diff --git a/SOURCES/evolution-data-server-3.8.5-caldav-initialize-backend-crash.patch b/SOURCES/evolution-data-server-3.8.5-caldav-initialize-backend-crash.patch new file mode 100644 index 0000000..5cfc507 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-caldav-initialize-backend-crash.patch @@ -0,0 +1,44 @@ +diff -up evolution-data-server-3.8.5/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-initialize-backend-crash evolution-data-server-3.8.5/calendar/backends/caldav/e-cal-backend-caldav.c +--- evolution-data-server-3.8.5/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-initialize-backend-crash 2014-01-15 15:01:59.631683627 +0100 ++++ evolution-data-server-3.8.5/calendar/backends/caldav/e-cal-backend-caldav.c 2014-01-15 15:01:59.682683626 +0100 +@@ -5071,20 +5071,23 @@ caldav_source_changed_thread (gpointer d + + old_slave_cmd = cbdav->priv->slave_cmd; + old_slave_busy = cbdav->priv->slave_busy; +- if (old_slave_busy) { ++ if (old_slave_busy) + update_slave_cmd (cbdav->priv, SLAVE_SHOULD_SLEEP); +- g_mutex_lock (&cbdav->priv->busy_lock); +- } + ++ g_mutex_lock (&cbdav->priv->busy_lock); ++ ++ /* guard the call with busy_lock, thus the two threads (this 'source changed' ++ thread and the 'backend open' thread) will not clash on internal data ++ when they are called in once */ + initialize_backend (cbdav, NULL); + + /* always wakeup thread, even when it was sleeping */ + g_cond_signal (&cbdav->priv->cond); + +- if (old_slave_busy) { ++ if (old_slave_busy) + update_slave_cmd (cbdav->priv, old_slave_cmd); +- g_mutex_unlock (&cbdav->priv->busy_lock); +- } ++ ++ g_mutex_unlock (&cbdav->priv->busy_lock); + + cbdav->priv->updating_source = FALSE; + +@@ -5102,7 +5105,9 @@ caldav_source_changed_cb (ESource *sourc + g_return_if_fail (source != NULL); + g_return_if_fail (cbdav != NULL); + +- if (cbdav->priv->updating_source) ++ if (cbdav->priv->updating_source || ++ !cbdav->priv->loaded || ++ !e_cal_backend_is_opened (E_CAL_BACKEND (cbdav))) + return; + + cbdav->priv->updating_source = TRUE; diff --git a/SOURCES/evolution-data-server-3.8.5-detect-list-errors.patch b/SOURCES/evolution-data-server-3.8.5-detect-list-errors.patch new file mode 100644 index 0000000..19cff41 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-detect-list-errors.patch @@ -0,0 +1,160 @@ +diff -up evolution-data-server-3.8.5/camel/camel-imapx-job.c.detect-list-errors evolution-data-server-3.8.5/camel/camel-imapx-job.c +--- evolution-data-server-3.8.5/camel/camel-imapx-job.c.detect-list-errors 2013-07-23 07:57:42.000000000 -0400 ++++ evolution-data-server-3.8.5/camel/camel-imapx-job.c 2013-12-19 13:42:15.923968414 -0500 +@@ -29,6 +29,7 @@ struct _CamelIMAPXRealJob { + volatile gint ref_count; + + GCancellable *cancellable; ++ GError *error; + + /* Used for running some jobs synchronously. */ + GCond done_cond; +@@ -113,6 +114,7 @@ camel_imapx_job_unref (CamelIMAPXJob *jo + + g_cond_clear (&real_job->done_cond); + g_mutex_clear (&real_job->done_mutex); ++ g_clear_error (&real_job->error); + + if (real_job->destroy_data != NULL) + real_job->destroy_data (real_job->data); +@@ -221,7 +223,10 @@ camel_imapx_job_run (CamelIMAPXJob *job, + if (cancel_id > 0) + g_cancellable_disconnect (cancellable, cancel_id); + +- return success; ++ if (success && g_cancellable_set_error_if_cancelled (cancellable, error)) ++ return FALSE; ++ ++ return success && !camel_imapx_job_propagate_error (job, error); + } + + gboolean +@@ -348,3 +353,37 @@ camel_imapx_job_get_cancellable (CamelIM + + return real_job->cancellable; + } ++ ++void ++camel_imapx_job_set_error (CamelIMAPXJob *job, ++ const GError *error) ++{ ++ CamelIMAPXRealJob *real_job; ++ ++ g_return_if_fail (CAMEL_IS_IMAPX_JOB (job)); ++ ++ real_job = (CamelIMAPXRealJob *) job; ++ ++ /* do not overwrite errors, the first set is kept */ ++ if (!real_job->error && error) ++ real_job->error = g_error_copy (error); ++} ++ ++gboolean ++camel_imapx_job_propagate_error (CamelIMAPXJob *job, ++ GError **error) ++{ ++ CamelIMAPXRealJob *real_job; ++ ++ g_return_val_if_fail (CAMEL_IS_IMAPX_JOB (job), FALSE); ++ ++ real_job = (CamelIMAPXRealJob *) job; ++ ++ if (!real_job->error) ++ return FALSE; ++ ++ if (error) ++ g_propagate_error (error, g_error_copy (real_job->error)); ++ ++ return TRUE; ++} +diff -up evolution-data-server-3.8.5/camel/camel-imapx-job.h.detect-list-errors evolution-data-server-3.8.5/camel/camel-imapx-job.h +--- evolution-data-server-3.8.5/camel/camel-imapx-job.h.detect-list-errors 2013-07-23 07:57:56.000000000 -0400 ++++ evolution-data-server-3.8.5/camel/camel-imapx-job.h 2013-12-19 13:42:15.923968414 -0500 +@@ -81,6 +81,10 @@ CamelFolder * camel_imapx_job_ref_folder + void camel_imapx_job_set_folder (CamelIMAPXJob *job, + CamelFolder *folder); + GCancellable * camel_imapx_job_get_cancellable (CamelIMAPXJob *job); ++void camel_imapx_job_set_error (CamelIMAPXJob *job, ++ const GError *error); ++gboolean camel_imapx_job_propagate_error (CamelIMAPXJob *job, ++ GError **error); + + G_END_DECLS + +diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.detect-list-errors evolution-data-server-3.8.5/camel/camel-imapx-server.c +--- evolution-data-server-3.8.5/camel/camel-imapx-server.c.detect-list-errors 2013-12-19 13:27:59.033552530 -0500 ++++ evolution-data-server-3.8.5/camel/camel-imapx-server.c 2013-12-19 13:42:15.925968140 -0500 +@@ -2772,6 +2772,7 @@ imapx_completion (CamelIMAPXServer *is, + CamelIMAPXCommand *ic; + gboolean success; + guint tag; ++ GError *local_error = NULL; + + /* Given "A0001 ...", 'A' = tag prefix, '0001' = tag. */ + +@@ -2829,18 +2830,40 @@ imapx_completion (CamelIMAPXServer *is, + return FALSE; + } + ++ camel_imapx_command_ref (ic); + camel_imapx_command_queue_remove (is->done, ic); + + QUEUE_UNLOCK (is); + +- ic->status = imapx_parse_status (stream, cancellable, error); ++ ic->status = imapx_parse_status (stream, cancellable, &local_error); ++ ++ if (ic->status == NULL || local_error) { ++ if (!local_error) ++ local_error = g_error_new_literal (CAMEL_IMAPX_ERROR, 1, "command parse status failed without error set"); ++ ++ camel_imapx_job_set_error (camel_imapx_command_get_job (ic), local_error); ++ g_propagate_error (error, local_error); ++ ++ camel_imapx_command_unref (ic); + +- if (ic->status == NULL) + return FALSE; ++ } ++ ++ if (ic->complete != NULL) { ++ if (!ic->complete (is, ic, cancellable, &local_error) || local_error) { ++ if (!local_error) ++ local_error = g_error_new_literal (CAMEL_IMAPX_ERROR, 1, "command complete failed without error set"); ++ ++ camel_imapx_job_set_error (camel_imapx_command_get_job (ic), local_error); ++ g_propagate_error (error, local_error); ++ ++ camel_imapx_command_unref (ic); + +- if (ic->complete != NULL) +- if (!ic->complete (is, ic, cancellable, error)) + return FALSE; ++ } ++ } ++ ++ camel_imapx_command_unref (ic); + + QUEUE_LOCK (is); + success = imapx_command_start_next (is, cancellable, error); +diff -up evolution-data-server-3.8.5/camel/camel-imapx-store.c.detect-list-errors evolution-data-server-3.8.5/camel/camel-imapx-store.c +--- evolution-data-server-3.8.5/camel/camel-imapx-store.c.detect-list-errors 2013-12-19 13:27:59.028552534 -0500 ++++ evolution-data-server-3.8.5/camel/camel-imapx-store.c 2013-12-19 13:42:15.926968007 -0500 +@@ -1011,11 +1011,15 @@ fetch_folders_for_pattern (CamelIMAPXSto + GError **error) + { + GPtrArray *folders; ++ GError *local_error = NULL; + + folders = camel_imapx_server_list ( +- server, pattern, flags, ext, cancellable, error); +- if (folders == NULL) ++ server, pattern, flags, ext, cancellable, &local_error); ++ if (folders == NULL || local_error) { ++ if (local_error) ++ g_propagate_error (error, local_error); + return FALSE; ++ } + + add_folders_to_summary (istore, server, folders, table, (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED)); + diff --git a/SOURCES/evolution-data-server-3.8.5-imapx-body-header.patch b/SOURCES/evolution-data-server-3.8.5-imapx-body-header.patch new file mode 100644 index 0000000..19d13a2 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-imapx-body-header.patch @@ -0,0 +1,33 @@ +diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-body-header evolution-data-server-3.8.5/camel/camel-imapx-server.c +--- evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-body-header 2014-01-16 15:04:31.962005652 +0100 ++++ evolution-data-server-3.8.5/camel/camel-imapx-server.c 2014-01-16 15:06:59.258999410 +0100 +@@ -1722,6 +1722,7 @@ imapx_untagged_fetch (CamelIMAPXServer * + GError **error) + { + struct _fetch_info *finfo; ++ gboolean got_body_header; + + g_return_val_if_fail (CAMEL_IS_IMAPX_SERVER (is), FALSE); + /* cancellable may be NULL */ +@@ -1733,6 +1734,21 @@ imapx_untagged_fetch (CamelIMAPXServer * + return FALSE; + } + ++ /* Some IMAP servers respond with BODY[HEADER] when ++ * asked for RFC822.HEADER. Treat them equivalently. */ ++ got_body_header = ++ ((finfo->got & FETCH_HEADER) == 0) && ++ (finfo->header == NULL) && ++ ((finfo->got & FETCH_BODY) != 0) && ++ (g_strcmp0 (finfo->section, "HEADER") == 0); ++ ++ if (got_body_header) { ++ finfo->got |= FETCH_HEADER; ++ finfo->got &= ~FETCH_BODY; ++ finfo->header = finfo->body; ++ finfo->body = NULL; ++ } ++ + if ((finfo->got & (FETCH_BODY | FETCH_UID)) == (FETCH_BODY | FETCH_UID)) { + CamelIMAPXJob *job; + GetMessageData *data; diff --git a/SOURCES/evolution-data-server-3.8.5-imapx-disconnect-changes.patch b/SOURCES/evolution-data-server-3.8.5-imapx-disconnect-changes.patch new file mode 100644 index 0000000..daee188 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-imapx-disconnect-changes.patch @@ -0,0 +1,22 @@ +diff -up evolution-data-server-3.8.5/camel/camel-imapx-store.c.imapx-disconnect-changes evolution-data-server-3.8.5/camel/camel-imapx-store.c +--- evolution-data-server-3.8.5/camel/camel-imapx-store.c.imapx-disconnect-changes 2014-04-07 14:55:07.661322786 +0200 ++++ evolution-data-server-3.8.5/camel/camel-imapx-store.c 2014-04-07 14:55:07.745322782 +0200 +@@ -303,15 +303,15 @@ imapx_disconnect_sync (CamelService *ser + { + CamelIMAPXStore *istore = CAMEL_IMAPX_STORE (service); + CamelServiceClass *service_class; ++ gboolean res; + + service_class = CAMEL_SERVICE_CLASS (camel_imapx_store_parent_class); +- if (!service_class->disconnect_sync (service, clean, cancellable, error)) +- return FALSE; ++ res = service_class->disconnect_sync (service, clean, cancellable, error); + + if (istore->con_man != NULL) + camel_imapx_conn_manager_close_connections (istore->con_man); + +- return TRUE; ++ return res; + } + + static CamelAuthenticationResult diff --git a/SOURCES/evolution-data-server-3.8.5-imapx-dont-timeout-on-reads.patch b/SOURCES/evolution-data-server-3.8.5-imapx-dont-timeout-on-reads.patch new file mode 100644 index 0000000..035a7da --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-imapx-dont-timeout-on-reads.patch @@ -0,0 +1,12 @@ +diff -up evolution-data-server-3.8.5/camel/camel-tcp-stream-raw.c.imapx-dont-timeout-on-reads evolution-data-server-3.8.5/camel/camel-tcp-stream-raw.c +--- evolution-data-server-3.8.5/camel/camel-tcp-stream-raw.c.imapx-dont-timeout-on-reads 2013-07-23 07:57:42.000000000 -0400 ++++ evolution-data-server-3.8.5/camel/camel-tcp-stream-raw.c 2014-01-16 10:13:51.984089439 -0500 +@@ -329,7 +329,7 @@ read_from_prfd (PRFileDesc *fd, + PR_GetCurrentThread (), (GDestroyNotify) NULL); + + do { +- bytes_read = PR_Recv (fd, buffer, n, 0, IO_TIMEOUT); ++ bytes_read = PR_Read (fd, buffer, n); + } while (bytes_read == -1 && PR_GetError () == PR_IO_PENDING_ERROR); + + if (cancel_id > 0) diff --git a/SOURCES/evolution-data-server-3.8.5-imapx-message-copy-unread.patch b/SOURCES/evolution-data-server-3.8.5-imapx-message-copy-unread.patch new file mode 100644 index 0000000..35509ca --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-imapx-message-copy-unread.patch @@ -0,0 +1,12 @@ +diff -up evolution-data-server-3.8.5/camel/camel-imapx-utils.c.imapx-message-copy-unread evolution-data-server-3.8.5/camel/camel-imapx-utils.c +--- evolution-data-server-3.8.5/camel/camel-imapx-utils.c.imapx-message-copy-unread 2013-07-23 13:57:59.000000000 +0200 ++++ evolution-data-server-3.8.5/camel/camel-imapx-utils.c 2014-01-27 14:29:11.364712042 +0100 +@@ -196,7 +196,7 @@ imapx_write_flags (GString *string, + + for (i = 0; flags != 0 && i< G_N_ELEMENTS (flag_table); i++) { + if (flag_table[i].flag & flags) { +- if (flags & CAMEL_IMAPX_MESSAGE_RECENT) ++ if (flag_table[i].flag & CAMEL_IMAPX_MESSAGE_RECENT) + continue; + if (!first) + g_string_append_c (string, ' '); diff --git a/SOURCES/evolution-data-server-3.8.5-imapx-message-flags.patch b/SOURCES/evolution-data-server-3.8.5-imapx-message-flags.patch new file mode 100644 index 0000000..83bd196 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-imapx-message-flags.patch @@ -0,0 +1,151 @@ +diff -up evolution-data-server-3.8.5/camel/camel-folder-summary.c.imapx-message-flags evolution-data-server-3.8.5/camel/camel-folder-summary.c +--- evolution-data-server-3.8.5/camel/camel-folder-summary.c.imapx-message-flags 2013-08-02 16:56:47.000000000 +0200 ++++ evolution-data-server-3.8.5/camel/camel-folder-summary.c 2014-01-30 12:01:15.998935449 +0100 +@@ -2011,12 +2011,29 @@ perform_content_info_load_from_db (Camel + } + + static void +-append_changed_uids (gchar *key, +- CamelMessageInfoBase *info, +- GPtrArray *array) ++gather_dirty_uids (gpointer key, ++ gpointer value, ++ gpointer user_data) + { +- if (info->dirty || info->flags & CAMEL_MESSAGE_FOLDER_FLAGGED) +- g_ptr_array_add (array, (gpointer) camel_pstring_strdup ((camel_message_info_uid (info)))); ++ const gchar *uid = key; ++ CamelMessageInfoBase *info = value; ++ GHashTable *hash = user_data; ++ ++ if (info->dirty) ++ g_hash_table_insert (hash, (gpointer) camel_pstring_strdup (uid), GINT_TO_POINTER (1)); ++} ++ ++static void ++gather_changed_uids (gpointer key, ++ gpointer value, ++ gpointer user_data) ++{ ++ const gchar *uid = key; ++ guint32 flags = GPOINTER_TO_UINT (value); ++ GHashTable *hash = user_data; ++ ++ if ((flags & CAMEL_MESSAGE_FOLDER_FLAGGED) != 0) ++ g_hash_table_insert (hash, (gpointer) camel_pstring_strdup (uid), GINT_TO_POINTER (1)); + } + + /** +@@ -2027,16 +2044,21 @@ append_changed_uids (gchar *key, + GPtrArray * + camel_folder_summary_get_changed (CamelFolderSummary *summary) + { +- GPtrArray *res = g_ptr_array_new (); +- +- /* FIXME[disk-summary] sucks, this function returns from memory. +- * We need to have collate or something to get the modified ones +- * from DB and merge */ ++ GPtrArray *res; ++ GHashTable *hash = g_hash_table_new_full (g_direct_hash, g_direct_equal, (GDestroyNotify) camel_pstring_free, NULL); + + camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); +- g_hash_table_foreach (summary->priv->loaded_infos, (GHFunc) append_changed_uids, res); ++ ++ g_hash_table_foreach (summary->priv->loaded_infos, gather_dirty_uids, hash); ++ g_hash_table_foreach (summary->priv->uids, gather_changed_uids, hash); ++ ++ res = g_ptr_array_sized_new (g_hash_table_size (hash)); ++ g_hash_table_foreach (hash, folder_summary_dupe_uids_to_array, res); ++ + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); + ++ g_hash_table_destroy (hash); ++ + return res; + } + +diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-message-flags evolution-data-server-3.8.5/camel/camel-imapx-server.c +--- evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-message-flags 2014-01-30 12:01:15.989935450 +0100 ++++ evolution-data-server-3.8.5/camel/camel-imapx-server.c 2014-01-30 12:02:29.616932482 +0100 +@@ -6898,7 +6898,12 @@ imapx_parser_thread (gpointer d) + GError *local_error = NULL; + + QUEUE_LOCK (is); +- cancellable = camel_operation_new (); ++ /* Do not use CamelOperation here, because it can be cancelled at ++ an application end with camel_operation_cancel_all() call, which ++ is done too early, before any pending jobs are properly finished ++ (it can be IDLE job, or save of folder changes back to the server). ++ */ ++ cancellable = g_cancellable_new (); + is->cancellable = g_object_ref (cancellable); + QUEUE_UNLOCK (is); + +@@ -7715,6 +7720,40 @@ imapx_sync_free_user (GArray *user_set) + g_array_free (user_set, TRUE); + } + ++static void ++imapx_unset_folder_flagged_flag (CamelFolderSummary *summary, ++ GPtrArray *changed_uids) ++{ ++ CamelMessageInfo *info; ++ gboolean changed = FALSE; ++ gint ii; ++ ++ g_return_if_fail (CAMEL_IS_FOLDER_SUMMARY (summary)); ++ g_return_if_fail (changed_uids != NULL); ++ ++ for (ii = 0; ii < changed_uids->len; ii++) { ++ info = camel_folder_summary_get (summary, changed_uids->pdata[ii]); ++ ++ if (info) { ++ CamelMessageInfoBase *mi = (CamelMessageInfoBase *) info; ++ ++ /* some infos could be only 'dirty' (needed to save into summary) */ ++ if ((mi->flags & CAMEL_MESSAGE_FOLDER_FLAGGED) != 0) { ++ mi->flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED; ++ mi->dirty = TRUE; ++ changed = TRUE; ++ } ++ ++ camel_message_info_free (info); ++ } ++ } ++ ++ if (changed) { ++ camel_folder_summary_touch (summary); ++ camel_folder_summary_save_to_db (summary, NULL); ++ } ++} ++ + static gboolean + imapx_server_sync_changes (CamelIMAPXServer *is, + CamelFolder *folder, +@@ -7873,6 +7912,7 @@ imapx_server_sync_changes (CamelIMAPXSer + if (nothing_to_do) { + imapx_sync_free_user (on_user); + imapx_sync_free_user (off_user); ++ imapx_unset_folder_flagged_flag (folder->summary, changed_uids); + camel_folder_free_uids (folder, changed_uids); + return TRUE; + } +diff -up evolution-data-server-3.8.5/camel/camel-imapx-utils.c.imapx-message-flags evolution-data-server-3.8.5/camel/camel-imapx-utils.c +--- evolution-data-server-3.8.5/camel/camel-imapx-utils.c.imapx-message-flags 2014-01-30 12:01:15.996935450 +0100 ++++ evolution-data-server-3.8.5/camel/camel-imapx-utils.c 2014-01-30 12:01:15.999935449 +0100 +@@ -257,6 +257,15 @@ imapx_update_message_info_flags (CamelMe + gboolean changed = FALSE; + CamelIMAPXMessageInfo *xinfo = (CamelIMAPXMessageInfo *) info; + ++ /* This makes sure that server flags has precedence from locally stored flags, ++ thus a user actually sees what is stored on the server, but only if the message ++ was not changed locally and is ready to be saved */ ++ if (!(camel_message_info_flags (info) & CAMEL_MESSAGE_FOLDER_FLAGGED) && ++ (camel_message_info_flags (info) & CAMEL_IMAPX_SERVER_FLAGS) != (server_flags & CAMEL_IMAPX_SERVER_FLAGS)) { ++ xinfo->server_flags = (xinfo->server_flags & ~CAMEL_IMAPX_SERVER_FLAGS) | ++ (camel_message_info_flags (info) & CAMEL_IMAPX_SERVER_FLAGS); ++ } ++ + if (server_flags != xinfo->server_flags) { + guint32 server_set, server_cleared; + diff --git a/SOURCES/evolution-data-server-3.8.5-imapx-server-dispose-block.patch b/SOURCES/evolution-data-server-3.8.5-imapx-server-dispose-block.patch index 9fa71f6..2adf19b 100644 --- a/SOURCES/evolution-data-server-3.8.5-imapx-server-dispose-block.patch +++ b/SOURCES/evolution-data-server-3.8.5-imapx-server-dispose-block.patch @@ -1,9 +1,9 @@ -diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.eds evolution-data-server-3.8.5/camel/camel-imapx-server.c ---- evolution-data-server-3.8.5/camel/camel-imapx-server.c.eds 2013-11-07 09:46:45.524877569 +0100 -+++ evolution-data-server-3.8.5/camel/camel-imapx-server.c 2013-11-07 09:48:20.332871086 +0100 -@@ -6963,13 +6963,8 @@ imapx_parser_thread (gpointer d) - - g_clear_error (&local_error); +diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-server-dispose-block evolution-data-server-3.8.5/camel/camel-imapx-server.c +--- evolution-data-server-3.8.5/camel/camel-imapx-server.c.imapx-server-dispose-block 2013-07-23 13:57:58.000000000 +0200 ++++ evolution-data-server-3.8.5/camel/camel-imapx-server.c 2014-02-28 15:52:35.061106174 +0100 +@@ -6978,13 +6978,8 @@ imapx_parser_thread (gpointer d) + is->parser_quit = FALSE; + g_signal_emit (is, signals[SHUTDOWN], 0); - return NULL; -} @@ -16,7 +16,7 @@ diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.eds evolution-da return NULL; } -@@ -7041,14 +7036,8 @@ imapx_server_dispose (GObject *object) +@@ -7056,14 +7051,8 @@ imapx_server_dispose (GObject *object) } QUEUE_UNLOCK (server); @@ -33,7 +33,7 @@ diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.eds evolution-da server->parser_thread = NULL; } -@@ -7288,7 +7277,8 @@ camel_imapx_server_connect (CamelIMAPXSe +@@ -7332,7 +7321,8 @@ camel_imapx_server_connect (CamelIMAPXSe if (!imapx_reconnect (is, cancellable, error)) return FALSE; diff --git a/SOURCES/evolution-data-server-3.8.5-imapx-server-side-search.patch b/SOURCES/evolution-data-server-3.8.5-imapx-server-side-search.patch new file mode 100644 index 0000000..d53a917 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-imapx-server-side-search.patch @@ -0,0 +1,501 @@ +diff -up evolution-data-server-3.8.5/camel/camel-imapx-search.c.imapx-server-side-search evolution-data-server-3.8.5/camel/camel-imapx-search.c +--- evolution-data-server-3.8.5/camel/camel-imapx-search.c.imapx-server-side-search 2013-07-23 13:57:42.000000000 +0200 ++++ evolution-data-server-3.8.5/camel/camel-imapx-search.c 2014-02-03 16:39:00.652093324 +0100 +@@ -27,6 +27,7 @@ + + struct _CamelIMAPXSearchPrivate { + GWeakRef server; ++ gint *local_data_search; /* not NULL, if testing whether all used headers are all locally available */ + }; + + enum { +@@ -88,32 +89,194 @@ imapx_search_dispose (GObject *object) + } + + static CamelSExpResult * ++imapx_search_result_match_all (CamelSExp *sexp, ++ CamelFolderSearch *search) ++{ ++ CamelSExpResult *result; ++ ++ g_return_val_if_fail (search != NULL, NULL); ++ ++ if (search->current != NULL) { ++ result = camel_sexp_result_new (sexp, CAMEL_SEXP_RES_BOOL); ++ result->value.boolean = TRUE; ++ } else { ++ gint ii; ++ ++ result = camel_sexp_result_new (sexp, CAMEL_SEXP_RES_ARRAY_PTR); ++ result->value.ptrarray = g_ptr_array_new (); ++ ++ for (ii = 0; ii < search->summary->len; ii++) ++ g_ptr_array_add ( ++ result->value.ptrarray, ++ (gpointer) search->summary->pdata[ii]); ++ } ++ ++ return result; ++} ++ ++static CamelSExpResult * ++imapx_search_result_match_none (CamelSExp *sexp, ++ CamelFolderSearch *search) ++{ ++ CamelSExpResult *result; ++ ++ g_return_val_if_fail (search != NULL, NULL); ++ ++ if (search->current != NULL) { ++ result = camel_sexp_result_new (sexp, CAMEL_SEXP_RES_BOOL); ++ result->value.boolean = FALSE; ++ } else { ++ result = camel_sexp_result_new (sexp, CAMEL_SEXP_RES_ARRAY_PTR); ++ result->value.ptrarray = g_ptr_array_new (); ++ } ++ ++ return result; ++} ++ ++static CamelSExpResult * ++imapx_search_process_criteria (CamelSExp *sexp, ++ CamelFolderSearch *search, ++ CamelIMAPXServer *server, ++ const GString *criteria, ++ const gchar *from_function) ++{ ++ CamelSExpResult *result; ++ GPtrArray *uids = NULL; ++ GError *error = NULL; ++ ++ uids = camel_imapx_server_uid_search ( ++ server, search->folder, criteria->str, NULL, &error); ++ ++ /* Sanity check. */ ++ g_return_val_if_fail ( ++ ((uids != NULL) && (error == NULL)) || ++ ((uids == NULL) && (error != NULL)), NULL); ++ ++ /* XXX No allowance for errors in CamelSExp callbacks! ++ * Dump the error to the console and make like we ++ * got an empty result. */ ++ if (error != NULL) { ++ g_warning ( ++ "%s: (UID SEARCH %s): %s", ++ from_function, criteria->str, error->message); ++ uids = g_ptr_array_new (); ++ g_error_free (error); ++ } ++ ++ if (search->current != NULL) { ++ result = camel_sexp_result_new (sexp, CAMEL_SEXP_RES_BOOL); ++ result->value.boolean = (uids && uids->len > 0); ++ } else { ++ result = camel_sexp_result_new (sexp, CAMEL_SEXP_RES_ARRAY_PTR); ++ result->value.ptrarray = g_ptr_array_ref (uids); ++ } ++ ++ g_ptr_array_unref (uids); ++ ++ return result; ++} ++ ++static CamelSExpResult * ++imapx_search_match_all (CamelSExp *sexp, ++ gint argc, ++ CamelSExpTerm **argv, ++ CamelFolderSearch *search) ++{ ++ CamelIMAPXSearch *imapx_search = CAMEL_IMAPX_SEARCH (search); ++ CamelIMAPXServer *server; ++ CamelSExpResult *result; ++ GPtrArray *summary; ++ gint local_data_search = 0, *prev_local_data_search, ii; ++ ++ if (argc != 1) ++ return imapx_search_result_match_none (sexp, search); ++ ++ server = camel_imapx_search_ref_server (CAMEL_IMAPX_SEARCH (search)); ++ if (!server || search->current || !search->summary) { ++ g_clear_object (&server); ++ ++ /* Chain up to parent's method. */ ++ return CAMEL_FOLDER_SEARCH_CLASS (camel_imapx_search_parent_class)-> ++ match_all (sexp, argc, argv, search); ++ } ++ ++ /* First try to see whether all used headers are available locally - if ++ they are, then do not use server-side filtering at all. */ ++ prev_local_data_search = imapx_search->priv->local_data_search; ++ imapx_search->priv->local_data_search = &local_data_search; ++ ++ summary = search->summary_set ? search->summary_set : search->summary; ++ ++ if (!CAMEL_IS_VEE_FOLDER (search->folder)) { ++ camel_folder_summary_prepare_fetch_all (search->folder->summary, NULL); ++ } ++ ++ for (ii = 0; ii < summary->len; ii++) { ++ search->current = camel_folder_summary_get (search->folder->summary, summary->pdata[ii]); ++ if (search->current) { ++ result = camel_sexp_term_eval (sexp, argv[0]); ++ camel_sexp_result_free (sexp, result); ++ camel_message_info_free (search->current); ++ search->current = NULL; ++ break; ++ } ++ } ++ imapx_search->priv->local_data_search = prev_local_data_search; ++ ++ if (local_data_search >= 0) { ++ g_clear_object (&server); ++ ++ /* Chain up to parent's method. */ ++ return CAMEL_FOLDER_SEARCH_CLASS (camel_imapx_search_parent_class)-> ++ match_all (sexp, argc, argv, search); ++ } ++ ++ /* let's change the requirements a bit, the parent class expects as a result boolean, ++ but here is expected GPtrArray of matched UIDs */ ++ result = camel_sexp_term_eval (sexp, argv[0]); ++ ++ g_object_unref (server); ++ ++ g_return_val_if_fail (result != NULL, result); ++ g_return_val_if_fail (result->type == CAMEL_SEXP_RES_ARRAY_PTR, result); ++ ++ return result; ++} ++ ++static CamelSExpResult * + imapx_search_body_contains (CamelSExp *sexp, + gint argc, + CamelSExpResult **argv, + CamelFolderSearch *search) + { ++ CamelIMAPXSearch *imapx_search = CAMEL_IMAPX_SEARCH (search); + CamelIMAPXServer *server; + CamelSExpResult *result; +- CamelSExpResultType type; + GString *criteria; +- GPtrArray *uids; + gint ii, jj; +- GError *error = NULL; ++ ++ /* Always do body-search server-side */ ++ if (imapx_search->priv->local_data_search) { ++ *imapx_search->priv->local_data_search = -1; ++ return imapx_search_result_match_none (sexp, search); ++ } + + /* Match everything if argv = [""] */ + if (argc == 1 && argv[0]->value.string[0] == '\0') +- goto match_all; ++ return imapx_search_result_match_all (sexp, search); + + /* Match nothing if empty argv or empty summary. */ + if (argc == 0 || search->summary->len == 0) +- goto match_none; ++ return imapx_search_result_match_none (sexp, search); + + server = camel_imapx_search_ref_server (CAMEL_IMAPX_SEARCH (search)); + + /* This will be NULL if we're offline. Search from cache. */ +- if (server == NULL) +- goto chain_up; ++ if (server == NULL) { ++ /* Chain up to parent's method. */ ++ return CAMEL_FOLDER_SEARCH_CLASS (camel_imapx_search_parent_class)-> ++ body_contains (sexp, argc, argv, search); ++ } + + /* Build the IMAP search criteria. */ + +@@ -157,78 +320,217 @@ imapx_search_body_contains (CamelSExp *s + } + } + +- uids = camel_imapx_server_uid_search ( +- server, search->folder, criteria->str, NULL, &error); ++ result = imapx_search_process_criteria (sexp, search, server, criteria, G_STRFUNC); + +- /* Sanity check. */ +- g_return_val_if_fail ( +- ((uids != NULL) && (error == NULL)) || +- ((uids == NULL) && (error != NULL)), NULL); ++ g_string_free (criteria, TRUE); ++ g_object_unref (server); + +- /* XXX No allowance for errors in CamelSExp callbacks! +- * Dump the error to the console and make like we +- * got an empty result. */ +- if (error != NULL) { +- g_warning ( +- "%s: (UID SEARCH %s): %s", +- G_STRFUNC, criteria->str, error->message); +- uids = g_ptr_array_new (); +- g_error_free (error); ++ return result; ++} ++ ++static gboolean ++imapx_search_is_header_from_summary (const gchar *header_name) ++{ ++ return g_ascii_strcasecmp (header_name, "From") == 0 || ++ g_ascii_strcasecmp (header_name, "To") == 0 || ++ g_ascii_strcasecmp (header_name, "CC") == 0 || ++ g_ascii_strcasecmp (header_name, "Subject") == 0; ++} ++ ++static CamelSExpResult * ++imapx_search_header_contains (CamelSExp *sexp, ++ gint argc, ++ CamelSExpResult **argv, ++ CamelFolderSearch *search) ++{ ++ CamelIMAPXSearch *imapx_search = CAMEL_IMAPX_SEARCH (search); ++ CamelIMAPXServer *server; ++ CamelSExpResult *result; ++ const gchar *headername, *command = NULL; ++ GString *criteria; ++ gint ii, jj; ++ ++ /* Match nothing if empty argv or empty summary. */ ++ if (argc <= 1 || ++ argv[0]->type != CAMEL_SEXP_RES_STRING || ++ search->summary->len == 0) ++ return imapx_search_result_match_none (sexp, search); ++ ++ headername = argv[0]->value.string; ++ ++ if (imapx_search_is_header_from_summary (headername)) { ++ if (imapx_search->priv->local_data_search) { ++ if (*imapx_search->priv->local_data_search >= 0) ++ *imapx_search->priv->local_data_search = (*imapx_search->priv->local_data_search) + 1; ++ return imapx_search_result_match_all (sexp, search); ++ } ++ ++ /* Chain up to parent's method. */ ++ return CAMEL_FOLDER_SEARCH_CLASS (camel_imapx_search_parent_class)-> ++ header_contains (sexp, argc, argv, search); ++ } else if (imapx_search->priv->local_data_search) { ++ *imapx_search->priv->local_data_search = -1; ++ return imapx_search_result_match_none (sexp, search); ++ } ++ ++ server = camel_imapx_search_ref_server (CAMEL_IMAPX_SEARCH (search)); ++ ++ /* This will be NULL if we're offline. Search from cache. */ ++ if (server == NULL) { ++ /* Chain up to parent's method. */ ++ return CAMEL_FOLDER_SEARCH_CLASS (camel_imapx_search_parent_class)-> ++ header_contains (sexp, argc, argv, search); + } + ++ /* Build the IMAP search criteria. */ ++ ++ criteria = g_string_sized_new (128); ++ + if (search->current != NULL) { +- type = CAMEL_SEXP_RES_BOOL; +- result = camel_sexp_result_new (sexp, type); +- result->value.boolean = (uids->len > 0); +- } else { +- type = CAMEL_SEXP_RES_ARRAY_PTR; +- result = camel_sexp_result_new (sexp, type); +- result->value.ptrarray = g_ptr_array_ref (uids); ++ const gchar *uid; ++ ++ /* Limit the search to a single UID. */ ++ uid = camel_message_info_uid (search->current); ++ g_string_append_printf (criteria, "UID %s", uid); + } + +- g_ptr_array_unref (uids); ++ if (g_ascii_strcasecmp (headername, "From") == 0) ++ command = "FROM"; ++ else if (g_ascii_strcasecmp (headername, "To") == 0) ++ command = "TO"; ++ else if (g_ascii_strcasecmp (headername, "CC") == 0) ++ command = "CC"; ++ else if (g_ascii_strcasecmp (headername, "Bcc") == 0) ++ command = "BCC"; ++ else if (g_ascii_strcasecmp (headername, "Subject") == 0) ++ command = "SUBJECT"; + +- g_string_free (criteria, TRUE); ++ for (ii = 1; ii < argc; ii++) { ++ struct _camel_search_words *words; ++ const guchar *term; ++ ++ if (argv[ii]->type != CAMEL_SEXP_RES_STRING) ++ continue; ++ ++ /* Handle multiple search words within a single term. */ ++ term = (const guchar *) argv[ii]->value.string; ++ words = camel_search_words_split (term); ++ ++ for (jj = 0; jj < words->len; jj++) { ++ gchar *cp; ++ ++ if (criteria->len > 0) ++ g_string_append_c (criteria, ' '); ++ ++ if (command) ++ g_string_append (criteria, command); ++ else ++ g_string_append_printf (criteria, "HEADER \"%s\"", headername); ++ ++ g_string_append (criteria, " \""); ++ ++ cp = words->words[jj]->word; ++ for (; *cp != '\0'; cp++) { ++ if (*cp == '\\' || *cp == '"') ++ g_string_append_c (criteria, '\\'); ++ g_string_append_c (criteria, *cp); ++ } ++ ++ g_string_append_c (criteria, '"'); ++ } ++ } ++ ++ result = imapx_search_process_criteria (sexp, search, server, criteria, G_STRFUNC); + ++ g_string_free (criteria, TRUE); + g_object_unref (server); + + return result; ++} + +-match_all: +- if (search->current != NULL) { +- type = CAMEL_SEXP_RES_BOOL; +- result = camel_sexp_result_new (sexp, type); +- result->value.boolean = TRUE; +- } else { +- type = CAMEL_SEXP_RES_ARRAY_PTR; +- result = camel_sexp_result_new (sexp, type); +- result->value.ptrarray = g_ptr_array_new (); ++static CamelSExpResult * ++imapx_search_header_exists (CamelSExp *sexp, ++ gint argc, ++ CamelSExpResult **argv, ++ CamelFolderSearch *search) ++{ ++ CamelIMAPXSearch *imapx_search = CAMEL_IMAPX_SEARCH (search); ++ CamelIMAPXServer *server; ++ CamelSExpResult *result; ++ GString *criteria; ++ gint ii; + +- for (ii = 0; ii < search->summary->len; ii++) +- g_ptr_array_add ( +- result->value.ptrarray, +- (gpointer) search->summary->pdata[ii]); ++ /* Match nothing if empty argv or empty summary. */ ++ if (argc == 0 || search->summary->len == 0) ++ return imapx_search_result_match_none (sexp, search); ++ ++ /* Check if asking for locally stored headers only */ ++ for (ii = 0; ii < argc; ii++) { ++ if (argv[ii]->type != CAMEL_SEXP_RES_STRING) ++ continue; ++ ++ if (!imapx_search_is_header_from_summary (argv[ii]->value.string)) ++ break; + } + +- return result; ++ /* All headers are from summary */ ++ if (ii == argc) { ++ if (imapx_search->priv->local_data_search) { ++ if (*imapx_search->priv->local_data_search >= 0) ++ *imapx_search->priv->local_data_search = (*imapx_search->priv->local_data_search) + 1; ++ ++ return imapx_search_result_match_all (sexp, search); ++ } ++ ++ /* Chain up to parent's method. */ ++ return CAMEL_FOLDER_SEARCH_CLASS (camel_imapx_search_parent_class)-> ++ header_exists (sexp, argc, argv, search); ++ } else if (imapx_search->priv->local_data_search) { ++ *imapx_search->priv->local_data_search = -1; ++ return imapx_search_result_match_none (sexp, search); ++ } ++ ++ server = camel_imapx_search_ref_server (CAMEL_IMAPX_SEARCH (search)); ++ ++ /* This will be NULL if we're offline. Search from cache. */ ++ if (server == NULL) { ++ /* Chain up to parent's method. */ ++ return CAMEL_FOLDER_SEARCH_CLASS (camel_imapx_search_parent_class)-> ++ header_exists (sexp, argc, argv, search); ++ } ++ ++ /* Build the IMAP search criteria. */ ++ ++ criteria = g_string_sized_new (128); + +-match_none: + if (search->current != NULL) { +- type = CAMEL_SEXP_RES_BOOL; +- result = camel_sexp_result_new (sexp, type); +- result->value.boolean = FALSE; +- } else { +- type = CAMEL_SEXP_RES_ARRAY_PTR; +- result = camel_sexp_result_new (sexp, type); +- result->value.ptrarray = g_ptr_array_new (); ++ const gchar *uid; ++ ++ /* Limit the search to a single UID. */ ++ uid = camel_message_info_uid (search->current); ++ g_string_append_printf (criteria, "UID %s", uid); + } + +- return result; ++ for (ii = 0; ii < argc; ii++) { ++ const gchar *headername; ++ ++ if (argv[ii]->type != CAMEL_SEXP_RES_STRING) ++ continue; ++ ++ headername = argv[ii]->value.string; ++ ++ if (criteria->len > 0) ++ g_string_append_c (criteria, ' '); + +-chain_up: +- /* Chain up to parent's body_contains() method. */ +- return CAMEL_FOLDER_SEARCH_CLASS (camel_imapx_search_parent_class)-> +- body_contains (sexp, argc, argv, search); ++ g_string_append_printf (criteria, "HEADER \"%s\" \"\"", headername); ++ } ++ ++ result = imapx_search_process_criteria (sexp, search, server, criteria, G_STRFUNC); ++ ++ g_string_free (criteria, TRUE); ++ g_object_unref (server); ++ ++ return result; + } + + static void +@@ -245,7 +547,10 @@ camel_imapx_search_class_init (CamelIMAP + object_class->dispose = imapx_search_dispose; + + search_class = CAMEL_FOLDER_SEARCH_CLASS (class); ++ search_class->match_all = imapx_search_match_all; + search_class->body_contains = imapx_search_body_contains; ++ search_class->header_contains = imapx_search_header_contains; ++ search_class->header_exists = imapx_search_header_exists; + + g_object_class_install_property ( + object_class, +@@ -263,6 +568,7 @@ static void + camel_imapx_search_init (CamelIMAPXSearch *search) + { + search->priv = CAMEL_IMAPX_SEARCH_GET_PRIVATE (search); ++ search->priv->local_data_search = NULL; + } + + /** diff --git a/SOURCES/evolution-data-server-3.8.5-kill-imapx-conn-manager.patch b/SOURCES/evolution-data-server-3.8.5-kill-imapx-conn-manager.patch deleted file mode 100644 index cd82c23..0000000 --- a/SOURCES/evolution-data-server-3.8.5-kill-imapx-conn-manager.patch +++ /dev/null @@ -1,1936 +0,0 @@ -diff -up evolution-data-server-3.8.5/camel/camel.h.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/camel.h ---- evolution-data-server-3.8.5/camel/camel.h.kill-imapx-conn-manager 2013-07-23 07:57:56.000000000 -0400 -+++ evolution-data-server-3.8.5/camel/camel.h 2013-09-12 15:51:33.362412243 -0400 -@@ -144,7 +144,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff -up evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.c.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.c -diff -up evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.h.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/camel-imapx-conn-manager.h -diff -up evolution-data-server-3.8.5/camel/camel-imapx-folder.c.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/camel-imapx-folder.c ---- evolution-data-server-3.8.5/camel/camel-imapx-folder.c.kill-imapx-conn-manager 2013-07-23 08:01:51.000000000 -0400 -+++ evolution-data-server-3.8.5/camel/camel-imapx-folder.c 2013-09-12 15:51:33.323412254 -0400 -@@ -178,7 +178,7 @@ static void - imapx_folder_dispose (GObject *object) - { - CamelIMAPXFolder *folder = CAMEL_IMAPX_FOLDER (object); -- CamelStore *parent_store; -+ CamelStore *store; - - if (folder->cache != NULL) { - g_object_unref (folder->cache); -@@ -190,10 +190,10 @@ imapx_folder_dispose (GObject *object) - folder->search = NULL; - } - -- parent_store = camel_folder_get_parent_store (CAMEL_FOLDER (folder)); -- if (parent_store) { -+ store = camel_folder_get_parent_store (CAMEL_FOLDER (folder)); -+ if (store != NULL) { - camel_store_summary_disconnect_folder_summary ( -- (CamelStoreSummary *) ((CamelIMAPXStore *) parent_store)->summary, -+ (CamelStoreSummary *) ((CamelIMAPXStore *) store)->summary, - CAMEL_FOLDER (folder)->summary); - } - -@@ -283,15 +283,17 @@ static void - imapx_search_free (CamelFolder *folder, - GPtrArray *uids) - { -- CamelIMAPXFolder *ifolder = CAMEL_IMAPX_FOLDER (folder); -+ CamelIMAPXFolder *imapx_folder; - -- g_return_if_fail (ifolder->search); -+ imapx_folder = CAMEL_IMAPX_FOLDER (folder); - -- g_mutex_lock (&ifolder->search_lock); -+ g_return_if_fail (imapx_folder->search); - -- camel_folder_search_free_result (ifolder->search, uids); -+ g_mutex_lock (&imapx_folder->search_lock); - -- g_mutex_unlock (&ifolder->search_lock); -+ camel_folder_search_free_result (imapx_folder->search, uids); -+ -+ g_mutex_unlock (&imapx_folder->search_lock); - } - - static GPtrArray * -@@ -301,48 +303,37 @@ imapx_search_by_uids (CamelFolder *folde - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXFolder *ifolder; -- CamelIMAPXSearch *isearch; -- CamelIMAPXServer *server = NULL; -- CamelStore *parent_store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXFolder *imapx_folder; -+ CamelIMAPXSearch *imapx_search; -+ CamelIMAPXServer *imapx_server; -+ CamelStore *store; - GPtrArray *matches; -- const gchar *folder_name; -- gboolean online; - - if (uids->len == 0) - return g_ptr_array_new (); - -- ifolder = CAMEL_IMAPX_FOLDER (folder); -- folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); -- -- online = camel_offline_store_get_online ( -- CAMEL_OFFLINE_STORE (parent_store)); -+ imapx_folder = CAMEL_IMAPX_FOLDER (folder); -+ store = camel_folder_get_parent_store (folder); - -- if (online) { -- /* do not panic when the server cannot be reached for whatever reason, -- * show offline data at least */ -- server = camel_imapx_store_get_server ( -- CAMEL_IMAPX_STORE (parent_store), -- folder_name, cancellable, NULL); -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, NULL); - -- g_mutex_lock (&ifolder->search_lock); -+ g_mutex_lock (&imapx_folder->search_lock); - -- isearch = CAMEL_IMAPX_SEARCH (ifolder->search); -- camel_imapx_search_set_server (isearch, server); -+ imapx_search = CAMEL_IMAPX_SEARCH (imapx_folder->search); -+ camel_imapx_search_set_server (imapx_search, imapx_server); - -- camel_folder_search_set_folder (ifolder->search, folder); -+ camel_folder_search_set_folder (imapx_folder->search, folder); - - matches = camel_folder_search_search ( -- ifolder->search, expression, uids, cancellable, error); -+ imapx_folder->search, expression, uids, cancellable, error); - -- camel_imapx_search_set_server (isearch, NULL); -+ camel_imapx_search_set_server (imapx_search, NULL); - -- g_mutex_unlock (&ifolder->search_lock); -+ g_mutex_unlock (&imapx_folder->search_lock); - -- if (server != NULL) -- g_object_unref (server); -+ g_clear_object (&imapx_server); - - return matches; - } -@@ -353,45 +344,34 @@ imapx_count_by_expression (CamelFolder * - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXFolder *ifolder; -- CamelIMAPXSearch *isearch; -- CamelIMAPXServer *server = NULL; -- CamelStore *parent_store; -- const gchar *folder_name; -- gboolean online; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXFolder *imapx_folder; -+ CamelIMAPXSearch *imapx_search; -+ CamelIMAPXServer *imapx_server; -+ CamelStore *store; - guint32 matches; - -- ifolder = CAMEL_IMAPX_FOLDER (folder); -- folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); -- -- online = camel_offline_store_get_online ( -- CAMEL_OFFLINE_STORE (parent_store)); -+ imapx_folder = CAMEL_IMAPX_FOLDER (folder); -+ store = camel_folder_get_parent_store (folder); - -- if (online) { -- /* do not panic when the server cannot be reached for whatever reason, -- * show offline data at least */ -- server = camel_imapx_store_get_server ( -- CAMEL_IMAPX_STORE (parent_store), -- folder_name, cancellable, NULL); -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, NULL); - -- g_mutex_lock (&ifolder->search_lock); -+ g_mutex_lock (&imapx_folder->search_lock); - -- isearch = CAMEL_IMAPX_SEARCH (ifolder->search); -- camel_imapx_search_set_server (isearch, server); -+ imapx_search = CAMEL_IMAPX_SEARCH (imapx_folder->search); -+ camel_imapx_search_set_server (imapx_search, imapx_server); - -- camel_folder_search_set_folder (ifolder->search, folder); -+ camel_folder_search_set_folder (imapx_folder->search, folder); - - matches = camel_folder_search_count ( -- ifolder->search, expression, cancellable, error); -+ imapx_folder->search, expression, cancellable, error); - -- camel_imapx_search_set_server (isearch, NULL); -+ camel_imapx_search_set_server (imapx_search, NULL); - -- g_mutex_unlock (&ifolder->search_lock); -+ g_mutex_unlock (&imapx_folder->search_lock); - -- if (server != NULL) -- g_object_unref (server); -+ g_clear_object (&imapx_server); - - return matches; - } -@@ -402,45 +382,34 @@ imapx_search_by_expression (CamelFolder - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXFolder *ifolder; -- CamelIMAPXSearch *isearch; -- CamelIMAPXServer *server = NULL; -- CamelStore *parent_store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXFolder *imapx_folder; -+ CamelIMAPXSearch *imapx_search; -+ CamelIMAPXServer *imapx_server; -+ CamelStore *store; - GPtrArray *matches; -- const gchar *folder_name; -- gboolean online; -- -- ifolder = CAMEL_IMAPX_FOLDER (folder); -- folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); - -- online = camel_offline_store_get_online ( -- CAMEL_OFFLINE_STORE (parent_store)); -+ imapx_folder = CAMEL_IMAPX_FOLDER (folder); -+ store = camel_folder_get_parent_store (folder); - -- if (online) { -- /* do not panic when the server cannot be reached for whatever reason, -- * show offline data at least */ -- server = camel_imapx_store_get_server ( -- CAMEL_IMAPX_STORE (parent_store), -- folder_name, cancellable, NULL); -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, NULL); - -- g_mutex_lock (&ifolder->search_lock); -+ g_mutex_lock (&imapx_folder->search_lock); - -- isearch = CAMEL_IMAPX_SEARCH (ifolder->search); -- camel_imapx_search_set_server (isearch, server); -+ imapx_search = CAMEL_IMAPX_SEARCH (imapx_folder->search); -+ camel_imapx_search_set_server (imapx_search, imapx_server); - -- camel_folder_search_set_folder (ifolder->search, folder); -+ camel_folder_search_set_folder (imapx_folder->search, folder); - - matches = camel_folder_search_search ( -- ifolder->search, expression, NULL, cancellable, error); -+ imapx_folder->search, expression, NULL, cancellable, error); - -- camel_imapx_search_set_server (isearch, NULL); -+ camel_imapx_search_set_server (imapx_search, NULL); - -- g_mutex_unlock (&ifolder->search_lock); -+ g_mutex_unlock (&imapx_folder->search_lock); - -- if (server != NULL) -- g_object_unref (server); -+ g_clear_object (&imapx_server); - - return matches; - } -@@ -450,9 +419,12 @@ imapx_get_filename (CamelFolder *folder, - const gchar *uid, - GError **error) - { -- CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) folder; -+ CamelIMAPXFolder *imapx_folder; -+ -+ imapx_folder = CAMEL_IMAPX_FOLDER (folder); - -- return camel_data_cache_get_filename (ifolder->cache, "cache", uid); -+ return camel_data_cache_get_filename ( -+ imapx_folder->cache, "cache", uid); - } - - static gboolean -@@ -463,32 +435,27 @@ imapx_append_message_sync (CamelFolder * - GCancellable *cancellable, - GError **error) - { -- CamelStore *parent_store; -- CamelIMAPXStore *istore; -- CamelIMAPXServer *server; -+ CamelStore *store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - gboolean success = FALSE; - -- parent_store = camel_folder_get_parent_store (folder); -- istore = CAMEL_IMAPX_STORE (parent_store); -+ store = camel_folder_get_parent_store (folder); - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (istore))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return FALSE; -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- if (appended_uid) -+ if (appended_uid != NULL) - *appended_uid = NULL; - -- server = camel_imapx_store_get_server (istore, NULL, cancellable, error); -- if (server) { -+ if (imapx_server != NULL) { - success = camel_imapx_server_append_message ( -- server, folder, message, info, appended_uid, cancellable, error); -- g_object_unref (server); -+ imapx_server, folder, message, info, -+ appended_uid, cancellable, error); - } - -+ g_clear_object (&imapx_server); -+ - return success; - } - -@@ -497,33 +464,23 @@ imapx_expunge_sync (CamelFolder *folder, - GCancellable *cancellable, - GError **error) - { -- CamelStore *parent_store; -- CamelIMAPXStore *istore; -- CamelIMAPXServer *server; -- const gchar *folder_name; -+ CamelStore *store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - gboolean success = FALSE; - -- folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); -- istore = CAMEL_IMAPX_STORE (parent_store); -+ store = camel_folder_get_parent_store (folder); - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (istore))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return FALSE; -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- server = camel_imapx_store_get_server ( -- istore, folder_name, cancellable, error); -- if (server != NULL) { -+ if (imapx_server != NULL) { - success = camel_imapx_server_expunge ( -- server, folder, cancellable, error); -- camel_imapx_store_op_done (istore, server, folder_name); -- g_object_unref (server); -+ imapx_server, folder, cancellable, error); - } - -+ g_clear_object (&imapx_server); -+ - return success; - } - -@@ -534,38 +491,23 @@ imapx_fetch_messages_sync (CamelFolder * - GCancellable *cancellable, - GError **error) - { -- CamelService *service; -- CamelStore *parent_store; -- CamelIMAPXStore *istore; -- CamelIMAPXServer *server; -- const gchar *folder_name; -+ CamelStore *store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - gboolean success = FALSE; - -- folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); -- istore = CAMEL_IMAPX_STORE (parent_store); -- service = CAMEL_SERVICE (parent_store); -+ store = camel_folder_get_parent_store (folder); - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (istore))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return FALSE; -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- if (!camel_service_connect_sync (service, cancellable, error)) -- return FALSE; -- -- server = camel_imapx_store_get_server ( -- istore, folder_name, cancellable, error); -- if (server != NULL) { -+ if (imapx_server != NULL) { - success = camel_imapx_server_fetch_messages ( -- server, folder, type, limit, cancellable, error); -- camel_imapx_store_op_done (istore, server, folder_name); -- g_object_unref (server); -+ imapx_server, folder, type, limit, cancellable, error); - } - -+ g_clear_object (&imapx_server); -+ - return success; - } - -@@ -577,17 +519,13 @@ imapx_get_message_sync (CamelFolder *fol - { - CamelMimeMessage *msg = NULL; - CamelStream *stream = NULL; -- CamelStore *parent_store; -- CamelIMAPXStore *istore; -- CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) folder; -- CamelIMAPXServer *server; -- const gchar *folder_name; -+ CamelStore *store; -+ CamelIMAPXFolder *imapx_folder; - const gchar *path = NULL; - gboolean offline_message = FALSE; - -- folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); -- istore = CAMEL_IMAPX_STORE (parent_store); -+ imapx_folder = CAMEL_IMAPX_FOLDER (folder); -+ store = camel_folder_get_parent_store (folder); - - if (!strchr (uid, '-')) - path = "cur"; -@@ -596,8 +534,10 @@ imapx_get_message_sync (CamelFolder *fol - offline_message = TRUE; - } - -- stream = camel_data_cache_get (ifolder->cache, path, uid, NULL); -+ stream = camel_data_cache_get (imapx_folder->cache, path, uid, NULL); - if (stream == NULL) { -+ CamelIMAPXServer *imapx_server; -+ - if (offline_message) { - g_set_error ( - error, CAMEL_FOLDER_ERROR, -@@ -606,23 +546,15 @@ imapx_get_message_sync (CamelFolder *fol - return NULL; - } - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (istore))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return NULL; -- } -+ imapx_server = camel_imapx_store_ref_server ( -+ CAMEL_IMAPX_STORE (store), error); - -- server = camel_imapx_store_get_server ( -- istore, folder_name, cancellable, error); -- if (server == NULL) -- return NULL; -+ if (imapx_server != NULL) { -+ stream = camel_imapx_server_get_message ( -+ imapx_server, folder, uid, cancellable, error); -+ } - -- stream = camel_imapx_server_get_message ( -- server, folder, uid, cancellable, error); -- camel_imapx_store_op_done (istore, server, folder_name); -- g_object_unref (server); -+ g_clear_object (&imapx_server); - } - - if (stream != NULL) { -@@ -630,14 +562,14 @@ imapx_get_message_sync (CamelFolder *fol - - msg = camel_mime_message_new (); - -- g_mutex_lock (&ifolder->stream_lock); -+ g_mutex_lock (&imapx_folder->stream_lock); - success = camel_data_wrapper_construct_from_stream_sync ( - CAMEL_DATA_WRAPPER (msg), stream, cancellable, error); - if (!success) { - g_object_unref (msg); - msg = NULL; - } -- g_mutex_unlock (&ifolder->stream_lock); -+ g_mutex_unlock (&imapx_folder->stream_lock); - g_object_unref (stream); - } - -@@ -670,26 +602,27 @@ imapx_get_quota_info_sync (CamelFolder * - GCancellable *cancellable, - GError **error) - { -- CamelStore *parent_store; -- CamelIMAPXServer *server; -+ CamelStore *store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - CamelFolderQuotaInfo *quota_info = NULL; - const gchar *folder_name; - gchar **quota_root_names; - gboolean success = FALSE; - -+ store = camel_folder_get_parent_store (folder); - folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); - -- server = camel_imapx_store_get_server ( -- CAMEL_IMAPX_STORE (parent_store), -- folder_name, cancellable, error); -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- if (server != NULL) { -+ if (imapx_server != NULL) { - success = camel_imapx_server_update_quota_info ( -- server, folder_name, cancellable, error); -- g_object_unref (server); -+ imapx_server, folder_name, cancellable, error); - } - -+ g_clear_object (&imapx_server); -+ - if (!success) - return NULL; - -@@ -699,7 +632,7 @@ imapx_get_quota_info_sync (CamelFolder * - /* XXX Just return info for the first quota root name, I guess. */ - if (quota_root_names != NULL && quota_root_names[0] != NULL) - quota_info = camel_imapx_store_dup_quota_info ( -- CAMEL_IMAPX_STORE (parent_store), -+ CAMEL_IMAPX_STORE (store), - quota_root_names[0]); - - g_strfreev (quota_root_names); -@@ -729,44 +662,29 @@ imapx_refresh_info_sync (CamelFolder *fo - GCancellable *cancellable, - GError **error) - { -- CamelService *service; -- CamelStore *parent_store; -- CamelIMAPXStore *istore; -- CamelIMAPXServer *server; -- const gchar *folder_name; -+ CamelStore *store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - gboolean success = FALSE; - -- folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); -- istore = CAMEL_IMAPX_STORE (parent_store); -- service = CAMEL_SERVICE (parent_store); -+ store = camel_folder_get_parent_store (folder); - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (istore))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return FALSE; -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- if (!camel_service_connect_sync (service, cancellable, error)) -- return FALSE; -- -- server = camel_imapx_store_get_server ( -- istore, folder_name, cancellable, error); -- if (server != NULL) { -+ if (imapx_server != NULL) { - success = camel_imapx_server_refresh_info ( -- server, folder, cancellable, error); -- camel_imapx_store_op_done (istore, server, folder_name); -- g_object_unref (server); -+ imapx_server, folder, cancellable, error); - } - -+ g_clear_object (&imapx_server); -+ - return success; - } - - /* Helper for imapx_synchronize_sync() */ - static gboolean --imapx_move_to_real_junk (CamelIMAPXServer *server, -+imapx_move_to_real_junk (CamelIMAPXServer *imapx_server, - CamelFolder *folder, - GCancellable *cancellable, - gboolean *out_need_to_expunge, -@@ -782,7 +700,7 @@ imapx_move_to_real_junk (CamelIMAPXServe - uids_to_copy = g_ptr_array_new_with_free_func ( - (GDestroyNotify) camel_pstring_free); - -- settings = camel_imapx_server_ref_settings (server); -+ settings = camel_imapx_server_ref_settings (imapx_server); - if (camel_imapx_settings_get_use_real_junk_path (settings)) { - real_junk_path = - camel_imapx_settings_dup_real_junk_path (settings); -@@ -795,7 +713,7 @@ imapx_move_to_real_junk (CamelIMAPXServe - CamelFolder *destination = NULL; - CamelIMAPXStore *store; - -- store = camel_imapx_server_ref_store (server); -+ store = camel_imapx_server_ref_store (imapx_server); - - if (real_junk_path != NULL) { - destination = camel_store_get_folder_sync ( -@@ -814,7 +732,8 @@ imapx_move_to_real_junk (CamelIMAPXServe - success = TRUE; - } else if (destination != NULL) { - success = camel_imapx_server_copy_message ( -- server, folder, destination, -+ imapx_server, -+ folder, destination, - uids_to_copy, TRUE, - cancellable, error); - *out_need_to_expunge = success; -@@ -839,7 +758,7 @@ imapx_move_to_real_junk (CamelIMAPXServe - - /* Helper for imapx_synchronize_sync() */ - static gboolean --imapx_move_to_real_trash (CamelIMAPXServer *server, -+imapx_move_to_real_trash (CamelIMAPXServer *imapx_server, - CamelFolder *folder, - GCancellable *cancellable, - gboolean *out_need_to_expunge, -@@ -855,7 +774,7 @@ imapx_move_to_real_trash (CamelIMAPXServ - uids_to_copy = g_ptr_array_new_with_free_func ( - (GDestroyNotify) camel_pstring_free); - -- settings = camel_imapx_server_ref_settings (server); -+ settings = camel_imapx_server_ref_settings (imapx_server); - if (camel_imapx_settings_get_use_real_trash_path (settings)) { - real_trash_path = - camel_imapx_settings_dup_real_trash_path (settings); -@@ -868,7 +787,7 @@ imapx_move_to_real_trash (CamelIMAPXServ - CamelFolder *destination = NULL; - CamelIMAPXStore *store; - -- store = camel_imapx_server_ref_store (server); -+ store = camel_imapx_server_ref_store (imapx_server); - - if (real_trash_path != NULL) { - destination = camel_store_get_folder_sync ( -@@ -887,7 +806,8 @@ imapx_move_to_real_trash (CamelIMAPXServ - success = TRUE; - } else if (destination != NULL) { - success = camel_imapx_server_copy_message ( -- server, folder, destination, -+ imapx_server, -+ folder, destination, - uids_to_copy, TRUE, - cancellable, error); - *out_need_to_expunge = success; -@@ -916,42 +836,32 @@ imapx_synchronize_sync (CamelFolder *fol - GCancellable *cancellable, - GError **error) - { -- CamelStore *parent_store; -- CamelIMAPXStore *istore; -- CamelIMAPXServer *server; -- const gchar *folder_name; -+ CamelStore *store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - gboolean success = FALSE; - -- folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); -- istore = CAMEL_IMAPX_STORE (parent_store); -+ store = camel_folder_get_parent_store (folder); - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (istore))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return FALSE; -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- server = camel_imapx_store_get_server ( -- istore, folder_name, cancellable, error); -- if (server != NULL) { -+ if (imapx_server != NULL) { - gboolean need_to_expunge; - - success = camel_imapx_server_sync_changes ( -- server, folder, cancellable, error); -+ imapx_server, folder, cancellable, error); - - if (success) { - success = imapx_move_to_real_junk ( -- server, folder, cancellable, -+ imapx_server, folder, cancellable, - &need_to_expunge, error); - expunge |= need_to_expunge; - } - - if (success) { - success = imapx_move_to_real_trash ( -- server, folder, cancellable, -+ imapx_server, folder, cancellable, - &need_to_expunge, error); - expunge |= need_to_expunge; - } -@@ -961,12 +871,11 @@ imapx_synchronize_sync (CamelFolder *fol - - if (success && expunge) - success = camel_imapx_server_expunge ( -- server, folder, cancellable, error); -- -- camel_imapx_store_op_done (istore, server, folder_name); -- g_object_unref (server); -+ imapx_server, folder, cancellable, error); - } - -+ g_clear_object (&imapx_server); -+ - return success; - } - -@@ -976,33 +885,23 @@ imapx_synchronize_message_sync (CamelFol - GCancellable *cancellable, - GError **error) - { -- CamelStore *parent_store; -- CamelIMAPXStore *istore; -- CamelIMAPXServer *server; -- const gchar *folder_name; -+ CamelStore *store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - gboolean success = FALSE; - -- folder_name = camel_folder_get_full_name (folder); -- parent_store = camel_folder_get_parent_store (folder); -- istore = CAMEL_IMAPX_STORE (parent_store); -+ store = camel_folder_get_parent_store (folder); - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (istore))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return FALSE; -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- server = camel_imapx_store_get_server ( -- istore, folder_name, cancellable, error); -- if (server != NULL) { -+ if (imapx_server != NULL) { - success = camel_imapx_server_sync_message ( -- server, folder, uid, cancellable, error); -- camel_imapx_store_op_done (istore, server, folder_name); -- g_object_unref (server); -+ imapx_server, folder, uid, cancellable, error); - } - -+ g_clear_object (&imapx_server); -+ - return success; - } - -@@ -1015,39 +914,29 @@ imapx_transfer_messages_to_sync (CamelFo - GCancellable *cancellable, - GError **error) - { -- CamelStore *parent_store; -- CamelIMAPXStore *istore; -- CamelIMAPXServer *server; -- const gchar *folder_name; -+ CamelStore *store; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - gboolean success = FALSE; - -- folder_name = camel_folder_get_full_name (source); -- parent_store = camel_folder_get_parent_store (source); -- istore = CAMEL_IMAPX_STORE (parent_store); -+ store = camel_folder_get_parent_store (source); - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (istore))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return FALSE; -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- server = camel_imapx_store_get_server ( -- istore, folder_name, cancellable, error); -- if (server != NULL) { -+ if (imapx_server != NULL) { - success = camel_imapx_server_copy_message ( -- server, source, dest, uids, -+ imapx_server, source, dest, uids, - delete_originals, cancellable, error); -- camel_imapx_store_op_done (istore, server, folder_name); -- g_object_unref (server); -+ -+ /* Update destination folder only if it's not frozen, -+ * to avoid updating for each "move" action on a single -+ * message while filtering. */ -+ if (!camel_folder_is_frozen (dest)) -+ imapx_refresh_info_sync (dest, cancellable, NULL); - } - -- /* update destination folder only if not frozen, to not update -- * for each single message transfer during filtering -- */ -- if (!camel_folder_is_frozen (dest)) -- imapx_refresh_info_sync (dest, cancellable, NULL); -+ g_clear_object (&imapx_server); - - return success; - } -@@ -1056,15 +945,15 @@ static void - imapx_rename (CamelFolder *folder, - const gchar *new_name) - { -- CamelStore *parent_store; -- CamelIMAPXStore *istore; -+ CamelStore *store; -+ CamelIMAPXStore *imapx_store; - const gchar *folder_name; - -- parent_store = camel_folder_get_parent_store (folder); -- istore = CAMEL_IMAPX_STORE (parent_store); -+ store = camel_folder_get_parent_store (folder); -+ imapx_store = CAMEL_IMAPX_STORE (store); - - camel_store_summary_disconnect_folder_summary ( -- CAMEL_STORE_SUMMARY (istore->summary), -+ CAMEL_STORE_SUMMARY (imapx_store->summary), - folder->summary); - - /* Chain up to parent's rename() method. */ -@@ -1074,7 +963,7 @@ imapx_rename (CamelFolder *folder, - folder_name = camel_folder_get_full_name (folder); - - camel_store_summary_connect_folder_summary ( -- CAMEL_STORE_SUMMARY (istore->summary), -+ CAMEL_STORE_SUMMARY (imapx_store->summary), - folder_name, folder->summary); - } - -@@ -1182,7 +1071,7 @@ camel_imapx_folder_new (CamelStore *stor - CamelFolder *folder; - CamelService *service; - CamelSettings *settings; -- CamelIMAPXFolder *ifolder; -+ CamelIMAPXFolder *imapx_folder; - const gchar *short_name; - gchar *state_file; - gboolean filter_all; -@@ -1217,12 +1106,9 @@ camel_imapx_folder_new (CamelStore *stor - "display-name", short_name, - "full_name", folder_name, - "parent-store", store, NULL); -- ifolder = (CamelIMAPXFolder *) folder; -- -- ((CamelIMAPXFolder *) folder)->raw_name = g_strdup (folder_name); - - folder->summary = camel_imapx_summary_new (folder); -- if (!folder->summary) { -+ if (folder->summary == NULL) { - g_set_error ( - error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, - _("Could not create folder summary for %s"), -@@ -1230,8 +1116,9 @@ camel_imapx_folder_new (CamelStore *stor - return NULL; - } - -- ifolder->cache = camel_data_cache_new (folder_dir, error); -- if (!ifolder->cache) { -+ imapx_folder = CAMEL_IMAPX_FOLDER (folder); -+ imapx_folder->cache = camel_data_cache_new (folder_dir, error); -+ if (imapx_folder->cache == NULL) { - g_prefix_error ( - error, _("Could not create cache for %s: "), - short_name); -@@ -1243,25 +1130,33 @@ camel_imapx_folder_new (CamelStore *stor - g_free (state_file); - camel_object_state_read (CAMEL_OBJECT (folder)); - -- ifolder->search = camel_imapx_search_new (); -- g_mutex_init (&ifolder->search_lock); -- g_mutex_init (&ifolder->stream_lock); -- ifolder->ignore_recent = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL); -- ifolder->exists_on_server = 0; -- ifolder->unread_on_server = 0; -- ifolder->modseq_on_server = 0; -- ifolder->uidnext_on_server = 0; -+ imapx_folder->search = camel_imapx_search_new (); -+ g_mutex_init (&imapx_folder->search_lock); -+ g_mutex_init (&imapx_folder->stream_lock); -+ imapx_folder->ignore_recent = g_hash_table_new_full ( -+ (GHashFunc) g_str_hash, -+ (GEqualFunc) g_str_equal, -+ (GDestroyNotify) g_free, -+ (GDestroyNotify) NULL); -+ imapx_folder->exists_on_server = 0; -+ imapx_folder->unread_on_server = 0; -+ imapx_folder->modseq_on_server = 0; -+ imapx_folder->uidnext_on_server = 0; -+ -+ if (filter_all) -+ folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT; - -- if (!g_ascii_strcasecmp (folder_name, "INBOX")) { -- if (filter_inbox || filter_all) -+ if (g_ascii_strcasecmp (folder_name, "INBOX") == 0) { -+ if (filter_inbox) - folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT; -+ - if (filter_junk) - folder->folder_flags |= CAMEL_FOLDER_FILTER_JUNK; - } else { - if (filter_junk && !filter_junk_inbox) - folder->folder_flags |= CAMEL_FOLDER_FILTER_JUNK; - -- if (filter_all || imapx_folder_get_apply_filters (ifolder)) -+ if (imapx_folder_get_apply_filters (imapx_folder)) - folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT; - } - -diff -up evolution-data-server-3.8.5/camel/camel-imapx-folder.h.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/camel-imapx-folder.h ---- evolution-data-server-3.8.5/camel/camel-imapx-folder.h.kill-imapx-conn-manager 2013-07-23 07:57:54.000000000 -0400 -+++ evolution-data-server-3.8.5/camel/camel-imapx-folder.h 2013-09-12 15:51:33.331412252 -0400 -@@ -62,7 +62,6 @@ struct _CamelIMAPXFolder { - CamelOfflineFolder parent; - CamelIMAPXFolderPrivate *priv; - -- gchar *raw_name; - CamelDataCache *cache; - CamelFolderSearch *search; - -diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.c.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/camel-imapx-server.c ---- evolution-data-server-3.8.5/camel/camel-imapx-server.c.kill-imapx-conn-manager 2013-07-23 07:57:58.000000000 -0400 -+++ evolution-data-server-3.8.5/camel/camel-imapx-server.c 2013-09-12 15:51:33.348412247 -0400 -@@ -351,14 +351,6 @@ enum { - PROP_STORE - }; - --enum { -- SELECT_CHANGED, -- SHUTDOWN, -- LAST_SIGNAL --}; -- --static guint signals[LAST_SIGNAL]; -- - static void imapx_uidset_init (struct _uidset_state *ss, - gint total, - gint limit); -@@ -2297,9 +2289,7 @@ imapx_untagged_bye (CamelIMAPXServer *is - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXStore *imapx_store; -- CamelService *service; -- CamelServiceConnectionStatus status; -+ CamelIMAPXStore *store; - guchar *token = NULL; - - g_return_val_if_fail (CAMEL_IS_IMAPX_SERVER (is), FALSE); -@@ -2317,18 +2307,11 @@ imapx_untagged_bye (CamelIMAPXServer *is - - is->state = IMAPX_SHUTDOWN; - -- imapx_store = camel_imapx_server_ref_store (is); -- service = CAMEL_SERVICE (imapx_store); -- status = camel_service_get_connection_status (service); -- -- /* Do not disconnect the service if we're still connecting. -- * camel_service_disconnect_sync() will cancel the connect -- * operation and the server message will get replaced with -- * a generic "Operation was cancelled" message. */ -- if (status == CAMEL_SERVICE_CONNECTED) -- camel_service_disconnect_sync (service, FALSE, NULL, NULL); -- -- g_object_unref (imapx_store); -+ /* Disconnect the CamelIMAPXStore. */ -+ store = camel_imapx_server_ref_store (is); -+ camel_service_disconnect_sync ( -+ CAMEL_SERVICE (store), FALSE, NULL, NULL); -+ g_object_unref (store); - - return FALSE; - } -@@ -3469,7 +3452,6 @@ imapx_command_select_done (CamelIMAPXSer - GCancellable *cancellable, - GError **error) - { -- const gchar *selected_folder = NULL; - gboolean success = TRUE; - GError *local_error = NULL; - -@@ -3580,7 +3562,6 @@ imapx_command_select_done (CamelIMAPXSer - ; - } - ifolder->uidvalidity_on_server = is->uidvalidity; -- selected_folder = camel_folder_get_full_name (folder); - - if (is->uidvalidity && is->uidvalidity != ((CamelIMAPXSummary *) folder->summary)->validity) - invalidate_local_cache (ifolder, is->uidvalidity); -@@ -3599,8 +3580,6 @@ imapx_command_select_done (CamelIMAPXSer - - camel_imapx_command_unref (ic); - -- g_signal_emit (is, signals[SELECT_CHANGED], 0, selected_folder); -- - return success; - } - -@@ -6874,6 +6853,7 @@ imapx_parser_thread (gpointer d) - { - CamelIMAPXServer *is = d; - CamelIMAPXStream *stream; -+ CamelIMAPXStore *store; - GCancellable *cancellable; - gboolean have_stream; - GError *local_error = NULL; -@@ -6965,8 +6945,6 @@ imapx_parser_thread (gpointer d) - - cancel_all_jobs (is, local_error); - -- g_clear_error (&local_error); -- - QUEUE_LOCK (is); - if (is->cancellable != NULL) { - g_object_unref (is->cancellable); -@@ -6976,7 +6954,14 @@ imapx_parser_thread (gpointer d) - QUEUE_UNLOCK (is); - - is->parser_quit = FALSE; -- g_signal_emit (is, signals[SHUTDOWN], 0); -+ -+ /* Disconnect the CamelService. */ -+ store = camel_imapx_server_ref_store (is); -+ camel_service_disconnect_sync ( -+ CAMEL_SERVICE (store), FALSE, NULL, NULL); -+ g_object_unref (store); -+ -+ g_clear_error (&local_error); - - return NULL; - } -@@ -7141,9 +7126,6 @@ camel_imapx_server_class_init (CamelIMAP - object_class->dispose = imapx_server_dispose; - object_class->constructed = imapx_server_constructed; - -- class->select_changed = NULL; -- class->shutdown = NULL; -- - g_object_class_install_property ( - object_class, - PROP_STREAM, -@@ -7167,32 +7149,6 @@ camel_imapx_server_class_init (CamelIMAP - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_STRINGS)); - -- /** -- * CamelIMAPXServer::select_changed -- * @server: the #CamelIMAPXServer which emitted the signal -- **/ -- signals[SELECT_CHANGED] = g_signal_new ( -- "select_changed", -- G_OBJECT_CLASS_TYPE (class), -- G_SIGNAL_RUN_FIRST, -- G_STRUCT_OFFSET (CamelIMAPXServerClass, select_changed), -- NULL, NULL, -- g_cclosure_marshal_VOID__STRING, -- G_TYPE_NONE, 1, G_TYPE_STRING); -- -- /** -- * CamelIMAPXServer::shutdown -- * @server: the #CamelIMAPXServer which emitted the signal -- **/ -- signals[SHUTDOWN] = g_signal_new ( -- "shutdown", -- G_OBJECT_CLASS_TYPE (class), -- G_SIGNAL_RUN_FIRST, -- G_STRUCT_OFFSET (CamelIMAPXServerClass, shutdown), -- NULL, NULL, -- g_cclosure_marshal_VOID__VOID, -- G_TYPE_NONE, 0); -- - class->tagprefix = 'A'; - } - -diff -up evolution-data-server-3.8.5/camel/camel-imapx-server.h.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/camel-imapx-server.h ---- evolution-data-server-3.8.5/camel/camel-imapx-server.h.kill-imapx-conn-manager 2013-07-23 07:57:54.000000000 -0400 -+++ evolution-data-server-3.8.5/camel/camel-imapx-server.h 2013-09-12 15:51:33.350412247 -0400 -@@ -164,11 +164,6 @@ struct _CamelIMAPXServer { - struct _CamelIMAPXServerClass { - CamelObjectClass parent_class; - -- /* Signals */ -- void (*select_changed) (CamelIMAPXServer *is, -- const gchar *selected_folder); -- void (*shutdown) (CamelIMAPXServer *is); -- - gchar tagprefix; - }; - -diff -up evolution-data-server-3.8.5/camel/camel-imapx-store.c.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/camel-imapx-store.c ---- evolution-data-server-3.8.5/camel/camel-imapx-store.c.kill-imapx-conn-manager 2013-07-23 07:57:57.000000000 -0400 -+++ evolution-data-server-3.8.5/camel/camel-imapx-store.c 2013-09-12 15:51:33.358412244 -0400 -@@ -57,6 +57,10 @@ - ((obj), CAMEL_TYPE_IMAPX_STORE, CamelIMAPXStorePrivate)) - - struct _CamelIMAPXStorePrivate { -+ CamelIMAPXServer *connected_server; -+ CamelIMAPXServer *connecting_server; -+ GMutex server_lock; -+ - GHashTable *quota_info; - GMutex quota_info_lock; - }; -@@ -189,24 +193,10 @@ imapx_store_dispose (GObject *object) - { - CamelIMAPXStore *imapx_store = CAMEL_IMAPX_STORE (object); - -- /* Force disconnect so we dont have it run later, -- * after we've cleaned up some stuff. */ -- if (imapx_store->con_man != NULL) { -- camel_service_disconnect_sync ( -- CAMEL_SERVICE (imapx_store), TRUE, NULL, NULL); -- g_object_unref (imapx_store->con_man); -- imapx_store->con_man = NULL; -- } -- -- if (imapx_store->authenticating_server != NULL) { -- g_object_unref (imapx_store->authenticating_server); -- imapx_store->authenticating_server = NULL; -- } -- -- if (imapx_store->summary != NULL) { -- g_object_unref (imapx_store->summary); -- imapx_store->summary = NULL; -- } -+ g_clear_object (&imapx_store->summary); -+ -+ g_clear_object (&imapx_store->priv->connected_server); -+ g_clear_object (&imapx_store->priv->connecting_server); - - /* Chain up to parent's dispose() method. */ - G_OBJECT_CLASS (camel_imapx_store_parent_class)->dispose (object); -@@ -219,6 +209,8 @@ imapx_store_finalize (GObject *object) - - g_mutex_clear (&imapx_store->get_finfo_lock); - -+ g_mutex_clear (&imapx_store->priv->server_lock); -+ - g_hash_table_destroy (imapx_store->priv->quota_info); - g_mutex_clear (&imapx_store->priv->quota_info_lock); - -@@ -257,42 +249,48 @@ imapx_get_name (CamelService *service, - return name; - } - --CamelIMAPXServer * --camel_imapx_store_get_server (CamelIMAPXStore *istore, -- const gchar *folder_name, -- GCancellable *cancellable, -- GError **error) --{ -- return camel_imapx_conn_manager_get_connection ( -- istore->con_man, folder_name, cancellable, error); --} -- --void --camel_imapx_store_op_done (CamelIMAPXStore *istore, -- CamelIMAPXServer *server, -- const gchar *folder_name) --{ -- g_return_if_fail (server != NULL); -- -- camel_imapx_conn_manager_update_con_info ( -- istore->con_man, server, folder_name); --} -- - static gboolean - imapx_connect_sync (CamelService *service, - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXStore *istore = (CamelIMAPXStore *) service; -- CamelIMAPXServer *server; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; -+ gboolean success; - -- server = camel_imapx_store_get_server (istore, NULL, cancellable, error); -- if (server) { -- g_object_unref (server); -- return TRUE; -+ imapx_store = CAMEL_IMAPX_STORE (service); -+ imapx_server = camel_imapx_server_new (imapx_store); -+ -+ g_mutex_lock (&imapx_store->priv->server_lock); -+ -+ /* We need to share the CamelIMAPXServer instance with the -+ * authenticate_sync() method, but we don't want other parts -+ * getting at it just yet. So stash it in a special private -+ * variable while connecting to the IMAP server. */ -+ g_warn_if_fail (imapx_store->priv->connecting_server == NULL); -+ imapx_store->priv->connecting_server = g_object_ref (imapx_server); -+ -+ g_mutex_unlock (&imapx_store->priv->server_lock); -+ -+ success = camel_imapx_server_connect ( -+ imapx_server, cancellable, error); -+ -+ g_mutex_lock (&imapx_store->priv->server_lock); -+ -+ g_warn_if_fail (imapx_store->priv->connecting_server == imapx_server); -+ g_clear_object (&imapx_store->priv->connecting_server); -+ -+ if (success) { -+ g_clear_object (&imapx_store->priv->connected_server); -+ imapx_store->priv->connected_server = imapx_server; -+ g_object_ref (imapx_server); - } - -- return FALSE; -+ g_mutex_unlock (&imapx_store->priv->server_lock); -+ -+ g_clear_object (&imapx_server); -+ -+ return success; - } - - static gboolean -@@ -301,15 +299,16 @@ imapx_disconnect_sync (CamelService *ser - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXStore *istore = CAMEL_IMAPX_STORE (service); -- CamelServiceClass *service_class; -+ CamelIMAPXStore *imapx_store; - -- service_class = CAMEL_SERVICE_CLASS (camel_imapx_store_parent_class); -- if (!service_class->disconnect_sync (service, clean, cancellable, error)) -- return FALSE; -+ imapx_store = CAMEL_IMAPX_STORE (service); -+ -+ g_mutex_lock (&imapx_store->priv->server_lock); - -- if (istore->con_man != NULL) -- camel_imapx_conn_manager_close_connections (istore->con_man); -+ g_warn_if_fail (imapx_store->priv->connecting_server == NULL); -+ g_clear_object (&imapx_store->priv->connected_server); -+ -+ g_mutex_unlock (&imapx_store->priv->server_lock); - - return TRUE; - } -@@ -320,23 +319,23 @@ imapx_authenticate_sync (CamelService *s - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXStore *istore = CAMEL_IMAPX_STORE (service); -- CamelIMAPXServer *server; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; -+ CamelAuthenticationResult result; -+ -+ imapx_store = CAMEL_IMAPX_STORE (service); -+ -+ /* This should have been set for us by connect_sync(). */ -+ g_mutex_lock (&imapx_store->priv->server_lock); -+ imapx_server = g_object_ref (imapx_store->priv->connecting_server); -+ g_mutex_unlock (&imapx_store->priv->server_lock); -+ -+ result = camel_imapx_server_authenticate ( -+ imapx_server, mechanism, cancellable, error); - -- /* CamelIMAPXConnManager sets this before calling -- * camel_imapx_server_connect()(), and then clears it -- * immediately after, all while holding the recursive -- * connection lock (CAMEL_SERVICE_REC_CONNECT_LOCK). -- * Otherwise we'd have no way of knowing which server -- * is trying to authenticate. */ -- server = istore->authenticating_server; -- -- g_return_val_if_fail ( -- CAMEL_IS_IMAPX_SERVER (server), -- CAMEL_AUTHENTICATION_REJECTED); -+ g_clear_object (&imapx_server); - -- return camel_imapx_server_authenticate ( -- server, mechanism, cancellable, error); -+ return result; - } - - CamelServiceAuthType camel_imapx_password_authtype = { -@@ -650,62 +649,64 @@ imapx_mark_folder_subscribed (CamelIMAPX - - static gboolean - imapx_subscribe_folder (CamelStore *store, -- const gchar *folder_name, -+ const gchar *folder_path, - gboolean emit_signal, - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXStore *istore = (CamelIMAPXStore *) store; -- CamelIMAPXServer *server; -- gboolean success; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; -+ gboolean success = FALSE; - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store))) -- return TRUE; -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- server = camel_imapx_store_get_server (istore, NULL, cancellable, error); -- if (!server) -- return FALSE; -+ if (folder_path != NULL && *folder_path == '/') -+ folder_path++; - -- if (folder_name && *folder_name == '/') -- folder_name++; -+ if (imapx_server != NULL) { -+ success = camel_imapx_server_manage_subscription ( -+ imapx_server, folder_path, TRUE, cancellable, error); -+ } - -- success = camel_imapx_server_manage_subscription ( -- server, folder_name, TRUE, cancellable, error); -- g_object_unref (server); -+ if (success) { -+ imapx_mark_folder_subscribed ( -+ imapx_store, folder_path, emit_signal); -+ } - -- if (success) -- imapx_mark_folder_subscribed (istore, folder_name, emit_signal); -+ g_clear_object (&imapx_server); - - return success; - } - - static gboolean - imapx_unsubscribe_folder (CamelStore *store, -- const gchar *folder_name, -+ const gchar *folder_path, - gboolean emit_signal, - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXStore *istore = (CamelIMAPXStore *) store; -- CamelIMAPXServer *server; -- gboolean success; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; -+ gboolean success = FALSE; - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store))) -- return TRUE; -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- server = camel_imapx_store_get_server (istore, NULL, cancellable, error); -- if (!server) -- return FALSE; -+ if (folder_path != NULL && *folder_path == '/') -+ folder_path++; - -- if (folder_name && *folder_name == '/') -- folder_name++; -+ if (imapx_server != NULL) { -+ success = camel_imapx_server_manage_subscription ( -+ imapx_server, folder_path, FALSE, cancellable, error); -+ } - -- success = camel_imapx_server_manage_subscription ( -- server, folder_name, FALSE, cancellable, error); -- g_object_unref (server); -+ if (success) { -+ imapx_unmark_folder_subscribed ( -+ imapx_store, folder_path, emit_signal); -+ } - -- if (success) -- imapx_unmark_folder_subscribed (istore, folder_name, emit_signal); -+ g_clear_object (&imapx_server); - - return success; - } -@@ -1043,7 +1044,7 @@ get_namespaces (CamelIMAPXStore *istore) - } - - static GHashTable * --fetch_folders_for_namespaces (CamelIMAPXStore *istore, -+fetch_folders_for_namespaces (CamelIMAPXStore *imapx_store, - const gchar *pattern, - gboolean sync, - GCancellable *cancellable, -@@ -1053,15 +1054,15 @@ fetch_folders_for_namespaces (CamelIMAPX - GHashTable *folders = NULL; - GList *namespaces = NULL, *l; - -- server = camel_imapx_store_get_server (istore, NULL, cancellable, error); -- if (!server) -+ server = camel_imapx_store_ref_server (imapx_store, error); -+ -+ if (server == NULL) - return NULL; - - folders = g_hash_table_new (folder_hash, folder_eq); -- namespaces = get_namespaces (istore); -+ namespaces = get_namespaces (imapx_store); - -- for (l = namespaces; l != NULL; l = g_list_next (l)) -- { -+ for (l = namespaces; l != NULL; l = g_list_next (l)) { - CamelIMAPXStoreNamespace *ns = l->data; - - while (ns) { -@@ -1085,7 +1086,7 @@ fetch_folders_for_namespaces (CamelIMAPX - - flags |= CAMEL_STORE_FOLDER_INFO_RECURSIVE; - if (!fetch_folders_for_pattern ( -- istore, server, pat, flags, list_ext, -+ imapx_store, server, pat, flags, list_ext, - folders, cancellable, error)) { - g_free (pat); - goto exception; -@@ -1095,7 +1096,7 @@ fetch_folders_for_namespaces (CamelIMAPX - * issue LSUB to list the subscribed folders separately */ - flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - if (!fetch_folders_for_pattern ( -- istore, server, pat, flags, NULL, -+ imapx_store, server, pat, flags, NULL, - folders, cancellable, error)) { - g_free (pat); - goto exception; -@@ -1578,29 +1579,24 @@ imapx_store_create_folder_sync (CamelSto - { - CamelStoreInfo *si; - CamelIMAPXStoreNamespace *ns; -- CamelIMAPXStore *istore = (CamelIMAPXStore *) store; -- CamelIMAPXServer *server; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - gchar *real_name, *full_name, *parent_real; - CamelFolderInfo *fi = NULL; - gchar dir_sep = 0; - gboolean success; - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return NULL; -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- server = camel_imapx_store_get_server (istore, NULL, cancellable, error); -- if (!server) -+ if (imapx_server == NULL) - return NULL; - -- if (!parent_name) -+ if (parent_name == NULL) - parent_name = ""; - -- ns = camel_imapx_store_summary_namespace_find_path (istore->summary, parent_name); -+ ns = camel_imapx_store_summary_namespace_find_path ( -+ imapx_store->summary, parent_name); - if (ns) - dir_sep = ns->sep; - -@@ -1613,47 +1609,56 @@ imapx_store_create_folder_sync (CamelSto - CAMEL_FOLDER_ERROR_INVALID_PATH, - _("The folder name \"%s\" is invalid because it contains the character \"%c\""), - folder_name, dir_sep); -- g_object_unref (server); -- return NULL; -+ goto exit; - } - -- parent_real = camel_imapx_store_summary_full_from_path (istore->summary, parent_name); -+ parent_real = camel_imapx_store_summary_full_from_path ( -+ imapx_store->summary, parent_name); - if (parent_real == NULL) { - g_set_error ( - error, CAMEL_FOLDER_ERROR, - CAMEL_FOLDER_ERROR_INVALID_STATE, - _("Unknown parent folder: %s"), parent_name); -- g_object_unref (server); -- return NULL; -+ goto exit; - } - -- si = camel_store_summary_path ((CamelStoreSummary *) istore->summary, parent_name); -+ si = camel_store_summary_path ( -+ (CamelStoreSummary *) imapx_store->summary, parent_name); - if (si && si->flags & CAMEL_STORE_INFO_FOLDER_NOINFERIORS) { - g_set_error ( - error, CAMEL_FOLDER_ERROR, - CAMEL_FOLDER_ERROR_INVALID_STATE, - _("The parent folder is not allowed to contain subfolders")); -- g_object_unref (server); -- return NULL; -+ goto exit; - } - - if (si) -- camel_store_summary_info_free ((CamelStoreSummary *) istore->summary, si); -+ camel_store_summary_info_free ( -+ (CamelStoreSummary *) imapx_store->summary, si); - -- real_name = camel_imapx_store_summary_path_to_full (istore->summary, folder_name, dir_sep); -- full_name = imapx_concat (istore, parent_real, real_name); -+ real_name = camel_imapx_store_summary_path_to_full ( -+ imapx_store->summary, folder_name, dir_sep); -+ full_name = imapx_concat (imapx_store, parent_real, real_name); - g_free (real_name); - - success = camel_imapx_server_create_folder ( -- server, full_name, cancellable, error); -- g_object_unref (server); -+ imapx_server, full_name, cancellable, error); -+ g_object_unref (imapx_server); - - if (success) { -+ CamelStoreSummary *summary; - CamelIMAPXStoreInfo *si; -+ const gchar *folder_path; - -- si = camel_imapx_store_summary_add_from_full (istore->summary, full_name, dir_sep); -- camel_store_summary_save ((CamelStoreSummary *) istore->summary); -- fi = imapx_build_folder_info (istore, camel_store_info_path (istore->summary, si)); -+ summary = CAMEL_STORE_SUMMARY (imapx_store->summary); -+ -+ si = camel_imapx_store_summary_add_from_full ( -+ imapx_store->summary, full_name, dir_sep); -+ camel_store_summary_save (summary); -+ folder_path = camel_store_info_path ( -+ summary, (CamelStoreInfo *) si); -+ fi = imapx_build_folder_info ( -+ imapx_store, folder_path); - fi->flags |= CAMEL_FOLDER_NOCHILDREN; - camel_store_folder_created (store, fi); - } -@@ -1661,6 +1666,9 @@ imapx_store_create_folder_sync (CamelSto - g_free (full_name); - g_free (parent_real); - -+exit: -+ g_clear_object (&imapx_server); -+ - return fi; - } - -@@ -1670,29 +1678,23 @@ imapx_store_delete_folder_sync (CamelSto - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXStore *istore = (CamelIMAPXStore *) store; -- CamelIMAPXServer *server; -- gboolean success; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; -+ gboolean success = FALSE; - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return FALSE; -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); -+ -+ if (imapx_server != NULL) { -+ success = camel_imapx_server_delete_folder ( -+ imapx_server, folder_name, cancellable, error); - } -- /* Use INBOX connection as the implementation would try to select inbox to ensure -- * we are not selected on the folder being deleted */ -- server = camel_imapx_store_get_server (istore, "INBOX", cancellable, error); -- if (!server) -- return FALSE; - -- success = camel_imapx_server_delete_folder ( -- server, folder_name, cancellable, error); -- g_object_unref (server); -+ if (success) { -+ imapx_delete_folder_from_cache (imapx_store, folder_name); -+ } - -- if (success) -- imapx_delete_folder_from_cache (istore, folder_name); -+ g_clear_object (&imapx_server); - - return success; - } -@@ -1704,12 +1706,11 @@ imapx_store_rename_folder_sync (CamelSto - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXStore *istore = (CamelIMAPXStore *) store; -- CamelIMAPXServer *server; - CamelService *service; - CamelSettings *settings; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - const gchar *user_cache_dir; -- gchar *oldpath, *newpath, *storage_path; - gboolean use_subscriptions; - gboolean success = FALSE; - -@@ -1723,52 +1724,52 @@ imapx_store_rename_folder_sync (CamelSto - - g_object_unref (settings); - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store))) { -- g_set_error ( -- error, CAMEL_SERVICE_ERROR, -- CAMEL_SERVICE_ERROR_UNAVAILABLE, -- _("You must be working online to complete this operation")); -- return FALSE; -- } -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, error); - -- if (use_subscriptions) -- imapx_unsubscribe_folder (store, old, FALSE, cancellable, NULL); -+ if (imapx_server != NULL) { -+ gchar *oldpath; -+ gchar *newpath; -+ gchar *storage_path; -+ -+ if (use_subscriptions) -+ imapx_unsubscribe_folder ( -+ store, old, FALSE, cancellable, NULL); - -- /* Use INBOX connection as the implementation would try to select inbox to ensure -- * we are not selected on the folder being renamed */ -- server = camel_imapx_store_get_server (istore, "INBOX", cancellable, error); -- if (server) { - success = camel_imapx_server_rename_folder ( -- server, old, new, cancellable, error); -- g_object_unref (server); -- } -- -- if (!success) { -- imapx_subscribe_folder (store, old, FALSE, cancellable, NULL); -- return FALSE; -- } -+ imapx_server, old, new, cancellable, error); - -- /* rename summary, and handle broken server */ -- rename_folder_info (istore, old, new); -+ if (!success) { -+ imapx_subscribe_folder ( -+ store, old, FALSE, cancellable, NULL); -+ goto exit; -+ } - -- if (use_subscriptions) -- success = imapx_subscribe_folder ( -- store, new, FALSE, cancellable, error); -+ /* Rename summary, and handle broken server. */ -+ rename_folder_info (imapx_store, old, new); - -- storage_path = g_build_filename (user_cache_dir, "folders", NULL); -- oldpath = imapx_path_to_physical (storage_path, old); -- newpath = imapx_path_to_physical (storage_path, new); -- g_free (storage_path); -+ if (use_subscriptions) -+ success = imapx_subscribe_folder ( -+ store, new, FALSE, cancellable, error); -+ -+ storage_path = g_build_filename (user_cache_dir, "folders", NULL); -+ oldpath = imapx_path_to_physical (storage_path, old); -+ newpath = imapx_path_to_physical (storage_path, new); -+ g_free (storage_path); -+ -+ /* So do we care if this didn't work? Its just a cache? */ -+ if (g_rename (oldpath, newpath) == -1) { -+ g_warning ( -+ "Could not rename message cache '%s' to '%s': %s: cache reset", -+ oldpath, newpath, g_strerror (errno)); -+ } - -- /* So do we care if this didn't work? Its just a cache? */ -- if (g_rename (oldpath, newpath) == -1) { -- g_warning ( -- "Could not rename message cache '%s' to '%s': %s: cache reset", -- oldpath, newpath, g_strerror (errno)); -+ g_free (oldpath); -+ g_free (newpath); - } - -- g_free (oldpath); -- g_free (newpath); -+exit: -+ g_clear_object (&imapx_server); - - return success; - } -@@ -1778,25 +1779,21 @@ imapx_store_noop_sync (CamelStore *store - GCancellable *cancellable, - GError **error) - { -- CamelIMAPXStore *istore = (CamelIMAPXStore *) store; -- GList *list, *link; -+ CamelIMAPXStore *imapx_store; -+ CamelIMAPXServer *imapx_server; - gboolean success = TRUE; - -- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store))) -- return TRUE; -+ /* If we're not connected then this truly is a no-op. */ - -- list = camel_imapx_conn_manager_get_connections (istore->con_man); -+ imapx_store = CAMEL_IMAPX_STORE (store); -+ imapx_server = camel_imapx_store_ref_server (imapx_store, NULL); - -- for (link = list; link != NULL; link = g_list_next (link)) { -- CamelIMAPXServer *server = CAMEL_IMAPX_SERVER (link->data); -- -- /* we just return last noops value, technically not correct though */ -- success = camel_imapx_server_noop (server, NULL, cancellable, error); -- if (!success) -- break; -+ if (imapx_server != NULL) { -+ success = camel_imapx_server_noop ( -+ imapx_server, NULL, cancellable, error); - } - -- g_list_free_full (list, (GDestroyNotify) g_object_unref); -+ g_clear_object (&imapx_server); - - return success; - } -@@ -2026,7 +2023,8 @@ camel_imapx_store_init (CamelIMAPXStore - g_mutex_init (&store->get_finfo_lock); - store->last_refresh_time = time (NULL) - (FINFO_REFRESH_INTERVAL + 10); - store->dir_sep = '/'; -- store->con_man = camel_imapx_conn_manager_new (CAMEL_STORE (store)); -+ -+ g_mutex_init (&store->priv->server_lock); - - store->priv->quota_info = g_hash_table_new_full ( - (GHashFunc) g_str_hash, -@@ -2042,6 +2040,50 @@ camel_imapx_store_init (CamelIMAPXStore - G_CALLBACK (imapx_store_update_store_flags), NULL); - } - -+/** -+ * camel_imapx_store_ref_server: -+ * @store: a #CamelIMAPXStore -+ * @error: return location for a #GError, or %NULL -+ * -+ * Returns the #CamelIMAPXServer for @store, if available. -+ * -+ * As a convenience, if the @store is not currently connected to an IMAP -+ * server, the function sets @error to %CAMEL_SERVER_ERROR_UNAVAILABLE and -+ * returns %NULL. If an operation can possibly be executed while offline, -+ * pass %NULL for @error. -+ * -+ * The returned #CamelIMAPXServer is referenced for thread-safety and must -+ * be unreferenced with g_object_unref() when finished with it. -+ * -+ * Returns: a #CamelIMAPXServer, or %NULL -+ * -+ * Since: 3.10 -+ **/ -+CamelIMAPXServer * -+camel_imapx_store_ref_server (CamelIMAPXStore *store, -+ GError **error) -+{ -+ CamelIMAPXServer *server = NULL; -+ -+ g_return_val_if_fail (CAMEL_IS_IMAPX_STORE (store), NULL); -+ -+ g_mutex_lock (&store->priv->server_lock); -+ -+ if (store->priv->connected_server != NULL) { -+ server = g_object_ref (store->priv->connected_server); -+ } else { -+ g_set_error ( -+ error, CAMEL_SERVICE_ERROR, -+ CAMEL_SERVICE_ERROR_UNAVAILABLE, -+ _("You must be working online " -+ "to complete this operation")); -+ } -+ -+ g_mutex_unlock (&store->priv->server_lock); -+ -+ return server; -+} -+ - CamelFolderQuotaInfo * - camel_imapx_store_dup_quota_info (CamelIMAPXStore *store, - const gchar *quota_root_name) -diff -up evolution-data-server-3.8.5/camel/camel-imapx-store.h.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/camel-imapx-store.h ---- evolution-data-server-3.8.5/camel/camel-imapx-store.h.kill-imapx-conn-manager 2013-07-23 07:57:56.000000000 -0400 -+++ evolution-data-server-3.8.5/camel/camel-imapx-store.h 2013-09-12 15:51:33.360412244 -0400 -@@ -32,7 +32,6 @@ - - #include "camel-imapx-server.h" - #include "camel-imapx-store-summary.h" --#include "camel-imapx-conn-manager.h" - - /* Standard GObject macros */ - #define CAMEL_TYPE_IMAPX_STORE \ -@@ -63,9 +62,6 @@ struct _CamelIMAPXStore { - CamelOfflineStore parent; - CamelIMAPXStorePrivate *priv; - -- CamelIMAPXConnManager *con_man; -- CamelIMAPXServer *authenticating_server; -- - CamelIMAPXStoreSummary *summary; /* in-memory list of folders */ - gchar dir_sep; - -@@ -91,13 +87,8 @@ struct _CamelIMAPXStoreClass { - - GType camel_imapx_store_get_type (void); - CamelIMAPXServer * -- camel_imapx_store_get_server (CamelIMAPXStore *store, -- const gchar *folder_name, -- GCancellable *cancellable, -+ camel_imapx_store_ref_server (CamelIMAPXStore *store, - GError **error); --void camel_imapx_store_op_done (CamelIMAPXStore *istore, -- CamelIMAPXServer *server, -- const gchar *folder_name); - CamelFolderQuotaInfo * - camel_imapx_store_dup_quota_info - (CamelIMAPXStore *store, -diff -up evolution-data-server-3.8.5/camel/Makefile.am.kill-imapx-conn-manager evolution-data-server-3.8.5/camel/Makefile.am ---- evolution-data-server-3.8.5/camel/Makefile.am.kill-imapx-conn-manager 2013-04-18 11:33:59.000000000 -0400 -+++ evolution-data-server-3.8.5/camel/Makefile.am 2013-09-12 15:51:33.270412271 -0400 -@@ -180,7 +180,6 @@ libcamel_1_2_la_SOURCES = \ - camel-vee-summary.c \ - camel-vtrash-folder.c \ - camel-imapx-command.c \ -- camel-imapx-conn-manager.c \ - camel-imapx-folder.c \ - camel-imapx-job.c \ - camel-imapx-search.c \ -@@ -315,7 +314,6 @@ libcamelinclude_HEADERS = \ - camel-vee-summary.h \ - camel-vtrash-folder.h \ - camel-imapx-command.h \ -- camel-imapx-conn-manager.h \ - camel-imapx-folder.h \ - camel-imapx-job.h \ - camel-imapx-search.h \ -diff -up evolution-data-server-3.8.5/docs/reference/camel/camel-docs.sgml.kill-imapx-conn-manager evolution-data-server-3.8.5/docs/reference/camel/camel-docs.sgml ---- evolution-data-server-3.8.5/docs/reference/camel/camel-docs.sgml.kill-imapx-conn-manager 2013-03-17 08:46:02.000000000 -0400 -+++ evolution-data-server-3.8.5/docs/reference/camel/camel-docs.sgml 2013-09-12 15:51:33.397412234 -0400 -@@ -202,7 +202,6 @@ - - Extensible IMAP - -- - - - -diff -up evolution-data-server-3.8.5/docs/reference/camel/camel-sections.txt.kill-imapx-conn-manager evolution-data-server-3.8.5/docs/reference/camel/camel-sections.txt ---- evolution-data-server-3.8.5/docs/reference/camel/camel-sections.txt.kill-imapx-conn-manager 2013-08-11 07:26:25.000000000 -0400 -+++ evolution-data-server-3.8.5/docs/reference/camel/camel-sections.txt 2013-09-12 15:51:33.407412231 -0400 -@@ -770,29 +770,6 @@ camel_imapx_command_queue_delete_link - - -
--camel-imapx-conn-manager --CamelIMAPXConnManager --CamelIMAPXConnManager --camel_imapx_conn_manager_new --camel_imapx_conn_manager_ref_store --camel_imapx_conn_manager_get_connection --camel_imapx_conn_manager_close_connections --camel_imapx_conn_manager_get_connections --camel_imapx_conn_manager_update_con_info -- --CAMEL_IMAPX_CONN_MANAGER --CAMEL_IS_IMAPX_CONN_MANAGER --CAMEL_TYPE_IMAPX_CONN_MANAGER --CAMEL_IMAPX_CONN_MANAGER_CLASS --CAMEL_IS_IMAPX_CONN_MANAGER_CLASS --CAMEL_IMAPX_CONN_MANAGER_GET_CLASS --CamelIMAPXConnManagerClass --camel_imapx_conn_manager_get_type -- --CamelIMAPXConnManagerPrivate --
-- --
- camel-imapx-folder - CamelIMAPXFolder - CamelIMAPXFolder -@@ -970,8 +947,7 @@ CamelIMAPXSettingsPrivate - camel-imapx-store - CamelIMAPXStore - CamelIMAPXStore --camel_imapx_store_get_server --camel_imapx_store_op_done -+camel_imapx_store_ref_server - camel_imapx_store_dup_quota_info - camel_imapx_store_set_quota_info - -diff -up evolution-data-server-3.8.5/docs/reference/camel/camel.types.kill-imapx-conn-manager evolution-data-server-3.8.5/docs/reference/camel/camel.types ---- evolution-data-server-3.8.5/docs/reference/camel/camel.types.kill-imapx-conn-manager 2013-08-11 07:26:25.000000000 -0400 -+++ evolution-data-server-3.8.5/docs/reference/camel/camel.types 2013-09-12 15:51:33.417412228 -0400 -@@ -16,7 +16,6 @@ camel_folder_search_get_type - camel_folder_summary_get_type - camel_gpg_context_get_type - camel_html_parser_get_type --camel_imapx_conn_manager_get_type - camel_imapx_folder_get_type - camel_imapx_search_get_type - camel_imapx_server_get_type diff --git a/SOURCES/evolution-data-server-3.8.5-ldap-not-writeable.patch b/SOURCES/evolution-data-server-3.8.5-ldap-not-writeable.patch new file mode 100644 index 0000000..1d27c26 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-ldap-not-writeable.patch @@ -0,0 +1,22 @@ +diff -up evolution-data-server-3.8.5/addressbook/backends/ldap/e-book-backend-ldap.c.ldap-not-writeable evolution-data-server-3.8.5/addressbook/backends/ldap/e-book-backend-ldap.c +--- evolution-data-server-3.8.5/addressbook/backends/ldap/e-book-backend-ldap.c.ldap-not-writeable 2013-08-11 00:00:52.000000000 +0200 ++++ evolution-data-server-3.8.5/addressbook/backends/ldap/e-book-backend-ldap.c 2014-01-13 14:16:00.083881277 +0100 +@@ -597,6 +597,7 @@ check_schema_support (EBookBackendLDAP * + const gchar *attrs[2]; + LDAPMessage *resp; + struct timeval timeout; ++ gchar *lst; + + g_rec_mutex_lock (&eds_ldap_handler_lock); + if (!bl->priv->ldap) { +@@ -684,6 +685,10 @@ check_schema_support (EBookBackendLDAP * + else { + g_rec_mutex_unlock (&eds_ldap_handler_lock); + } ++ ++ lst = e_data_book_string_slist_to_comma_string (bl->priv->supported_fields); ++ e_book_backend_notify_property_changed (E_BOOK_BACKEND (bl), BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS, lst); ++ g_free (lst); + } + + #ifndef SUNLDAP diff --git a/SOURCES/evolution-data-server-3.8.5-maildir-get-folder-use-after-free.patch b/SOURCES/evolution-data-server-3.8.5-maildir-get-folder-use-after-free.patch new file mode 100644 index 0000000..ad14166 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-maildir-get-folder-use-after-free.patch @@ -0,0 +1,12 @@ +diff -up evolution-data-server-3.8.5/camel/providers/local/camel-maildir-store.c.maildir-get-folder-use-after-free evolution-data-server-3.8.5/camel/providers/local/camel-maildir-store.c +--- evolution-data-server-3.8.5/camel/providers/local/camel-maildir-store.c.maildir-get-folder-use-after-free 2014-02-03 11:35:38.138877132 +0100 ++++ evolution-data-server-3.8.5/camel/providers/local/camel-maildir-store.c 2014-02-03 11:35:38.297877125 +0100 +@@ -207,7 +207,7 @@ maildir_store_get_folder_sync (CamelStor + + /* Chain up to parent's get_folder() method. */ + store_class = CAMEL_STORE_CLASS (camel_maildir_store_parent_class); +- if (!store_class->get_folder_sync (store, dir_name, flags, cancellable, error)) { ++ if (!store_class->get_folder_sync (store, name, flags, cancellable, error)) { + g_free (name); + return NULL; + } diff --git a/SOURCES/evolution-data-server-3.8.5-prefer-gpg2.patch b/SOURCES/evolution-data-server-3.8.5-prefer-gpg2.patch new file mode 100644 index 0000000..647cc8c --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-prefer-gpg2.patch @@ -0,0 +1,13 @@ +diff -up evolution-data-server-3.8.5/camel/camel-gpg-context.c.prefer-gpg2 evolution-data-server-3.8.5/camel/camel-gpg-context.c +--- evolution-data-server-3.8.5/camel/camel-gpg-context.c.prefer-gpg2 2013-07-23 14:01:51.000000000 +0200 ++++ evolution-data-server-3.8.5/camel/camel-gpg-context.c 2014-01-23 15:44:50.535990255 +0100 +@@ -456,8 +456,8 @@ gpg_ctx_get_executable_name (void) + { + static gint index = -1; + const gchar *names[] = { +- "gpg", + "gpg2", ++ "gpg", + NULL + }; + diff --git a/SOURCES/evolution-data-server-3.8.5-translations.patch b/SOURCES/evolution-data-server-3.8.5-translations.patch new file mode 100644 index 0000000..072faf0 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-translations.patch @@ -0,0 +1,45808 @@ +diff -up evolution-data-server-3.8.5/po/bn_IN.po.translations evolution-data-server-3.8.5/po/bn_IN.po +--- evolution-data-server-3.8.5/po/bn_IN.po.translations 2013-03-17 13:46:02.000000000 +0100 ++++ evolution-data-server-3.8.5/po/bn_IN.po 2014-01-13 16:23:40.773630232 +0100 +@@ -1,315 +1,315 @@ + # translation of bn_IN.po to Bengali INDIA + # This file is distributed under the same license as the evolution-data-server package. + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +-# ++# + # Runa Bhattacharjee , 2004. + # Runa Bhattacharjee , 2007. + # Runa Bhattacharjee , 2008, 2009, 2011, 2012. ++# sray , 2013. #zanata + msgid "" + msgstr "" + "Project-Id-Version: bn_IN\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=" ++"evolution-data-server&keywords=I18N+L10N&component=Misc.\n" + "POT-Creation-Date: 2012-08-28 13:07+0000\n" +-"PO-Revision-Date: 2012-09-20 12:39+0530\n" +-"Last-Translator: Runa Bhattacharjee \n" ++"PO-Revision-Date: 2013-10-10 07:13-0400\n" ++"Last-Translator: sray \n" + "Language-Team: Bengali (India) \n" +-"Language: bn_IN\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Lokalize 1.2\n" ++"Language: bn-IN\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + "\n" ++"X-Generator: Zanata 3.1.2\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:116 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1232 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4785 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:931 +-#: ../addressbook/libebook/e-book-client.c:106 +-#: ../addressbook/libedata-book/e-data-book.c:432 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:570 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619 +-#: ../calendar/libecal/e-cal.c:4033 ../calendar/libecal/e-cal-client.c:148 +-#: ../camel/camel-imapx-command.c:594 +-#: ../camel/providers/imap/camel-imap-command.c:524 +-#: ../camel/providers/imap/camel-imap-store.c:468 +-#: ../libedataserver/e-client.c:165 +-msgid "Unknown error" +-msgstr "অজানা সমস্যা" +- +-#: ../addressbook/backends/file/e-book-backend-file.c:141 ++#: ../addressbook/backends/file/e-book-backend-file.c:114 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "'%s' ফাইল মুছে ফেলতে ব্যর্থ: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:164 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:616 ++#: ../addressbook/backends/file/e-book-backend-file.c:138 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "%s ডিরেক্টরি নির্মাণ করতে ব্যর্থ: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:459 ++#: ../addressbook/backends/file/e-book-backend-file.c:385 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "'%s' রিসোর্সের জন্য হার্ড-লিংক প্রস্তুত করতে ব্যর্থ: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:561 +-#: ../addressbook/backends/file/e-book-backend-file.c:1127 ++#: ../addressbook/backends/file/e-book-backend-file.c:487 ++#: ../addressbook/backends/file/e-book-backend-file.c:911 + msgid "No UID in the contact" + msgstr "পরিচিতের ক্ষেত্রে কোনো UID উপস্থিত নেই" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1569 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508 ++#: ../addressbook/backends/file/e-book-backend-file.c:757 ++#, c-format ++msgid "Conflicting UIDs found in added contacts" ++msgstr "যোগ করা পরিচিতিগুলিতে অসংগতিমূলক UIDs পাওয়া গেছে" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:844 ++#: ../addressbook/backends/file/e-book-backend-file.c:1038 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2656 ++#, c-format ++msgid "Contact '%s' not found" ++msgstr "'%s' পরিচিতি পাওয়া যায়নি" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:940 ++#, c-format ++msgid "Tried to modify contact '%s' with out of sync revision" ++msgstr "সিঙ্ক বহির্ভূত রিভিশন ছাড়া '%s' পরিচিতি সংশোধন করার চেষ্টা করা হয়েছে" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:1089 ++#: ../addressbook/backends/file/e-book-backend-file.c:1139 ++#, c-format ++msgid "Query '%s' not supported" ++msgstr "ক্যোয়েরি '%s' সমর্থিত নয়" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:1098 ++#: ../addressbook/backends/file/e-book-backend-file.c:1148 ++#, c-format ++msgid "Invalid Query '%s'" ++msgstr "অবৈধ ক্যোয়েরি '%s'" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:1248 + msgid "Loading..." + msgstr "লোড করা হচ্ছে ..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1572 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510 ++#: ../addressbook/backends/file/e-book-backend-file.c:1250 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4978 + msgid "Searching..." + msgstr "অনুসন্ধান করা হচ্ছে..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:2115 ++#: ../addressbook/backends/file/e-book-backend-file.c:1568 + #, c-format +-msgid "Failed to build summary for an address book %s" +-msgstr "%s ঠিকানা বইয়ের জন্য সংক্ষিপ্ত তথ্য প্রস্তুত করতে ব্যর্থ" ++msgid "Failed to rename old database from '%s' to '%s': %s" ++msgstr "পুরনো ডেটাবেসের %s' নাম পাল্টে '%s' করা যায়নি: %s" ++ ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4873 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:338 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 ++#: ../addressbook/libebook-contacts/e-phone-number.c:58 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:562 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:592 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 ++#: ../calendar/libecal/e-cal.c:2339 ++#: ../calendar/libecal/e-cal-client.c:275 ++#: ../camel/camel-imapx-command.c:609 ++#: ../libedataserver/e-client.c:179 ++msgid "Unknown error" ++msgstr "অজানা সমস্যা" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:645 ++#: ../addressbook/backends/google/e-book-backend-google.c:679 + msgid "Querying for updated contacts…" + msgstr "আপডেট করা পরিচিতিদের তথ্য অনুসন্ধান করা হচ্ছে…" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:782 ++#: ../addressbook/backends/google/e-book-backend-google.c:816 + msgid "Querying for updated groups…" + msgstr "আপডেট হওয়া দলের তথ্য অনুসন্ধান করা হচ্ছে…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1202 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326 ++#: ../addressbook/backends/google/e-book-backend-google.c:1265 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:389 + msgid "The backend does not support bulk additions" + msgstr "ব্যাক-এন্ডে একযোগে একাধিক সংযোজন সমর্থিত হবে না" + + #. Insert the entry on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1234 ++#: ../addressbook/backends/google/e-book-backend-google.c:1297 + msgid "Creating new contact…" + msgstr "নতুন পরিচিতির তথ্য যোগ করুন…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1323 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433 ++#: ../addressbook/backends/google/e-book-backend-google.c:1388 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:506 + msgid "The backend does not support bulk removals" + msgstr "ব্যাক-এন্ডে একযোগে একাধিক অপসারণ সমর্থিত হবে না" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1351 ++#: ../addressbook/backends/google/e-book-backend-google.c:1416 + msgid "Deleting contact…" + msgstr "পরিচিতির তথ্য মুছে ফেলুন…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1601 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487 ++#: ../addressbook/backends/google/e-book-backend-google.c:1670 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:567 + msgid "The backend does not support bulk modifications" + msgstr "ব্যাক-এন্ডে একযোগে একাধিক সংযোজন সমর্থিত হবে না" + + #. Update the contact on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1639 ++#: ../addressbook/backends/google/e-book-backend-google.c:1708 + msgid "Modifying contact…" + msgstr "পরিচিতির তথ্য পরিবর্তন করুন…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1809 ++#: ../addressbook/backends/google/e-book-backend-google.c:1879 + msgid "Loading…" + msgstr "লোড করা হচ্ছে ..." + +-#: ../addressbook/backends/google/e-book-google-utils.c:1562 ++#. System Group: My Contacts ++#: ../addressbook/backends/google/e-book-google-utils.c:1606 ++#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1 + msgid "Personal" + msgstr "ব্যক্তিগত" + +-#. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1563 ++#. System Group: Friends ++#: ../addressbook/backends/google/e-book-google-utils.c:1608 + msgid "Friends" + msgstr "বন্ধুবান্ধব" + +-#. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1564 ++#. System Group: Family ++#: ../addressbook/backends/google/e-book-google-utils.c:1610 + msgid "Family" + msgstr "পরিবার" + +-#. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1565 ++#. System Group: Coworkers ++#: ../addressbook/backends/google/e-book-google-utils.c:1612 + msgid "Coworkers" + msgstr "সহকর্মী" + +-#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165 ++#. Translators: An error message shown to a user when trying to do an ++#. * operation on the LDAP address book which is not connected to the server ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174 + msgid "Not connected" + msgstr "সংযুক্ত নয়" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793 +-msgid "Using Distinguished Name (DN)" +-msgstr "Distinguished Name (DN) ব্যবহার করা হচ্ছে" +- +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796 +-msgid "Using Email Address" +-msgstr "ই-মেইল ঠিকানা ব্যবহার করা হচ্ছে" +- +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "v3 অথবা v2 বাইন্ড প্রয়োগ করে বাইন্ড করতে ব্যর্থ" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088 + msgid "Reconnecting to LDAP server..." + msgstr "LDAP সার্ভার'র সাথে পুনরায় সংযোগ করা হচ্ছে..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218 + msgid "Invalid DN syntax" + msgstr "DN সিন্টেক্স বৈধ নয়" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1231 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4784 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4872 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP সংক্রান্ত ত্রুটি 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Adding contact to LDAP server..." + msgstr "LDAP সার্ভারে পরিচিতি যোগ করা হচ্ছে..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1890 + msgid "Removing contact from LDAP server..." + msgstr "LDAP সার্ভার থেকে পরিচিতি মুছে ফেলা হচ্ছে..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2022 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2405 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2431 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: ldap_first_entry থেকে NULL প্রাপ্ত হয়েছে" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2265 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2456 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2489 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: ব্যবস্থাপনার অযোগ্য ফলাফলের ধরন %d প্রাপ্ত হয়েছে" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2356 + msgid "Modifying contact from LDAP server..." + msgstr "LDAP সার্ভারে পরিচিতি পরিবর্তন করা হচ্ছে..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2673 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2886 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2718 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2950 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: ব্যবস্থাপনার অযোগ্য ধরনের অনুসন্ধানের ফলাফল %d প্রাপ্ত হয়েছে" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4821 + msgid "Receiving LDAP search results..." + msgstr "LDAP'র অনুসন্ধানের ফলাফল প্রাপ্ত করা হচ্ছে..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5000 + msgid "Error performing search" + msgstr "অনুসন্ধানের সময় সমস্যা" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "পরিচিতদের তালিকা ডাউনলোড করা হচ্ছে (%d)... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5654 + #, c-format +-#| msgid "Failed to create hardlink for resource '%s': %s" + msgid "Failed to get the DN for user '%s'" + msgstr "'%s' ব্যবহারকারীর জন্য DN প্রাপ্ত করতে ব্যর্থ" + +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:645 +-#, c-format +-#| msgid "Failed to remove file '%s': %s" +-msgid "Failed to open addressbook at '%s': %s" +-msgstr "'%s'-এ উপস্থিত ঠিকানা-বই খুলতে ব্যর্থ: %s" +- +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:420 + #, c-format +-msgid "Create resource '%s' failed with HTTP status: %d (%s)" +-msgstr "HTTP অবস্থা সহ '%s' রিসোর্স নির্মাণের প্রয়াস ব্যর্থ: %d (%s)" ++msgid "Create resource '%s' failed with HTTP status %d (%s)" ++msgstr "'%s' রিসোর্স তৈরি ব্যর্থ হয়েছে, HTTP স্ট্যাটাস হল %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:522 + #, c-format +-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)" + msgid "DELETE failed with HTTP status %d" + msgstr "HTTP অবস্থা %d সহ DELETE-র কাজ ব্যর্থ হয়েছে" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588 + msgid "Contact on server changed -> not modifying" + msgstr "সার্ভারে পরিচিতি পরিবর্তিত হয়েছে -> পরিবর্তন করা হবে না" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:597 + #, c-format +-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)" +-msgid "Modify contact failed with HTTP status: %d (%s)" +-msgstr "HTTP অবস্থা %d সহ পরিচিতি পরিবর্তনের কাজ ব্যর্থ হয়েছে (%s)" ++msgid "Modify contact failed with HTTP status %d (%s)" ++msgstr "পরিচিতি সংশোধন ব্যর্থ হয়েছে, HTTP স্ট্যাটাস হল %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912 +-#| msgid "Error loading address book: %s" ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1007 + msgid "Loading Addressbook summary..." + msgstr "ঠিকানা-বইয়ের সংক্ষিপ্ত তথ্য লোড করা হচ্ছে..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026 + #, c-format +-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)" + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "HTTP অবস্থা %d সহ webdav-র মধ্যে PROPFIND-র কাজ ব্যর্থ হয়েছে (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1051 + msgid "No response body in webdav PROPFIND result" + msgstr "webdav PROPFIND ফলাফলের মধ্যে প্রতিক্রিয়ার অংশ অনুপস্থিত" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1083 + #, c-format +-#| msgid "Downloading contacts (%d)... " + msgid "Loading Contacts (%d%%)" + msgstr "পরিচিতদের তালিকা লোড করা হচ্ছে (%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1416 + msgid "Cannot transform SoupURI to string" + msgstr "SoupURI-কে পংক্তিতে রূপান্তর করা সম্ভব নয়" + +-#: ../addressbook/libebook/e-book-client.c:95 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24 + msgid "No such book" + msgstr "এই ধরনের কোনো বই উপস্থিত নেই" + +-#: ../addressbook/libebook/e-book-client.c:97 +-#: ../addressbook/libedata-book/e-data-book.c:306 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26 ++#: ../addressbook/libedata-book/e-data-book.c:797 + msgid "Contact not found" + msgstr "পরিচিতি পাওয়া যায়নি" + +-#: ../addressbook/libebook/e-book-client.c:99 +-#: ../addressbook/libedata-book/e-data-book.c:307 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28 ++#: ../addressbook/libedata-book/e-data-book.c:798 + msgid "Contact ID already exists" + msgstr "পরিচিতির ID বর্তমানে উপস্থিত" + +-#: ../addressbook/libebook/e-book-client.c:101 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30 + msgid "No such source" + msgstr "এই ধরনের কোনো উৎস উপস্থিত নেই" + +-#: ../addressbook/libebook/e-book-client.c:103 +-#: ../addressbook/libedata-book/e-data-book.c:323 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32 ++#: ../addressbook/libedata-book/e-data-book.c:814 + msgid "No space" + msgstr "স্থান ফাঁকা নেই" + +-#: ../addressbook/libebook/e-book-client.c:488 +-msgid "Failed to run book factory" +-msgstr "বুক ফ্যাক্টরি সঞ্চালন করতে ব্যর্থ" +- +-#: ../addressbook/libebook/e-book-client.c:2244 +-#: ../calendar/libecal/e-cal-client.c:4602 +-msgid "Cannot get connection to view" +-msgstr "প্রদর্শনের জন্য সংযোগ প্রাপ্ত করতে ব্যর্থ" +- + #. Dummy row as EContactField starts from 1 +-#: ../addressbook/libebook/e-contact.c:121 ++#: ../addressbook/libebook-contacts/e-contact.c:120 + msgid "Unique ID" + msgstr "স্বতন্ত্র ID" + +@@ -317,13 +317,12 @@ msgstr "স্বতন্ত্র ID" + #. * so we can generate its value if necessary in the getter + #. Translators: This is an EContact field description, in this case it's a + #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here. +-#: ../addressbook/libebook/e-contact.c:126 ++#: ../addressbook/libebook-contacts/e-contact.c:125 + msgid "File Under" + msgstr "চিহ্নিত স্থানে ফাইল করা হবে" + + #. URI of the book to which the contact belongs to +-#: ../addressbook/libebook/e-contact.c:128 +-#| msgid "Book URI" ++#: ../addressbook/libebook-contacts/e-contact.c:127 + msgid "Book UID" + msgstr "বইয়ের UID" + +@@ -331,435 +330,434 @@ msgstr "বইয়ের UID" + #. FN isn't really a structured field - we use a getter/setter + #. * so we can set the N property (since evo 1.4 works fine with + #. * vcards that don't even have a N attribute. *sigh*) +-#: ../addressbook/libebook/e-contact.c:134 ++#: ../addressbook/libebook-contacts/e-contact.c:133 + msgid "Full Name" + msgstr "সম্পূর্ণ নাম" + +-#: ../addressbook/libebook/e-contact.c:135 ++#: ../addressbook/libebook-contacts/e-contact.c:134 + msgid "Given Name" + msgstr "প্রদত্ত নাম" + +-#: ../addressbook/libebook/e-contact.c:136 ++#: ../addressbook/libebook-contacts/e-contact.c:135 + msgid "Family Name" + msgstr "পারিবারিক নাম" + +-#: ../addressbook/libebook/e-contact.c:137 ++#: ../addressbook/libebook-contacts/e-contact.c:136 + msgid "Nickname" + msgstr "উপনাম" + + #. Email fields +-#: ../addressbook/libebook/e-contact.c:140 ++#: ../addressbook/libebook-contacts/e-contact.c:139 + msgid "Email 1" + msgstr "ই-মেইল ১" + +-#: ../addressbook/libebook/e-contact.c:141 ++#: ../addressbook/libebook-contacts/e-contact.c:140 + msgid "Email 2" + msgstr "ই-মেইল ২" + +-#: ../addressbook/libebook/e-contact.c:142 ++#: ../addressbook/libebook-contacts/e-contact.c:141 + msgid "Email 3" + msgstr "ই-মেইল ৩" + +-#: ../addressbook/libebook/e-contact.c:143 ++#: ../addressbook/libebook-contacts/e-contact.c:142 + msgid "Email 4" + msgstr "ই-মেইল ৪" + +-#: ../addressbook/libebook/e-contact.c:145 ++#: ../addressbook/libebook-contacts/e-contact.c:144 + msgid "Mailer" + msgstr "মেইলার" + + #. Address Labels +-#: ../addressbook/libebook/e-contact.c:148 ++#: ../addressbook/libebook-contacts/e-contact.c:147 + msgid "Home Address Label" + msgstr "বাড়ির ঠিকানার লেবেল" + +-#: ../addressbook/libebook/e-contact.c:149 ++#: ../addressbook/libebook-contacts/e-contact.c:148 + msgid "Work Address Label" + msgstr "কর্মস্থলের ঠিকানার লেবেল" + +-#: ../addressbook/libebook/e-contact.c:150 ++#: ../addressbook/libebook-contacts/e-contact.c:149 + msgid "Other Address Label" + msgstr "অন্যান্য ঠিকানার লেবেল" + + #. Phone fields +-#: ../addressbook/libebook/e-contact.c:153 ++#: ../addressbook/libebook-contacts/e-contact.c:152 + msgid "Assistant Phone" + msgstr "সহকারীর ফোন" + +-#: ../addressbook/libebook/e-contact.c:154 ++#: ../addressbook/libebook-contacts/e-contact.c:153 + msgid "Business Phone" + msgstr "ব্যবসার ফোন" + +-#: ../addressbook/libebook/e-contact.c:155 ++#: ../addressbook/libebook-contacts/e-contact.c:154 + msgid "Business Phone 2" + msgstr "ব্যবসার ফোন ২" + +-#: ../addressbook/libebook/e-contact.c:156 ++#: ../addressbook/libebook-contacts/e-contact.c:155 + msgid "Business Fax" + msgstr "ব্যবসার ফ্যাক্স" + +-#: ../addressbook/libebook/e-contact.c:157 ++#: ../addressbook/libebook-contacts/e-contact.c:156 + msgid "Callback Phone" + msgstr "প্রত্যুত্তের উদ্দেশ্যে ফোন" + +-#: ../addressbook/libebook/e-contact.c:158 ++#: ../addressbook/libebook-contacts/e-contact.c:157 + msgid "Car Phone" + msgstr "গাড়ির ফোন" + +-#: ../addressbook/libebook/e-contact.c:159 ++#: ../addressbook/libebook-contacts/e-contact.c:158 + msgid "Company Phone" + msgstr "কোম্পানির ফোন" + +-#: ../addressbook/libebook/e-contact.c:160 ++#: ../addressbook/libebook-contacts/e-contact.c:159 + msgid "Home Phone" + msgstr "বাড়ির ফোন" + +-#: ../addressbook/libebook/e-contact.c:161 ++#: ../addressbook/libebook-contacts/e-contact.c:160 + msgid "Home Phone 2" + msgstr "বাড়ির ফোন ২" + +-#: ../addressbook/libebook/e-contact.c:162 ++#: ../addressbook/libebook-contacts/e-contact.c:161 + msgid "Home Fax" + msgstr "বাড়ির ফ্যাক্স" + +-#: ../addressbook/libebook/e-contact.c:163 ++#: ../addressbook/libebook-contacts/e-contact.c:162 + msgid "ISDN" + msgstr "ISDN" + +-#: ../addressbook/libebook/e-contact.c:164 ++#: ../addressbook/libebook-contacts/e-contact.c:163 + msgid "Mobile Phone" + msgstr "মোবাইল ফোন" + +-#: ../addressbook/libebook/e-contact.c:165 ++#: ../addressbook/libebook-contacts/e-contact.c:164 + msgid "Other Phone" + msgstr "অন্যান্য ফোন" + +-#: ../addressbook/libebook/e-contact.c:166 ++#: ../addressbook/libebook-contacts/e-contact.c:165 + msgid "Other Fax" + msgstr "অন্যান্য ফ্যাক্স" + +-#: ../addressbook/libebook/e-contact.c:167 ++#: ../addressbook/libebook-contacts/e-contact.c:166 + msgid "Pager" + msgstr "পেজার" + +-#: ../addressbook/libebook/e-contact.c:168 ++#: ../addressbook/libebook-contacts/e-contact.c:167 + msgid "Primary Phone" + msgstr "প্রধান ফোন" + +-#: ../addressbook/libebook/e-contact.c:169 ++#: ../addressbook/libebook-contacts/e-contact.c:168 + msgid "Radio" + msgstr "রেডিও" + +-#: ../addressbook/libebook/e-contact.c:170 ++#: ../addressbook/libebook-contacts/e-contact.c:169 + msgid "Telex" + msgstr "টেলেক্স" + + #. To translators: TTY is Teletypewriter +-#: ../addressbook/libebook/e-contact.c:172 ++#: ../addressbook/libebook-contacts/e-contact.c:171 + msgid "TTY" + msgstr "TTY" + + #. Organizational fields +-#: ../addressbook/libebook/e-contact.c:175 ++#: ../addressbook/libebook-contacts/e-contact.c:174 + msgid "Organization" + msgstr "সংস্থা" + +-#: ../addressbook/libebook/e-contact.c:176 ++#: ../addressbook/libebook-contacts/e-contact.c:175 + msgid "Organizational Unit" + msgstr "সংস্থার বিভাগ" + +-#: ../addressbook/libebook/e-contact.c:177 ++#: ../addressbook/libebook-contacts/e-contact.c:176 + msgid "Office" + msgstr "অফিস" + +-#: ../addressbook/libebook/e-contact.c:178 ++#: ../addressbook/libebook-contacts/e-contact.c:177 + msgid "Title" + msgstr "শিরোনাম" + +-#: ../addressbook/libebook/e-contact.c:179 ++#: ../addressbook/libebook-contacts/e-contact.c:178 + msgid "Role" + msgstr "ভূমিকা" + +-#: ../addressbook/libebook/e-contact.c:180 ++#: ../addressbook/libebook-contacts/e-contact.c:179 + msgid "Manager" + msgstr "ম্যানেজার" + +-#: ../addressbook/libebook/e-contact.c:181 ++#: ../addressbook/libebook-contacts/e-contact.c:180 + msgid "Assistant" + msgstr "সহায়ক" + + #. Web fields +-#: ../addressbook/libebook/e-contact.c:184 ++#: ../addressbook/libebook-contacts/e-contact.c:183 + msgid "Homepage URL" + msgstr "হোমপেজ'র URL" + +-#: ../addressbook/libebook/e-contact.c:185 ++#: ../addressbook/libebook-contacts/e-contact.c:184 + msgid "Weblog URL" + msgstr "ওয়েবলগ'র URL" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:188 +-#: ../libedataserverui/e-categories-dialog.c:90 ++#: ../addressbook/libebook-contacts/e-contact.c:187 + msgid "Categories" + msgstr "বিভাগ" + + #. Collaboration fields +-#: ../addressbook/libebook/e-contact.c:191 ++#: ../addressbook/libebook-contacts/e-contact.c:190 + msgid "Calendar URI" + msgstr "বর্ষপঞ্জির'র URI" + +-#: ../addressbook/libebook/e-contact.c:192 ++#: ../addressbook/libebook-contacts/e-contact.c:191 + msgid "Free/Busy URL" + msgstr "মুক্ত/ব্যস্ত URL" + +-#: ../addressbook/libebook/e-contact.c:193 ++#: ../addressbook/libebook-contacts/e-contact.c:192 + msgid "ICS Calendar" + msgstr "ICS বর্ষপঞ্জি" + +-#: ../addressbook/libebook/e-contact.c:194 ++#: ../addressbook/libebook-contacts/e-contact.c:193 + msgid "Video Conferencing URL" + msgstr "ভিডিও কনফারেন্সের URL" + + #. Misc fields +-#: ../addressbook/libebook/e-contact.c:197 ++#: ../addressbook/libebook-contacts/e-contact.c:196 + msgid "Spouse's Name" + msgstr "স্বামী/স্ত্রী-র নাম" + +-#: ../addressbook/libebook/e-contact.c:198 ++#: ../addressbook/libebook-contacts/e-contact.c:197 + msgid "Note" + msgstr "নোট" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:201 ++#: ../addressbook/libebook-contacts/e-contact.c:200 + msgid "AIM Home Screen Name 1" + msgstr "AIM বাড়ির স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:202 ++#: ../addressbook/libebook-contacts/e-contact.c:201 + msgid "AIM Home Screen Name 2" + msgstr "AIM বাড়ির স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:203 ++#: ../addressbook/libebook-contacts/e-contact.c:202 + msgid "AIM Home Screen Name 3" + msgstr "AIM বাড়ির স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:204 ++#: ../addressbook/libebook-contacts/e-contact.c:203 + msgid "AIM Work Screen Name 1" + msgstr "AIM কর্মস্থলের স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:205 ++#: ../addressbook/libebook-contacts/e-contact.c:204 + msgid "AIM Work Screen Name 2" + msgstr "AIM কর্মস্থলের স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:206 ++#: ../addressbook/libebook-contacts/e-contact.c:205 + msgid "AIM Work Screen Name 3" + msgstr "AIM কর্মস্থলের স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:207 ++#: ../addressbook/libebook-contacts/e-contact.c:206 + msgid "GroupWise Home Screen Name 1" + msgstr "GroupWise বাড়ির স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:208 ++#: ../addressbook/libebook-contacts/e-contact.c:207 + msgid "GroupWise Home Screen Name 2" + msgstr "GroupWise বাড়ির স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:209 ++#: ../addressbook/libebook-contacts/e-contact.c:208 + msgid "GroupWise Home Screen Name 3" + msgstr "GroupWise বাড়ির স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:210 ++#: ../addressbook/libebook-contacts/e-contact.c:209 + msgid "GroupWise Work Screen Name 1" + msgstr "GroupWise কর্মস্থলের স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:211 ++#: ../addressbook/libebook-contacts/e-contact.c:210 + msgid "GroupWise Work Screen Name 2" + msgstr "GroupWise কর্মস্থলের স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:212 ++#: ../addressbook/libebook-contacts/e-contact.c:211 + msgid "GroupWise Work Screen Name 3" + msgstr "GroupWise কর্মস্থলের স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:213 ++#: ../addressbook/libebook-contacts/e-contact.c:212 + msgid "Jabber Home ID 1" + msgstr "Jabber বাড়ির ID ১" + +-#: ../addressbook/libebook/e-contact.c:214 ++#: ../addressbook/libebook-contacts/e-contact.c:213 + msgid "Jabber Home ID 2" + msgstr "Jabber বাড়ির Id ২" + +-#: ../addressbook/libebook/e-contact.c:215 ++#: ../addressbook/libebook-contacts/e-contact.c:214 + msgid "Jabber Home ID 3" + msgstr "Jabber বাড়ির Id ৩" + +-#: ../addressbook/libebook/e-contact.c:216 ++#: ../addressbook/libebook-contacts/e-contact.c:215 + msgid "Jabber Work ID 1" + msgstr "Jabber কর্মস্থলের Id ১" + +-#: ../addressbook/libebook/e-contact.c:217 ++#: ../addressbook/libebook-contacts/e-contact.c:216 + msgid "Jabber Work ID 2" + msgstr "Jabber কর্মস্থলের Id ২" + +-#: ../addressbook/libebook/e-contact.c:218 ++#: ../addressbook/libebook-contacts/e-contact.c:217 + msgid "Jabber Work ID 3" + msgstr "Jabber কর্মস্থলের Id ৩" + +-#: ../addressbook/libebook/e-contact.c:219 ++#: ../addressbook/libebook-contacts/e-contact.c:218 + msgid "Yahoo! Home Screen Name 1" + msgstr "Yahoo! বাড়ির স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:220 ++#: ../addressbook/libebook-contacts/e-contact.c:219 + msgid "Yahoo! Home Screen Name 2" + msgstr "Yahoo! বাড়ির স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:221 ++#: ../addressbook/libebook-contacts/e-contact.c:220 + msgid "Yahoo! Home Screen Name 3" + msgstr "Yahoo! বাড়ির স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:222 ++#: ../addressbook/libebook-contacts/e-contact.c:221 + msgid "Yahoo! Work Screen Name 1" + msgstr "Yahoo! কর্মস্থলের স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:223 ++#: ../addressbook/libebook-contacts/e-contact.c:222 + msgid "Yahoo! Work Screen Name 2" + msgstr "Yahoo! কর্মস্থলের স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:224 ++#: ../addressbook/libebook-contacts/e-contact.c:223 + msgid "Yahoo! Work Screen Name 3" + msgstr "Yahoo! কর্মস্থলের স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:225 ++#: ../addressbook/libebook-contacts/e-contact.c:224 + msgid "MSN Home Screen Name 1" + msgstr "MSN বাড়ির স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:226 ++#: ../addressbook/libebook-contacts/e-contact.c:225 + msgid "MSN Home Screen Name 2" + msgstr "MSN বাড়ির স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:227 ++#: ../addressbook/libebook-contacts/e-contact.c:226 + msgid "MSN Home Screen Name 3" + msgstr "MSN বাড়ির স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:228 ++#: ../addressbook/libebook-contacts/e-contact.c:227 + msgid "MSN Work Screen Name 1" + msgstr "MSN কর্মস্থলের স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:229 ++#: ../addressbook/libebook-contacts/e-contact.c:228 + msgid "MSN Work Screen Name 2" + msgstr "MSN কর্মস্থলের স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:230 ++#: ../addressbook/libebook-contacts/e-contact.c:229 + msgid "MSN Work Screen Name 3" + msgstr "MSN কর্মস্থলের স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:231 ++#: ../addressbook/libebook-contacts/e-contact.c:230 + msgid "ICQ Home ID 1" + msgstr "ICQ বাড়ির ID ১" + +-#: ../addressbook/libebook/e-contact.c:232 ++#: ../addressbook/libebook-contacts/e-contact.c:231 + msgid "ICQ Home ID 2" + msgstr "ICQ বাড়ির Id ২" + +-#: ../addressbook/libebook/e-contact.c:233 ++#: ../addressbook/libebook-contacts/e-contact.c:232 + msgid "ICQ Home ID 3" + msgstr "ICQ বাড়ির Id ৩" + +-#: ../addressbook/libebook/e-contact.c:234 ++#: ../addressbook/libebook-contacts/e-contact.c:233 + msgid "ICQ Work ID 1" + msgstr "ICQ কর্মস্থলের ID ১" + +-#: ../addressbook/libebook/e-contact.c:235 ++#: ../addressbook/libebook-contacts/e-contact.c:234 + msgid "ICQ Work ID 2" + msgstr "ICQ কর্মস্থলের Id ২" + +-#: ../addressbook/libebook/e-contact.c:236 ++#: ../addressbook/libebook-contacts/e-contact.c:235 + msgid "ICQ Work ID 3" + msgstr "ICQ কর্মস্থলের Id ৩" + + #. Last modified time +-#: ../addressbook/libebook/e-contact.c:239 ++#: ../addressbook/libebook-contacts/e-contact.c:238 + msgid "Last Revision" + msgstr "সর্বশেষ পরিবর্তন" + + #. Translators: This is an EContact field description, in this case it's a + #. * virtual field, which returns either name of the contact or the organization + #. * name, recognized by multiple other fields, where the first filled is used. +-#: ../addressbook/libebook/e-contact.c:243 ++#: ../addressbook/libebook-contacts/e-contact.c:242 + msgid "Name or Org" + msgstr "নাম অথবা সংস্থা" + + #. Address fields +-#: ../addressbook/libebook/e-contact.c:246 ++#: ../addressbook/libebook-contacts/e-contact.c:245 + msgid "Address List" + msgstr "ঠিকানার তালিকা" + +-#: ../addressbook/libebook/e-contact.c:247 ++#: ../addressbook/libebook-contacts/e-contact.c:246 + msgid "Home Address" + msgstr "বাড়ির ঠিকানা" + +-#: ../addressbook/libebook/e-contact.c:248 ++#: ../addressbook/libebook-contacts/e-contact.c:247 + msgid "Work Address" + msgstr "কর্মস্থলের ঠিকানা" + +-#: ../addressbook/libebook/e-contact.c:249 ++#: ../addressbook/libebook-contacts/e-contact.c:248 + msgid "Other Address" + msgstr "অন্যান্য ঠিকানা" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:252 ++#: ../addressbook/libebook-contacts/e-contact.c:251 + msgid "Category List" + msgstr "বিভাগের তালিকা" + + #. Photo/Logo +-#: ../addressbook/libebook/e-contact.c:255 ++#: ../addressbook/libebook-contacts/e-contact.c:254 + msgid "Photo" + msgstr "ছবি" + +-#: ../addressbook/libebook/e-contact.c:256 ++#: ../addressbook/libebook-contacts/e-contact.c:255 + msgid "Logo" + msgstr "প্রতীকচিহ্ন" + + #. Translators: This is an EContact field description, in this case it's a name + #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2 +-#: ../addressbook/libebook/e-contact.c:260 ++#: ../addressbook/libebook-contacts/e-contact.c:259 + msgid "Name" + msgstr "নাম" + +-#: ../addressbook/libebook/e-contact.c:261 ++#: ../addressbook/libebook-contacts/e-contact.c:260 + msgid "Email List" + msgstr "ই-মেইল তালিকা" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:264 ++#: ../addressbook/libebook-contacts/e-contact.c:263 + msgid "AIM Screen Name List" + msgstr "AIM স্ক্রিন নামের তালিকা" + +-#: ../addressbook/libebook/e-contact.c:265 ++#: ../addressbook/libebook-contacts/e-contact.c:264 + msgid "GroupWise ID List" + msgstr "GroupWise Id-র তালিকা" + +-#: ../addressbook/libebook/e-contact.c:266 ++#: ../addressbook/libebook-contacts/e-contact.c:265 + msgid "Jabber ID List" + msgstr "Jabber Id-র তালিকা" + +-#: ../addressbook/libebook/e-contact.c:267 ++#: ../addressbook/libebook-contacts/e-contact.c:266 + msgid "Yahoo! Screen Name List" + msgstr "Yahoo! স্ক্রিন নামের তালিকা" + +-#: ../addressbook/libebook/e-contact.c:268 ++#: ../addressbook/libebook-contacts/e-contact.c:267 + msgid "MSN Screen Name List" + msgstr "MSN স্ক্রিন নামের তালিকা" + +-#: ../addressbook/libebook/e-contact.c:269 ++#: ../addressbook/libebook-contacts/e-contact.c:268 + msgid "ICQ ID List" + msgstr "ICQ ID-র তালিকা" + +-#: ../addressbook/libebook/e-contact.c:271 ++#: ../addressbook/libebook-contacts/e-contact.c:270 + msgid "Wants HTML Mail" + msgstr "HTML মেইল প্রাপ্ত করতে ইচ্ছুক" + + #. Translators: This is an EContact field description, in this case it's a + #. * field describing whether it's a Contact list (list of email addresses) or a + #. * regular contact for one person/organization/... +-#: ../addressbook/libebook/e-contact.c:276 ++#: ../addressbook/libebook-contacts/e-contact.c:275 + msgid "List" + msgstr "তালিকা" + +@@ -767,413 +765,486 @@ msgstr "তালিকা" + #. * used to determine whether when sending to Contact lists the addresses should be + #. * shown or not to other recipients - basically whether to use BCC field or CC + #. * message header when sending messages to this Contact list. +-#: ../addressbook/libebook/e-contact.c:281 +-#| msgid "List Show Addresses" ++#: ../addressbook/libebook-contacts/e-contact.c:280 + msgid "List Shows Addresses" + msgstr "ঠিকানা প্রদর্শনের তালিকা" + +-#: ../addressbook/libebook/e-contact.c:283 ++#: ../addressbook/libebook-contacts/e-contact.c:282 + msgid "Birth Date" + msgstr "জন্ম তারিখ" + +-#: ../addressbook/libebook/e-contact.c:284 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919 ++#: ../addressbook/libebook-contacts/e-contact.c:283 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:875 + msgid "Anniversary" + msgstr "বাত্সরিক" + + # নাকী প্রতীক ?? + #. Security fields +-#: ../addressbook/libebook/e-contact.c:287 ++#: ../addressbook/libebook-contacts/e-contact.c:286 + msgid "X.509 Certificate" + msgstr "X.509 সার্টিফিকেট" + +-#: ../addressbook/libebook/e-contact.c:289 ++#: ../addressbook/libebook-contacts/e-contact.c:288 + msgid "Gadu-Gadu Home ID 1" + msgstr "Gadu-Gadu বাড়ির ID ১" + +-#: ../addressbook/libebook/e-contact.c:290 ++#: ../addressbook/libebook-contacts/e-contact.c:289 + msgid "Gadu-Gadu Home ID 2" + msgstr "Gadu-Gadu বাড়ির ID ২" + +-#: ../addressbook/libebook/e-contact.c:291 ++#: ../addressbook/libebook-contacts/e-contact.c:290 + msgid "Gadu-Gadu Home ID 3" + msgstr "Gadu-Gadu বাড়ির ID ৩" + +-#: ../addressbook/libebook/e-contact.c:292 ++#: ../addressbook/libebook-contacts/e-contact.c:291 + msgid "Gadu-Gadu Work ID 1" + msgstr "Gadu-Gadu কর্মস্থলের ID ১" + +-#: ../addressbook/libebook/e-contact.c:293 ++#: ../addressbook/libebook-contacts/e-contact.c:292 + msgid "Gadu-Gadu Work ID 2" + msgstr "Gadu-Gadu কর্মস্থলের ID ২" + +-#: ../addressbook/libebook/e-contact.c:294 ++#: ../addressbook/libebook-contacts/e-contact.c:293 + msgid "Gadu-Gadu Work ID 3" + msgstr "Gadu-Gadu কর্মস্থলের ID ৩" + +-#: ../addressbook/libebook/e-contact.c:295 ++#: ../addressbook/libebook-contacts/e-contact.c:294 + msgid "Gadu-Gadu ID List" + msgstr "Gadu-Gadu Id-র তালিকা" + + #. Geo information +-#: ../addressbook/libebook/e-contact.c:298 ++#: ../addressbook/libebook-contacts/e-contact.c:297 + msgid "Geographic Information" + msgstr "ভৌগলিক তথ্য" + +-#: ../addressbook/libebook/e-contact.c:300 ++#: ../addressbook/libebook-contacts/e-contact.c:299 + msgid "Telephone" + msgstr "দূরভাষ" + +-#: ../addressbook/libebook/e-contact.c:302 ++#: ../addressbook/libebook-contacts/e-contact.c:301 + msgid "Skype Home Name 1" + msgstr "Skype বাড়ির স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:303 ++#: ../addressbook/libebook-contacts/e-contact.c:302 + msgid "Skype Home Name 2" + msgstr "Skype বাড়ির স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:304 ++#: ../addressbook/libebook-contacts/e-contact.c:303 + msgid "Skype Home Name 3" + msgstr "Skype বাড়ির স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:305 ++#: ../addressbook/libebook-contacts/e-contact.c:304 + msgid "Skype Work Name 1" + msgstr "Skype কর্মস্থলের স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:306 ++#: ../addressbook/libebook-contacts/e-contact.c:305 + msgid "Skype Work Name 2" + msgstr "Skype কর্মস্থলের স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:307 ++#: ../addressbook/libebook-contacts/e-contact.c:306 + msgid "Skype Work Name 3" + msgstr "Skype কর্মস্থলের স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:308 ++#: ../addressbook/libebook-contacts/e-contact.c:307 + msgid "Skype Name List" + msgstr "Skype স্ক্রিন নামের তালিকা" + +-#: ../addressbook/libebook/e-contact.c:310 ++#: ../addressbook/libebook-contacts/e-contact.c:309 + msgid "SIP address" + msgstr "SIP ঠিকানা" + +-#: ../addressbook/libebook/e-contact.c:312 ++#: ../addressbook/libebook-contacts/e-contact.c:311 + msgid "Google Talk Home Name 1" + msgstr "Google Talk বাড়ির স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:313 ++#: ../addressbook/libebook-contacts/e-contact.c:312 + msgid "Google Talk Home Name 2" + msgstr "Google Talk বাড়ির স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:314 ++#: ../addressbook/libebook-contacts/e-contact.c:313 + msgid "Google Talk Home Name 3" + msgstr "Google Talk বাড়ির স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:315 ++#: ../addressbook/libebook-contacts/e-contact.c:314 + msgid "Google Talk Work Name 1" + msgstr "Google Talk কর্মস্থলের স্ক্রিনের নাম ১" + +-#: ../addressbook/libebook/e-contact.c:316 ++#: ../addressbook/libebook-contacts/e-contact.c:315 + msgid "Google Talk Work Name 2" + msgstr "Google Talk কর্মস্থলের স্ক্রিনের নাম ২" + +-#: ../addressbook/libebook/e-contact.c:317 ++#: ../addressbook/libebook-contacts/e-contact.c:316 + msgid "Google Talk Work Name 3" + msgstr "Google Talk কর্মস্থলের স্ক্রিনের নাম ৩" + +-#: ../addressbook/libebook/e-contact.c:318 ++#: ../addressbook/libebook-contacts/e-contact.c:317 + msgid "Google Talk Name List" + msgstr "Google Talk নামের তালিকা" + +-#: ../addressbook/libebook/e-contact.c:320 +-#| msgid "Skype Name List" ++#: ../addressbook/libebook-contacts/e-contact.c:319 + msgid "Twitter Name List" + msgstr "Twitter নামের তালিকা" + +-#: ../addressbook/libebook/e-contact.c:1623 +-#: ../addressbook/libebook/e-destination.c:879 ++#: ../addressbook/libebook-contacts/e-contact.c:1624 ++#: ../addressbook/libebook/e-destination.c:884 + msgid "Unnamed List" + msgstr "নামবিহীন তালিকা" + +-#: ../addressbook/libedata-book/e-book-backend.c:17 +-msgid "Cannot process, book backend is opening" +-msgstr "সঞ্চালন করতে ব্যর্থ, বইয়ের ব্যাক-এন্ড আরম্ভ করা হচ্ছে" ++#: ../addressbook/libebook-contacts/e-phone-number.c:43 ++msgid "The library was built without phone number support." ++msgstr "লাইব্রেরি ফোন নম্বর সহায়তা ছাড়া গঠন করা হয়েছে।" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:45 ++msgid "The phone number parser reported an yet unkown error code." ++msgstr "ফোন নম্বর পার্জার অপর একটি অজানা ত্রুটি কোড রিপোর্ট করেছে।" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:47 ++msgid "Not a phone number" ++msgstr "একটি ফোন নম্বর নয়" + +-#: ../addressbook/libedata-book/e-book-backend.c:90 ++#: ../addressbook/libebook-contacts/e-phone-number.c:49 ++msgid "Invalid country calling code" ++msgstr "অবৈধ কান্ট্রি কলিং কোড" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:51 ++msgid "" ++"Remaining text after the country calling code is too short for a phone " ++"number" ++msgstr "" ++"কান্ট্রি কলিং কোডের পরে বাকি থাকা টেক্সট একটি ফোন নম্বরের ক্ষেত্রে পর্যাপ্ত " ++"নয়" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:53 ++msgid "Text is too short for a phone number" ++msgstr "একটি ফোন নম্বরের জন্য টেক্সট একেবারেই অপর্যাপ্ত" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:55 ++msgid "Text is too long for a phone number" ++msgstr "একটি ফোন নম্বরের ক্ষেত্রে টেক্সট অত্যন্ত দীর্ঘ" ++ ++#: ../addressbook/libebook/e-book-client.c:643 ++#: ../addressbook/libedata-book/e-book-backend.c:120 + #, c-format + msgid "Unknown book property '%s'" + msgstr "বই সংক্রান্ত অজানা বৈশিষ্ট্য '%s'" + +-#: ../addressbook/libedata-book/e-book-backend.c:107 ++#: ../addressbook/libebook/e-book-client.c:658 + #, c-format + msgid "Cannot change value of book property '%s'" + msgstr "বই সংক্রান্ত বৈশিষ্ট্য '%s'-র মান পরিবর্তন করতে ব্যর্থ" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500 +-#: ../camel/camel-db.c:503 ++#: ../addressbook/libebook/e-book-client.c:993 ++#: ../addressbook/libebook/e-book-client.c:1168 ++#: ../calendar/libecal/e-cal-client.c:1515 ++#: ../calendar/libecal/e-cal-client.c:1697 ++#, c-format ++msgid "Unable to connect to '%s': " ++msgstr "'%s' এর সংগে সংযোগ করা গেল না: " ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793 ++#, c-format ++msgid "Error introspecting unknown summary field '%s'" ++msgstr "অজানা সারাংশ ফিল্ড '%s' বিশ্লেষণে ত্রুটি" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289 ++#: ../camel/camel-db.c:544 + #, c-format + msgid "Insufficient memory" + msgstr "অপর্যাপ্ত মেমরি" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1422 + #, c-format +-msgid "Contact '%s' not found" +-msgstr "'%s' পরিচিতি পাওয়া যায়নি" ++msgid "Invalid contact field '%d' specified in summary" ++msgstr "সারাংশে অবৈধ পরিচিতি ফিল্ড '%d' নির্দিষ্ট" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1456 ++#, c-format ++msgid "" ++"Contact field '%s' of type '%s' specified in summary, but only boolean, " ++"string and string list field types are supported" ++msgstr "" ++"পরিচিতি ফিল্ড '%s' ধরণ '%s' সারাংশে নির্দিষ্ট করা হয়েছে, কিন্তু শুধুমাত্র " ++"boolean, স্ট্রিং এবং স্ট্রীং তালিকা ফিল্ড সমর্থিত" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3686 ++#, c-format ++msgid "" ++"Full search_contacts are not stored in cache. vcards cannot be returned." ++msgstr "" ++"ক্যাশেতে সম্পূর্ণ অনুসন্ধান পরিচিত (_c) সঞ্চিত হয় না। vcards ফেরত পাঠানো যায় " ++"না।" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3812 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3893 ++#, c-format ++msgid "Query contained unsupported elements" ++msgstr "ক্যোয়ারিতে অসমর্থিত উপাদান অাছে" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 ++#, c-format ++msgid "Invalid Query" ++msgstr "অবৈধ ক্যোয়ারি" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3840 ++#, c-format ++msgid "" ++"Full search_contacts are not stored in cache. Hence only summary query is " ++"supported." ++msgstr "" ++"ক্যাশেতে সম্পূর্ণ অনুসন্ধান পরিচিত (_c) সঞ্চয় করা হয় না। তাই শুধুমাত্র " ++"সারাংশ ক্যোয়ারি সমর্থিত।" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 ++#: ../addressbook/libedata-book/e-data-book.c:669 ++#: ../addressbook/libedata-book/e-data-book.c:809 ++#: ../calendar/libedata-cal/e-data-cal.c:612 ++#: ../calendar/libedata-cal/e-data-cal.c:771 ++#: ../libedataserver/e-client.c:166 ++#, c-format ++msgid "Invalid query" ++msgstr "অবৈধ কোয়েরি" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3940 ++#, c-format ++msgid "" ++"Full vcards are not stored in cache. Hence only summary query is supported." ++msgstr "" ++"ক্যাশেতে সম্পূর্ণ vcards সঞ্চয় করা হয় না। তাই শুধুমাত্র সারাংশ ক্যোয়ারি " ++"সমর্থিত।" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4643 ++#, c-format ++msgid "Unable to remove the db file: errno %d" ++msgstr "db ফাইল সরানো যায়নি: errno %d" ++ ++#: ../addressbook/libedata-book/e-book-backend-sync.c:179 ++#: ../calendar/libedata-cal/e-cal-backend-sync.c:182 ++msgid "Clients cannot set backend properties" ++msgstr "ক্লায়েন্ট ব্যাক-এন্ড বিশিষ্টতা সেট করতে পারে না" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:201 +-#: ../addressbook/libedata-book/e-data-book.c:214 +-#: ../addressbook/libedata-book/e-data-book.c:724 ++#. Translators: This is a prefix to a detailed error message * ++#: ../addressbook/libedata-book/e-data-book.c:691 ++#: ../calendar/libedata-cal/e-data-cal.c:635 + msgid "Invalid query: " + msgstr "অবৈধ অনুসন্ধান: " + +-#: ../addressbook/libedata-book/e-data-book.c:302 +-#: ../calendar/libedata-cal/e-data-cal.c:415 ++#: ../addressbook/libedata-book/e-data-book.c:793 ++#: ../calendar/libedata-cal/e-data-cal.c:752 + msgid "Success" + msgstr "সফল" + +-#: ../addressbook/libedata-book/e-data-book.c:303 +-#: ../calendar/libecal/e-cal.c:4001 ../calendar/libedata-cal/e-data-cal.c:416 +-#: ../libedataserver/e-client.c:122 ++#: ../addressbook/libedata-book/e-data-book.c:794 ++#: ../calendar/libecal/e-cal.c:2307 ++#: ../calendar/libedata-cal/e-data-cal.c:753 ++#: ../libedataserver/e-client.c:133 + msgid "Backend is busy" + msgstr "ব্যাক-এন্ড বর্তমানে ব্যস্ত" + +-#: ../addressbook/libedata-book/e-data-book.c:304 +-#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132 ++#: ../addressbook/libedata-book/e-data-book.c:795 ++#: ../calendar/libedata-cal/e-data-cal.c:754 ++#: ../libedataserver/e-client.c:143 + msgid "Repository offline" + msgstr "সংরক্ষণস্থল বর্তমানে অফ-লাইন" + +-#: ../addressbook/libedata-book/e-data-book.c:305 +-#: ../calendar/libecal/e-cal.c:4015 ../calendar/libedata-cal/e-data-cal.c:418 +-#: ../libedataserver/e-client.c:138 ++#: ../addressbook/libedata-book/e-data-book.c:796 ++#: ../calendar/libecal/e-cal.c:2321 ++#: ../calendar/libedata-cal/e-data-cal.c:755 ++#: ../libedataserver/e-client.c:150 + msgid "Permission denied" + msgstr "অনুমতি প্রদান করা হয়নি" + +-#: ../addressbook/libedata-book/e-data-book.c:308 +-#: ../calendar/libedata-cal/e-data-cal.c:423 ++#: ../addressbook/libedata-book/e-data-book.c:799 ++#: ../calendar/libedata-cal/e-data-cal.c:760 + msgid "Authentication Failed" + msgstr "অনুমোদন করতে বিফল" + +-#: ../addressbook/libedata-book/e-data-book.c:309 +-#: ../calendar/libedata-cal/e-data-cal.c:424 ++#: ../addressbook/libedata-book/e-data-book.c:800 ++#: ../calendar/libedata-cal/e-data-cal.c:761 + msgid "Authentication Required" + msgstr "অনুমোদন আবশ্যক" + +-#: ../addressbook/libedata-book/e-data-book.c:310 +-#: ../calendar/libedata-cal/e-data-cal.c:425 ++#: ../addressbook/libedata-book/e-data-book.c:801 ++#: ../calendar/libedata-cal/e-data-cal.c:762 + msgid "Unsupported field" + msgstr "অসমর্থিত ক্ষেত্র" + +-#: ../addressbook/libedata-book/e-data-book.c:311 +-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146 ++#: ../addressbook/libedata-book/e-data-book.c:802 ++#: ../calendar/libedata-cal/e-data-cal.c:764 ++#: ../libedataserver/e-client.c:158 + msgid "Unsupported authentication method" + msgstr "অনুমোদন প্রণালী সমর্থিত নয়" + +-#: ../addressbook/libedata-book/e-data-book.c:312 +-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148 ++#: ../addressbook/libedata-book/e-data-book.c:803 ++#: ../calendar/libedata-cal/e-data-cal.c:765 ++#: ../libedataserver/e-client.c:160 + msgid "TLS not available" + msgstr "TLS উপলব্ধ নয়" + +-#: ../addressbook/libedata-book/e-data-book.c:313 ++#: ../addressbook/libedata-book/e-data-book.c:804 + msgid "Address book does not exist" + msgstr "ঠিকানা বই অনুপস্থিত" + +-#: ../addressbook/libedata-book/e-data-book.c:314 ++#: ../addressbook/libedata-book/e-data-book.c:805 + msgid "Book removed" + msgstr "বই মুছে ফেলা হয়েছে" + +-#: ../addressbook/libedata-book/e-data-book.c:315 +-#: ../calendar/libedata-cal/e-data-cal.c:431 ++#: ../addressbook/libedata-book/e-data-book.c:806 ++#: ../calendar/libedata-cal/e-data-cal.c:768 + msgid "Not available in offline mode" + msgstr "অফ-লাইন অবস্থায় উপলব্ধ নেই" + +-#: ../addressbook/libedata-book/e-data-book.c:316 +-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150 ++#: ../addressbook/libedata-book/e-data-book.c:807 ++#: ../calendar/libedata-cal/e-data-cal.c:769 ++#: ../libedataserver/e-client.c:162 + msgid "Search size limit exceeded" + msgstr "অনুসন্ধানের মাপের সর্বোচ্চ দৈর্ঘ্য অতিক্রান্ত হয়েছে" + +-#: ../addressbook/libedata-book/e-data-book.c:317 +-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152 ++#: ../addressbook/libedata-book/e-data-book.c:808 ++#: ../calendar/libedata-cal/e-data-cal.c:770 ++#: ../libedataserver/e-client.c:164 + msgid "Search time limit exceeded" + msgstr "অনসন্ধানের সময়ের সীমা অতিক্রান্ত হয়েছে" + +-#: ../addressbook/libedata-book/e-data-book.c:318 +-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154 +-msgid "Invalid query" +-msgstr "অবৈধ কোয়েরি" +- +-#: ../addressbook/libedata-book/e-data-book.c:319 +-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156 ++#: ../addressbook/libedata-book/e-data-book.c:810 ++#: ../calendar/libedata-cal/e-data-cal.c:772 ++#: ../libedataserver/e-client.c:168 + msgid "Query refused" + msgstr "কোয়েরি প্রত্যাখ্যাত" + +-#: ../addressbook/libedata-book/e-data-book.c:320 +-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142 ++#: ../addressbook/libedata-book/e-data-book.c:811 ++#: ../calendar/libedata-cal/e-data-cal.c:773 ++#: ../libedataserver/e-client.c:154 + msgid "Could not cancel" + msgstr "বাতিল করা যায়নি" + + #. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") }, + #. { OtherError, N_("Other error") }, +-#: ../addressbook/libedata-book/e-data-book.c:322 +-#: ../calendar/libedata-cal/e-data-cal.c:438 ++#: ../addressbook/libedata-book/e-data-book.c:813 ++#: ../calendar/libedata-cal/e-data-cal.c:775 + msgid "Invalid server version" + msgstr "সার্ভারের সংস্করণ বৈধ নয়" + +-#: ../addressbook/libedata-book/e-data-book.c:324 +-#: ../calendar/libecal/e-cal.c:3999 ../calendar/libedata-cal/e-data-cal.c:439 +-#: ../libedataserver/e-client.c:120 ++#: ../addressbook/libedata-book/e-data-book.c:815 ++#: ../calendar/libecal/e-cal.c:2305 ++#: ../calendar/libedata-cal/e-data-cal.c:776 ++#: ../libedataserver/e-client.c:131 + msgid "Invalid argument" + msgstr "অবৈধ আর্গুমেন্ট" + + #. Translators: The string for NOT_SUPPORTED error +-#: ../addressbook/libedata-book/e-data-book.c:326 +-#: ../calendar/libecal/e-cal.c:4038 ../calendar/libedata-cal/e-data-cal.c:441 +-#: ../libedataserver/e-client.c:144 ++#: ../addressbook/libedata-book/e-data-book.c:817 ++#: ../calendar/libecal/e-cal.c:1064 ++#: ../calendar/libecal/e-cal.c:1432 ++#: ../calendar/libecal/e-cal.c:1912 ++#: ../calendar/libecal/e-cal.c:2344 ++#: ../calendar/libedata-cal/e-data-cal.c:778 ++#: ../libedataserver/e-client.c:156 ++#, c-format + msgid "Not supported" + msgstr "সমর্থিত নয়" + +-#: ../addressbook/libedata-book/e-data-book.c:327 +-#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162 ++#: ../addressbook/libedata-book/e-data-book.c:818 ++#: ../calendar/libedata-cal/e-data-cal.c:779 ++#: ../libedataserver/e-client.c:174 + msgid "Backend is not opened yet" + msgstr "ব্যাক-এন্ড বর্তমানে আরম্ভ করা হয়নি" + +-#: ../addressbook/libedata-book/e-data-book.c:335 +-#: ../calendar/libecal/e-cal-client.c:619 +-#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160 ++#: ../addressbook/libedata-book/e-data-book.c:819 ++#: ../libedataserver/e-client.c:176 ++msgid "Object is out of sync" ++msgstr "অবজেক্ট সিঙ্ক বহির্ভূত" ++ ++#: ../addressbook/libedata-book/e-data-book.c:827 ++#: ../calendar/libedata-cal/e-data-cal.c:787 ++#: ../libedataserver/e-client.c:172 + msgid "Other error" + msgstr "অন্যান্য সমস্যা" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:542 +-#: ../addressbook/libedata-book/e-data-book.c:909 +-msgid "Cannot get contact: " +-msgstr "পরিচিতির তথ্য প্রাপ্ত করতে ব্যর্থ: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:567 +-#: ../addressbook/libedata-book/e-data-book.c:592 +-msgid "Empty query: " +-msgstr "ফাঁকা অনুসন্ধান: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:617 +-#: ../addressbook/libedata-book/e-data-book.c:1007 +-msgid "Cannot add contact: " +-msgstr "পরিচিতি যোগ করতে ব্যর্থ: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:642 +-#: ../addressbook/libedata-book/e-data-book.c:1041 +-msgid "Cannot modify contacts: " +-msgstr "পরিচিতির তথ্য পরিবর্তন করতে ব্যর্থ: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:796 ++#: ../addressbook/libedata-book/e-data-book.c:1133 + msgid "Cannot open book: " + msgstr "বই খুলতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:812 +-msgid "Cannot remove book: " +-msgstr "বই মুছে ফেলতে ব্যর্থ: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:839 ++#: ../addressbook/libedata-book/e-data-book.c:1217 + msgid "Cannot refresh address book: " + msgstr "ঠিকানা বই নতুন করে প্রদর্শন করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:865 +-msgid "Cannot get backend property: " +-msgstr "ব্যাক-এন্ডের বৈশিষ্ট্য প্রাপ্ত করতে ব্যর্থ: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:890 +-#: ../calendar/libedata-cal/e-data-cal.c:1016 +-msgid "Cannot set backend property: " +-msgstr "ব্যাক-এন্ডের বৈশিষ্ট্য নির্ধারণ করতে ব্যর্থ: " ++#: ../addressbook/libedata-book/e-data-book.c:1298 ++msgid "Cannot get contact: " ++msgstr "পরিচিতির তথ্য প্রাপ্ত করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:927 ++#: ../addressbook/libedata-book/e-data-book.c:1364 + msgid "Cannot get contact list: " + msgstr "পরিচিতিদের তালিকা প্রাপ্ত করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:961 ++#: ../addressbook/libedata-book/e-data-book.c:1456 + msgid "Cannot get contact list uids: " + msgstr "পরিচিতিদের uid-র তালিকা প্রাপ্ত করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1066 ++#: ../addressbook/libedata-book/e-data-book.c:1536 ++msgid "Cannot add contact: " ++msgstr "পরিচিতি যোগ করতে ব্যর্থ: " ++ ++#. Translators: This is prefix to a detailed error message ++#: ../addressbook/libedata-book/e-data-book.c:1599 ++msgid "Cannot modify contacts: " ++msgstr "পরিচিতির তথ্য পরিবর্তন করতে ব্যর্থ: " ++ ++#. Translators: This is prefix to a detailed error message ++#: ../addressbook/libedata-book/e-data-book.c:1640 + msgid "Cannot remove contacts: " + msgstr "পরিচিতদের তথ্য মুছে ফেলা সম্ভব নয়: " + +-#: ../addressbook/libedata-book/e-data-book-factory.c:103 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:114 ++#: ../addressbook/libedata-book/e-data-book-factory.c:94 ++#: ../calendar/libedata-cal/e-data-cal-factory.c:97 + #, c-format +-#| msgid "No backend factory for '%s' of '%s'" + msgid "No backend name in source '%s'" + msgstr "'%s' -র জন্য কোনো ব্যাক-এন্ড নাম উপস্থিত নেই" + +-#: ../addressbook/libedata-book/e-data-book-factory.c:115 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:127 ++#: ../addressbook/libedata-book/e-data-book-factory.c:185 ++#: ../calendar/libedata-cal/e-data-cal-factory.c:191 + #, c-format +-msgid "Invalid backend name '%s' in source '%s'" +-msgstr "'%s' ব্যাক-এন্ডের নাম '%s' সোর্সের মধ্যে উপস্থিত রয়েছে, যা বৈধ নয়" +- +-#: ../addressbook/libedata-book/e-data-book-factory.c:319 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:230 +-#| msgid "POP Source URI" + msgid "Missing source UID" + msgstr "অনুপস্থিত সোর্স UID" + +-#: ../addressbook/libedata-book/e-data-book-factory.c:332 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:243 ++#: ../addressbook/libedata-book/e-data-book-factory.c:196 ++#: ../calendar/libedata-cal/e-data-cal-factory.c:201 + #, c-format +-#| msgid "No such source" + msgid "No such source for UID '%s'" + msgstr "UID '%s'-র জন্য কোনো উৎস নেই" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:560 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "সার্ভারের সাথে সংযোগ স্থাপন করা যাচ্ছে না (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:598 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:590 + #, c-format +-#| msgid "Failed to connect to POP server %s in secure mode: %s" + msgid "Failed to connect to a server using SSL: %s" + msgstr "SSL সহযোগে সার্ভারের সাথে সংযোগ করতে ব্যর্থ: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603 +-msgid "" +-"Failed to connect to a server using SSL. One possible reason is an invalid " +-"certificate being used by the server. If this is expected, like self-signed " +-"certificate being used on the server, then disable certificate validity " +-"tests by selecting 'Ignore invalid SSL certificate' option in Properties" +-msgstr "" +-"SSL সহযোগে সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ। সার্ভার দ্বারা ব্যবহৃত " +-"সার্টিফিকেটটি বৈধ না হলে এই সমস্যা দেখা দিতে পারে। সার্ভারের মধ্যে " +-"স্ব-স্বাক্ষরিত সার্টিফিকেট ব্যবহৃত হলে এই পরিস্থিতি প্রত্যাশিত হবে ও এই " +-"ক্ষেত্রে সার্টিকেটের বৈধতা যাচাইয়ের পরীক্ষাগুলি নিষ্ক্রিয় করার জন্য 'বিবিধ " +-"বৈশিষ্ট্য' থেকে 'অবৈধ SSL সার্টিফিকেট উপেক্ষা করা হবে' বিকল্পটি নির্বাচন করুন।" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:601 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "অপ্রত্যাশিত HTTP অবস্থাসূচক কোড %d প্রাপ্ত হয়েছে (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635 +-#| msgid "Backend is not opened yet" ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:620 + msgid "CalDAV backend is not loaded yet" + msgstr "CalDAV ব্যাক-এন্ড বর্তমানে আরম্ভ করা হয়নি" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017 +-#| msgid "Invalid server URI" ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1009 + msgid "Invalid Redirect URL" + msgstr "পুনরনির্দেশের URL বৈধ নয়" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2716 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2491 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2849 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1183,475 +1254,448 @@ msgstr "" + "হয়েছে।\n" + "ত্রুটির বার্তা: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2639 +-#| msgid "Cannot create calendar object: " +-msgid "Cannot create local store" +-msgstr "স্থানীয় সংগ্রহস্থল প্রস্তুত করতে ব্যর্থ" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2648 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2801 + #, c-format +-#| msgid "Cannot create folder '%s': %s" + msgid "Cannot create local cache folder '%s'" + msgstr "স্থানীয় ক্যাশে ফোল্ডার '%s' প্রস্তুত করতে ব্যর্থ" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2659 +-#| msgid "Could not create cache file" +-msgid "Could not create synch slave thread" +-msgstr "synch স্লেভ থ্রেড প্রস্তুত করতে ব্যর্থ" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3671 +-#| msgid "The backend does not support bulk additions" ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3893 + msgid "CalDAV does not support bulk additions" + msgstr "CalDAV দ্বারা একযোগে একাধিক সংযোজন সমর্থিত হবে না" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3773 +-#| msgid "The backend does not support bulk modifications" ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3996 + msgid "CalDAV does not support bulk modifications" + msgstr "CalDAV দ্বারা একযোগে একাধিক পরিবর্তন সমর্থিত হবে না" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3941 +-#| msgid "The backend does not support bulk removals" ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4165 + msgid "CalDAV does not support bulk removals" + msgstr "CalDAV দ্বারা একযোগে একাধিক অপসারণ সমর্থিত হবে না" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4600 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4837 + msgid "Calendar doesn't support Free/Busy" + msgstr "বর্ষপঞ্জি দ্বারা মুক্ত/ব্যস্ত অবস্থা সমর্থিত হয় না" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4608 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4846 + msgid "Schedule outbox url not found" + msgstr "নির্ধারিত আউটবক্স url পাওয়া যায়নি" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4707 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4945 + msgid "Unexpected result in schedule-response" + msgstr "schedule-response-র মধ্যে অপ্রত্যাশিত ফলাফল প্রাপ্ত হয়েছে" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:877 + msgid "Birthday" + msgstr "জন্মদিন" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:913 + #, c-format + msgid "Birthday: %s" + msgstr "জন্মদিন: %s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:944 + #, c-format + msgid "Anniversary: %s" + msgstr "বাত্সরিক: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:235 ++#: ../calendar/backends/file/e-cal-backend-file.c:243 + msgid "Cannot save calendar data: Malformed URI." + msgstr "বর্ষপঞ্জির তথ্য সংরক্ষণ করতে ব্যর্থ: URI সঠিক বিন্যাসে নেই।" + +-#: ../calendar/backends/file/e-cal-backend-file.c:242 +-#: ../calendar/backends/file/e-cal-backend-file.c:248 ++#: ../calendar/backends/file/e-cal-backend-file.c:250 ++#: ../calendar/backends/file/e-cal-backend-file.c:256 + msgid "Cannot save calendar data" + msgstr "বর্ষপঞ্জির তথ্য সংরক্ষণ করতে ব্যর্থ" + +-#: ../calendar/backends/http/e-cal-backend-http.c:482 ++#: ../calendar/backends/http/e-cal-backend-http.c:477 + #, c-format +-#| msgid "Malformed signature" + msgid "Malformed URI: %s" + msgstr "ত্রুটিপূর্ণ URI: %s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:543 ++#: ../calendar/backends/http/e-cal-backend-http.c:568 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "অবৈধ URI-র দিকে নির্দেশ করা হয়েছে" + +-#: ../calendar/backends/http/e-cal-backend-http.c:580 ++#: ../calendar/backends/http/e-cal-backend-http.c:605 + #, c-format + msgid "Bad file format." + msgstr "ফাইলের বিন্যাস সঠিক নয়।" + +-#: ../calendar/backends/http/e-cal-backend-http.c:590 ++#: ../calendar/backends/http/e-cal-backend-http.c:615 + #, c-format + msgid "Not a calendar." + msgstr "বর্ষপঞ্জি নয়।" + +-#: ../calendar/backends/http/e-cal-backend-http.c:886 +-#: ../calendar/backends/http/e-cal-backend-http.c:890 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:511 ++#: ../calendar/backends/http/e-cal-backend-http.c:926 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:520 + msgid "Could not create cache file" + msgstr "ক্যাশে ফাইল নির্মাণ করতে ব্যর্থ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:171 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:173 + msgid "Could not retrieve weather data" + msgstr "আবহাওয়া সম্পর্কে তথ্য প্রাপ্ত করতে ব্যর্থ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:276 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:284 + msgid "Weather: Fog" + msgstr "আবহাওয়া: কুয়াশা" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:277 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:285 + msgid "Weather: Cloudy Night" + msgstr "আবহাওয়া: মেঘলা রাত" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:278 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:286 + msgid "Weather: Cloudy" + msgstr "আবহাওয়া: মেঘলা" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:279 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:287 + msgid "Weather: Overcast" + msgstr "আবহাওয়া: মেঘাচ্ছন্ন" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:280 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:288 + msgid "Weather: Showers" + msgstr "আবহাওয়া: বৃষ্টি" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:281 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:289 + msgid "Weather: Snow" + msgstr "আবহাওয়া: তুষারপাত" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:282 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:290 + msgid "Weather: Clear Night" + msgstr "আবহাওয়া: মেঘমুক্ত রাত" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:283 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:291 + msgid "Weather: Sunny" + msgstr "আবহাওয়া: রৌদ্রোজ্জ্বল" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:284 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:292 + msgid "Weather: Thunderstorms" + msgstr "আবহাওয়া: বজ্রবিদ্যুতসহ ঝোড়ো বৃষ্টি" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:408 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:416 + msgid "Forecast" + msgstr "পূর্বাবাস" + +-#: ../calendar/libecal/e-cal.c:4003 ++#: ../calendar/libecal/e-cal.c:2309 + msgid "Repository is offline" + msgstr "সংরক্ষণস্থল বর্তমানে অন-লাইন অবস্থায় নেই" + +-#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135 ++#: ../calendar/libecal/e-cal.c:2311 ++#: ../calendar/libecal/e-cal-client.c:262 + msgid "No such calendar" + msgstr "এই ধরনের বর্ষপঞ্জি উপস্থিত নেই" + +-#: ../calendar/libecal/e-cal.c:4007 ../calendar/libecal/e-cal-client.c:137 +-#: ../calendar/libedata-cal/e-data-cal.c:420 ++#: ../calendar/libecal/e-cal.c:2313 ++#: ../calendar/libecal/e-cal-client.c:264 ++#: ../calendar/libedata-cal/e-data-cal.c:757 + msgid "Object not found" + msgstr "অবজেক্ট পাওয়া যায়নি" + +-#: ../calendar/libecal/e-cal.c:4009 ../calendar/libecal/e-cal-client.c:139 +-#: ../calendar/libedata-cal/e-data-cal.c:421 ++#: ../calendar/libecal/e-cal.c:2315 ++#: ../calendar/libecal/e-cal-client.c:266 ++#: ../calendar/libedata-cal/e-data-cal.c:758 + msgid "Invalid object" + msgstr "অবৈধ অবজেক্ট" + +-#: ../calendar/libecal/e-cal.c:4011 ++#: ../calendar/libecal/e-cal.c:2317 + msgid "URI not loaded" + msgstr "URI বর্তমানে লোড করা নয়" + +-#: ../calendar/libecal/e-cal.c:4013 ++#: ../calendar/libecal/e-cal.c:2319 + msgid "URI already loaded" + msgstr "URI পূর্বে লোড করা হয়েছে" + +-#: ../calendar/libecal/e-cal.c:4017 ++#: ../calendar/libecal/e-cal.c:2323 + msgid "Unknown User" + msgstr "অজানা ব্যবহারকারী" + +-#: ../calendar/libecal/e-cal.c:4019 ../calendar/libecal/e-cal-client.c:143 +-#: ../calendar/libedata-cal/e-data-cal.c:422 ++#: ../calendar/libecal/e-cal.c:2325 ++#: ../calendar/libecal/e-cal-client.c:270 ++#: ../calendar/libedata-cal/e-data-cal.c:759 + msgid "Object ID already exists" + msgstr "অবজেক্ট ID বর্তমানে উপস্থিত" + +-#: ../calendar/libecal/e-cal.c:4021 ++#: ../calendar/libecal/e-cal.c:2327 + msgid "Protocol not supported" + msgstr "প্রোটোকল সমর্থিত নয়" + +-#: ../calendar/libecal/e-cal.c:4023 ++#: ../calendar/libecal/e-cal.c:2329 + msgid "Operation has been canceled" + msgstr "কর্ম বাতিল করা হয়েছে" + +-#: ../calendar/libecal/e-cal.c:4025 ++#: ../calendar/libecal/e-cal.c:2331 + msgid "Could not cancel operation" + msgstr "কর্ম বাতিল করতে ব্যর্থ" + +-#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128 ++#: ../calendar/libecal/e-cal.c:2333 ++#: ../libedataserver/e-client.c:139 + msgid "Authentication failed" + msgstr "অনুমোদন কর্ম বিফল" + +-#: ../calendar/libecal/e-cal.c:4029 +-#: ../camel/providers/smtp/camel-smtp-transport.c:857 +-#: ../libedataserver/e-client.c:130 ++#: ../calendar/libecal/e-cal.c:2335 ++#: ../camel/providers/smtp/camel-smtp-transport.c:915 ++#: ../libedataserver/e-client.c:141 + msgid "Authentication required" + msgstr "অনুমোদন আবশ্যক" + +-#: ../calendar/libecal/e-cal.c:4031 ++#: ../calendar/libecal/e-cal.c:2337 + msgid "A D-Bus exception has occurred" + msgstr "একটি D-Bus একসেপশন উৎপন্ন হয়েছে" + +-#: ../calendar/libecal/e-cal.c:4035 ++#: ../calendar/libecal/e-cal.c:2341 + msgid "No error" + msgstr "কোনো ত্রুটি হয়নি" + +-#: ../calendar/libecal/e-cal-client.c:141 +-#: ../calendar/libedata-cal/e-data-cal.c:430 ++#: ../calendar/libecal/e-cal-client.c:268 ++#: ../calendar/libedata-cal/e-data-cal.c:767 + msgid "Unknown user" + msgstr "অজানা ব্যবহারকারী" + +-#: ../calendar/libecal/e-cal-client.c:145 +-#: ../calendar/libedata-cal/e-data-cal.c:419 ++#: ../calendar/libecal/e-cal-client.c:272 ++#: ../calendar/libedata-cal/e-data-cal.c:756 + msgid "Invalid range" + msgstr "অবৈধ সীমা" + +-#: ../calendar/libecal/e-cal-client.c:610 +-msgid "Failed to run calendar factory" +-msgstr "ক্যালেন্ডার ফ্যাক্টরি সঞ্চালন করতে ব্যর্থ" ++#: ../calendar/libecal/e-cal-client.c:920 ++#: ../calendar/libedata-cal/e-cal-backend.c:204 ++#, c-format ++msgid "Unknown calendar property '%s'" ++msgstr "বর্ষপঞ্জি সংক্রান্ত অজানা বৈশিষ্ট্য '%s'" ++ ++#: ../calendar/libecal/e-cal-client.c:935 ++#, c-format ++msgid "Cannot change value of calendar property '%s'" ++msgstr "বর্ষপঞ্জির বৈশিষ্ট্য '%s'-র মান পরিবর্তন করতে ব্যর্থ" + +-#: ../calendar/libecal/e-cal-component.c:1339 ++#: ../calendar/libecal/e-cal-component.c:1340 + msgid "Untitled appointment" + msgstr "শিরোনামহীন সাক্ষাত্কার" + +-#: ../calendar/libecal/e-cal-recur.c:3987 ++#: ../calendar/libecal/e-cal-recur.c:4036 + msgid "1st" + msgstr "১-লা" + + # প্রথম, দ্বিতীয়, তৃতীয় বললেই হবে +-#: ../calendar/libecal/e-cal-recur.c:3988 ++#: ../calendar/libecal/e-cal-recur.c:4037 + msgid "2nd" + msgstr "২-য়" + +-#: ../calendar/libecal/e-cal-recur.c:3989 ++#: ../calendar/libecal/e-cal-recur.c:4038 + msgid "3rd" + msgstr "৩-য়" + +-#: ../calendar/libecal/e-cal-recur.c:3990 ++#: ../calendar/libecal/e-cal-recur.c:4039 + msgid "4th" + msgstr "৪-র্থ" + +-#: ../calendar/libecal/e-cal-recur.c:3991 ++#: ../calendar/libecal/e-cal-recur.c:4040 + msgid "5th" + msgstr "৫-ম" + +-#: ../calendar/libecal/e-cal-recur.c:3992 ++#: ../calendar/libecal/e-cal-recur.c:4041 + msgid "6th" + msgstr "৬-ই" + +-#: ../calendar/libecal/e-cal-recur.c:3993 ++#: ../calendar/libecal/e-cal-recur.c:4042 + msgid "7th" + msgstr "৭-ই" + +-#: ../calendar/libecal/e-cal-recur.c:3994 ++#: ../calendar/libecal/e-cal-recur.c:4043 + msgid "8th" + msgstr "৮-ই" + +-#: ../calendar/libecal/e-cal-recur.c:3995 ++#: ../calendar/libecal/e-cal-recur.c:4044 + msgid "9th" + msgstr "৯-ই" + +-#: ../calendar/libecal/e-cal-recur.c:3996 ++#: ../calendar/libecal/e-cal-recur.c:4045 + msgid "10th" + msgstr "১০-ই" + +-#: ../calendar/libecal/e-cal-recur.c:3997 ++#: ../calendar/libecal/e-cal-recur.c:4046 + msgid "11th" + msgstr "১১-ই" + +-#: ../calendar/libecal/e-cal-recur.c:3998 ++#: ../calendar/libecal/e-cal-recur.c:4047 + msgid "12th" + msgstr "১২-ই" + +-#: ../calendar/libecal/e-cal-recur.c:3999 ++#: ../calendar/libecal/e-cal-recur.c:4048 + msgid "13th" + msgstr "১৩-ই" + +-#: ../calendar/libecal/e-cal-recur.c:4000 ++#: ../calendar/libecal/e-cal-recur.c:4049 + msgid "14th" + msgstr "১৪-ই" + +-#: ../calendar/libecal/e-cal-recur.c:4001 ++#: ../calendar/libecal/e-cal-recur.c:4050 + msgid "15th" + msgstr "১৫-ই" + +-#: ../calendar/libecal/e-cal-recur.c:4002 ++#: ../calendar/libecal/e-cal-recur.c:4051 + msgid "16th" + msgstr "১৬-ই" + +-#: ../calendar/libecal/e-cal-recur.c:4003 ++#: ../calendar/libecal/e-cal-recur.c:4052 + msgid "17th" + msgstr "১৭-ই" + +-#: ../calendar/libecal/e-cal-recur.c:4004 ++#: ../calendar/libecal/e-cal-recur.c:4053 + msgid "18th" + msgstr "১৮-ই" + +-#: ../calendar/libecal/e-cal-recur.c:4005 ++#: ../calendar/libecal/e-cal-recur.c:4054 + msgid "19th" + msgstr "১৯-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4006 ++#: ../calendar/libecal/e-cal-recur.c:4055 + msgid "20th" + msgstr "২০-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4007 ++#: ../calendar/libecal/e-cal-recur.c:4056 + msgid "21st" + msgstr "২১-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4008 ++#: ../calendar/libecal/e-cal-recur.c:4057 + msgid "22nd" + msgstr "২২-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4009 ++#: ../calendar/libecal/e-cal-recur.c:4058 + msgid "23rd" + msgstr "২৩-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4010 ++#: ../calendar/libecal/e-cal-recur.c:4059 + msgid "24th" + msgstr "২৪-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4011 ++#: ../calendar/libecal/e-cal-recur.c:4060 + msgid "25th" + msgstr "২৫-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4012 ++#: ../calendar/libecal/e-cal-recur.c:4061 + msgid "26th" + msgstr "২৬-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4013 ++#: ../calendar/libecal/e-cal-recur.c:4062 + msgid "27th" + msgstr "২৭-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4014 ++#: ../calendar/libecal/e-cal-recur.c:4063 + msgid "28th" + msgstr "২৮-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4015 ++#: ../calendar/libecal/e-cal-recur.c:4064 + msgid "29th" + msgstr "২৯-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4016 ++#: ../calendar/libecal/e-cal-recur.c:4065 + msgid "30th" + msgstr "৩০-এ" + +-#: ../calendar/libecal/e-cal-recur.c:4017 ++#: ../calendar/libecal/e-cal-recur.c:4066 + msgid "31st" + msgstr "৩১-এ" + +-#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723 ++#: ../calendar/libecal/e-cal-util.c:707 ++#: ../calendar/libecal/e-cal-util.c:734 + msgctxt "Priority" + msgid "High" + msgstr "উচ্চ" + +-#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725 ++#: ../calendar/libecal/e-cal-util.c:709 ++#: ../calendar/libecal/e-cal-util.c:736 + msgctxt "Priority" + msgid "Normal" + msgstr "স্বাভাবিক" + +-#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727 ++#: ../calendar/libecal/e-cal-util.c:711 ++#: ../calendar/libecal/e-cal-util.c:738 + msgctxt "Priority" + msgid "Low" + msgstr "নিম্ন" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:721 ++#: ../calendar/libecal/e-cal-util.c:732 + msgctxt "Priority" + msgid "Undefined" + msgstr "অনির্ধারিত" + +-#: ../calendar/libedata-cal/e-cal-backend.c:36 +-msgid "Cannot process, calendar backend is opening" +-msgstr "সঞ্চালন করতে ব্যর্থ, বর্ষপঞ্জির ব্যাক-এন্ড আরম্ভ করা হচ্ছে" +- +-#: ../calendar/libedata-cal/e-cal-backend.c:135 +-#, c-format +-msgid "Unknown calendar property '%s'" +-msgstr "বর্ষপঞ্জি সংক্রান্ত অজানা বৈশিষ্ট্য '%s'" +- +-#: ../calendar/libedata-cal/e-cal-backend.c:152 +-#, c-format +-msgid "Cannot change value of calendar property '%s'" +-msgstr "বর্ষপঞ্জির বৈশিষ্ট্য '%s'-র মান পরিবর্তন করতে ব্যর্থ" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215 +-#, c-format +-msgid "\"%s\" expects no arguments" +-msgstr "\"%s\"-এ কোনো আর্গুমেন্ট প্রত্যাশিত নয়" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541 + #, c-format + msgid "\"%s\" expects one argument" + msgstr "\"%s\"-এ একটি আর্গুমেন্ট প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380 + #, c-format + msgid "\"%s\" expects the first argument to be a string" + msgstr "\"%s\"-র প্রথম আর্গুমেন্ট পংক্তি (string) রূপে প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134 +-#, c-format +-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" +-msgstr "" +-"\"%s\"'র প্রথম আর্গুমেন্ট একটি ISO 8601 date/time পংক্তি (string) রূপে " +-"প্রত্যাশিত" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160 + #, c-format +-msgid "\"%s\" expects two arguments" +-msgstr "\"%s\"-এ দুটি আর্গুমেন্ট প্রত্যাশিত" ++msgid "\"%s\" expects two or three arguments" ++msgstr "\"%s\"-র ক্ষেত্র দুই অথবা তিনটি আর্গুমেন্ট প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548 + #, c-format + msgid "\"%s\" expects the first argument to be a time_t" + msgstr "\"%s\"-র প্রথম আর্গুমেন্ট time_t রূপে প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190 +-#, c-format +-msgid "\"%s\" expects the second argument to be an integer" +-msgstr "\"%s\"-র দ্বিতীয় আর্গুমেন্ট পূর্ণসংখ্যা রূপে প্রত্যাশিত" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395 +-#, c-format +-msgid "\"%s\" expects two or three arguments" +-msgstr "\"%s\"-র ক্ষেত্র দুই অথবা তিনটি আর্গুমেন্ট প্রত্যাশিত" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826 + #, c-format + msgid "\"%s\" expects the second argument to be a time_t" + msgstr "\"%s\"-র দ্বিতীয় আর্গুমেন্ট time_t রূপে প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186 + #, c-format + msgid "\"%s\" expects the third argument to be a string" + msgstr "\"%s\"-র তৃতীয় আর্গুমেন্ট পংক্তি (string) রূপে প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248 + #, c-format + msgid "\"%s\" expects none or two arguments" + msgstr "\"%s\"-এ শূণ্য অথবা দুটি আর্গুমেন্ট প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434 ++#, c-format ++msgid "\"%s\" expects two arguments" ++msgstr "\"%s\"-এ দুটি আর্গুমেন্ট প্রত্যাশিত" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326 ++#, c-format ++msgid "\"%s\" expects no arguments" ++msgstr "\"%s\"-এ কোনো আর্গুমেন্ট প্রত্যাশিত নয়" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676 + #, c-format + msgid "\"%s\" expects the second argument to be a string" + msgstr "\"%s\"-র দ্বিতীয় আর্গুমেন্ট পংক্তি (string) রূপে প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707 + #, c-format + msgid "" + "\"%s\" expects the first argument to be either \"any\", \"summary\", or " +@@ -1659,163 +1703,162 @@ msgid "" + "\"classification\"" + msgstr "" + "\"%s\" দ্বারা প্রত্যাশিত প্রথম আর্গুমেন্টের জন্য সম্ভাব্য মান \"any\", " +-"\"summary\", " +-"অথবা \"description\" অথবা \"location\" অথবা \"attendee\" অথবা \"organizer\" " +-"অথবা \"classification\"" ++"\"summary\", অথবা \"description\" অথবা \"location\" অথবা \"attendee\" অথবা " ++"\"organizer\" অথবা \"classification\"" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 + #, c-format + msgid "\"%s\" expects at least one argument" + msgstr "\"%s\"-এ অন্তত একটি আর্গুমেন্ট প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893 + #, c-format + msgid "" + "\"%s\" expects all arguments to be strings or one and only one argument to " + "be a boolean false (#f)" + msgstr "" + "\"%s\"-র সকল আর্গুমেন্ট পংক্তি (string) রূপে অথবা শুধুমাত্র একটি আর্গুমেন্ট " +-"বুলিয়েন " +-"false (#f) রূপে প্রত্যাশিত" ++"বুলিয়েন false (#f) রূপে প্রত্যাশিত" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389 ++#, c-format ++msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" ++msgstr "" ++"\"%s\"'র প্রথম আর্গুমেন্ট একটি ISO 8601 date/time পংক্তি (string) রূপে " ++"প্রত্যাশিত" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450 ++#, c-format ++msgid "\"%s\" expects the second argument to be an integer" ++msgstr "\"%s\"-র দ্বিতীয় আর্গুমেন্ট পূর্ণসংখ্যা রূপে প্রত্যাশিত" + +-#: ../calendar/libedata-cal/e-data-cal.c:426 ++#: ../calendar/libedata-cal/e-data-cal.c:763 + msgid "Unsupported method" + msgstr "অসমর্থিত পদ্ধতি" + +-#: ../calendar/libedata-cal/e-data-cal.c:429 ++#: ../calendar/libedata-cal/e-data-cal.c:766 + msgid "Calendar does not exist" + msgstr "বর্ষপঞ্জি বর্তমানে অনুপস্থিত" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:909 ++#: ../calendar/libedata-cal/e-data-cal.c:1237 + msgid "Cannot open calendar: " + msgstr "বর্ষপঞ্জি খুলতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:934 +-msgid "Cannot remove calendar: " +-msgstr "বর্ষপঞ্জি মুছে ফেলতে ব্যর্থ: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:961 ++#: ../calendar/libedata-cal/e-data-cal.c:1298 + msgid "Cannot refresh calendar: " + msgstr "বর্ষপঞ্জি নতুন করে প্রদর্শন করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:990 +-#| msgid "Cannot retrieve calendar address: %s" ++#: ../calendar/libedata-cal/e-data-cal.c:1337 + msgid "Cannot retrieve backend property: " + msgstr "ব্যাক-এন্ডের বৈশিষ্ট্য প্রাপ্ত করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1045 ++#: ../calendar/libedata-cal/e-data-cal.c:1395 + msgid "Cannot retrieve calendar object path: " + msgstr "বর্ষপঞ্জির অবজেক্টের পাথ উদ্ধার করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1075 ++#: ../calendar/libedata-cal/e-data-cal.c:1441 + msgid "Cannot retrieve calendar object list: " + msgstr "বর্ষপঞ্জির অবজেক্টের তালিকা উদ্ধার করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1104 ++#: ../calendar/libedata-cal/e-data-cal.c:1494 + msgid "Cannot retrieve calendar free/busy list: " + msgstr "বর্ষপঞ্জির মধ্যে মুক্ত/ব্যস্তের তালিকা প্রাপ্ত করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1142 ++#: ../calendar/libedata-cal/e-data-cal.c:1535 + msgid "Cannot create calendar object: " + msgstr "বর্ষপঞ্জির অবজেক্ট প্রস্তুত করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1177 ++#: ../calendar/libedata-cal/e-data-cal.c:1604 + msgid "Cannot modify calendar object: " + msgstr "বর্ষপঞ্জির অবজেক্ট পরিবর্তন করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1217 ++#: ../calendar/libedata-cal/e-data-cal.c:1666 + msgid "Cannot remove calendar object: " + msgstr "বর্ষপঞ্জির অবজেক্ট মুছে ফেলতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1254 ++#: ../calendar/libedata-cal/e-data-cal.c:1727 + msgid "Cannot receive calendar objects: " + msgstr "বর্ষপঞ্জির অবজেক্ট প্রাপ্ত করা সম্ভব নয়: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1285 ++#: ../calendar/libedata-cal/e-data-cal.c:1768 + msgid "Cannot send calendar objects: " + msgstr "বর্ষপঞ্জির অবজেক্ট পাঠানো সম্ভব নয়: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1317 ++#: ../calendar/libedata-cal/e-data-cal.c:1828 + msgid "Could not retrieve attachment uris: " + msgstr "সংযুক্ত বস্তুর uri প্রাপ্ত করতে ব্যর্থ: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1345 ++#: ../calendar/libedata-cal/e-data-cal.c:1878 + msgid "Could not discard reminder: " + msgstr "রিমাইন্ডার বর্জন করা যায়নি: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1374 ++#: ../calendar/libedata-cal/e-data-cal.c:1917 + msgid "Could not get calendar view path: " + msgstr "বর্ষপঞ্জি প্রদর্শনের পাথ প্রাপ্ত করা যায়নি: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1404 ++#: ../calendar/libedata-cal/e-data-cal.c:1963 + msgid "Could not retrieve calendar time zone: " + msgstr "বর্ষপঞ্জিতে ব্যবহৃত সময়ের অঞ্চল প্রাপ্ত করা সম্ভব হয়নি: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1430 ++#: ../calendar/libedata-cal/e-data-cal.c:2007 + msgid "Could not add calendar time zone: " + msgstr "বর্ষপঞ্জির সময়ের অঞ্চল যোগ করা সম্ভব হয়নি: " + +-#: ../calendar/libedata-cal/e-data-cal-factory.c:220 +-#, c-format +-msgid "Invalid call" +-msgstr "অবৈধ কল" +- +-#: ../camel/camel-cipher-context.c:206 ++#: ../camel/camel-cipher-context.c:208 + #, c-format + msgid "Signing is not supported by this cipher" + msgstr "এই সাইফার দ্বারা স্বাক্ষর করা সম্ভব নয়" + +-#: ../camel/camel-cipher-context.c:219 ++#: ../camel/camel-cipher-context.c:221 + #, c-format + msgid "Verifying is not supported by this cipher" + msgstr "এই সাইফার সহযোগে পরিচয় প্রমাণ করা সম্ভব নয়" + +-#: ../camel/camel-cipher-context.c:235 ++#: ../camel/camel-cipher-context.c:237 + #, c-format + msgid "Encryption is not supported by this cipher" + msgstr "এই সাইফার দ্বারা এনক্রিপশন করা সম্ভব নয়" + +-#: ../camel/camel-cipher-context.c:249 ++#: ../camel/camel-cipher-context.c:251 + #, c-format + msgid "Decryption is not supported by this cipher" + msgstr "এই সাইফার দ্বারা ডিক্রিপশন করা সম্ভব নয়" + +-#: ../camel/camel-cipher-context.c:262 ++#: ../camel/camel-cipher-context.c:264 + #, c-format + msgid "You may not import keys with this cipher" + msgstr "এই সাইফার দ্বারা কি ইম্পোর্ট করা যাবে না" + +-#: ../camel/camel-cipher-context.c:276 ++#: ../camel/camel-cipher-context.c:278 + #, c-format + msgid "You may not export keys with this cipher" + msgstr "এই সাইফার দ্বারা কি এক্সপোর্ট করা যাবে না" + +-#: ../camel/camel-cipher-context.c:817 ++#: ../camel/camel-cipher-context.c:819 + msgid "Signing message" + msgstr "বার্তা স্বাক্ষর প্রণালী" + +-#: ../camel/camel-cipher-context.c:1058 ++#: ../camel/camel-cipher-context.c:1060 + msgid "Encrypting message" + msgstr "বার্তা এনক্রিপ্ট প্রণালী" + +-#: ../camel/camel-cipher-context.c:1185 ++#: ../camel/camel-cipher-context.c:1187 + msgid "Decrypting message" + msgstr "বার্তা ডিক্রিপ্ট প্রণালী" + +@@ -1833,7 +1876,7 @@ msgstr "ক্যাশে ফাইল + msgid "Could not remove cache entry: %s: %s" + msgstr "ক্যাশে এন্ট্রি মুছে ফেলা যায়নি: %s: %s" + +-#: ../camel/camel-disco-diary.c:201 ++#: ../camel/camel-disco-diary.c:207 + #, c-format + msgid "" + "Could not write log entry: %s\n" +@@ -1844,8 +1887,7 @@ msgstr "" + "নেটওয়ার্কে পুনরায় সংযোগ করার পরে এই সার্ভারের উপর \n" + "সঞ্চালিত কর্ম পুনরায় করা হবে না।" + +-#: ../camel/camel-disco-diary.c:266 +-#: ../camel/providers/imap/camel-imap-journal.c:309 ++#: ../camel/camel-disco-diary.c:279 + #, c-format + msgid "" + "Could not open '%s':\n" +@@ -1856,40 +1898,47 @@ msgstr "" + "%s\n" + "এই ফোল্ডারে করা পরিবর্তন পুনরায় সুসংগত করা হবে না।" + +-#: ../camel/camel-disco-diary.c:310 ++#: ../camel/camel-disco-diary.c:326 + msgid "Resynchronizing with server" + msgstr "সার্ভারের সাথে সুসংগত করা হবে" + +-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93 ++#: ../camel/camel-disco-folder.c:76 ++#: ../camel/camel-offline-folder.c:93 + msgid "Downloading new messages for offline mode" + msgstr "অফ-লাইন অবস্থায় ব্যবহারের জন্য নতুন বার্তা ডাউনলোড করা হচ্ছে" + +-#: ../camel/camel-disco-folder.c:420 ++#: ../camel/camel-disco-folder.c:422 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "অফ-লাইন ব্যবহারের জন্য '%s' ফোল্ডার প্রস্তুত করা হচ্ছে" + +-#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334 ++#: ../camel/camel-disco-folder.c:489 ++#: ../camel/camel-offline-folder.c:336 + msgid "Copy folder content locally for _offline operation" + msgstr "অফ-লাইন কর্মের জন্য ফোল্ডারের বিষয়বস্তু স্থানীয়রূপে কপি করুন (_o)" + +-#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413 +-#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482 +-#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:614 +-#: ../camel/camel-imapx-folder.c:648 ../camel/camel-imapx-folder.c:688 +-#: ../camel/camel-imapx-folder.c:724 ../camel/camel-imapx-store.c:275 +-#: ../camel/camel-imapx-store.c:1383 ../camel/camel-imapx-store.c:1471 +-#: ../camel/camel-imapx-store.c:1520 +-#: ../camel/providers/imap/camel-imap-store.c:1268 +-#: ../camel/providers/imap/camel-imap-store.c:2030 +-#: ../camel/providers/imap/camel-imap-store.c:2502 +-#: ../camel/providers/imap/camel-imap-store.c:3265 +-#: ../camel/providers/pop3/camel-pop3-folder.c:524 +-#: ../camel/providers/pop3/camel-pop3-folder.c:654 +-#: ../camel/providers/pop3/camel-pop3-folder.c:844 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1046 +-#: ../camel/providers/pop3/camel-pop3-store.c:408 +-#: ../camel/providers/pop3/camel-pop3-store.c:831 ++#: ../camel/camel-disco-store.c:475 ++#: ../camel/camel-imapx-folder.c:478 ++#: ../camel/camel-imapx-folder.c:514 ++#: ../camel/camel-imapx-folder.c:553 ++#: ../camel/camel-imapx-folder.c:613 ++#: ../camel/camel-imapx-folder.c:748 ++#: ../camel/camel-imapx-folder.c:933 ++#: ../camel/camel-imapx-folder.c:993 ++#: ../camel/camel-imapx-folder.c:1032 ++#: ../camel/camel-imapx-store.c:368 ++#: ../camel/camel-imapx-store.c:1592 ++#: ../camel/camel-imapx-store.c:1681 ++#: ../camel/camel-imapx-store.c:1730 ++#: ../camel/providers/pop3/camel-pop3-folder.c:555 ++#: ../camel/providers/pop3/camel-pop3-folder.c:705 ++#: ../camel/providers/pop3/camel-pop3-folder.c:940 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1150 ++#: ../camel/providers/pop3/camel-pop3-store.c:291 ++#: ../camel/providers/pop3/camel-pop3-store.c:519 ++#: ../camel/providers/pop3/camel-pop3-store.c:567 ++#: ../camel/providers/pop3/camel-pop3-store.c:652 ++#: ../camel/providers/pop3/camel-pop3-store.c:1052 + #, c-format + msgid "You must be working online to complete this operation" + msgstr "এই কর্ম সমাপ্ত করার জন্য অন-লাইন অবস্থায় থাকা আবশ্যক" +@@ -1899,248 +1948,263 @@ msgstr "এই কর্ম সমাপ + msgid "Canceled" + msgstr "বাতিল করা হয়েছে" + +-#: ../camel/camel-filter-driver.c:897 ../camel/camel-filter-search.c:772 ++#: ../camel/camel-filter-driver.c:916 ++#: ../camel/camel-filter-search.c:797 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "চাইল্ড প্রসেস '%s' নির্মাণ করতে ব্যর্থ: %s" + +-#: ../camel/camel-filter-driver.c:945 ++#: ../camel/camel-filter-driver.c:964 + #, c-format + msgid "Invalid message stream received from %s: %s" + msgstr "%s থেকে অবৈধ বার্তা স্রোত প্রাপ্ত হয়েছে: %s" + +-#: ../camel/camel-filter-driver.c:1141 ../camel/camel-filter-driver.c:1148 ++#: ../camel/camel-filter-driver.c:1171 ++#: ../camel/camel-filter-driver.c:1180 + msgid "Syncing folders" + msgstr "ফোল্ডার সুসংগত করা হচ্ছে" + +-#: ../camel/camel-filter-driver.c:1242 ../camel/camel-filter-driver.c:1707 ++#: ../camel/camel-filter-driver.c:1278 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "ফিল্টার পার্স করতে সমস্যা: %s: %s" + +-#: ../camel/camel-filter-driver.c:1253 ../camel/camel-filter-driver.c:1718 ++#: ../camel/camel-filter-driver.c:1289 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "ফিল্টার সঞ্চালন করতে ব্যর্থ: %s: %s" + +-#: ../camel/camel-filter-driver.c:1349 ++#: ../camel/camel-filter-driver.c:1385 + #, c-format + msgid "Unable to open spool folder" + msgstr "স্পুল ফোল্ডার খুলতে ব্যর্থ" + +-#: ../camel/camel-filter-driver.c:1361 ++#: ../camel/camel-filter-driver.c:1397 + #, c-format + msgid "Unable to process spool folder" + msgstr "স্পুল ফোল্ডার প্রক্রিয়াকরণ ব্যর্থ" + +-#: ../camel/camel-filter-driver.c:1379 ++#: ../camel/camel-filter-driver.c:1420 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "%d বার্তা প্রাপ্ত করতে ব্যর্থ (%d%%)" + +-#: ../camel/camel-filter-driver.c:1386 ../camel/camel-filter-driver.c:1408 ++#: ../camel/camel-filter-driver.c:1429 ++#: ../camel/camel-filter-driver.c:1451 + #, c-format + msgid "Failed on message %d" + msgstr "বার্তা %d'এ ব্যর্থতা" + +-#: ../camel/camel-filter-driver.c:1423 ../camel/camel-filter-driver.c:1529 ++#: ../camel/camel-filter-driver.c:1470 ++#: ../camel/camel-filter-driver.c:1584 + msgid "Syncing folder" + msgstr "ফোল্ডার সুসংগত করা হচ্ছে" + +-#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1535 ++#: ../camel/camel-filter-driver.c:1475 ++#: ../camel/camel-filter-driver.c:1592 + msgid "Complete" + msgstr "সমাপ্ত" + +-#: ../camel/camel-filter-driver.c:1487 ++#: ../camel/camel-filter-driver.c:1538 + #, c-format + msgid "Getting message %d of %d" + msgstr "বার্তা %d প্রাপ্ত করা হচ্ছে, সর্বমোট %d" + +-#: ../camel/camel-filter-driver.c:1505 ++#: ../camel/camel-filter-driver.c:1556 + #, c-format + msgid "Failed at message %d of %d" + msgstr "%d বার্তা ব্যর্থ, সর্বমোট %d" + ++#: ../camel/camel-filter-driver.c:1752 ++#: ../camel/camel-filter-driver.c:1786 ++#, c-format ++msgid "Execution of filter '%s' failed: " ++msgstr "'%s' ফিল্টারের সম্পাদনা ব্যর্থ হয়েছে: " ++ ++#: ../camel/camel-filter-driver.c:1776 ++#, c-format ++msgid "Error parsing filter '%s': %s: %s" ++msgstr "'%s' ফিল্টার পার্জ করতে সমস্যা: %s: %s" ++ ++#: ../camel/camel-filter-driver.c:1795 ++#, c-format ++msgid "Error executing filter '%s': %s: %s" ++msgstr "'%s' ফিল্টার সম্পাদনায় সমস্যা: %s: %s" ++ + #: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" + msgstr "বার্তা আহরণ করতে ব্যর্থ" + +-#: ../camel/camel-filter-search.c:512 ++#: ../camel/camel-filter-search.c:537 + msgid "Invalid arguments to (system-flag)" + msgstr "অবৈধ আর্গুমেন্ট চিহ্নিত হয়েছে (system-flag)" + +-#: ../camel/camel-filter-search.c:530 ++#: ../camel/camel-filter-search.c:555 + msgid "Invalid arguments to (user-tag)" + msgstr "অবৈধ আর্গুমেন্ট চিহ্নিত হয়েছে (user-tag)" + +-#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958 ++#: ../camel/camel-filter-search.c:1046 ++#: ../camel/camel-filter-search.c:1055 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "ফিল্টার সহযোগে অনুসন্ধান করতে ব্যর্থ: %s: %s" + +-#: ../camel/camel-folder.c:270 ++#: ../camel/camel-folder.c:310 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" + msgstr[0] "'%s'-র মধ্যে নতুন অবাঞ্ছিত বার্তা সনাক্ত করা হচ্ছে" + msgstr[1] "'%s'-র মধ্যে নতুন অবাঞ্ছিত বার্তা সনাক্ত করা হচ্ছে" + +-#: ../camel/camel-folder.c:310 ++#: ../camel/camel-folder.c:350 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" + msgstr[0] "'%s'-র মধ্যে নতুন হ্যাম বার্তা সনাক্ত করা হচ্ছে" + msgstr[1] "'%s'-র মধ্যে নতুন হ্যাম বার্তা সনাক্ত করা হচ্ছে" + +-#: ../camel/camel-folder.c:358 ++#: ../camel/camel-folder.c:398 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "'%s'-র মধ্যে নতুন বার্তা ফিল্টার করা হচ্ছে" + msgstr[1] "'%s'-র মধ্যে নতুন বার্তা ফিল্টার করা হচ্ছে" + +-#: ../camel/camel-folder.c:930 ++#: ../camel/camel-folder.c:972 + #: ../camel/providers/local/camel-maildir-folder.c:321 + msgid "Moving messages" + msgstr "বার্তা স্থানান্তরণ করা হচ্ছে" + +-#: ../camel/camel-folder.c:933 ++#: ../camel/camel-folder.c:975 + msgid "Copying messages" + msgstr "বার্তা কপি করা হচ্ছে" + +-#: ../camel/camel-folder.c:1253 ++#: ../camel/camel-folder.c:1295 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "'%s' ফোল্ডারের জন্য কোটা অথবা স্থান বরাদ্দের তথ্য সমর্থিত হবে না" + +-#: ../camel/camel-folder.c:3371 ++#: ../camel/camel-folder.c:3528 + #, c-format +-#| msgid "Syncing folders" + msgid "Expunging folder '%s'" + msgstr "'%s' ফোল্ডারের তথ্য স্থায়ীরূপে বর্জন করা হচ্ছে" + +-#: ../camel/camel-folder.c:3603 ++#: ../camel/camel-folder.c:3760 + #, c-format +-#| msgid "Retrieving message '%s'" + msgid "Retrieving message '%s' in %s" + msgstr "বার্তা '%s' উদ্ধার করা হচ্ছে, সর্বমোট %s" + +-#: ../camel/camel-folder.c:3753 ++#: ../camel/camel-folder.c:3911 + #, c-format +-#| msgid "Fetching summary information for new messages in %s" + msgid "Retrieving quota information for '%s'" + msgstr "%s'র মধ্যে উপস্থিত কোটার তথ্য প্রাপ্ত করা হচ্ছে" + +-#: ../camel/camel-folder.c:3985 ++#: ../camel/camel-folder.c:4143 + #, c-format +-#| msgid "Cannot get folder '%s': %s" + msgid "Refreshing folder '%s'" + msgstr "'%s' ফোল্ডার নতুন করে প্রদর্শন করা হচ্ছে" + +-#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587 +-#, c-format +-msgid "" +-"Cannot parse search expression: %s:\n" +-"%s" +-msgstr "" +-"অনুসন্ধানের জন্য এক্সপ্রেশন পার্স করতে ব্যর্থ: %s:\n" +-"%s" +- +-#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599 +-#, c-format +-msgid "" +-"Error executing search expression: %s:\n" +-"%s" +-msgstr "" +-"অনুসন্ধানের এক্সপ্রেশন সঞ্চালন করতে সমস্যা: %s:\n" +-"%s" +- + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865 ++#: ../camel/camel-folder-search.c:838 ++#: ../camel/camel-folder-search.c:881 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s)-র ক্ষেত্রে একটি বুলিয়ান ফলাফল আবশ্যক" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:932 ++#: ../camel/camel-folder-search.c:916 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s), %s-র মধ্যে ব্যবহার করা যাবে না" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947 ++#: ../camel/camel-folder-search.c:923 ++#: ../camel/camel-folder-search.c:931 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) একটি ধরন পরীক্ষার পংক্তি আবশ্যক" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:975 ++#: ../camel/camel-folder-search.c:959 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s)-এ একটি অ্যারে ফলাফল প্রত্যাশিত" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:985 ++#: ../camel/camel-folder-search.c:969 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) ফোল্ডার সংকলন আবশ্যক" + +-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668 +-#: ../camel/camel-gpg-context.c:1327 ++#: ../camel/camel-folder-search.c:1862 ++#: ../camel/camel-folder-search.c:2029 ++#, c-format ++msgid "Cannot parse search expression: %s:\n" ++"%s" ++msgstr "অনুসন্ধানের জন্য এক্সপ্রেশন পার্স করতে ব্যর্থ: %s:\n" ++"%s" ++ ++#: ../camel/camel-folder-search.c:1874 ++#: ../camel/camel-folder-search.c:2041 ++#, c-format ++msgid "Error executing search expression: %s:\n" ++"%s" ++msgstr "অনুসন্ধানের এক্সপ্রেশন সঞ্চালন করতে সমস্যা: %s:\n" ++"%s" ++ ++#: ../camel/camel-gpg-context.c:730 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/camel-gpg-context.c:1398 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "gpg সঞ্চালন করতে ব্যর্থ: %s" + +-#: ../camel/camel-gpg-context.c:668 +-#: ../camel/providers/smtp/camel-smtp-transport.c:860 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/providers/smtp/camel-smtp-transport.c:918 + msgid "Unknown" + msgstr "অজানা" + +-#: ../camel/camel-gpg-context.c:733 ++#: ../camel/camel-gpg-context.c:800 + #, c-format +-msgid "" +-"Unexpected GnuPG status message encountered:\n" ++msgid "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" +-msgstr "" +-"অপ্রত্যাশিত GnuPG অবস্থাসহ সনাক্ত করা হয়েছে:\n" ++msgstr "অপ্রত্যাশিত GnuPG অবস্থাসহ সনাক্ত করা হয়েছে:\n" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:769 ++#: ../camel/camel-gpg-context.c:836 + #, c-format + msgid "Failed to parse gpg userid hint." + msgstr "gpg userid'র সংকেত পার্স করতে ব্যর্থ।" + +-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809 ++#: ../camel/camel-gpg-context.c:861 ++#: ../camel/camel-gpg-context.c:876 + #, c-format + msgid "Failed to parse gpg passphrase request." + msgstr "gpg passphrase'র অনুরোধ পার্স করতে ব্যর্থ" + +-#: ../camel/camel-gpg-context.c:830 ++#: ../camel/camel-gpg-context.c:897 + #, c-format +-msgid "" +-"You need a PIN to unlock the key for your\n" ++msgid "You need a PIN to unlock the key for your\n" + "SmartCard: \"%s\"" +-msgstr "" +-"আপনার স্মার্ট-কার্ড আন-লক করার জন্য একটি PIN\n" ++msgstr "আপনার স্মার্ট-কার্ড আন-লক করার জন্য একটি PIN\n" + "আবশ্যক: \"%s\"" + +-#: ../camel/camel-gpg-context.c:834 ++#: ../camel/camel-gpg-context.c:901 + #, c-format +-msgid "" +-"You need a passphrase to unlock the key for\n" ++msgid "You need a passphrase to unlock the key for\n" + "user: \"%s\"" + msgstr "" + "চিহ্নিত ব্যবহারকারীর কি আন-লক করার জন্য পাসফ্রেস\n" + "প্রয়োগ করা আবশ্যক: \"%s\"" + +-#: ../camel/camel-gpg-context.c:840 ++#: ../camel/camel-gpg-context.c:907 + #, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "'%s'-র জন্য GnuPG থেকে অপ্রত্যাশিত অনুরোধ" + +-#: ../camel/camel-gpg-context.c:850 ++#: ../camel/camel-gpg-context.c:919 + msgid "" + "Note the encrypted content doesn't contain information about a recipient, " + "thus there will be a password prompt for each of stored private key." +@@ -2148,222 +2212,235 @@ msgstr "" + "উল্লেখ্য, এনক্রিপ্ট করা তথ্যের মধ্যে প্রাপকের কোনো তথ্য উপস্থিত নেই। এর ফলে " + "সংরক্ষিত সকল ব্যক্তিগত কি-র জন্য পাসওয়ার্ড জানতে চাওয়া হবে।" + +-#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523 ++#: ../camel/camel-gpg-context.c:950 ++#: ../camel/camel-net-utils.c:524 + #: ../camel/camel-tcp-stream-raw.c:268 +-#: ../camel/providers/nntp/camel-nntp-summary.c:388 +-#: ../libedataserver/e-client.c:140 ++#: ../camel/providers/nntp/camel-nntp-summary.c:402 ++#: ../libedataserver/e-client.c:152 + #, c-format + msgid "Cancelled" + msgstr "বাতিল করা হয়েছে" + +-#: ../camel/camel-gpg-context.c:900 ++#: ../camel/camel-gpg-context.c:971 + #, c-format + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "গোপন-কি আন-লক করতে ব্যর্থ: ৩-বার ভুল পাসওয়ার্ড লেখা হয়েছে।" + +-#: ../camel/camel-gpg-context.c:913 ++#: ../camel/camel-gpg-context.c:984 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "GnuPG থেকে অপ্রত্যাশিত প্রত্যুত্তর: %s" + +-#: ../camel/camel-gpg-context.c:1044 ++#: ../camel/camel-gpg-context.c:1115 + #, c-format + msgid "Failed to encrypt: No valid recipients specified." + msgstr "এনক্রিপ্ট করতে ব্যর্থ: বৈধ প্রাপক উল্লেখ করা হয়নি।" + +-#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831 ++#: ../camel/camel-gpg-context.c:1665 ++#: ../camel/camel-smime-context.c:846 + msgid "Could not generate signing data: " + msgstr "স্বাক্ষর করতে ব্যবহৃত তথ্য নির্মাণ করতে ব্যর্থ: " + +-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844 +-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101 +-#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249 ++#: ../camel/camel-gpg-context.c:1714 ++#: ../camel/camel-gpg-context.c:1918 ++#: ../camel/camel-gpg-context.c:2028 ++#: ../camel/camel-gpg-context.c:2179 ++#: ../camel/camel-gpg-context.c:2279 ++#: ../camel/camel-gpg-context.c:2327 + msgid "Failed to execute gpg." + msgstr "gpg সঞ্চালন করতে ব্যর্থ।" + +-#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727 +-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755 +-#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971 +-#: ../camel/camel-smime-context.c:980 ++#: ../camel/camel-gpg-context.c:1793 ++#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1809 ++#: ../camel/camel-gpg-context.c:1829 ++#: ../camel/camel-smime-context.c:973 ++#: ../camel/camel-smime-context.c:987 ++#: ../camel/camel-smime-context.c:996 + #, c-format + msgid "Cannot verify message signature: Incorrect message format" + msgstr "বার্তার স্বাক্ষর পরীক্ষা করতে ব্যর্থ: বার্তার বিন্যাস সঠিক নয়" + +-#: ../camel/camel-gpg-context.c:1797 ++#: ../camel/camel-gpg-context.c:1871 + msgid "Cannot verify message signature: " + msgstr "বার্তার স্বাক্ষর পরীক্ষা করতে ব্যর্থ: " + +-#: ../camel/camel-gpg-context.c:1920 ++#: ../camel/camel-gpg-context.c:1994 + msgid "Could not generate encrypting data: " + msgstr "এনক্রিপ্ট করতে ব্যবহৃত তথ্য নির্মাণ করতে ব্যর্থ: " + +-#: ../camel/camel-gpg-context.c:1973 ++#: ../camel/camel-gpg-context.c:2047 + msgid "This is a digitally encrypted message part" + msgstr "এটি ডিজিটাল রূপে এনক্রিপ্ট করা বার্তার অংশ" + +-#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040 +-#: ../camel/camel-gpg-context.c:2063 ++#: ../camel/camel-gpg-context.c:2105 ++#: ../camel/camel-gpg-context.c:2114 ++#: ../camel/camel-gpg-context.c:2137 + #, c-format + msgid "Cannot decrypt message: Incorrect message format" + msgstr "বার্তা ডিক্রিপ্ট করতে ব্যর্থ: বার্তার বিন্যাস সঠিক নয়" + +-#: ../camel/camel-gpg-context.c:2051 ++#: ../camel/camel-gpg-context.c:2125 + #, c-format + msgid "Failed to decrypt MIME part: protocol error" + msgstr "MIME'র অংশ ডিক্রিপ্ট করতে ব্যর্থ: প্রোটোকল জড়িত সমস্যা" + +-#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268 ++#: ../camel/camel-gpg-context.c:2220 ++#: ../camel/camel-smime-context.c:1287 + msgid "Encrypted content" + msgstr "এনক্রিপ্ট করা বিষয়বস্তু" + +-#: ../camel/camel-imapx-folder.c:104 ++#: ../camel/camel-imapx-folder.c:710 ++#, c-format ++msgid "No quota information available for folder '%s'" ++msgstr "'%s' ফোল্ডারের জন্য কোনো কোটা তথ্য উপলব্ধ নেই" ++ ++#: ../camel/camel-imapx-folder.c:809 ++#: ../camel/camel-imapx-folder.c:882 ++#, c-format ++msgid "No destination folder specified" ++msgstr "কোনো গন্তব্য ফোল্ডার নির্দিষ্ট করা নেই" ++ ++#: ../camel/camel-imapx-folder.c:828 ++msgid "Unable to move junk messages" ++msgstr "জাঙ্ক বার্তাগুলি সরানো যায়নি" ++ ++#: ../camel/camel-imapx-folder.c:901 ++msgid "Unable to move deleted messages" ++msgstr "মুছে দেওয়া বার্তাগুলি সরানো যায়নি" ++ ++#: ../camel/camel-imapx-folder.c:1119 ++#: ../camel/providers/nntp/camel-nntp-folder.c:794 ++msgid "Apply message _filters to this folder" ++msgstr "এই ফোল্ডারের জন্য বার্তার ফিল্টার প্রয়োগ করা হবে (_f)" ++ ++#: ../camel/camel-imapx-folder.c:1228 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "%s-র জন্য ফোল্ডারের সংক্ষিপ্ত তথ্য প্রস্তুত করা যায়নি" + +-#: ../camel/camel-imapx-folder.c:112 ++#: ../camel/camel-imapx-folder.c:1236 + #, c-format + msgid "Could not create cache for %s: " + msgstr "%s-র জন্য ক্যাশে প্রস্তুত করতে ব্যর্থ: " + +-#: ../camel/camel-imapx-folder.c:794 +-#: ../camel/providers/imap/camel-imap-folder.c:365 +-#: ../camel/providers/nntp/camel-nntp-folder.c:738 +-#| msgid "Cannot copy messages to the Trash folder" +-msgid "Apply message _filters to this folder" +-msgstr "এই ফোল্ডারের জন্য বার্তার ফিল্টার প্রয়োগ করা হবে (_f)" +- +-#: ../camel/camel-imapx-server.c:1020 +-#| msgid "Server unexpectedly disconnected" ++#: ../camel/camel-imapx-server.c:1283 + msgid "Server disconnected" + msgstr "সার্ভারের সাথে সংযোগ বিচ্ছিন্ন করা হয়েছে" + +-#: ../camel/camel-imapx-server.c:1472 +-msgid "Error writing to cache stream: " +-msgstr "ক্যাশে স্ট্রিমে লিখতে ত্রুটি: " ++#: ../camel/camel-imapx-server.c:1772 ++msgid "Error writing to cache stream" ++msgstr "ক্যাশে স্ট্রীমে লিখতে ত্রুটি" ++ ++#: ../camel/camel-imapx-server.c:2441 ++#, c-format ++msgid "Alert from IMAP server %s:\n" ++"%s" ++msgstr "IMAP সার্ভার থেকে সতর্কতা %s:\n" ++"%s" + +-#: ../camel/camel-imapx-server.c:2404 ++#: ../camel/camel-imapx-server.c:3029 + #, c-format + msgid "Not authenticated" + msgstr "অনুমোদিত নয়" + +-#: ../camel/camel-imapx-server.c:2473 +-#| msgid "Error performing search" ++#: ../camel/camel-imapx-server.c:3107 + msgid "Error performing IDLE" + msgstr "IDLE সঞ্চালন করতে ব্যর্থ" + +-#: ../camel/camel-imapx-server.c:3325 +-#: ../camel/providers/imap/camel-imap-store.c:413 +-#: ../camel/providers/imap/camel-imap-store.c:467 ++#: ../camel/camel-imapx-server.c:3994 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "নিরাপদ মোডে IMAP সার্ভার %s'র সাথে সংযোগ করতে ব্যর্থ: %s" + +-#: ../camel/camel-imapx-server.c:3326 +-#: ../camel/providers/imap/camel-imap-store.c:414 +-#: ../camel/providers/smtp/camel-smtp-transport.c:202 ++#: ../camel/camel-imapx-server.c:3995 ++#: ../camel/providers/smtp/camel-smtp-transport.c:203 + msgid "STARTTLS not supported" + msgstr "STARTTLS সমর্থিত নয়" + +-#: ../camel/camel-imapx-server.c:3365 +-#: ../camel/providers/imap/camel-imap-store.c:439 ++#: ../camel/camel-imapx-server.c:4034 + #, c-format +-#| msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "নিরাপদ মোডে IMAP সার্ভার %s-র সাথে সংযোগ করতে ব্যর্থ: " + +-#: ../camel/camel-imapx-server.c:3435 +-#: ../camel/providers/imap/camel-imap-store.c:747 ++#: ../camel/camel-imapx-server.c:4114 + #, c-format +-#| msgid "IMAP server %s does not support requested authentication type %s" + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP সার্ভার %s-র দ্বারা %s অনুমোদন প্রণালী সমর্থিত হয় না" + +-#: ../camel/camel-imapx-server.c:3446 ../camel/camel-session.c:494 +-#: ../camel/providers/imap/camel-imap-store.c:1172 +-#: ../camel/providers/pop3/camel-pop3-store.c:259 +-#: ../camel/providers/pop3/camel-pop3-store.c:587 +-#: ../camel/providers/smtp/camel-smtp-transport.c:467 ++#: ../camel/camel-imapx-server.c:4125 ++#: ../camel/camel-session.c:495 ++#: ../camel/providers/pop3/camel-pop3-store.c:303 ++#: ../camel/providers/pop3/camel-pop3-store.c:737 ++#: ../camel/providers/smtp/camel-smtp-transport.c:509 + #, c-format +-#| msgid "No support for authentication type %s" + msgid "No support for %s authentication" + msgstr "%s অনুমোদন প্রণালী সমর্থিত নয়" + +-#: ../camel/camel-imapx-server.c:3465 +-#: ../camel/providers/imap/camel-imap-store.c:1140 +-#: ../camel/providers/nntp/camel-nntp-store.c:502 +-#| msgid "Cannot authenticate to server: %s" ++#: ../camel/camel-imapx-server.c:4144 ++#: ../camel/providers/nntp/camel-nntp-store.c:407 ++#: ../camel/providers/nntp/camel-nntp-store.c:595 + msgid "Cannot authenticate without a username" + msgstr "ব্যবহারকারী নাম বিনা অনুমোদন করতে ব্যর্থ" + +-#: ../camel/camel-imapx-server.c:3474 +-#: ../camel/providers/imap/camel-imap-store.c:1148 +-#: ../camel/providers/nntp/camel-nntp-store.c:511 +-#: ../camel/providers/pop3/camel-pop3-store.c:512 +-#: ../camel/providers/pop3/camel-pop3-store.c:532 +-#| msgid "Authentication Failed" ++#: ../camel/camel-imapx-server.c:4153 ++#: ../camel/providers/nntp/camel-nntp-store.c:604 ++#: ../camel/providers/pop3/camel-pop3-store.c:662 ++#: ../camel/providers/pop3/camel-pop3-store.c:682 + msgid "Authentication password not available" + msgstr "অনুমোদনের পাসওয়ার্ড উপলব্ধ নেই" + +-#: ../camel/camel-imapx-server.c:3667 +-#| msgid "Encrypting message" ++#: ../camel/camel-imapx-server.c:4360 + msgid "Error fetching message" + msgstr "বার্তা প্রাপ্ত করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:3749 +-#| msgid "Failed to cache %s: " +-msgid "Failed to copy the tmp file" +-msgstr "tmp ফাইল কপি করতে ব্যর্থ" +- +-#: ../camel/camel-imapx-server.c:3763 +-#| msgid "Failed to encode data" ++#: ../camel/camel-imapx-server.c:4410 ++#: ../camel/camel-imapx-server.c:4418 + msgid "Failed to close the tmp stream" + msgstr "স্ট্রিম বন্ধ করতে ব্যর্থ" + +-#: ../camel/camel-imapx-server.c:3861 +-#| msgid "Copying messages" ++#: ../camel/camel-imapx-server.c:4447 ++msgid "Failed to copy the tmp file" ++msgstr "tmp ফাইল কপি করতে ব্যর্থ" ++ ++#: ../camel/camel-imapx-server.c:4571 + msgid "Error copying messages" + msgstr "বার্তা কপি করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:3996 +-#| msgid "Sending message" ++#: ../camel/camel-imapx-server.c:4740 + msgid "Error appending message" + msgstr "বার্তা সংযোজন করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:4186 ++#: ../camel/camel-imapx-server.c:4939 + msgid "Error fetching message headers" + msgstr "বার্তার হেডার প্রাপ্ত করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:4328 +-#| msgid "Retrieving message '%s'" ++#: ../camel/camel-imapx-server.c:5090 + msgid "Error retrieving message" + msgstr "বার্তা উদ্ধার করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:4450 ../camel/camel-imapx-server.c:4657 ++#: ../camel/camel-imapx-server.c:5221 ++#: ../camel/camel-imapx-server.c:5449 + #, c-format +-#| msgid "Fetching summary information for new messages in %s" + msgid "Fetching summary information for new messages in '%s'" + msgstr "%s'র মধ্যে উপস্থিত নতুন বার্তার সংক্ষিপ্ত তথ্য প্রাপ্ত করা হচ্ছে" + +-#: ../camel/camel-imapx-server.c:4507 ++#: ../camel/camel-imapx-server.c:5285 + #, c-format +-#| msgid "Scanning for changed messages in %s" + msgid "Scanning for changed messages in '%s'" + msgstr "%s'র মধ্যে পরিবর্তিত বার্তা পরীক্ষা করা হচ্ছে" + +-#: ../camel/camel-imapx-server.c:4550 +-#| msgid "Checking for new messages" ++#: ../camel/camel-imapx-server.c:5338 + msgid "Error fetching new messages" + msgstr "নতুন বার্তা প্রাপ্ত করে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:4756 +-#| msgid "Verifying message" ++#: ../camel/camel-imapx-server.c:5551 + msgid "Error while fetching messages" + msgstr "বার্তা প্রাপ্ত করে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:4764 ../camel/camel-imapx-server.c:4800 ++#: ../camel/camel-imapx-server.c:5559 ++#: ../camel/camel-imapx-server.c:5592 + #, c-format +-#| msgid "Fetching summary information for new messages in %s" + msgid "Fetching summary information for %d message in '%s'" + msgid_plural "Fetching summary information for %d messages in '%s'" + msgstr[0] "" +@@ -2371,152 +2448,136 @@ msgstr[0] "" + msgstr[1] "" + "%d-টি বার্তার সংক্ষিপ্ত তথ্য প্রাপ্ত করা হচ্ছে, যা '%s-র মধ্যে উপস্থিত রয়েছে" + +-#: ../camel/camel-imapx-server.c:4931 ../camel/camel-imapx-server.c:4967 +-#| msgid "Error performing search" ++#: ../camel/camel-imapx-server.c:5728 ++#: ../camel/camel-imapx-server.c:5758 + msgid "Error refreshing folder" + msgstr "ফোল্ডার নবায়নে সমস্যা" + +-#: ../camel/camel-imapx-server.c:5060 +-#| msgid "Expunging old messages" ++#: ../camel/camel-imapx-server.c:5882 + msgid "Error expunging message" + msgstr "পুরোনো বার্তা স্থায়ীরূপে বর্জন করতে সমস্যা" + +-#: ../camel/camel-imapx-server.c:5157 +-#| msgid "Storing folder" ++#: ../camel/camel-imapx-server.c:5993 + msgid "Error fetching folders" + msgstr "ফোল্ডার প্রাপ্ত করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:5236 +-#| msgid "_Show only subscribed folders" ++#: ../camel/camel-imapx-server.c:6075 + msgid "Error subscribing to folder" + msgstr "ফোল্ডারে সাবস্ক্রাইভ করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:5293 +-#| msgid "Storing folder" ++#: ../camel/camel-imapx-server.c:6140 + msgid "Error creating folder" + msgstr "ফোল্ডার তৈরি করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:5342 +-#| msgid "Storing folder" ++#: ../camel/camel-imapx-server.c:6194 + msgid "Error deleting folder" + msgstr "ফোল্ডার মুছে ফেলতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:5396 +-#| msgid "Storing folder" ++#: ../camel/camel-imapx-server.c:6268 + msgid "Error renaming folder" + msgstr "ফোল্ডারের নাম পরিবর্তন করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:5451 +-#| msgid "Error performing search" ++#: ../camel/camel-imapx-server.c:6343 ++msgid "Error retrieving quota information" ++msgstr "কোটা তথ্য পুনরুদ্ধার করতে সমস্যা" ++ ++#: ../camel/camel-imapx-server.c:6408 ++msgid "Search failed" ++msgstr "অনুসন্ধান ব্যর্থ হয়েছে" ++ ++#: ../camel/camel-imapx-server.c:6471 + msgid "Error performing NOOP" + msgstr "NOOP সঞ্চালন করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:5553 ++#: ../camel/camel-imapx-server.c:6580 + msgid "Error syncing changes" + msgstr "পরিবর্তন সুসংগত করতে ত্রুটি" + +-#: ../camel/camel-imapx-server.c:6183 +-#: ../camel/providers/imap/camel-imap-folder.c:3517 ++#: ../camel/camel-imapx-server.c:7385 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "%s ID সহ বার্তা প্রাপ্ত করতে ব্যর্থ: %s" + +-#: ../camel/camel-imapx-server.c:6184 +-#: ../camel/providers/imap/camel-imap-folder.c:3518 ++#: ../camel/camel-imapx-server.c:7386 + msgid "No such message available." + msgstr "এই ধরনের কোনো বার্তা উপস্থিত নেই।" + +-#: ../camel/camel-imapx-server.c:6339 ../camel/camel-imapx-server.c:6354 ++#: ../camel/camel-imapx-server.c:7547 ++#: ../camel/camel-imapx-server.c:7562 + msgid "Cannot create spool file: " + msgstr "স্পুল ফাইল নির্মাণ করতে ব্যর্থ: " + +-#: ../camel/camel-imapx-store.c:157 +-#: ../camel/providers/imap/camel-imap-store.c:825 ++#: ../camel/camel-imapx-server.c:8304 ++msgid "IMAP server does not support quotas" ++msgstr "IMAP সার্ভার কোটা সমর্থন করে না" ++ ++#: ../camel/camel-imapx-store.c:249 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP সার্ভার %s" + +-#: ../camel/camel-imapx-store.c:160 +-#: ../camel/providers/imap/camel-imap-store.c:828 ++#: ../camel/camel-imapx-store.c:252 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "%s'র জন্য IMAP পরিসেবা, %s'র উপর" + +-#: ../camel/camel-imapx-store.c:251 +-#: ../camel/providers/imap/camel-imap-provider.c:98 +-#: ../camel/providers/nntp/camel-nntp-provider.c:85 ++#: ../camel/camel-imapx-store.c:343 ++#: ../camel/providers/nntp/camel-nntp-provider.c:95 + #: ../camel/providers/pop3/camel-pop3-provider.c:83 + msgid "Password" + msgstr "পাসওয়ার্ড" + +-#: ../camel/camel-imapx-store.c:253 +-#: ../camel/providers/imap/camel-imap-provider.c:100 +-msgid "This option will connect to the IMAP server using a plaintext password." +-msgstr "" +-"এই বিকল্পের ফলে একটি প্লেইন-টেক্সট পাসওয়ার্ড সহযোগে IMAP সার্ভারের সাথে সংযোগ " +-"করা " +-"হবে।" +- +-#: ../camel/camel-imapx-store.c:344 +-#: ../camel/providers/imap/camel-imap-store.c:2061 +-#: ../camel/providers/imap/camel-imap-store.c:2257 ++#: ../camel/camel-imapx-store.c:345 ++msgid "" ++"This option will connect to the IMAP server using a plaintext password." ++msgstr "" ++"এই বিকল্পের ফলে একটি প্লেইন-টেক্সট পাসওয়ার্ড সহযোগে IMAP সার্ভারের সাথে " ++"সংযোগ করা হবে।" ++ ++#: ../camel/camel-imapx-store.c:453 + #, c-format + msgid "No such folder %s" + msgstr "%s'র অনুরূপ কোনো ফোল্ডার উপস্থিত নেই" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/camel-imapx-store.c:369 ../camel/camel-imapx-store.c:851 +-#: ../camel/providers/imap/camel-imap-store.c:274 +-#: ../camel/providers/imap/camel-imap-store.c:2673 ++#: ../camel/camel-imapx-store.c:478 ++#: ../camel/camel-imapx-store.c:968 + #: ../camel/providers/local/camel-maildir-folder.c:473 +-#: ../camel/providers/local/camel-maildir-store.c:307 +-#: ../camel/providers/local/camel-maildir-store.c:699 +-#: ../camel/providers/local/camel-maildir-store.c:705 +-#: ../camel/providers/local/camel-maildir-store.c:789 ++#: ../camel/providers/local/camel-maildir-store.c:316 ++#: ../camel/providers/local/camel-maildir-store.c:750 ++#: ../camel/providers/local/camel-maildir-store.c:756 ++#: ../camel/providers/local/camel-maildir-store.c:840 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "ইনবক্স" + +-#: ../camel/camel-imapx-store.c:1084 ++#: ../camel/camel-imapx-store.c:1231 + #, c-format +-#| msgid "Retrieving message '%s'" + msgid "Retrieving folder list for %s" + msgstr "%s-র জন্য ফোল্ডারের তালিকা প্রাপ্ত করা হচ্ছে" + +-#: ../camel/camel-imapx-store.c:1188 +-#: ../camel/providers/nntp/camel-nntp-store.c:1769 +-#, c-format +-msgid "No such folder: %s" +-msgstr "এই ধরনের ফোল্ডার উপস্থিত নেই: %s" +- +-#: ../camel/camel-imapx-store.c:1404 +-#: ../camel/providers/imap/camel-imap-store.c:2074 +-#: ../camel/providers/imap/camel-imap-store.c:2517 ++#: ../camel/camel-imapx-store.c:1614 + #, c-format +-msgid "" +-"The folder name \"%s\" is invalid because it contains the character \"%c\"" ++msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "" + "\"%s\" ফোল্ডারের নামের মধ্যে অবৈধ অক্ষর \"%c\" উপস্থিত থাকার ফলে তা বৈধ নয়" + +-#: ../camel/camel-imapx-store.c:1415 +-#: ../camel/providers/imap/camel-imap-store.c:2530 ++#: ../camel/camel-imapx-store.c:1625 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "ঊর্ধ্বস্থ ফোল্ডার অজানা: %s" + +-#: ../camel/camel-imapx-store.c:1425 +-#: ../camel/providers/imap/camel-imap-store.c:2137 +-#: ../camel/providers/imap/camel-imap-store.c:2581 ++#: ../camel/camel-imapx-store.c:1635 + #, c-format + msgid "The parent folder is not allowed to contain subfolders" + msgstr "ঊর্ধ্বস্থ ফোল্ডারটির মধ্যে সাব-ফোল্ডার নির্মাণ করা যাবে না" + +-#: ../camel/camel-imapx-stream.c:72 ++#: ../camel/camel-imapx-stream.c:98 + #, c-format + msgid "Source stream returned no data" + msgstr "উৎসের স্ট্রিম থেকে কোনো তথ্য পাওয়া যায়নি" + +-#: ../camel/camel-imapx-stream.c:81 ++#: ../camel/camel-imapx-stream.c:107 + #, c-format + msgid "Source stream unavailable" + msgstr "উৎসের স্ট্রিম উপলব্ধ নয়" +@@ -2531,8 +2592,7 @@ msgstr "%s'র জন্য লক ফ� + msgid "Timed out trying to get lock file on %s. Try again later." + msgstr "" + "%s-র উপর লক ফাইল নির্মাণ করার সময়সীমা উত্তীর্ণ হয়েছে। কিছুক্ষণ পরে পুনরায় " +-"চেষ্টা " +-"করুন।" ++"চেষ্টা করুন।" + + #: ../camel/camel-lock.c:205 + #, c-format +@@ -2554,7 +2614,8 @@ msgstr "লকিং হেল্পা� + msgid "Cannot fork locking helper: %s" + msgstr "লকিং হেল্পার fork করতে ব্যর্থ: %s" + +-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239 ++#: ../camel/camel-lock-client.c:211 ++#: ../camel/camel-lock-client.c:239 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" + msgstr "'%s' লক করতে ব্যর্থ: lock-helper'র ক্ষেত্রে প্রোটোকল জড়িত সমস্যা" +@@ -2613,7 +2674,8 @@ msgstr "মেইল ফাইল পড় + msgid "Error writing mail temp file: %s" + msgstr "অস্থায়ী মেইল ফাইল লিখতে ব্যর্থ: %s" + +-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560 ++#: ../camel/camel-movemail.c:493 ++#: ../camel/camel-movemail.c:562 + #, c-format + msgid "Error copying mail temp file: %s" + msgstr "অস্থায়ী মেইল ফাইল কপি করতে ব্যর্থ: %s" +@@ -2633,44 +2695,57 @@ msgstr "কোনো স্বাক্� + msgid "parse error" + msgstr "পার্স করতে সমস্যা" + +-#: ../camel/camel-net-utils.c:703 ++#: ../camel/camel-net-utils.c:704 + #, c-format + msgid "Resolving: %s" + msgstr "মীমাংসা করা হচ্ছে: %s" + +-#: ../camel/camel-net-utils.c:726 ++#: ../camel/camel-net-utils.c:727 + msgid "Host lookup failed" + msgstr "হোস্ট অনুসন্ধান ব্যর্থ" + +-#: ../camel/camel-net-utils.c:732 ++#: ../camel/camel-net-utils.c:733 + #, c-format +-msgid "Host lookup failed: %s: %s" +-msgstr "হোস্ট অনুসন্ধান ব্যর্থ: %s: %s" ++msgid "Host lookup '%s' failed. Check your host name for spelling errors." ++msgstr "" ++"'%s' হোস্ট খোঁজা ব্যর্থ হয়েছে। অাপনার হোস্ট নামে যে কোনো ভুল বানান নেই তা " ++"দেখে নিন।" ++ ++#: ../camel/camel-net-utils.c:737 ++#, c-format ++msgid "Host lookup '%s' failed: %s" ++msgstr "'%s' হোস্ট খোঁজা ব্যর্থ হয়েছে: %s" + +-#: ../camel/camel-net-utils.c:853 ++#: ../camel/camel-net-utils.c:858 + msgid "Resolving address" + msgstr "ঠিকানা মীমাংসা করা হচ্ছে" + +-#: ../camel/camel-net-utils.c:874 ++#: ../camel/camel-net-utils.c:879 + msgid "Name lookup failed" + msgstr "নাম অনুসন্ধান করতে ব্যর্থ" + +-#: ../camel/camel-net-utils.c:880 ++#: ../camel/camel-net-utils.c:886 ++msgid "Name lookup failed. Check your host name for spelling errors." ++msgstr "" ++"নতুন খোঁজ ব্যর্থ হয়েছে। অাপনার হোস্ট নামে যে কোনো ভুল বানান নেই তা দেখে নিন।" ++ ++#: ../camel/camel-net-utils.c:890 + #, c-format + msgid "Name lookup failed: %s" + msgstr "নাম অনুসন্ধান করতে ব্যর্থ: %s" + +-#: ../camel/camel-network-service.c:114 ++#: ../camel/camel-network-service.c:350 + #, c-format +-msgid "Could not connect to %s: " +-msgstr "%s-র সাথে সংযোগ করতে ব্যর্থ: " ++msgid "Could not connect to '%s:%s': " ++msgstr "'%s:%s' এর সংগে সংযোগ করা গেল না: " + +-#: ../camel/camel-offline-folder.c:210 ++#: ../camel/camel-offline-folder.c:212 + #, c-format + msgid "Syncing messages in folder '%s' to disk" + msgstr "'%s' ফোল্ডারের বার্তা ডিস্কের মধ্যে সুসংগত করা হচ্ছে" + +-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177 ++#: ../camel/camel-offline-journal.c:145 ++#: ../camel/camel-offline-journal.c:177 + #, c-format + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "'%s' ফোল্ডারের জন্য অফ-লাইন জার্নাল লিখতে ব্যর্থ: %s" +@@ -2683,27 +2758,29 @@ msgstr "ভার্চুয়াল ফ� + msgid "For reading mail as a query of another set of folders" + msgstr "একটি পৃথক ফোল্ডার সংকলন থেকে কোয়েরি রূপে মেইল পড়ার জন্য ব্যবহৃত" + +-#: ../camel/camel-provider.c:193 ++#: ../camel/camel-provider.c:263 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." + msgstr "%s লোড করতে ব্যর্থ: বর্তমান সিস্টেমে মডিউল লোড করা সম্ভব নয়।" + +-#: ../camel/camel-provider.c:202 ++#: ../camel/camel-provider.c:272 + #, c-format + msgid "Could not load %s: %s" + msgstr "%s লোড করতে ব্যর্থ: %s" + +-#: ../camel/camel-provider.c:211 ++#: ../camel/camel-provider.c:281 + #, c-format + msgid "Could not load %s: No initialization code in module." + msgstr "%s লোড করতে ব্যর্থ: মডিউলের মধ্যে প্রারম্ভিক কোড উপস্থিত নেই।" + +-#: ../camel/camel-provider.c:410 ../camel/camel-session.c:406 ++#: ../camel/camel-provider.c:429 ++#: ../camel/camel-session.c:407 + #, c-format + msgid "No provider available for protocol '%s'" + msgstr "'%s' প্রোটোকলের জন্য কোনো উপলব্ধকারী উপস্থিত নেই" + + #: ../camel/camel-sasl-anonymous.c:35 ++#: ../camel/providers/nntp/camel-nntp-provider.c:85 + msgid "Anonymous" + msgstr "Anonymous" + +@@ -2719,29 +2796,23 @@ msgstr "পরিচয় প্রমা� + + #: ../camel/camel-sasl-anonymous.c:81 + #, c-format +-msgid "" +-"Invalid email address trace information:\n" ++msgid "Invalid email address trace information:\n" + "%s" +-msgstr "" +-"ই-মেইল ঠিকানার ক্ষেত্রে অবৈধ trace তথ্য:\n" ++msgstr "ই-মেইল ঠিকানার ক্ষেত্রে অবৈধ trace তথ্য:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:95 + #, c-format +-msgid "" +-"Invalid opaque trace information:\n" ++msgid "Invalid opaque trace information:\n" + "%s" +-msgstr "" +-"অবৈধ opaque trace তথ্য:\n" ++msgstr "অবৈধ opaque trace তথ্য:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:109 + #, c-format +-msgid "" +-"Invalid trace information:\n" ++msgid "Invalid trace information:\n" + "%s" +-msgstr "" +-"অবৈধ trace তথ্য:\n" ++msgstr "অবৈধ trace তথ্য:\n" + "%s" + + #: ../camel/camel-sasl-cram-md5.c:46 +@@ -2753,8 +2824,8 @@ msgid "" + "This option will connect to the server using a secure CRAM-MD5 password, if " + "the server supports it." + msgstr "" +-"এই বিকল্পের ফলে সার্ভারের দ্বারা সমর্থিত হলে নিরাপদ CRAM-MD5 পাসওয়ার্ড সহযোগে " +-"সার্ভারের সাথে সংযোগ করা যাবে।" ++"এই বিকল্পের ফলে সার্ভারের দ্বারা সমর্থিত হলে নিরাপদ CRAM-MD5 পাসওয়ার্ড " ++"সহযোগে সার্ভারের সাথে সংযোগ করা যাবে।" + + #: ../camel/camel-sasl-digest-md5.c:59 + msgid "DIGEST-MD5" +@@ -2766,37 +2837,38 @@ msgid "" + "if the server supports it." + msgstr "" + "এই বিকল্পের ফলে সার্ভারের দ্বারা সমর্থিত হলে নিরাপদ DIGEST-MD5 পাসওয়ার্ড " +-"সহযোগে " +-"সার্ভারের সাথে সংযোগ করা যাবে।" ++"সহযোগে সার্ভারের সাথে সংযোগ করা যাবে।" + +-#: ../camel/camel-sasl-digest-md5.c:853 ++#: ../camel/camel-sasl-digest-md5.c:855 + #, c-format + msgid "Server challenge too long (>2048 octets)" + msgstr "সার্ভারের চ্যালেঞ্জ অতিশয় লম্বা (>২০৪৮ অকটেট)" + +-#: ../camel/camel-sasl-digest-md5.c:864 ++#: ../camel/camel-sasl-digest-md5.c:866 + #, c-format + msgid "Server challenge invalid\n" + msgstr "সার্ভারের চ্যালেঞ্জ বৈধ নয়\n" + +-#: ../camel/camel-sasl-digest-md5.c:872 ++#: ../camel/camel-sasl-digest-md5.c:874 + #, c-format + msgid "Server challenge contained invalid \"Quality of Protection\" token" + msgstr "সার্ভারের মধ্যে অবৈধ \"Quality of Protection\" টোকেন উপস্থিত রয়েছে" + +-#: ../camel/camel-sasl-digest-md5.c:905 ++#: ../camel/camel-sasl-digest-md5.c:907 + #, c-format + msgid "Server response did not contain authorization data" + msgstr "" +-"সার্ভার থেকে প্রাপ্ত প্রত্যুত্তরের মধ্যে পরিচয় প্রমাণ সংক্রান্ত তথ্য অনুপস্থিত" ++"সার্ভার থেকে প্রাপ্ত প্রত্যুত্তরের মধ্যে পরিচয় প্রমাণ সংক্রান্ত তথ্য " ++"অনুপস্থিত" + +-#: ../camel/camel-sasl-digest-md5.c:926 ++#: ../camel/camel-sasl-digest-md5.c:928 + #, c-format + msgid "Server response contained incomplete authorization data" + msgstr "" +-"সার্ভার থেকে প্রাপ্ত প্রত্যুত্তরের মধ্যে পরিচয় প্রমাণ সংক্রান্ত তথ্য অসম্পূর্ণ" ++"সার্ভার থেকে প্রাপ্ত প্রত্যুত্তরের মধ্যে পরিচয় প্রমাণ সংক্রান্ত তথ্য " ++"অসম্পূর্ণ" + +-#: ../camel/camel-sasl-digest-md5.c:939 ++#: ../camel/camel-sasl-digest-md5.c:941 + #, c-format + msgid "Server response does not match" + msgstr "সার্ভারের প্রত্যুত্তরে গরমিল" +@@ -2806,11 +2878,11 @@ msgid "GSSAPI" + msgstr "GSSAPI" + + #: ../camel/camel-sasl-gssapi.c:93 +-msgid "This option will connect to the server using Kerberos 5 authentication." ++msgid "" ++"This option will connect to the server using Kerberos 5 authentication." + msgstr "" + "এই বিকল্পের ফলে Kerberos 5 পরিচয়প্রমাণ ব্যবস্থা সহযোগে সার্ভারের সাথে সংযোগ " +-"করতে " +-"হবে।" ++"করতে হবে।" + + #: ../camel/camel-sasl-gssapi.c:134 + msgid "" +@@ -2852,8 +2924,7 @@ msgid "" + "credential handle did not reference any credentials." + msgstr "" + "কনটেক্ট প্রারম্ভের জন্য উল্লিখিত পরিচিতি বৈধ নয়, অথবা পরিচিতির হ্যান্ডেল " +-"দ্বারা কোনো " +-"পরিচয় চিহ্নিত করা যায়নি।" ++"দ্বারা কোনো পরিচয় চিহ্নিত করা যায়নি।" + + #: ../camel/camel-sasl-gssapi.c:160 + msgid "The supplied context handle did not refer to a valid context." +@@ -2871,14 +2942,16 @@ msgstr "পরিচিতির সু� + msgid "The referenced credentials have expired." + msgstr "নির্দিষ্ট পরিচিতিগুলির মেয়াদ উত্তীর্ণ হয়েছে।" + +-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340 +-#: ../camel/camel-sasl-gssapi.c:384 ../camel/camel-sasl-gssapi.c:401 +-#: ../camel/providers/smtp/camel-smtp-transport.c:575 ++#: ../camel/camel-sasl-gssapi.c:175 ++#: ../camel/camel-sasl-gssapi.c:340 ++#: ../camel/camel-sasl-gssapi.c:388 ++#: ../camel/camel-sasl-gssapi.c:405 ++#: ../camel/providers/smtp/camel-smtp-transport.c:616 + #, c-format + msgid "Bad authentication response from server." + msgstr "সার্ভার থেকে অনুমোদন সংক্রান্ত প্রত্যুত্তর সঠিক নয়।" + +-#: ../camel/camel-sasl-gssapi.c:413 ++#: ../camel/camel-sasl-gssapi.c:417 + #, c-format + msgid "Unsupported security layer." + msgstr "অসমর্থিত নিরাপত্তার স্তর।" +@@ -2887,7 +2960,8 @@ msgstr "অসমর্থিত নি� + msgid "Login" + msgstr "লগ-ইন" + +-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46 ++#: ../camel/camel-sasl-login.c:42 ++#: ../camel/camel-sasl-plain.c:46 + msgid "This option will connect to the server using a simple password." + msgstr "এই বিকল্পের ফলে একটি সাধারণ পাসওয়ার্ড সহযোগে সংযোগ করা হবে।" + +@@ -2896,11 +2970,11 @@ msgstr "এই বিকল্পের + msgid "Unknown authentication state." + msgstr "অনুমোদনের অবস্থা অজানা।" + +-#: ../camel/camel-sasl-ntlm.c:47 ++#: ../camel/camel-sasl-ntlm.c:48 + msgid "NTLM / SPA" + msgstr "NTLM / SPA" + +-#: ../camel/camel-sasl-ntlm.c:49 ++#: ../camel/camel-sasl-ntlm.c:50 + msgid "" + "This option will connect to a Windows-based server using NTLM / Secure " + "Password Authentication." +@@ -2921,49 +2995,50 @@ msgid "This option will authorise a POP + msgstr "এই বিকল্পের ফলে SMTP সংযোগের পূর্বে একটি POP সংযোগ অনুমোদন করা হবে" + + #: ../camel/camel-sasl-popb4smtp.c:84 +-#| msgid "POP Source URI" + msgid "POP Source UID" + msgstr "POP উৎসের UID" + +-#: ../camel/camel-sasl-popb4smtp.c:96 ++#: ../camel/camel-sasl-popb4smtp.c:98 + #, c-format + msgid "POP Before SMTP authentication using an unknown transport" + msgstr "অজানা পরিবহণ সহযোগে SMTP অনুমোদনের পূর্বে POP অনুমোদন" + +-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117 ++#: ../camel/camel-sasl-popb4smtp.c:110 ++#: ../camel/camel-sasl-popb4smtp.c:119 + #, c-format +-#| msgid "POP Before SMTP authentication using a non-POP source" + msgid "POP Before SMTP authentication attempted with a %s service" +-msgstr "%s পরিসেবা সহযোগে SMTP অনুমোদনের পূর্বে POP অনুমোদনের প্রয়াস করা হয়েছে" ++msgstr "" ++"%s পরিসেবা সহযোগে SMTP অনুমোদনের পূর্বে POP অনুমোদনের প্রয়াস করা হয়েছে" + +-#: ../camel/camel-search-private.c:112 ++#: ../camel/camel-search-private.c:116 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "রেগুলার এক্সপ্রেশন কম্পাইল করতে বিফল: %s: %s" + +-#: ../camel/camel-session.c:415 ++#: ../camel/camel-session.c:416 + #, c-format +-#| msgid "No provider available for protocol '%s'" + msgid "Invalid GType registered for protocol '%s'" + msgstr "'%s' প্রোটোকলের জন্য কোনো অবৈধ GType নিবন্ধিত হয়েছে" + +-#: ../camel/camel-session.c:509 ++#: ../camel/camel-session.c:510 + #, c-format +-#| msgid "Authentication failed" + msgid "%s authentication failed" + msgstr "%s অনুমোদন বিফল" + +-#: ../camel/camel-session.c:645 +-#| msgid "Operation not supported" ++#: ../camel/camel-session.c:646 + msgid "Forwarding messages is not supported" + msgstr "বার্তা অনুবর্তনের কাজ সমর্থিত নয়" + +-#: ../camel/camel-session.c:1362 ++#. Translators: The first argument is the account type ++#. * (e.g. "IMAP"), the second is the user name, and the ++#. * third is the host name. ++#: ../camel/camel-session.c:1423 + #, c-format + msgid "Please enter the %s password for %s on host %s." + msgstr "অনুগ্রহ করে %s'র জন্য %s হোস্টের উপর %s পাসওয়ার্ড লিখুন।" + +-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057 ++#: ../camel/camel-smime-context.c:351 ++#: ../camel/camel-smime-context.c:1074 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "'%s'-র সার্টিফিকেট অনুসন্ধান করতে ব্যর্থ" +@@ -2996,7 +3071,8 @@ msgstr "সার্টিফিকে� + msgid "Cannot add CMS Signing time" + msgstr "CMS স্বাক্ষরের সময় যোত করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454 ++#: ../camel/camel-smime-context.c:439 ++#: ../camel/camel-smime-context.c:454 + #, c-format + msgid "Encryption certificate for '%s' does not exist" + msgstr "'%s'-র এনক্রিপশন সার্টিফিকেট অনুপস্থিত" +@@ -3066,15 +3142,18 @@ msgstr "স্বাক্ষরের � + msgid "Digests missing from enveloped data" + msgstr "এনভেলাপ করা তথ্য থেকে ডাইজেস্ট সনাক্ত করা যায়নি" + +-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602 ++#: ../camel/camel-smime-context.c:591 ++#: ../camel/camel-smime-context.c:602 + msgid "Cannot calculate digests" + msgstr "ডাইজেস্ট গণনা করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613 ++#: ../camel/camel-smime-context.c:609 ++#: ../camel/camel-smime-context.c:613 + msgid "Cannot set message digests" + msgstr "বার্তার ডাইজেট সংস্করণ প্রেরণ করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628 ++#: ../camel/camel-smime-context.c:623 ++#: ../camel/camel-smime-context.c:628 + msgid "Certificate import failed" + msgstr "সার্টিফিকেট ইম্পোর্ট কর্ম বিফল" + +@@ -3094,115 +3173,117 @@ msgstr "" + msgid "Cannot find signature digests" + msgstr "স্বাক্ষরের ডাইজেস্ট পাওয়া যায়নি" + +-#: ../camel/camel-smime-context.c:661 ++#: ../camel/camel-smime-context.c:662 + #, c-format + msgid "Signer: %s <%s>: %s\n" + msgstr "স্বাক্ষরকারী: %s <%s>: %s\n" + +-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130 ++#: ../camel/camel-smime-context.c:858 ++#: ../camel/camel-smime-context.c:1148 + msgid "Cannot create encoder context" + msgstr "এনকোডার টেক্সট নির্মাণ করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:848 ++#: ../camel/camel-smime-context.c:864 + msgid "Failed to add data to CMS encoder" + msgstr "CMS এনকোডার'এ তথ্য যোগ করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147 ++#: ../camel/camel-smime-context.c:869 ++#: ../camel/camel-smime-context.c:1165 + msgid "Failed to encode data" + msgstr "তথ্য এনকোড করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243 ++#: ../camel/camel-smime-context.c:1013 ++#: ../camel/camel-smime-context.c:1262 + msgid "Decoder failed" + msgstr "ডিকোডার ব্যর্থ" + +-#: ../camel/camel-smime-context.c:1065 ++#: ../camel/camel-smime-context.c:1082 + msgid "Cannot find common bulk encryption algorithm" + msgstr "সাধারণ বাল্ক এনক্রিপশন অ্যালগোরিদম পাওয়া যায়নি" + +-#: ../camel/camel-smime-context.c:1073 ++#: ../camel/camel-smime-context.c:1090 + msgid "Cannot allocate slot for encryption bulk key" + msgstr "এনক্রিপশন বাল্ক-কি'র জন্য স্লট বরাদ্দ করা যায়নি" + +-#: ../camel/camel-smime-context.c:1084 ++#: ../camel/camel-smime-context.c:1101 + msgid "Cannot create CMS Message" + msgstr "CMS বার্তা নির্মাণ করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:1090 ++#: ../camel/camel-smime-context.c:1107 + msgid "Cannot create CMS Enveloped data" + msgstr "CMS Enveloped তথ্য নির্মাণ করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:1096 ++#: ../camel/camel-smime-context.c:1113 + msgid "Cannot attach CMS Enveloped data" + msgstr "CMS Enveloped তথ্য সংযোজন করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:1102 ++#: ../camel/camel-smime-context.c:1119 + msgid "Cannot attach CMS data object" + msgstr "CMS ডাটা অবজেক্ট সংযুক্ত করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:1111 ++#: ../camel/camel-smime-context.c:1128 + msgid "Cannot create CMS Recipient information" + msgstr "CMS প্রাপক সংক্রান্ত তথ্য নির্মাণ করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:1116 ++#: ../camel/camel-smime-context.c:1133 + msgid "Cannot add CMS Recipient information" + msgstr "CMS প্রাপক সংক্রান্ত তথ্য যোগ করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:1141 ++#: ../camel/camel-smime-context.c:1159 + msgid "Failed to add data to encoder" + msgstr "এনকোডারে তথ্য যোগ করতে ব্যর্থ" + +-#: ../camel/camel-smime-context.c:1250 ++#: ../camel/camel-smime-context.c:1269 + msgid "S/MIME Decrypt: No encrypted content found" + msgstr "S/MIME Decrypt: এনক্রিপ্ট করা কোনো তথ্য পাওয়া যায়নি" + +-#: ../camel/camel-store.c:1838 ++#: ../camel/camel-store.c:1871 + #, c-format + msgid "Cannot create folder '%s': folder exists" + msgstr "'%s' ফোল্ডার নির্মাণ করতে ব্যর্থ: ফোল্ডার বর্তমানে উপস্থিত" + +-#: ../camel/camel-store.c:1881 ++#: ../camel/camel-store.c:1914 + #, c-format +-#| msgid "Syncing folders" + msgid "Opening folder '%s'" + msgstr "'%s' ফোল্ডার খোলা হচ্ছে" + +-#: ../camel/camel-store.c:2066 ++#: ../camel/camel-store.c:2099 + #, c-format +-#| msgid "Scanning for changed messages in %s" + msgid "Scanning folders in '%s'" + msgstr "%s'র মধ্যে উপস্থিত ফোল্ডার পরীক্ষা করা হচ্ছে" + +-#. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088 ++#: ../camel/camel-store.c:2115 ++#: ../camel/camel-store.c:2146 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Trash" + msgstr "আবর্জনা" + +-#. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092 ++#: ../camel/camel-store.c:2127 ++#: ../camel/camel-store.c:2162 + #: ../camel/camel-vtrash-folder.c:50 + msgid "Junk" + msgstr "অবাঞ্ছিত" + +-#: ../camel/camel-store.c:2540 ++#: ../camel/camel-store.c:2615 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "ফোল্ডার নির্মাণ করতে ব্যর্থ: %s: ফোল্ডার বর্তমানে উপস্থিত" + +-#: ../camel/camel-store.c:2554 ++#: ../camel/camel-store.c:2629 + #, c-format +-#| msgid "Cannot get folder '%s': %s" + msgid "Creating folder '%s'" + msgstr "ফোল্ডার '%s' তৈরি করা হচ্ছে" + +-#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410 +-#: ../camel/providers/local/camel-maildir-store.c:306 ++#: ../camel/camel-store.c:2747 ++#: ../camel/camel-vee-store.c:416 ++#: ../camel/providers/local/camel-maildir-store.c:315 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "ফোল্ডার মুছে ফেলা যায়নি: %s: অবৈধ কর্ম" + +-#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460 +-#: ../camel/providers/local/camel-maildir-store.c:788 ++#: ../camel/camel-store.c:2890 ++#: ../camel/camel-vee-store.c:466 ++#: ../camel/providers/local/camel-maildir-store.c:839 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "ফোল্ডারের নাম পরিবর্তন করতে ব্যর্থ: %s: অবৈধ কর্ম" +@@ -3210,8 +3291,8 @@ msgstr "ফোল্ডারের ন� + #: ../camel/camel-stream-filter.c:334 + msgid "Only reset to beginning is supported with CamelStreamFilter" + msgstr "" +-"CamelStreamFilter-র সাথে শুধুমাত্র প্রারম্ভিক মানে পুনরায় নির্ধারণের ব্যবস্থা " +-"সমর্থিত হবে" ++"CamelStreamFilter-র সাথে শুধুমাত্র প্রারম্ভিক মানে পুনরায় নির্ধারণের " ++"ব্যবস্থা সমর্থিত হবে" + + #: ../camel/camel-stream-null.c:78 + msgid "Only reset to beginning is supported with CamelHttpStream" +@@ -3219,25 +3300,23 @@ msgstr "" + "CamelHttpStream-র সাথে শুধুমাত্র প্রারম্ভিক মানে পুনরায় নির্ধারণের ব্যবস্থা " + "সমর্থিত হবে" + +-#: ../camel/camel-stream-process.c:267 ++#: ../camel/camel-stream-process.c:275 + #, c-format + msgid "Connection cancelled" + msgstr "সংযোগ বাতিল করা হয়েছে" + +-#: ../camel/camel-stream-process.c:272 ++#: ../camel/camel-stream-process.c:280 + #, c-format + msgid "Could not connect with command \"%s\": %s" + msgstr "\"%s\" কমান্ড সহযোগে সংযোগ করতে ব্যর্থ: %s" + +-#: ../camel/camel-subscribable.c:386 ++#: ../camel/camel-subscribable.c:397 + #, c-format +-#| msgid "_Show only subscribed folders" + msgid "Subscribing to folder '%s'" + msgstr "'%s' ফোল্ডারে সাবস্ক্রাইব করতে ত্রুটি'" + +-#: ../camel/camel-subscribable.c:518 ++#: ../camel/camel-subscribable.c:529 + #, c-format +-#| msgid "_Show only subscribed folders" + msgid "Unsubscribing from folder '%s'" + msgstr "'%s' ফোল্ডার থেকে আন-সাবস্ক্রাইব করা হচ্ছে" + +@@ -3246,73 +3325,75 @@ msgstr "'%s' ফোল্ডার থ� + msgid "NSPR error code %d" + msgstr "NSPR ত্রুটির কোড %d" + +-#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658 ++#: ../camel/camel-tcp-stream-raw.c:649 ++#: ../camel/camel-tcp-stream-raw.c:662 + #, c-format + msgid "The proxy host does not support SOCKS4" + msgstr "প্রক্সি হোস্ট দ্বারা SOCKS4 সমর্থন করা হয় না" + +-#: ../camel/camel-tcp-stream-raw.c:669 ++#: ../camel/camel-tcp-stream-raw.c:675 + #, c-format + msgid "The proxy host denied our request: code %d" + msgstr "প্রক্সি হোস্ট দ্বারা আমাদের অনুরোধ প্রত্যাখ্যান করা হয়েছে: কোড %d" + +-#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771 ++#: ../camel/camel-tcp-stream-raw.c:773 ++#: ../camel/camel-tcp-stream-raw.c:781 + #, c-format + msgid "The proxy host does not support SOCKS5" + msgstr "প্রক্সি হোস্ট দ্বারা SOCKS5 সমর্থন করা হয় না" + +-#: ../camel/camel-tcp-stream-raw.c:777 ++#: ../camel/camel-tcp-stream-raw.c:789 + #, c-format + msgid "Could not find a suitable authentication type: code 0x%x" + msgstr "যথাযত অনুমোদনের ধরন পাওয়া যায়নি: code 0x%x" + +-#: ../camel/camel-tcp-stream-raw.c:789 ++#: ../camel/camel-tcp-stream-raw.c:801 + msgid "General SOCKS server failure" + msgstr "SOCKS সার্ভারের সাধারণ বিফলতা" + +-#: ../camel/camel-tcp-stream-raw.c:790 ++#: ../camel/camel-tcp-stream-raw.c:802 + msgid "SOCKS server's rules do not allow connection" + msgstr "SOCKS সার্ভারের নিয়ম অনুযায়ী সংযোগের অনুমতি নেই" + +-#: ../camel/camel-tcp-stream-raw.c:791 ++#: ../camel/camel-tcp-stream-raw.c:803 + msgid "Network is unreachable from SOCKS server" + msgstr "SOCKS সার্ভার থেকে নেটওয়ার্কের সাথে সংযোগ স্থাপন করা যাচ্ছে না" + +-#: ../camel/camel-tcp-stream-raw.c:792 ++#: ../camel/camel-tcp-stream-raw.c:804 + msgid "Host is unreachable from SOCKS server" + msgstr "SOCKS সার্ভার থেকে হোস্টের সাথে সংযোগ স্থাপন করা যাচ্ছে না" + +-#: ../camel/camel-tcp-stream-raw.c:793 ++#: ../camel/camel-tcp-stream-raw.c:805 + msgid "Connection refused" + msgstr "সংযোগ প্রত্যাখ্যান করা হয়েছে" + +-#: ../camel/camel-tcp-stream-raw.c:794 ++#: ../camel/camel-tcp-stream-raw.c:806 + msgid "Time-to-live expired" + msgstr "অবস্থান-কাল অতিবাহীত হয়েছে" + +-#: ../camel/camel-tcp-stream-raw.c:795 ++#: ../camel/camel-tcp-stream-raw.c:807 + msgid "Command not supported by SOCKS server" + msgstr "SOCKS সার্ভার দ্বারা এই কমান্ড সমর্থিত নয়" + +-#: ../camel/camel-tcp-stream-raw.c:796 ++#: ../camel/camel-tcp-stream-raw.c:808 + msgid "Address type not supported by SOCKS server" + msgstr "SOCKS সার্ভার দ্বারা এই ধরনের ঠিকানা সমর্থিত নয়" + +-#: ../camel/camel-tcp-stream-raw.c:797 ++#: ../camel/camel-tcp-stream-raw.c:809 + msgid "Unknown error from SOCKS server" + msgstr "SOCKS সার্ভার থেকে উৎপন্ন অজানা সমস্যা" + +-#: ../camel/camel-tcp-stream-raw.c:830 ++#: ../camel/camel-tcp-stream-raw.c:842 + #, c-format + msgid "Got unknown address type from SOCKS server" + msgstr "SOCKS সার্ভার থেকে অজানা ধরনের ঠিকানা প্রাপ্ত হয়েছে" + +-#: ../camel/camel-tcp-stream-raw.c:848 ++#: ../camel/camel-tcp-stream-raw.c:860 + #, c-format + msgid "Incomplete reply from SOCKS server" + msgstr "SOCKS সার্ভার থেকে অসম্পূর্ণ উত্তর প্রাপ্ত হয়েছে" + +-#: ../camel/camel-tcp-stream-raw.c:868 ++#: ../camel/camel-tcp-stream-raw.c:880 + #, c-format + msgid "Hostname is too long (maximum is 255 characters)" + msgstr "" +@@ -3320,111 +3401,24 @@ msgstr "" + + #. SOCKS5 + #. reserved - must be 0 +-#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910 ++#: ../camel/camel-tcp-stream-raw.c:912 ++#: ../camel/camel-tcp-stream-raw.c:922 + #, c-format + msgid "Invalid reply from proxy server" + msgstr "প্রক্সি সার্ভার থেকে প্রাপ্ত উত্তর বৈধ নয়" + +-#: ../camel/camel-tcp-stream-ssl.c:502 +-#, c-format +-#| msgid "" +-#| "Issuer: %s\n" +-#| "Subject: %s\n" +-#| "Fingerprint: %s\n" +-#| "Signature: %s" +-msgid "" +-" Issuer: %s\n" +-" Subject: %s\n" +-" Fingerprint: %s\n" +-" Signature: %s" +-msgstr "" +-" প্রকাশক: %s\n" +-" প্রাপক: %s\n" +-" ফিঙ্গার-প্রিন্ট: %s\n" +-" স্বাক্ষর: %s" +- +-#: ../camel/camel-tcp-stream-ssl.c:508 +-msgid "GOOD" +-msgstr "GOOD" +- +-#: ../camel/camel-tcp-stream-ssl.c:508 +-msgid "BAD" +-msgstr "BAD" +- +-#. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:512 +-#, c-format +-msgid "" +-"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n" +-"\n" +-"Detailed information about the certificate:\n" +-"%s" +-msgstr "" +-"'%s'-র SSL সার্টিফিকেটটি বিশ্বাসযোগ্য নয়। এটি গ্রহণ করতে আপনি ইচ্ছুক কি?\n" +-"\n" +-"সার্টিফিকেট সম্পর্কে বিস্তারিত বিবরণ:\n" +-"%s" +- +-#: ../camel/camel-tcp-stream-ssl.c:516 +-msgid "_Reject" +-msgstr "প্রত্যাখ্যান করুন (_R)" +- +-#: ../camel/camel-tcp-stream-ssl.c:517 +-msgid "Accept _Temporarily" +-msgstr "সাময়িকভাবে গ্রহণ করুন (_T)" +- +-#: ../camel/camel-tcp-stream-ssl.c:518 +-msgid "_Accept Permanently" +-msgstr "স্থায়ীভাবে গ্রহণ করা হবে (_A)" +- +-#: ../camel/camel-tcp-stream-ssl.c:579 +-#, c-format +-msgid "" +-"Certificate problem: %s\n" +-"Issuer: %s" +-msgstr "" +-"সার্টিফিকেট সংক্রান্ত সমস্যা: %s\n" +-"প্রকাশক: %s" +- +-#: ../camel/camel-tcp-stream-ssl.c:631 +-#, c-format +-msgid "" +-"Bad certificate domain: %s\n" +-"Issuer: %s" +-msgstr "" +-"সার্টিফফিকেট ডোমেইন সঠিক নয়: %s\n" +-"প্রকাশক: %s" +- +-#: ../camel/camel-tcp-stream-ssl.c:649 +-#, c-format +-msgid "" +-"Certificate expired: %s\n" +-"Issuer: %s" +-msgstr "" +-"সার্টিফিকেটের মেয়াদ উত্তীর্ণ হয়েছে: %s\n" +-"প্রকাশক: %s" +- +-#: ../camel/camel-tcp-stream-ssl.c:666 +-#, c-format +-msgid "" +-"Certificate revocation list expired: %s\n" +-"Issuer: %s" +-msgstr "" +-"সার্টিফিকেট প্রত্যাখ্যান তালিকার মেয়াদ উত্তীর্ণ হয়েছে: %s\n" +-"প্রকাশক: %s" +- +-#: ../camel/camel-url.c:330 ++#: ../camel/camel-url.c:331 + #, c-format + msgid "Could not parse URL '%s'" + msgstr "URL '%s' পার্স করতে ব্যর্থ" + + #: ../camel/camel-vee-folder.c:494 + #, c-format +-#| msgid "Cannot get folder '%s': %s" + msgid "Updating folder '%s'" + msgstr "ফোল্ডার '%s' আপডেট করা হচ্ছে" + +-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965 ++#: ../camel/camel-vee-folder.c:855 ++#: ../camel/camel-vee-folder.c:965 + #, c-format + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "ভার্চুয়াল ফোল্ডারের মধ্যে বার্তা কপি অথবা স্থানান্তর করা সম্ভব নয়" +@@ -3439,28 +3433,28 @@ msgstr "%s'র অনুরূপ কো + msgid "Error storing '%s': " + msgstr "'%s' সংরক্ষণ করতে ত্রুটি: " + +-#: ../camel/camel-vee-folder.c:1169 ++#: ../camel/camel-vee-folder.c:1171 + msgid "Automatically _update on change in source folders" + msgstr "উৎস ফোল্ডারে পরিবর্তন হলে স্বয়ংক্রিয়ভাবে আপডেট করা হবে (_u)" + + #. Translators: 'Unmatched' is a folder name under Search folders where are shown + #. * all messages not belonging into any other configured search folder +-#: ../camel/camel-vee-store.c:38 ++#: ../camel/camel-vee-store.c:42 + msgid "Unmatched" + msgstr "মিল পাওয়া যায়নি" + +-#: ../camel/camel-vee-store.c:436 ++#: ../camel/camel-vee-store.c:442 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "ফোল্ডার মুছে ফেলা যায়নি: %s: এই ধরনের কোনো ফোল্ডার উপস্থিত নেই" + +-#: ../camel/camel-vee-store.c:470 ++#: ../camel/camel-vee-store.c:476 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "" + "ফোল্ডারের নাম পরিবর্তন করা যায়নি: %s: এই ধরনের কোনো ফোল্ডার উপস্থিত নেই" + +-#: ../camel/camel-vee-store.c:532 ++#: ../camel/camel-vee-store.c:538 + msgid "Enable _Unmatched folder" + msgstr "গরমিলের ফোল্ডার সক্রিয় করা হবে (_U)" + +@@ -3472,282 +3466,92 @@ msgstr "আবর্জনার ফো� + msgid "Cannot copy messages to the Junk folder" + msgstr "অবাঞ্ছিত বার্তার ফোল্ডারে বার্তা কপি করতে ব্যর্থ" + +-#: ../camel/providers/imap/camel-imap-command.c:200 +-#: ../camel/providers/imap/camel-imap-command.c:299 +-#, c-format +-msgid "No output stream" +-msgstr "আউটপুট স্ট্রিম অনুপস্থিত" +- +-#: ../camel/providers/imap/camel-imap-command.c:208 +-#: ../camel/providers/imap/camel-imap-command.c:307 +-#, c-format +-msgid "No input stream" +-msgstr "ইনপুট স্ট্রিম অনুপস্থিত" +- +-#: ../camel/providers/imap/camel-imap-command.c:392 +-#, c-format +-msgid "Server unexpectedly disconnected: %s" +-msgstr "সার্ভারের সাথে অপ্রত্যাশিত ভাবে সংযোগ বিচ্ছিন্ন করা হয়েছে: %s" +- +-#: ../camel/providers/imap/camel-imap-command.c:425 +-#, c-format +-#| msgid "" +-#| "Alert from IMAP server %s@%s:\n" +-#| "%s" +-msgid "" +-"Alert from IMAP server %s@%s in folder %s:\n" +-"%s" +-msgstr "" +-"IMAP সার্ভার %s@%s থেকে %s ফোল্ডারের মধ্যে প্রাপ্ত সতর্কবার্তা:\n" +-"%s" +- +-#: ../camel/providers/imap/camel-imap-command.c:429 +-#, c-format +-msgid "" +-"Alert from IMAP server %s@%s:\n" +-"%s" +-msgstr "" +-"IMAP সার্ভার %s@%s থেকে প্রাপ্ত সতর্কবার্তা:\n" +-"%s" +- +-#: ../camel/providers/imap/camel-imap-command.c:511 +-#, c-format +-msgid "Unexpected response from IMAP server: %s" +-msgstr "IMAP সার্ভার থেকে প্রাপ্ত অপ্রত্যাশিত প্রতিক্রিয়া: %s" +- +-#: ../camel/providers/imap/camel-imap-command.c:523 +-#, c-format +-msgid "IMAP command failed: %s" +-msgstr "IMAP কমান্ড বিফল: %s" +- +-#: ../camel/providers/imap/camel-imap-command.c:606 +-#, c-format +-msgid "Server response ended too soon." +-msgstr "সার্ভার থেকে প্রাপ্ত প্রতিক্রিয় অতি শীঘ্র সমাপ্ত হয়েছে।" +- +-#: ../camel/providers/imap/camel-imap-command.c:821 +-#, c-format +-msgid "IMAP server response did not contain %s information" +-msgstr "" +-"IMAP সার্ভার থেকে প্রাপ্ত প্রত্যুত্তরের মধ্য %s সংক্রান্ত তথ্য অনুপস্থিত" +- +-#: ../camel/providers/imap/camel-imap-command.c:859 +-#, c-format +-msgid "Unexpected OK response from IMAP server: %s" +-msgstr "IMAP সার্ভার থেকে অপ্রত্যাশিত OK প্রতিক্রিয়া: %s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:354 +-#| msgid "Always check for new mail in this folder" +-msgid "Always check for _new mail in this folder" +-msgstr "এই ফোল্ডারের মধ্যে সর্বদা নতুন বার্তার উপস্থিতি অনুসন্ধান করা হবে (_n)" +- +-#: ../camel/providers/imap/camel-imap-folder.c:445 +-#, c-format +-msgid "Could not create directory %s: %s" +-msgstr "%s ডিরেক্টরি নির্মাণ করতে ব্যর্থ: %s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:466 +-#, c-format +-msgid "Could not load summary for %s" +-msgstr "%s'র সংক্ষিপ্ত তথ্য লোড করতে ব্যর্থ" +- +-#: ../camel/providers/imap/camel-imap-folder.c:1135 +-#, c-format +-msgid "Scanning for changed messages in %s" +-msgstr "%s'র মধ্যে পরিবর্তিত বার্তা পরীক্ষা করা হচ্ছে" +- +-#: ../camel/providers/imap/camel-imap-folder.c:3480 +-msgid "Unable to retrieve message: " +-msgstr "বার্তা উদ্ধার করা যায়নি: " +- +-#: ../camel/providers/imap/camel-imap-folder.c:3594 +-#: ../camel/providers/imap/camel-imap-folder.c:4485 +-#: ../camel/providers/nntp/camel-nntp-folder.c:493 +-#, c-format +-msgid "This message is not currently available" +-msgstr "চিহ্নিত বার্তা বর্তমানে উপলব্ধ নয়" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4059 +-#: ../camel/providers/imap/camel-imap-folder.c:4140 +-#, c-format +-msgid "Fetching summary information for new messages in %s" +-msgstr "%s'র মধ্যে উপস্থিত নতুন বার্তার সংক্ষিপ্ত তথ্য প্রাপ্ত করা হচ্ছে" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4272 +-#, c-format +-msgid "Incomplete server response: no information provided for message %d" +-msgstr "" +-"সার্ভার থেকে প্রাপ্ত প্রত্যুত্তর অসম্পূর্ণ: বার্তা %d সংক্রান্ত কোনো তথ্য " +-"উপস্থিত নেই" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4282 +-#, c-format +-msgid "Incomplete server response: no UID provided for message %d" +-msgstr "" +-"সার্ভার থেকে প্রাপ্ত প্রত্যুত্তর অসম্পূর্ণ: বার্তা %d'র UID উপস্থিত নেই" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4522 +-#, c-format +-msgid "Could not find message body in FETCH response." +-msgstr "FETCH কর্মের প্রত্যুত্তরের মধ্যে বার্তার প্রধান অংশ অনুপস্থিত।" +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:196 +-#: ../camel/providers/imap/camel-imap-message-cache.c:253 +-msgid "Could not open cache directory: " +-msgstr "ক্যাশে ডিরেক্টরি খোলা যায়নি: " +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:331 +-#, c-format +-msgid "Failed to cache message %s: %s" +-msgstr "বার্তা %s ক্যাশে করা যায়নি: %s" +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:397 +-#, c-format +-msgid "Failed to cache message %s: " +-msgstr "বার্তা %s ক্যাশে করা যায়নি: " +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:539 +-#, c-format +-msgid "Failed to cache %s: " +-msgstr "%s ক্যাশে করতে ব্যর্থ: " +- +-#: ../camel/providers/imap/camel-imap-provider.c:40 + #: ../camel/providers/imapx/camel-imapx-provider.c:38 + msgid "Checking for New Mail" + msgstr "নতুন মেইলের উপস্থিতি পরীক্ষা করা হচ্ছে" + +-#: ../camel/providers/imap/camel-imap-provider.c:42 + #: ../camel/providers/imapx/camel-imapx-provider.c:40 + msgid "C_heck for new messages in all folders" + msgstr "সকল ফোল্ডারের মধ্যে নতুন বার্তার উপস্থিতি পরীক্ষা করা হবে (_h)" + +-#: ../camel/providers/imap/camel-imap-provider.c:44 + #: ../camel/providers/imapx/camel-imapx-provider.c:42 + msgid "Ch_eck for new messages in subscribed folders" + msgstr "" + "সাবস্ক্রাইব করা ফোল্ডারের মধ্যে নতুন বার্তার উপস্থিতি পরীক্ষা করা হবে (_h)" + +-#: ../camel/providers/imap/camel-imap-provider.c:47 ++#: ../camel/providers/imapx/camel-imapx-provider.c:44 ++msgid "Use _Quick Resync if the server supports it" ++msgstr "সার্ভার দ্বারা সমর্থিত হলে Quick Resync ব্যবহার করা হবে (_Q)" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:46 ++msgid "_Listen for server change notifications" ++msgstr "সার্ভার পরিবর্তনের সূচনাবার্তার জন্য অপেক্ষা করা হবে (_L)" ++ + #: ../camel/providers/imapx/camel-imapx-provider.c:49 + #: ../camel/providers/nntp/camel-nntp-provider.c:46 + msgid "Folders" + msgstr "ফোল্ডার" + +-#: ../camel/providers/imap/camel-imap-provider.c:49 + #: ../camel/providers/imapx/camel-imapx-provider.c:51 + msgid "_Show only subscribed folders" + msgstr "শুধুমাত্র সাব-স্ক্রাইব করা ফোল্ডার প্রদর্শিত হবে (_S)" + +-#: ../camel/providers/imap/camel-imap-provider.c:51 + #: ../camel/providers/imapx/camel-imapx-provider.c:54 + msgid "O_verride server-supplied folder namespace" + msgstr "সার্ভার দ্বারা উপলব্ধ ফোল্ডার নেম-স্পেস অগ্রাহ্য করা হবে (_v)" + +-#: ../camel/providers/imap/camel-imap-provider.c:53 +-msgid "Names_pace:" +-msgstr "নেম-স্পেস: (_p)" ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++msgid "Namespace:" ++msgstr "নেম-স্পেস:" + +-#: ../camel/providers/imap/camel-imap-provider.c:55 + #: ../camel/providers/imapx/camel-imapx-provider.c:59 + #: ../camel/providers/local/camel-local-provider.c:41 +-#: ../camel/providers/local/camel-local-provider.c:77 +-#: ../camel/providers/local/camel-local-provider.c:97 ++#: ../camel/providers/local/camel-local-provider.c:81 ++#: ../camel/providers/local/camel-local-provider.c:101 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Options" + msgstr "বিকল্প" + +-#: ../camel/providers/imap/camel-imap-provider.c:57 + #: ../camel/providers/imapx/camel-imapx-provider.c:61 + #: ../camel/providers/nntp/camel-nntp-provider.c:43 +-#| msgid "_Apply filters to new messages in INBOX" + msgid "Apply _filters to new messages in all folders" + msgstr "সকল ফোল্ডারে আগত নতুন বার্তায় ফিল্টার প্রয়োগ করা হবে (_f)" + +-#: ../camel/providers/imap/camel-imap-provider.c:59 + #: ../camel/providers/imapx/camel-imapx-provider.c:63 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "" +-"চিহ্নিত সার্ভারের ইনবক্সের মধ্যে আগত নতুন বার্তার ক্ষেত্রে ফিল্টার প্রয়োগ করা " +-"হবে (_A)" ++"চিহ্নিত সার্ভারের ইনবক্সের মধ্যে আগত নতুন বার্তার ক্ষেত্রে ফিল্টার প্রয়োগ " ++"করা হবে (_A)" + +-#: ../camel/providers/imap/camel-imap-provider.c:61 + #: ../camel/providers/imapx/camel-imapx-provider.c:65 + msgid "Check new messages for _Junk contents" + msgstr "নতুন বার্তার মধ্যে অবাঞ্ছিত বার্তা পরীক্ষা করা হবে (_J)" + +-#: ../camel/providers/imap/camel-imap-provider.c:63 + #: ../camel/providers/imapx/camel-imapx-provider.c:67 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "" + "INBOX (ইনবক্স) ফোল্ডারে শুধুমাত্র অবাঞ্ছিত বার্তা (Junk) পরীক্ষা করা হবে(_B)" + +-#: ../camel/providers/imap/camel-imap-provider.c:65 + #: ../camel/providers/imapx/camel-imapx-provider.c:69 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "স্বয়ংক্রিয়ভাবে দূরবর্তী বার্তা স্থানীয়রূপে সুসংগত করা হবে (_z)" + +-#: ../camel/providers/imap/camel-imap-provider.c:71 +-msgid "IMAP default port" ++#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++msgid "Default IMAP port" + msgstr "IMAP-র ডিফল্ট পোর্ট" + +-#: ../camel/providers/imap/camel-imap-provider.c:72 + #: ../camel/providers/imapx/camel-imapx-provider.c:76 +-#| msgid "IMAP server %s" + msgid "IMAP over SSL" + msgstr "SSL-র সাথে ব্যবহৃত IMAP" + +-#: ../camel/providers/imap/camel-imap-provider.c:78 +-msgid "IMAP" +-msgstr "IMAP" ++#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++msgid "IMAP+" ++msgstr "IMAP+" + +-#: ../camel/providers/imap/camel-imap-provider.c:80 + #: ../camel/providers/imapx/camel-imapx-provider.c:85 + msgid "For reading and storing mail on IMAP servers." + msgstr "IMAP সার্ভারের মেইল পড়া ও সংরক্ষণের উদ্দেশ্যে।" + +-#: ../camel/providers/imap/camel-imap-store.c:2186 +-#: ../camel/providers/local/camel-maildir-store.c:274 +-#: ../camel/providers/local/camel-mbox-store.c:442 +-#: ../camel/providers/local/camel-mh-store.c:564 +-#, c-format +-msgid "Cannot create folder '%s': folder exists." +-msgstr "'%s' ফোল্ডার নির্মাণ করতে ব্যর্থ: ফোল্ডার বর্তমানে উপস্থিত।" +- +-#: ../camel/providers/imap/camel-imap-store.c:2961 +-#, c-format +-#| msgid "Retrieving message '%s'" +-msgid "Retrieving list of folders at '%s'" +-msgstr "'%s'-এ উপস্থিত ফোল্ডারের তালিকা প্রাপ্ত করা হচ্ছে" +- +-#: ../camel/providers/imap/camel-imap-store.c:3309 +-#, c-format +-msgid "Server unexpectedly disconnected" +-msgstr "সার্ভারের সাথে অপ্রত্যাশিত ভাবে সংযোগ বিচ্ছিন্ন করা হয়েছে" +- +-#: ../camel/providers/imap/camel-imap-store.c:3312 +-msgid "Server unexpectedly disconnected: " +-msgstr "সার্ভারের সাথে অপ্রত্যাশিত ভাবে সংযোগ বিচ্ছিন্ন করা হয়েছে: " +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:44 +-msgid "Use _Quick Resync if the server supports it" +-msgstr "সার্ভার দ্বারা সমর্থিত হলে Quick Resync ব্যবহার করা হবে (_Q)" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:46 +-msgid "_Listen for server change notifications" +-msgstr "সার্ভার পরিবর্তনের সূচনাবার্তার জন্য অপেক্ষা করা হবে (_L)" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 +-msgid "Namespace:" +-msgstr "নেম-স্পেস:" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 +-msgid "Default IMAP port" +-msgstr "IMAP-র ডিফল্ট পোর্ট" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 +-msgid "IMAP+" +-msgstr "IMAP+" +- + #: ../camel/providers/local/camel-local-folder.c:194 + #, c-format + msgid "~%s (%s)" +@@ -3765,17 +3569,14 @@ msgid "%s (%s)" + msgstr "%s (%s)" + + #: ../camel/providers/local/camel-local-folder.c:499 +-#| msgid "Index message body data" + msgid "_Index message body data" + msgstr "বার্তার প্রধান অংশের তথ্যের ইন্ডেক্স (_I)" + + #: ../camel/providers/local/camel-local-folder.c:727 + #, c-format +-msgid "" +-"Cannot get message %s from folder %s\n" ++msgid "Cannot get message %s from folder %s\n" + "%s" +-msgstr "" +-"%s বার্তাটি %s ফোল্ডার থেকে প্রাপ্ত করা যায়নি\n" ++msgstr "%s বার্তাটি %s ফোল্ডার থেকে প্রাপ্ত করা যায়নি\n" + "%s" + + #: ../camel/providers/local/camel-local-provider.c:43 +@@ -3790,43 +3591,41 @@ msgstr "MH-বিন্যাসের � + msgid "For storing local mail in MH-like mail directories." + msgstr "MH-অনুরূপ মেইল ডিরেক্টরির মধ্যে স্থানীয় মেইল সংরক্ষণের উদ্দেশ্যে।" + +-#: ../camel/providers/local/camel-local-provider.c:64 ++#: ../camel/providers/local/camel-local-provider.c:68 + msgid "Local delivery" + msgstr "স্থানীয় বণ্টনব্যবস্থা" + +-#: ../camel/providers/local/camel-local-provider.c:65 ++#: ../camel/providers/local/camel-local-provider.c:69 + msgid "" + "For retrieving (moving) local mail from standard mbox-formatted spools into " + "folders managed by Evolution." + msgstr "" + "প্রমিত mbox-ফরম্যাটের স্পুল থেকে Evolution দ্বারা পরিচালিত ফোল্ডারের মধ্যে " +-"স্থানীয় " +-"মেইল উদ্ধার (স্থানাতর) করতে ব্যবহৃত।" ++"স্থানীয় মেইল উদ্ধার (স্থানাতর) করতে ব্যবহৃত।" + +-#: ../camel/providers/local/camel-local-provider.c:79 +-#: ../camel/providers/local/camel-local-provider.c:99 +-#| msgid "_Apply filters to new messages in INBOX" ++#: ../camel/providers/local/camel-local-provider.c:83 ++#: ../camel/providers/local/camel-local-provider.c:103 + msgid "_Apply filters to new messages in Inbox" + msgstr "Inbox ফোল্ডারে আগত নতুন বার্তায় ফিল্টার প্রয়োগ করা হবে (_A)" + +-#: ../camel/providers/local/camel-local-provider.c:86 ++#: ../camel/providers/local/camel-local-provider.c:90 + msgid "Maildir-format mail directories" + msgstr "Maildir-বিন্যাসের মেইল ডিরেক্টরি" + +-#: ../camel/providers/local/camel-local-provider.c:87 ++#: ../camel/providers/local/camel-local-provider.c:91 + msgid "For storing local mail in maildir directories." + msgstr "maildir ডিরেক্টরির মধ্যে স্থানীয় মেইল সংরক্ষণের উদ্দেশ্যে।" + +-#: ../camel/providers/local/camel-local-provider.c:100 ++#: ../camel/providers/local/camel-local-provider.c:104 + msgid "_Store status headers in Elm/Pine/Mutt format" + msgstr "অবস্থাসূচক হেডার Elm/Pine/Mutt বিন্যাসে সংরক্ষণ করা হবে (_S)" + +-#: ../camel/providers/local/camel-local-provider.c:107 ++#: ../camel/providers/local/camel-local-provider.c:111 + msgid "Standard Unix mbox spool file" + msgstr "প্রমিত Unix mbox স্পুল ফাইল" + +-#: ../camel/providers/local/camel-local-provider.c:108 +-#: ../camel/providers/local/camel-local-provider.c:120 ++#: ../camel/providers/local/camel-local-provider.c:112 ++#: ../camel/providers/local/camel-local-provider.c:126 + msgid "" + "For reading and storing local mail in external standard mbox spool files.\n" + "May also be used to read a tree of Elm, Pine, or Mutt style folders." +@@ -3835,7 +3634,7 @@ msgstr "" + "জন্য।\n" + "Elm, Pine অথবা Mutt বিন্যাসের ফোল্ডারের ট্রি পড়ার জন্যও ব্যবহার করা যাবে।" + +-#: ../camel/providers/local/camel-local-provider.c:119 ++#: ../camel/providers/local/camel-local-provider.c:125 + msgid "Standard Unix mbox spool directory" + msgstr "প্রমিত Unix mbox স্পুল ডিরেক্টরি" + +@@ -3851,7 +3650,7 @@ msgstr "স্থানীয় মেই� + + #: ../camel/providers/local/camel-local-store.c:223 + #: ../camel/providers/local/camel-local-store.c:383 +-#: ../camel/providers/local/camel-maildir-store.c:104 ++#: ../camel/providers/local/camel-maildir-store.c:117 + #: ../camel/providers/local/camel-mbox-store.c:581 + #: ../camel/providers/local/camel-spool-store.c:89 + #, c-format +@@ -3866,7 +3665,7 @@ msgstr "সংগ্রহস্থল� + #: ../camel/providers/local/camel-local-store.c:244 + #: ../camel/providers/local/camel-local-store.c:254 + #: ../camel/providers/local/camel-local-store.c:396 +-#: ../camel/providers/local/camel-maildir-store.c:137 ++#: ../camel/providers/local/camel-maildir-store.c:145 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "ফোল্ডার প্রাপ্ত করতে বিফল: %s: %s" +@@ -3893,7 +3692,7 @@ msgstr "ফোল্ডারের ম� + msgid "Could not rename '%s': %s" + msgstr "'%s'-র পরিবর্তন করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-local-summary.c:527 ++#: ../camel/providers/local/camel-local-summary.c:567 + #, c-format + msgid "Unable to add message to summary: unknown reason" + msgstr "সামারি তথ্যের মধ্যে বার্তা যোগ করতে ব্যর্থ: অজানা কারণ" +@@ -3925,93 +3724,84 @@ msgstr "%s বার্তাটি %s � + msgid "Cannot transfer message to destination folder: %s" + msgstr "গন্তব্যের ফোল্ডারের মধ্যে বার্তা স্থানান্তর করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:112 +-#, c-format +-#| msgid "Cannot create folder: %s : Folder name cannot contain a dot" +-msgid "Cannot create folder: %s: Folder name cannot contain a dot" +-msgstr "" +-"ফোল্ডার নির্মাণ করতে ব্যর্থ: %s: ফোল্ডারের নামের মধ্যে বিন্দু চিহ্ন প্রয়োগ " +-"করা চলবে না" +- +-#: ../camel/providers/local/camel-maildir-store.c:122 +-#: ../camel/providers/local/camel-maildir-store.c:806 ++#: ../camel/providers/local/camel-maildir-store.c:125 ++#: ../camel/providers/local/camel-maildir-store.c:848 + #, c-format + msgid "Folder %s already exists" + msgstr "%s ফোল্ডাটি বর্তমানে উপস্থিত রয়েছে" + +-#: ../camel/providers/local/camel-maildir-store.c:221 +-#: ../camel/providers/local/camel-maildir-store.c:252 ++#: ../camel/providers/local/camel-maildir-store.c:230 ++#: ../camel/providers/local/camel-maildir-store.c:261 + #: ../camel/providers/local/camel-mbox-store.c:403 + #: ../camel/providers/local/camel-mbox-store.c:424 + #, c-format + msgid "Cannot create folder '%s': %s" + msgstr "ফোল্ডার '%s' নির্মাণ করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:236 ++#: ../camel/providers/local/camel-maildir-store.c:245 + #: ../camel/providers/local/camel-mbox-store.c:369 +-#: ../camel/providers/local/camel-mh-store.c:522 ++#: ../camel/providers/local/camel-mh-store.c:514 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "ফোল্ডার '%s' প্রাপ্ত করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:242 ++#: ../camel/providers/local/camel-maildir-store.c:251 + #: ../camel/providers/local/camel-mbox-store.c:379 +-#: ../camel/providers/local/camel-mh-store.c:531 ++#: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "ফোল্ডার '%s' প্রাপ্ত করতে ব্যর্থ: ফোল্ডার বর্তমানে অনুপস্থিত" + +-#: ../camel/providers/local/camel-maildir-store.c:269 ++#: ../camel/providers/local/camel-maildir-store.c:278 + #, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "ফোল্ডার '%s' প্রাপ্ত করতে ব্যর্থ: maildir ডিরেক্টরি নয়।" + +-#: ../camel/providers/local/camel-maildir-store.c:338 +-#: ../camel/providers/local/camel-maildir-store.c:378 +-#: ../camel/providers/local/camel-mh-store.c:682 ++#: ../camel/providers/local/camel-maildir-store.c:283 ++#: ../camel/providers/local/camel-mbox-store.c:442 ++#: ../camel/providers/local/camel-mh-store.c:556 ++#, c-format ++msgid "Cannot create folder '%s': folder exists." ++msgstr "'%s' ফোল্ডার নির্মাণ করতে ব্যর্থ: ফোল্ডার বর্তমানে উপস্থিত।" ++ ++#: ../camel/providers/local/camel-maildir-store.c:347 ++#: ../camel/providers/local/camel-maildir-store.c:387 ++#: ../camel/providers/local/camel-mh-store.c:674 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "'%s' ফোল্ডার মুছে ফেলা যায়নি: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:340 ++#: ../camel/providers/local/camel-maildir-store.c:349 + msgid "not a maildir directory" + msgstr "maildir ডিরেক্টরি নয়" + +-#: ../camel/providers/local/camel-maildir-store.c:589 +-#: ../camel/providers/local/camel-maildir-store.c:1003 ++#: ../camel/providers/local/camel-maildir-store.c:628 ++#: ../camel/providers/local/camel-maildir-store.c:1063 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format + msgid "Could not scan folder '%s': %s" + msgstr "'%s' ফোল্ডার স্ক্যান করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:797 +-#, c-format +-msgid "Cannot rename the folder: %s: Folder name cannot contain a dot" +-msgstr "" +-"ফোল্ডারের নাম পরিবর্তন করতে ব্যর্থ: %s: ফোল্ডারের নামের মধ্যে বিন্দু চিহ্ন " +-"ব্যবহার করা " +-"চলবে না" +- +-#: ../camel/providers/local/camel-maildir-summary.c:434 +-#: ../camel/providers/local/camel-maildir-summary.c:567 ++#: ../camel/providers/local/camel-maildir-summary.c:458 ++#: ../camel/providers/local/camel-maildir-summary.c:591 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "maildir ডিরেক্টরির পাথ খুলতে ব্যর্থ: %s: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:558 ++#: ../camel/providers/local/camel-maildir-summary.c:582 + msgid "Checking folder consistency" + msgstr "ফোল্ডারের সুসংগতি পরীক্ষা ব্যবস্থা" + +-#: ../camel/providers/local/camel-maildir-summary.c:651 ++#: ../camel/providers/local/camel-maildir-summary.c:675 + msgid "Checking for new messages" + msgstr "নতুন বার্তার উপস্থিতি পরীক্ষা করা হচ্ছে" + +-#: ../camel/providers/local/camel-maildir-summary.c:746 +-#: ../camel/providers/local/camel-mbox-summary.c:418 +-#: ../camel/providers/local/camel-mbox-summary.c:650 +-#: ../camel/providers/local/camel-mbox-summary.c:794 +-#: ../camel/providers/local/camel-spool-summary.c:132 ++#: ../camel/providers/local/camel-maildir-summary.c:770 ++#: ../camel/providers/local/camel-mbox-summary.c:450 ++#: ../camel/providers/local/camel-mbox-summary.c:682 ++#: ../camel/providers/local/camel-mbox-summary.c:830 ++#: ../camel/providers/local/camel-spool-summary.c:141 + msgid "Storing folder" + msgstr "ফোল্ডার সংরক্ষণ করা হচ্ছে" + +@@ -4064,11 +3854,9 @@ msgstr "ফোল্ডার বর্� + #: ../camel/providers/local/camel-mbox-store.c:672 + #: ../camel/providers/local/camel-mbox-store.c:701 + #, c-format +-msgid "" +-"Could not delete folder '%s':\n" ++msgid "Could not delete folder '%s':\n" + "%s" +-msgstr "" +-"ফোল্ডার '%s' মুছে ফেলা যায়নি:\n" ++msgstr "ফোল্ডার '%s' মুছে ফেলা যায়নি:\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:682 +@@ -4102,86 +3890,85 @@ msgstr "'%s'-র নাম পরিব� + msgid "Could not rename '%s' to %s: %s" + msgstr "'%s'র নাম %s'এ পরিবর্তন করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:428 ++#: ../camel/providers/local/camel-mbox-summary.c:460 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "ফোল্ডার খুলতে ব্যর্থ: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:490 ++#: ../camel/providers/local/camel-mbox-summary.c:522 + #, c-format + msgid "Fatal mail parser error near position %s in folder %s" + msgstr "%s অবস্থানে, %s ফোল্ডারের মধ্যে মেইল পার্সার সংক্রান্ত গুরুতর ত্রুটি" + +-#: ../camel/providers/local/camel-mbox-summary.c:575 ++#: ../camel/providers/local/camel-mbox-summary.c:607 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "ফোল্ডার পরীক্ষা করা যায়নি: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:663 +-#: ../camel/providers/local/camel-mbox-summary.c:803 +-#: ../camel/providers/local/camel-spool-summary.c:139 ++#: ../camel/providers/local/camel-mbox-summary.c:695 ++#: ../camel/providers/local/camel-mbox-summary.c:839 ++#: ../camel/providers/local/camel-spool-summary.c:148 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "ফাইল খুলতে ব্যর্থ: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:677 +-#: ../camel/providers/local/camel-spool-summary.c:154 ++#: ../camel/providers/local/camel-mbox-summary.c:709 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "অস্থায়ী মেইল-বক্স খুলতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:694 +-#: ../camel/providers/local/camel-mbox-summary.c:919 ++#: ../camel/providers/local/camel-mbox-summary.c:726 ++#: ../camel/providers/local/camel-mbox-summary.c:956 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "উৎস ফোল্ডার %s বন্ধ করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:705 ++#: ../camel/providers/local/camel-mbox-summary.c:739 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "অস্থায়ী ফোল্ডার বন্ধ করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:722 ++#: ../camel/providers/local/camel-mbox-summary.c:758 + #, c-format + msgid "Could not rename folder: %s" + msgstr "ফোল্ডারের নাম পরিবর্তন করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:817 +-#: ../camel/providers/local/camel-mbox-summary.c:1085 ++#: ../camel/providers/local/camel-mbox-summary.c:853 ++#: ../camel/providers/local/camel-mbox-summary.c:1122 + #, c-format + msgid "Could not store folder: %s" + msgstr "ফোল্ডার সংরক্ষণ করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:856 +-#: ../camel/providers/local/camel-mbox-summary.c:1116 ++#: ../camel/providers/local/camel-mbox-summary.c:892 ++#: ../camel/providers/local/camel-mbox-summary.c:1162 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " + "it.)" + msgstr "" + "MBOX ক্ষতিগ্রস্ত, অনুগ্রহ করে তা সংশোধন করুন। (From অর্থাৎ প্রাপক বিশিষ্ট " +-"পংক্তি " +-"প্রত্যাশিত কিন্তু তা পাওয়া যায়নি।)" ++"পংক্তি প্রত্যাশিত কিন্তু তা পাওয়া যায়নি।)" + +-#: ../camel/providers/local/camel-mbox-summary.c:865 +-#: ../camel/providers/local/camel-mbox-summary.c:1125 ++#: ../camel/providers/local/camel-mbox-summary.c:902 ++#: ../camel/providers/local/camel-mbox-summary.c:1174 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "সংক্ষিপ্ত তথ্য ও ফোল্ডারে গরমিল, সুসংগতির (sync) পরেও" + +-#: ../camel/providers/local/camel-mbox-summary.c:1030 +-#: ../camel/providers/local/camel-spool-summary.c:347 ++#: ../camel/providers/local/camel-mbox-summary.c:1067 ++#: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "অজানা সমস্যা: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1183 +-#: ../camel/providers/local/camel-mbox-summary.c:1213 ++#: ../camel/providers/local/camel-mbox-summary.c:1232 ++#: ../camel/providers/local/camel-mbox-summary.c:1262 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "অস্থায়ী মেইল-বক্সে লিখতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1202 ++#: ../camel/providers/local/camel-mbox-summary.c:1251 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "অস্থায়ী মেইল-বক্সে লিখতে ব্যর্থ: %s: %s" +@@ -4191,12 +3978,12 @@ msgstr "অস্থায়ী মেই� + msgid "Cannot append message to mh folder: %s: " + msgstr "mh ফোল্ডারের শেষে বার্তা যোগ করতে ব্যর্থ: %s: " + +-#: ../camel/providers/local/camel-mh-store.c:541 ++#: ../camel/providers/local/camel-mh-store.c:533 + #, c-format + msgid "Could not create folder '%s': %s" + msgstr "ফোল্ডার '%s' নির্মাণ করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-mh-store.c:557 ++#: ../camel/providers/local/camel-mh-store.c:549 + #, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "ফোল্ডার '%s' প্রাপ্ত করতে ব্যর্থ: ডিরেক্টরি নয়।" +@@ -4227,7 +4014,6 @@ msgid "Spool folder tree %s" + msgstr "স্পুল ফোল্ডার ট্রি %s" + + #: ../camel/providers/local/camel-spool-store.c:432 +-#| msgid "Invalid source" + msgid "Invalid spool" + msgstr "বৈধ স্পুল নয়" + +@@ -4238,11 +4024,9 @@ msgstr "ফোল্ডার '%s/%s' � + + #: ../camel/providers/local/camel-spool-store.c:505 + #, c-format +-msgid "" +-"Could not open folder '%s':\n" ++msgid "Could not open folder '%s':\n" + "%s" +-msgstr "" +-"ফোল্ডার '%s' খুলতে ব্যর্থ:\n" ++msgstr "ফোল্ডার '%s' খুলতে ব্যর্থ:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:511 +@@ -4252,11 +4036,9 @@ msgstr "ফোল্ডার '%s' ব� + + #: ../camel/providers/local/camel-spool-store.c:519 + #, c-format +-msgid "" +-"Could not create folder '%s':\n" ++msgid "Could not create folder '%s':\n" + "%s" +-msgstr "" +-"ফোল্ডার '%s' নির্মাণ করতে ব্যর্থ:\n" ++msgstr "ফোল্ডার '%s' নির্মাণ করতে ব্যর্থ:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:532 +@@ -4279,21 +4061,21 @@ msgstr "স্পুল ফোল্ড� + msgid "Spool folders cannot be renamed" + msgstr "স্পুল ফোল্ডারের নাম পরিবর্তন করা সম্ভব নয়" + +-#: ../camel/providers/local/camel-spool-summary.c:170 +-#: ../camel/providers/local/camel-spool-summary.c:182 +-#: ../camel/providers/local/camel-spool-summary.c:194 ++#: ../camel/providers/local/camel-spool-summary.c:179 ++#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:203 + #, c-format + msgid "Could not synchronize temporary folder %s: %s" + msgstr "অস্থায়ী ফোল্ডার %s সুসংগত (sync) করতে ব্যর্থ: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:212 ++#: ../camel/providers/local/camel-spool-summary.c:221 + #, c-format + msgid "Could not synchronize spool folder %s: %s" + msgstr "স্পুল ফোল্ডার %s সুসংগত (sync) করা যায়নি: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:244 +-#: ../camel/providers/local/camel-spool-summary.c:263 +-#: ../camel/providers/local/camel-spool-summary.c:276 ++#: ../camel/providers/local/camel-spool-summary.c:253 ++#: ../camel/providers/local/camel-spool-summary.c:272 ++#: ../camel/providers/local/camel-spool-summary.c:285 + #, c-format + msgid "" + "Could not synchronize spool folder %s: %s\n" +@@ -4302,47 +4084,51 @@ msgstr "" + "স্পুল ফোল্ডার %s সুসংগত (sync) করা যায়নি: %s\n" + "ফোল্ডার সম্ভবত ক্ষতিগ্রস্ত, '%s'-এ কপি সংরক্ষণ করা হয়েছে" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:278 +-#: ../camel/providers/nntp/camel-nntp-folder.c:360 +-#: ../camel/providers/nntp/camel-nntp-folder.c:481 ++#: ../camel/providers/nntp/camel-nntp-folder.c:285 ++#: ../camel/providers/nntp/camel-nntp-folder.c:388 ++#: ../camel/providers/nntp/camel-nntp-folder.c:510 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "অভ্যন্তরীণ সমস্যা: UID'র বিন্যাস সঠিক নয়: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:332 +-#: ../camel/providers/pop3/camel-pop3-folder.c:610 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1005 ++#: ../camel/providers/nntp/camel-nntp-folder.c:349 ++#: ../camel/providers/nntp/camel-nntp-folder.c:354 ++#: ../camel/providers/pop3/camel-pop3-folder.c:657 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1107 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "%s বার্তা প্রাপ্ত করতে ব্যর্থ: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:339 +-#: ../camel/providers/nntp/camel-nntp-folder.c:504 +-#: ../camel/providers/pop3/camel-pop3-folder.c:548 +-#: ../camel/providers/pop3/camel-pop3-folder.c:600 +-#: ../camel/providers/pop3/camel-pop3-folder.c:619 ++#: ../camel/providers/nntp/camel-nntp-folder.c:361 ++#: ../camel/providers/nntp/camel-nntp-folder.c:536 ++#: ../camel/providers/pop3/camel-pop3-folder.c:582 ++#: ../camel/providers/pop3/camel-pop3-folder.c:647 ++#: ../camel/providers/pop3/camel-pop3-folder.c:666 + #, c-format + msgid "Cannot get message %s: " + msgstr "বার্তা প্রাপ্ত করতে ব্যর্থ %s: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:559 +-#: ../camel/providers/nntp/camel-nntp-folder.c:565 +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:525 ++#, c-format ++msgid "This message is not currently available" ++msgstr "চিহ্নিত বার্তা বর্তমানে উপলব্ধ নয়" ++ ++#: ../camel/providers/nntp/camel-nntp-folder.c:593 ++#: ../camel/providers/nntp/camel-nntp-folder.c:599 + #, c-format + msgid "Posting failed: %s" + msgstr "পোস্ট করতে ব্যর্থ: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:606 ++#: ../camel/providers/nntp/camel-nntp-folder.c:664 + msgid "Posting failed: " + msgstr "পোস্ট করতে ব্যর্থ: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:633 ++#: ../camel/providers/nntp/camel-nntp-folder.c:689 + #, c-format + msgid "You cannot post NNTP messages while working offline!" + msgstr "অফ-লাইন অবস্থায় NNTP বার্তা পোস্ট করা সম্ভব নয়!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:653 ++#: ../camel/providers/nntp/camel-nntp-folder.c:709 + #, c-format + msgid "You cannot copy messages from a NNTP folder!" + msgstr "NNTP ফোল্ডার থেকে বার্তা কপি করা সম্ভব নয়!" +@@ -4352,8 +4138,7 @@ msgid "" + "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" + msgstr "" + "সংক্ষিপ্ত বিন্যাসে ফোল্ডার প্রদর্শন করা হবে (অর্থাৎ comp.os.linux'র পরিবর্তে " +-"c.o." +-"linux) (_S)" ++"c.o.linux) (_S)" + + #: ../camel/providers/nntp/camel-nntp-provider.c:51 + msgid "In the subscription _dialog, show relative folder names" +@@ -4377,57 +4162,61 @@ msgstr "USENET নিউজগ্রু� + + #: ../camel/providers/nntp/camel-nntp-provider.c:87 + msgid "" ++"This option will connect to the NNTP server anonymously, without " ++"authentication." ++msgstr "প্রমাণীকরণ ছাড়াই এই বিকল্প নামবিহীন ভাবে NNTP সার্ভারে সংযুক্ত হবে।" ++ ++#: ../camel/providers/nntp/camel-nntp-provider.c:97 ++msgid "" + "This option will authenticate with the NNTP server using a plaintext " + "password." + msgstr "" +-"এই বিকল্পের ফলে একটি প্লেইন-টেক্সট পাসওয়ার্ড সহযোগে NNTP সার্ভারে অনুমোদন করা " +-"হবে।" ++"এই বিকল্পের ফলে একটি প্লেইন-টেক্সট পাসওয়ার্ড সহযোগে NNTP সার্ভারে অনুমোদন " ++"করা হবে।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:286 ++#: ../camel/providers/nntp/camel-nntp-store.c:386 + #, c-format + msgid "Could not read greeting from %s: " + msgstr "%s থেকে প্রাপ্ত অভিবাদন পড়তে বিফল: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:298 ++#: ../camel/providers/nntp/camel-nntp-store.c:394 + #, c-format + msgid "NNTP server %s returned error code %d: %s" + msgstr "NNTP সার্ভার %s দ্বারা এরার কোড %d উৎপন্ন হয়েছে: %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:463 ++#: ../camel/providers/nntp/camel-nntp-store.c:555 + #, c-format + msgid "USENET News via %s" + msgstr "%s'র মাধ্যমে USENET নিউজ" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1058 ++#: ../camel/providers/nntp/camel-nntp-store.c:1218 + #, c-format +-msgid "" +-"Error retrieving newsgroups:\n" ++msgid "Error retrieving newsgroups:\n" + "\n" + "%s" +-msgstr "" +-"নিউজ-গ্রুপ উদ্ধার করতে সমস্যা:\n" ++msgstr "নিউজ-গ্রুপ উদ্ধার করতে সমস্যা:\n" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1150 ++#: ../camel/providers/nntp/camel-nntp-store.c:1319 + #, c-format + msgid "You cannot create a folder in a News store: subscribe instead." + msgstr "" + "নিউজ সংগ্রহস্থলের ফোল্ডার নির্মাণ করতে ব্যর্থ: পরিবর্তে সাব-স্ক্রাইব করুন।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1166 ++#: ../camel/providers/nntp/camel-nntp-store.c:1335 + #, c-format + msgid "You cannot rename a folder in a News store." + msgstr "নিউজ সংগ্রহস্থলের মধ্যে ফোল্ডারের নাম পরিবর্তন করা সম্ভব নয়।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1189 ++#: ../camel/providers/nntp/camel-nntp-store.c:1358 + #, c-format + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "" + "নিউজ সংগ্রহস্থলের মধ্যে ফোল্ডার মুছে ফেলা সম্ভব নয়: পরিবর্তে আন-সাবস্ক্রাইব " + "করুন।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1388 ++#: ../camel/providers/nntp/camel-nntp-store.c:1577 + #, c-format + msgid "" + "You cannot subscribe to this newsgroup:\n" +@@ -4438,10 +4227,9 @@ msgstr "" + "\n" + "এই নিউজগ্রুপ উপস্থিত নেই। নির্বাচিত ফোল্ডার সম্ভবত একটি ঊর্ধ্বস্থ ফোল্ডার।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1436 ++#: ../camel/providers/nntp/camel-nntp-store.c:1644 + #, c-format +-msgid "" +-"You cannot unsubscribe to this newsgroup:\n" ++msgid "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" + msgstr "" +@@ -4449,70 +4237,77 @@ msgstr "" + "\n" + "নিউজ-গ্রুপ উপস্থিত নেই!" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1626 ++#: ../camel/providers/nntp/camel-nntp-store.c:2081 + msgid "NNTP Command failed: " + msgstr "NNTP কমান্ড সঞ্চালনে বিফল: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:1711 ++#: ../camel/providers/nntp/camel-nntp-store.c:2178 + #, c-format + msgid "Not connected." + msgstr "সংযুক্ত নয়।" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:198 +-#: ../camel/providers/nntp/camel-nntp-summary.c:328 ++#: ../camel/providers/nntp/camel-nntp-store.c:2272 ++#, c-format ++msgid "No such folder: %s" ++msgstr "এই ধরনের ফোল্ডার উপস্থিত নেই: %s" ++ ++#: ../camel/providers/nntp/camel-nntp-summary.c:200 ++#: ../camel/providers/nntp/camel-nntp-summary.c:339 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: নতুন বার্তা স্ক্যান করা হচ্ছে" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:216 ++#: ../camel/providers/nntp/camel-nntp-summary.c:222 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "xover থেকে অপ্রত্যাশিত সার্ভারের প্রতিক্রিয়া প্রাপ্ত হয়েছে: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:346 ++#: ../camel/providers/nntp/camel-nntp-summary.c:360 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "head থেকে অপ্রত্যাশিত সার্ভারের প্রতিক্রিয়া প্রাপ্ত হয়েছে: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:393 ++#: ../camel/providers/nntp/camel-nntp-summary.c:407 + #, c-format + msgid "Operation failed: %s" + msgstr "কর্ম বিফল: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:443 +-#: ../camel/providers/pop3/camel-pop3-folder.c:516 ++#: ../camel/providers/pop3/camel-pop3-folder.c:468 ++#: ../camel/providers/pop3/camel-pop3-folder.c:547 + #, c-format + msgid "No message with UID %s" + msgstr "UID %s সহ কোনো বার্তা উপস্থিত নেই" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:532 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 + #, c-format + msgid "Retrieving POP message %d" + msgstr "POP বার্তা %d উদ্ধার করা হচ্ছে" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:611 ++#: ../camel/providers/pop3/camel-pop3-folder.c:658 + msgid "Unknown reason" + msgstr "অজানা কারণ" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:659 ++#: ../camel/providers/pop3/camel-pop3-folder.c:710 + msgid "Retrieving POP summary" + msgstr "POP'র সংক্ষিপ্ত তথ্য প্রাপ্ত করা হচ্ছে" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:710 +-#| msgid "Cannot get POP summary: %s" ++#: ../camel/providers/pop3/camel-pop3-folder.c:771 ++#: ../camel/providers/pop3/camel-pop3-folder.c:774 ++#: ../camel/providers/pop3/camel-pop3-folder.c:787 ++#: ../camel/providers/pop3/camel-pop3-folder.c:800 ++#: ../camel/providers/pop3/camel-pop3-folder.c:814 + msgid "Cannot get POP summary: " + msgstr "POP সংক্রান্ত সংক্ষিপ্ত তথ্য প্রাপ্ত করতে ব্যর্থ: " + +-#: ../camel/providers/pop3/camel-pop3-folder.c:829 ++#: ../camel/providers/pop3/camel-pop3-folder.c:925 + msgid "Expunging old messages" + msgstr "পুরোনো বার্তা স্থায়ীরূপে বর্জন করা হচ্ছে" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:849 ++#: ../camel/providers/pop3/camel-pop3-folder.c:945 + msgid "Expunging deleted messages" + msgstr "মুছে ফেলা বার্তা স্থায়ীরূপে বর্জন করা হচ্ছে" + + #: ../camel/providers/pop3/camel-pop3-provider.c:39 +-#| msgid "Message storage" + msgid "Message Storage" + msgstr "বার্তা সংগ্রহ" + +@@ -4540,7 +4335,6 @@ msgid "Default POP3 port" + msgstr "ডিফল্ট POP3 পোর্ট " + + #: ../camel/providers/pop3/camel-pop3-provider.c:56 +-#| msgid "POP3 server %s" + msgid "POP3 over SSL" + msgstr "SSL-র মাধ্যমে POP3" + +@@ -4558,8 +4352,7 @@ msgid "" + "is the only option supported by many POP servers." + msgstr "" + "এই বিকল্পের ফলে একটি প্লেইন-টেক্সট পাসওয়ার্ড সহযোগে POP সার্ভারের সাথে সংযোগ " +-"করা " +-"হবে। অধিকাংশ POP সার্ভারের দ্বারা শুধুমাত্র এই বিকল্পটি সমর্থিত হয়।" ++"করা হবে। অধিকাংশ POP সার্ভারের দ্বারা শুধুমাত্র এই বিকল্পটি সমর্থিত হয়।" + + #: ../camel/providers/pop3/camel-pop3-provider.c:95 + msgid "" +@@ -4568,82 +4361,73 @@ msgid "" + "claim to support it." + msgstr "" + "এই বিকল্পের ফলে একটি এনক্রিপ্ট করা পাসওয়ার্ড সহযোগে APOP প্রোটোকলের মাধ্যমে " +-"POP " +-"সার্ভারের সাথে সংযোগ করা হবে। অনেক সার্ভারের দ্বারা এই বৈশিষ্ট্য সমর্থিত হলেও " +-"সব " +-"ব্যবহারকারীদের জন্য এটি ব্যবহার করা নাও সম্ভব হতে পারে।" ++"POP সার্ভারের সাথে সংযোগ করা হবে। অনেক সার্ভারের দ্বারা এই বৈশিষ্ট্য সমর্থিত " ++"হলেও সব ব্যবহারকারীদের জন্য এটি ব্যবহার করা নাও সম্ভব হতে পারে।" + + #. Translators: This is the separator between an error and an explanation +-#: ../camel/providers/pop3/camel-pop3-store.c:83 ++#: ../camel/providers/pop3/camel-pop3-store.c:99 + msgid ": " + msgstr ": " + +-#: ../camel/providers/pop3/camel-pop3-store.c:139 ++#: ../camel/providers/pop3/camel-pop3-store.c:161 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "POP সার্ভার %s থেকে প্রাপ্ত অভিবাদন পড়তে ব্যর্থ" + +-#: ../camel/providers/pop3/camel-pop3-store.c:154 ++#: ../camel/providers/pop3/camel-pop3-store.c:176 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "নিরাপদ মোডে POP সার্ভার %s'র সাথে সংযোগ করতে ব্যর্থ: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:155 ++#: ../camel/providers/pop3/camel-pop3-store.c:177 + msgid "STLS not supported by server" + msgstr "সার্ভারের দ্বারা STLS সমর্থিত নয়" + + #. Translators: Last %s is an optional + #. * explanation beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:176 ++#: ../camel/providers/pop3/camel-pop3-store.c:198 + #, c-format + msgid "Failed to connect to POP server %s in secure mode%s" + msgstr "নিরাপদ মোডে POP সার্ভার %s-র সাথে সংযোগ করতে ব্যর্থ%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:189 ++#: ../camel/providers/pop3/camel-pop3-store.c:211 + #, c-format +-#| msgid "Failed to connect to POP server %s in secure mode: %s" + msgid "Failed to connect to POP server %s in secure mode: " + msgstr "নিরাপদ মোডে POP সার্ভার %s'র সাথে সংযোগ করতে ব্যর্থ: " + +-#: ../camel/providers/pop3/camel-pop3-store.c:298 ++#: ../camel/providers/pop3/camel-pop3-store.c:351 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "POP সার্ভার %s'এ লগ-ইন করতে ব্যর্থ: SASL প্রোটোকল সংক্রান্ত সমস্যা" + +-#: ../camel/providers/pop3/camel-pop3-store.c:320 ++#: ../camel/providers/pop3/camel-pop3-store.c:373 + #, c-format + msgid "Failed to authenticate on POP server %s: " + msgstr "POP সার্ভার %s-এ অনুমোদন করতে ব্যর্থ: " + +-#: ../camel/providers/pop3/camel-pop3-store.c:371 ++#: ../camel/providers/pop3/camel-pop3-store.c:481 + #, c-format + msgid "POP3 server %s" + msgstr "POP3 সার্ভার %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:374 ++#: ../camel/providers/pop3/camel-pop3-store.c:484 + #, c-format + msgid "POP3 server for %s on %s" + msgstr "%s-র জন্য POP3 পরিসেবা, %s-র উপর" + +-#: ../camel/providers/pop3/camel-pop3-store.c:546 ++#: ../camel/providers/pop3/camel-pop3-store.c:696 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " + "attack suspected. Please contact your admin." + msgstr "" + "POP সার্ভার %s-র সাথে সংযোগ স্থাপনে ব্যর্থ:\tঅবৈধ APOP ID প্রাপ্ত। সম্ভবত " +-"ভুয়ো পরিচয় " +-"ধারণ করে অনুপ্রবেশের প্রচেষ্টা করা হয়েছে। অনুগ্রহ করে অ্যাডমিনিস্ট্রেটেরের " +-"সাথে " +-"যোগাযোগ করুন।" +- +-#: ../camel/providers/pop3/camel-pop3-store.c:598 +-#, c-format +-#| msgid "" +-#| "Unable to connect to POP server %s.\n" +-#| "Error sending password: %s" +-msgid "" +-"Unable to connect to POP server %s.\n" ++"ভুয়ো পরিচয় ধারণ করে অনুপ্রবেশের প্রচেষ্টা করা হয়েছে। অনুগ্রহ করে " ++"অ্যাডমিনিস্ট্রেটেরের সাথে যোগাযোগ করুন।" ++ ++#: ../camel/providers/pop3/camel-pop3-store.c:748 ++#, c-format ++msgid "Unable to connect to POP server %s.\n" + "Error sending password: " + msgstr "" + "POP সার্ভার %s-র সাথে সংযোগ স্থাপন করতে ব্যর্থ\n" +@@ -4651,31 +4435,26 @@ msgstr "" + + #. Translators: Last %s is an optional explanation + #. * beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:613 ++#: ../camel/providers/pop3/camel-pop3-store.c:763 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending username%s" + msgstr "" + "POP সার্ভার %s-র সাথে সংযোগ করতে ব্যর্থ।\n" + "ব্যবহারকারীর নাম পাঠাতে ত্রুটি%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:673 +-#, c-format +-msgid "Could not connect to POP server %s" +-msgstr "POP সার্ভার %s'র সাথে সংযোগ করতে ব্যর্থ" +- +-#: ../camel/providers/pop3/camel-pop3-store.c:701 ++#: ../camel/providers/pop3/camel-pop3-store.c:845 + #, c-format + msgid "No such folder '%s'." + msgstr "'%s'-র অনুরূপ ফোল্ডার উপস্থিত নেই।" + +-#: ../camel/providers/pop3/camel-pop3-store.c:718 ++#: ../camel/providers/pop3/camel-pop3-store.c:862 + #, c-format + msgid "POP3 stores have no folder hierarchy" + msgstr "POP3 সংগ্রহস্থলের কোনো অনুক্রম উপস্থিত নেই" + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:36 ++#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1 + msgid "Sendmail" + msgstr "Sendmail" + +@@ -4686,55 +4465,58 @@ msgid "" + msgstr "" + "স্থানীয় সিস্টেমে \"sendmail\" প্রোগ্রামের মাধ্যমে মেইল বণ্টনের উদ্দেশ্যে।" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:49 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:50 + msgid "sendmail" + msgstr "sendmail" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:51 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:52 + msgid "Mail delivery via the sendmail program" + msgstr "sendmail প্রোগ্রামের মাধ্যমে মেইল বণ্টন" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:93 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:165 + #, c-format + msgid "Could not parse recipient list" + msgstr "প্রাপকদের তালিকা পার্স করতে ব্যর্থ" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:126 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:182 ++#, c-format ++msgid "Could not parse arguments" ++msgstr "অার্গুমেন্ট পার্জ করা গেল না" ++ ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:213 + #, c-format +-msgid "Could not create pipe to sendmail: %s: mail not sent" +-msgstr "sendmail'র জন্য পাইপ নির্মাণ করতে ব্যর্থ: %s: মেইল প্রেরণ করা যায়নি" ++msgid "Could not create pipe to '%s': %s: mail not sent" ++msgstr "'%s' এ পাইপ তৈরি করা গেল না: %s: মেল পাঠানো হয়নি" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:148 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:238 + #, c-format +-msgid "Could not fork sendmail: %s: mail not sent" +-msgstr "sendmail fork করতে ব্যর্থ: %s: মেইল প্রেরণ করা যায়নি" ++msgid "Could not fork '%s': %s: mail not sent" ++msgstr "'%s' ফোর্ক করা গেল না: %s: মেল পাঠানো হয়নি" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:287 + msgid "Could not send message: " + msgstr "বার্তা পাঠাতে ব্যর্থ: " + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:317 + #, c-format +-msgid "sendmail exited with signal %s: mail not sent." +-msgstr "সিগনাল %s উৎপন্ন করে sendmail বন্ধ হয়েছে: মেইল প্রেরণ করা যায়নি।" ++msgid "'%s' exited with signal %s: mail not sent." ++msgstr "'%s' সিগন্যাল সমেত প্রস্থান করেছে %s: মেল পাঠানো হয়নি।" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:327 + #, c-format +-msgid "Could not execute %s: mail not sent." +-msgstr "%s সঞ্চালন করতে ব্যর্থ: মেইল প্রেরণ করা যায়নি" ++msgid "Could not execute '%s': mail not sent." ++msgstr "সম্পাদন করা গেল না '%s': মেল পাঠানো হয়নি।" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:332 + #, c-format +-msgid "sendmail exited with status %d: mail not sent." +-msgstr "" +-"%d অবস্থার সূচনা প্রদান করে sendmail বন্ধ হয়েছে: মেইল প্রেরণ করা যায়নি।" ++msgid "'%s' exited with status %d: mail not sent." ++msgstr "'%s' স্ট্যাটাস সহ প্রস্থান করেছে %d: মেল পাঠানো হয়নি।" + + #: ../camel/providers/smtp/camel-smtp-provider.c:42 + msgid "Default SMTP port" + msgstr "ডিফল্ট SMTP পোর্ট" + + #: ../camel/providers/smtp/camel-smtp-provider.c:43 +-#| msgid "SMTP server %s" + msgid "SMTP over SSL" + msgstr "SSL-র মাধ্যমে SMTP" + +@@ -4748,230 +4530,228 @@ msgstr "SMTP" + + #: ../camel/providers/smtp/camel-smtp-provider.c:52 + msgid "For delivering mail by connecting to a remote mailhub using SMTP." +-msgstr "SMTP সহযোগে দূরবর্তী মেইল-হাবের সাথে সংযোগ করে মেইল বণ্টনের উদ্দেশ্যে।" ++msgstr "" ++"SMTP সহযোগে দূরবর্তী মেইল-হাবের সাথে সংযোগ করে মেইল বণ্টনের উদ্দেশ্যে।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:154 +-#: ../camel/providers/smtp/camel-smtp-transport.c:162 ++#: ../camel/providers/smtp/camel-smtp-transport.c:158 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 + msgid "Welcome response error: " + msgstr "স্বাগতম বার্তা সম্পর্কিত সমস্যা: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:201 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "নিরাপদ মোডে SMTP সার্ভার %s'র সাথে সংযুক্ত করতে ব্যর্থ: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:210 +-#: ../camel/providers/smtp/camel-smtp-transport.c:223 +-#: ../camel/providers/smtp/camel-smtp-transport.c:230 ++#: ../camel/providers/smtp/camel-smtp-transport.c:211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:224 ++#: ../camel/providers/smtp/camel-smtp-transport.c:231 + msgid "STARTTLS command failed: " + msgstr "STARTTLS কমান্ড সঞ্চালনে ব্যর্থ: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:241 ++#: ../camel/providers/smtp/camel-smtp-transport.c:242 + #, c-format +-#| msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgid "Failed to connect to SMTP server %s in secure mode: " + msgstr "নিরাপদ মোডে SMTP সার্ভার %s-র সাথে সংযোগ স্থাপন করতে ব্যর্থ: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:301 ++#: ../camel/providers/smtp/camel-smtp-transport.c:342 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP সার্ভার %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:304 ++#: ../camel/providers/smtp/camel-smtp-transport.c:345 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "%s'র মাধ্যমে SMTP মেইল বণ্টন" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:378 ++#: ../camel/providers/smtp/camel-smtp-transport.c:419 + #, c-format +-#| msgid "SMTP server %s does not support requested authentication type %s." + msgid "SMTP server %s does not support %s authentication" + msgstr "SMTP সার্ভার %s দ্বারা অনুমোদন প্রণালী %s সমর্থিত হয় না" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:458 ++#: ../camel/providers/smtp/camel-smtp-transport.c:500 + #, c-format + msgid "No SASL mechanism was specified" + msgstr "কোনো SASL পদ্ধতি নির্ধারণ করা হয়নি" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:488 +-#: ../camel/providers/smtp/camel-smtp-transport.c:499 +-#: ../camel/providers/smtp/camel-smtp-transport.c:512 ++#: ../camel/providers/smtp/camel-smtp-transport.c:530 ++#: ../camel/providers/smtp/camel-smtp-transport.c:541 ++#: ../camel/providers/smtp/camel-smtp-transport.c:554 + msgid "AUTH command failed: " + msgstr "AUTH কমান্ড ব্যর্থ: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:654 ++#: ../camel/providers/smtp/camel-smtp-transport.c:695 + #, c-format + msgid "Cannot send message: service not connected." + msgstr "বার্তা প্রেরণ করতে ব্যর্থ: পরিসেবা সংযুক্ত নয়।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:661 ++#: ../camel/providers/smtp/camel-smtp-transport.c:702 + #, c-format + msgid "Cannot send message: sender address not valid." + msgstr "বার্তা প্রেরণ করতে ব্যর্থ: প্রেরকের ঠিকানা বৈধ নয়।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:665 ++#: ../camel/providers/smtp/camel-smtp-transport.c:706 + msgid "Sending message" + msgstr "বার্তা প্রেরণ করা হচ্ছে" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:690 ++#: ../camel/providers/smtp/camel-smtp-transport.c:731 + #, c-format + msgid "Cannot send message: no recipients defined." + msgstr "বার্তা প্রেরণ করতে ব্যর্থ: প্রাপক উল্লিখিত হয়নি।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:744 + #, c-format + msgid "Cannot send message: one or more invalid recipients" + msgstr "বার্তা প্রেরণ করতে ব্যর্থ: এক অথবা অধিক প্রাপক বৈধ নয়" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:807 ++#: ../camel/providers/smtp/camel-smtp-transport.c:865 + msgid "Syntax error, command unrecognized" + msgstr "সিনটেক্স জড়িত সমস্যা, অজানা কমান্ড" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:809 ++#: ../camel/providers/smtp/camel-smtp-transport.c:867 + msgid "Syntax error in parameters or arguments" + msgstr "পরামিতি অথবা আর্গুমেন্টে সিনটেক্স জড়িত সমস্যা" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:811 ++#: ../camel/providers/smtp/camel-smtp-transport.c:869 + msgid "Command not implemented" + msgstr "কমান্ত সঞ্চালিত হয়নি" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:813 ++#: ../camel/providers/smtp/camel-smtp-transport.c:871 + msgid "Command parameter not implemented" + msgstr "কমান্ডের পরামিতি সঞ্চালিত হয়নি" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:815 ++#: ../camel/providers/smtp/camel-smtp-transport.c:873 + msgid "System status, or system help reply" +-msgstr "সিস্টেমের অবস্থা, অথবা সিস্টেম সহয়তা ব্যবস্থা থেকে প্রাপ্ত প্রত্যুত্তর" ++msgstr "" ++"সিস্টেমের অবস্থা, অথবা সিস্টেম সহয়তা ব্যবস্থা থেকে প্রাপ্ত প্রত্যুত্তর" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:817 ++#: ../camel/providers/smtp/camel-smtp-transport.c:875 + msgid "Help message" + msgstr "সহায়তা বার্তা" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:819 ++#: ../camel/providers/smtp/camel-smtp-transport.c:877 + msgid "Service ready" + msgstr "পরিসেবা প্রস্তুত" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:821 ++#: ../camel/providers/smtp/camel-smtp-transport.c:879 + msgid "Service closing transmission channel" + msgstr "পরিসেবার দ্বারা পরিবহণ চ্যানেল বন্ধ করা হচ্ছে" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:823 ++#: ../camel/providers/smtp/camel-smtp-transport.c:881 + msgid "Service not available, closing transmission channel" + msgstr "পরিসেবা উপলব্ধ নয়, পরিবহণ চ্যানেল বন্ধ করা হচ্ছে" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:825 ++#: ../camel/providers/smtp/camel-smtp-transport.c:883 + msgid "Requested mail action okay, completed" + msgstr "মেইল সংক্রান্ত অনুরোধ করা কর্ম সঠিক, সম্পন্ন করা হয়েছে" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:827 ++#: ../camel/providers/smtp/camel-smtp-transport.c:885 + msgid "User not local; will forward to " + msgstr "স্থানীয় ব্যবহারকারী নয়; 'এ অনুবর্তন করা হবে" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:829 ++#: ../camel/providers/smtp/camel-smtp-transport.c:887 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "মেইল সংক্রান্ত অনুরোধ করা কর্ম সঞ্চালিত হয়নি: মেইল-বক্স উপলব্ধ নয়" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:831 ++#: ../camel/providers/smtp/camel-smtp-transport.c:889 + msgid "Requested action not taken: mailbox unavailable" + msgstr "অনুরোধ করা কর্ম সঞ্চালিত হয়নি: মেইল-বক্স উপলব্ধ নয়" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:833 ++#: ../camel/providers/smtp/camel-smtp-transport.c:891 + msgid "Requested action aborted: error in processing" + msgstr "অনুরোধ করা কর্ম বাতিল করা হয়েছে: প্রক্রিয়াকরণে সমস্যা" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:835 ++#: ../camel/providers/smtp/camel-smtp-transport.c:893 + msgid "User not local; please try " + msgstr "স্থানীয় ব্যবহারকারী নয়; অনুগ্রহ করে প্রচেষ্টা করুন" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:837 ++#: ../camel/providers/smtp/camel-smtp-transport.c:895 + msgid "Requested action not taken: insufficient system storage" + msgstr "অনুরোধ করা কর্ম সঞ্চালিত হয়নি: সংগ্রহস্থলে পর্যাপ্ত স্থান অনুপস্থিত" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:839 ++#: ../camel/providers/smtp/camel-smtp-transport.c:897 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "" + "মেইল সংক্রান্ত অনুরোধ করা কর্ম বাতিল করা হয়েছে: সংগ্রহস্থলে বরাদ্দ স্থান " +-"অতিক্রান্ত " +-"হয়েছে" ++"অতিক্রান্ত হয়েছে" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:841 ++#: ../camel/providers/smtp/camel-smtp-transport.c:899 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "অনুরোধ করা কর্ম সঞ্চালিত হয়নি: মেইল-বক্সের নাম গ্রহণযোগ্য নয়" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:843 ++#: ../camel/providers/smtp/camel-smtp-transport.c:901 + msgid "Start mail input; end with ." + msgstr "মেইল ইনপুট আরম্ভ করুন; অন্তে ব্যবহার করুন ." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:845 ++#: ../camel/providers/smtp/camel-smtp-transport.c:903 + msgid "Transaction failed" + msgstr "ট্রানসাকশান বিফল" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:849 ++#: ../camel/providers/smtp/camel-smtp-transport.c:907 + msgid "A password transition is needed" + msgstr "পাসওয়ার্ড পরিবর্তন প্রয়োজন" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:851 ++#: ../camel/providers/smtp/camel-smtp-transport.c:909 + msgid "Authentication mechanism is too weak" + msgstr "অনুমোদন প্রণালী সুদৃঢ় নয়" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:853 ++#: ../camel/providers/smtp/camel-smtp-transport.c:911 + msgid "Encryption required for requested authentication mechanism" + msgstr "অনুরোধ করা অনুমোদন ব্যবস্থায় এনক্রিপশন প্রয়োজন" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:855 ++#: ../camel/providers/smtp/camel-smtp-transport.c:913 + msgid "Temporary authentication failure" + msgstr "অস্থায়ী অনমোদন প্রক্রিয়া বিফল" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1112 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1170 + msgid "SMTP Greeting" + msgstr "SMTP'র অভিবাদন" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1139 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1157 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1165 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1197 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1219 + msgid "HELO command failed: " + msgstr "HELO কমান্ড ব্যর্থ: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1240 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1255 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1265 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1294 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1309 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1319 + msgid "MAIL FROM command failed: " + msgstr "MAIL FROM কমান্ড ব্যর্থ: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1292 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1346 + msgid "RCPT TO command failed: " + msgstr "RCPT TO কমান্ড ব্যর্থ: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1309 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1319 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1363 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1373 + #, c-format + msgid "RCPT TO <%s> failed: " + msgstr "RCPT TO <%s> ব্যর্থ: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1362 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1373 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1384 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1443 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1463 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1477 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1486 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1416 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1427 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1438 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1497 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1517 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1531 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1540 + msgid "DATA command failed: " + msgstr "DATA কমান্ড ব্যর্থ: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1511 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1526 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1535 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1565 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1580 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1589 + msgid "RSET command failed: " + msgstr "RSET কমান্ড ব্যর্থ: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1560 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1574 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1581 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1614 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1628 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1635 + msgid "QUIT command failed: " + msgstr "QUIT কমান্ড ব্যর্থ: " + + #: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1 +-#| msgid "Contact ID already exists" + msgid "Contact UID of a user" + msgstr "ব্যবহারকারীর পরিচয়ের UID " + +@@ -4989,7 +4769,8 @@ msgstr "জন্মদিন ও বা + + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4 + msgid "Number of units for determining a birthday or anniversary reminder" +-msgstr "জন্মদিন ও বার্ষিকী স্মরণের পদ্ধতি নির্ধারণের জন্য ব্যবহৃত এককের সংখ্যা" ++msgstr "" ++"জন্মদিন ও বার্ষিকী স্মরণের পদ্ধতি নির্ধারণের জন্য ব্যবহৃত এককের সংখ্যা" + + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5 + msgid "Birthday and anniversary reminder units" +@@ -5005,21 +4786,19 @@ msgstr "" + + #: ../libebackend/e-authentication-mediator.c:205 + #: ../libebackend/e-authentication-mediator.c:216 +-#: ../libebackend/e-authentication-mediator.c:849 +-#: ../libebackend/e-authentication-mediator.c:1179 ++#: ../libebackend/e-authentication-mediator.c:852 ++#: ../libebackend/e-authentication-mediator.c:1185 + msgid "Bus name vanished (client terminated?)" + msgstr "বাসের নাম আড়াল হয়ে গেছে (ক্লায়েন্ট বন্ধ হয়ে গেছে কি?)" + + #: ../libebackend/e-authentication-mediator.c:264 +-#| msgid "No response from the server" + msgid "No response from client" + msgstr "ক্লায়েন্ট থেকে কোনো প্রতিক্রিয়া পাওয়া যায়নি" + + #: ../libebackend/e-authentication-mediator.c:334 + #: ../libebackend/e-authentication-mediator.c:345 +-#: ../libebackend/e-authentication-mediator.c:843 +-#: ../libebackend/e-authentication-mediator.c:1173 +-#| msgid "Could not cancel operation" ++#: ../libebackend/e-authentication-mediator.c:846 ++#: ../libebackend/e-authentication-mediator.c:1179 + msgid "Client cancelled the operation" + msgstr "ক্লায়েন্ট দ্বারা এই কাজ বাতিল করা হয়েছে" + +@@ -5027,48 +4806,46 @@ msgstr "ক্লায়েন্ট দ� + msgid "Client reports password was rejected" + msgstr "ক্লায়েন্ট থেকে পাসওয়ার্ড প্রত্যাখানের সূচনা প্রাপ্ত হয়েছে" + +-#: ../libebackend/e-authentication-session.c:532 ++#: ../libebackend/e-authentication-session.c:543 + msgid "Add this password to your keyring" + msgstr "এই পাসওয়ার্ডটিকে কি-রিংয়ের মধ্যে যোগ করুন" + +-#: ../libebackend/e-authentication-session.c:595 ++#: ../libebackend/e-authentication-session.c:648 + msgid "Password was incorrect" + msgstr "পাসওয়ার্ড সঠিক নয়" + +-#: ../libebackend/e-authentication-session.c:1331 +-#: ../libebackend/e-authentication-session.c:1507 +-#: ../libebackend/e-authentication-session.c:1690 +-#| msgid "Operation cancelled" +-msgid "Keyring operation was cancelled" +-msgstr "কি-রং সংক্রান্ত কর্ম বাতিল করা হয়েছে" +- +-#: ../libebackend/e-backend.c:190 ++#: ../libebackend/e-backend.c:428 + #, c-format +-#| msgid "IMAP server %s does not support requested authentication type %s" + msgid "%s does not support authentication" + msgstr "%s দ্বারা অনুমোদন সমর্থিত হয় না" + +-#: ../libebackend/e-collection-backend.c:734 ++#: ../libebackend/e-collection-backend.c:800 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "%s দ্বারা দূরবর্তী অবস্থানে রিসোর্স নির্মাণ সমর্থিত হয় না" + +-#: ../libebackend/e-collection-backend.c:793 ++#: ../libebackend/e-collection-backend.c:859 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "%s দ্বারা দূরবর্তী অবস্থানে রিসোর্স অপসারণ সমর্থিত হয় না" + +-#: ../libebackend/e-server-side-source.c:128 ++#: ../libebackend/e-data-factory.c:320 ++#, c-format ++msgid "No backend factory for hash key '%s'" ++msgstr "'%s' হ্যাশ কী'র জন্য কোনো ব্যাক-এন্ড ফ্যাক্টরি নয়" ++ ++#: ../libebackend/e-server-side-source.c:134 + #, c-format + msgid "Data source is missing a [%s] group" + msgstr "তথ্যের উৎসের মধ্যে একটি [%s] সংকলন অনুপস্থিত রয়েছে" + +-#: ../libebackend/e-server-side-source.c:945 ../libedataserver/e-source.c:1092 ++#: ../libebackend/e-server-side-source.c:1008 ++#: ../libedataserver/e-source.c:1138 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "%s তথ্যের উৎস দ্বারা দূরবর্তী অবস্থানে রিসোর্স নির্মাণ সমর্থিত হয় না" + +-#: ../libebackend/e-server-side-source.c:959 ++#: ../libebackend/e-server-side-source.c:1022 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" +@@ -5076,12 +4853,13 @@ msgstr "" + "দূরবর্তী অবস্থানে রিসোর্স নির্মাণের জন্য %s তথ্যের উৎসের মধ্যে কোনো সংকলনের " + "ব্যাক-এন্ড উপস্থিত নয়" + +-#: ../libebackend/e-server-side-source.c:987 ../libedataserver/e-source.c:1201 ++#: ../libebackend/e-server-side-source.c:1050 ++#: ../libedataserver/e-source.c:1251 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "%s তথ্যের উৎস দ্বারা দূরবর্তী অবস্থানে রিসোর্স অপসারণ সমর্থিত হয় না" + +-#: ../libebackend/e-server-side-source.c:1001 ++#: ../libebackend/e-server-side-source.c:1064 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" +@@ -5089,22 +4867,33 @@ msgstr "" + "দূরবর্তী অবস্থানে রিসোর্স অপসারণের জন্য %s তথ্যের উৎসের মধ্যে কোনো সংকলনের " + "ব্যাক-এন্ড উপস্থিত নয়" + +-#: ../libebackend/e-server-side-source.c:1336 ++#: ../libebackend/e-server-side-source.c:1095 ++#: ../libedataserver/e-source.c:1347 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990 ++#, c-format ++msgid "Data source '%s' does not support OAuth 2.0 authentication" ++msgstr "ডেটা সোর্স '%s' OAuth 2.0 প্রমাণীকরণ সমর্থন করে না" ++ ++#: ../libebackend/e-server-side-source.c:1438 + #, c-format + msgid "File must have a '.source' extension" + msgstr "ফাইলের ক্ষেত্রে একটি '.source' এক্সটেনশন উপস্থিত থাকা আবশ্যক" + +-#: ../libebackend/e-source-registry-server.c:522 +-#: ../libedataserver/e-source-registry.c:1512 +-#| msgid "Failed to authenticate.\n" ++#: ../libebackend/e-source-registry-server.c:523 ++#: ../libedataserver/e-source-registry.c:1882 + msgid "The user declined to authenticate" + msgstr "ব্যবহারকারী নিজের পরিচয় অনুমোদন করেননি" + +-#: ../libebackend/e-source-registry-server.c:770 ++#: ../libebackend/e-source-registry-server.c:792 + #, c-format + msgid "UID '%s' is already in use" + msgstr "UID '%s' বর্তমানে ব্যবহৃত হচ্ছে" + ++#: ../libebackend/e-user-prompter-server.c:303 ++#, c-format ++msgid "Extension dialog '%s' not found." ++msgstr "এক্সটেনশন ডায়ালগ '%s' খুঁজে পাওয়া গেল না।" ++ + #: ../libedataserver/e-categories.c:46 + msgctxt "CategoryName" + msgid "Anniversary" +@@ -5217,121 +5006,143 @@ msgctxt "CategoryName" + msgid "Waiting" + msgstr "অপেক্ষারত" + +-#: ../libedataserver/e-client.c:124 +-#| msgid "URI not loaded" ++#: ../libedataserver/e-client.c:135 + msgid "Source not loaded" + msgstr "সোর্স লোড করা হয়নি" + +-#: ../libedataserver/e-client.c:126 +-#| msgid "URI already loaded" ++#: ../libedataserver/e-client.c:137 + msgid "Source already loaded" + msgstr "সোর্স লোড করা হয়েছে" + +-#. Translators: This means that the EClient does not support offline mode, or +-#. * it's not set to by a user, thus it is unavailable while user is not connected. +-#: ../libedataserver/e-client.c:136 +-#| msgid "Offline mode unavailable" ++#. Translators: This means that the EClient does not ++#. * support offline mode, or it's not set to by a user, ++#. * thus it is unavailable while user is not connected. ++#: ../libedataserver/e-client.c:148 + msgid "Offline unavailable" + msgstr "অফ-লাইন মোড উপলব্ধ নয়" + +-#: ../libedataserver/e-client.c:158 +-#| msgid "parse error" ++#: ../libedataserver/e-client.c:170 + msgid "D-Bus error" + msgstr "D-Bus সংক্রান্ত সমস্যা" + + #: ../libedataserver/e-source-authenticator.c:166 +-#| msgid "Authentication required" + msgid "Address book authentication request" + msgstr "ঠিকানা বই অনুমোদনের অনুরোধ" + + #: ../libedataserver/e-source-authenticator.c:171 +-#| msgid "Authentication required" + msgid "Calendar authentication request" + msgstr "বর্ষপঞ্জি অনুমোদনের অনুরোধ" + + #: ../libedataserver/e-source-authenticator.c:175 +-#| msgid "Authentication required" + msgid "Mail authentication request" + msgstr "মেইল অনুমোদনের অনুরোধ" + + #. generic account prompt + #: ../libedataserver/e-source-authenticator.c:178 +-#| msgid "Authentication required" + msgid "Authentication request" + msgstr "অনুমোদনের অনুরোধ" + + #: ../libedataserver/e-source-authenticator.c:188 + #, c-format +-#| msgid "Please enter the %s password for %s on host %s." + msgid "Please enter the password for address book \"%s\"." + msgstr "অনুগ্রহ করে \"%s\" ঠিকানা বইয়ের পাসওয়ার্ড লিখুন।" + + #: ../libedataserver/e-source-authenticator.c:194 + #, c-format +-#| msgid "Please enter the %s password for %s on host %s." + msgid "Please enter the password for calendar \"%s\"." + msgstr "\"%s\" বর্ষপঞ্জির জন্য অনুগ্রহ করে পাসওয়ার্ড লিখুন।" + + #: ../libedataserver/e-source-authenticator.c:200 + #, c-format +-#| msgid "Please enter the %s password for %s on host %s." + msgid "Please enter the password for mail account \"%s\"." + msgstr "অনুগ্রহ করে \"%s\" মেইল অ্যাকাউন্টের পাসওয়ার্ড লিখুন।" + + #: ../libedataserver/e-source-authenticator.c:206 + #, c-format +-#| msgid "Please enter the %s password for %s on host %s." + msgid "Please enter the password for mail transport \"%s\"." + msgstr "অনুগ্রহ করে \"%s\" মেইল পরিবহণকারীর পাসওয়ার্ড লিখুন।" + + #: ../libedataserver/e-source-authenticator.c:212 + #, c-format +-#| msgid "Please enter the %s password for %s on host %s." + msgid "Please enter the password for memo list \"%s\"." + msgstr "\"%s\" মেমো তালিকার জন্য অনুগ্রহ করে পাসওয়ার্ড লিখুন।" + + #: ../libedataserver/e-source-authenticator.c:218 + #, c-format +-#| msgid "Please enter the %s password for %s on host %s." + msgid "Please enter the password for task list \"%s\"." + msgstr "\"%s\" কাজের তালিকার জন্য অনুগ্রহ করে পাসওয়ার্ড লিখুন।" + + #: ../libedataserver/e-source-authenticator.c:224 + #, c-format +-#| msgid "Please enter the %s password for %s on host %s." + msgid "Please enter the password for account \"%s\"." + msgstr "\"%s\" অ্যাকাউন্টের জন্য অনুগ্রহ করে পাসওয়ার্ড লিখুন।" + +-#: ../libedataserver/e-source.c:621 ++#: ../libedataserver/e-source.c:627 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "সোর্স ফাইলের মধ্যে [%s] সংকলন অনুপস্থিত" + +-#: ../libedataserver/e-source.c:919 ++#: ../libedataserver/e-source.c:949 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "'%s' তথ্যের উৎস সরিয়ে নেওয়া যাবে না" + +-#: ../libedataserver/e-source.c:1001 ++#: ../libedataserver/e-source.c:1041 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "'%s' তথ্যের উৎস লিখনযোগ্য নয়" + +-#: ../libedataserver/e-source.c:1382 +-#| msgid "Unnamed List" ++#: ../libedataserver/e-source.c:1559 + msgid "Unnamed" + msgstr "নামবিহীন" + +-#: ../libedataserver/e-source-mail-signature.c:485 ++#: ../libedataserver/e-source-mail-signature.c:487 + #, c-format + msgid "Signature script must be a local file" + msgstr "স্বাক্ষরের ফাইলটি স্থানীয় ফাইল হওয়া আবশ্যক" + ++#: ../libedataserver/e-source-webdav.c:1529 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by address book '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "" ++"'%s' হোস্টের SSL সার্টিফিকেট, '%s' ঠিকানা পুস্তিকা দিয়ে ব্যবহৃত, বিশ্বস্ত। " ++"অাপনি কি এটি গ্রহণ করতে চান?" ++ ++#: ../libedataserver/e-source-webdav.c:1538 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " ++"wish to accept it?" ++msgstr "" ++"'%s' হোস্টের SSL সার্টিফিকেট, '%s' ক্যালেন্ডার দ্বারা ব্যবহৃত, বিশ্বস্ত নয়। " ++"অাপনি এটিকে গ্রহণ করতে চান?" ++ ++#: ../libedataserver/e-source-webdav.c:1547 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "" ++"'%s' হোস্টের SSL সার্টিফিকেট, '%s' মেমো তালিকা দিয়ে ব্যবহৃত, বিশ্বস্ত নয়। " ++"অাপনি এটিকে গ্রহণ করতে চান?" ++ ++#: ../libedataserver/e-source-webdav.c:1556 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by task list '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "" ++"'%s' হোস্টের SSL সার্টিফিকেট, '%s' টাস্ক তালিকা দ্বারা ব্যবহৃত, বিশ্বস্ত নয়। " ++"অাপনি কি এটিকে গ্রহণ করতে চান?" ++ + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1949 ++#: ../libedataserver/e-time-utils.c:1663 ++#: ../libedataserver/e-time-utils.c:1962 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%a %m/%d/%Y %I:%M:%S %p" + +@@ -5339,7 +5150,8 @@ msgstr "%a %m/%d/%Y %I:%M:%S %p" + #. * in 24-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1655 ../libedataserver/e-time-utils.c:1940 ++#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1953 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%a %m/%d/%Y %H:%M:%S" + +@@ -5347,7 +5159,8 @@ msgstr "%a %m/%d/%Y %H:%M:%S" + #. * in 12-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1660 ../libedataserver/e-time-utils.c:1945 ++#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1958 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%a %m/%d/%Y %I:%M %p" + +@@ -5355,78 +5168,83 @@ msgstr "%a %m/%d/%Y %I:%M %p" + #. * in 24-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1665 ../libedataserver/e-time-utils.c:1936 ++#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1949 + msgid "%a %m/%d/%Y %H:%M" + msgstr "%a %m/%d/%Y %H:%M" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1670 ++#: ../libedataserver/e-time-utils.c:1683 + msgid "%a %m/%d/%Y %I %p" + msgstr "%a %m/%d/%Y %I %p" + + #. strptime format of a weekday, a date and a time, + #. * in 24-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1675 ++#: ../libedataserver/e-time-utils.c:1688 + msgid "%a %m/%d/%Y %H" + msgstr "%a %m/%d/%Y %H" + + #. strptime format of a weekday and a date. + #. strftime format of a weekday and a date. +-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1798 +-#: ../libedataserver/e-time-utils.c:1931 ++#: ../libedataserver/e-time-utils.c:1691 ++#: ../libedataserver/e-time-utils.c:1811 ++#: ../libedataserver/e-time-utils.c:1944 + msgid "%a %m/%d/%Y" + msgstr "%a %m/%d/%Y" + + #. strptime format of a date and a time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1685 ++#: ../libedataserver/e-time-utils.c:1698 + msgid "%m/%d/%Y %I:%M:%S %p" + msgstr "%m/%d/%Y %I:%M:%S %p" + + #. strptime format of a date and a time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1689 ++#: ../libedataserver/e-time-utils.c:1702 + msgid "%m/%d/%Y %H:%M:%S" + msgstr "%m/%d/%Y %H:%M:%S" + + #. strptime format of a date and a time, in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1694 ++#: ../libedataserver/e-time-utils.c:1707 + msgid "%m/%d/%Y %I:%M %p" + msgstr "%m/%d/%Y %I:%M %p" + + #. strptime format of a date and a time, in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1699 ++#: ../libedataserver/e-time-utils.c:1712 + msgid "%m/%d/%Y %H:%M" + msgstr "%m/%d/%Y %H:%M" + + #. strptime format of a date and a time, in 12-hour format, + #. * without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1704 ++#: ../libedataserver/e-time-utils.c:1717 + msgid "%m/%d/%Y %I %p" + msgstr "%m/%d/%Y %I %p" + + #. strptime format of a date and a time, in 24-hour format, + #. * without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1709 ++#: ../libedataserver/e-time-utils.c:1722 + msgid "%m/%d/%Y %H" + msgstr "%m/%d/%Y %H" + + #. strptime format of a weekday and a date. + #. This is the preferred date format for the locale. +-#: ../libedataserver/e-time-utils.c:1712 ../libedataserver/e-time-utils.c:1801 ++#: ../libedataserver/e-time-utils.c:1725 ++#: ../libedataserver/e-time-utils.c:1814 + msgid "%m/%d/%Y" + msgstr "%m/%d/%Y" + + #. strptime format for a time of day, in 12-hour format. + #. strftime format of a time in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1993 ++#: ../libedataserver/e-time-utils.c:1885 ++#: ../libedataserver/e-time-utils.c:2006 + msgid "%I:%M:%S %p" + msgstr "%I:%M:%S %p" + + #. strptime format for a time of day, in 24-hour format. + #. strftime format of a time in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1876 ../libedataserver/e-time-utils.c:1985 ++#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1998 + msgid "%H:%M:%S" + msgstr "%H:%M:%S" + +@@ -5434,25 +5252,27 @@ msgstr "%H:%M:%S" + #. * in 12-hour format. + #. strftime format of a time in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1990 ++#: ../libedataserver/e-time-utils.c:1894 ++#: ../libedataserver/e-time-utils.c:2003 + msgid "%I:%M %p" + msgstr "%I:%M %p" + + #. strptime format for time of day, without seconds 24-hour format. + #. strftime format of a time in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:1982 ++#: ../libedataserver/e-time-utils.c:1898 ++#: ../libedataserver/e-time-utils.c:1995 + msgid "%H:%M" + msgstr "%H:%M" + + #. strptime format for time of day, without seconds 24-hour format, + #. * and no colon. +-#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1902 + msgid "%H%M" + msgstr "%H%M" + + #. strptime format for hour and AM/PM, 12-hour format. +-#: ../libedataserver/e-time-utils.c:1893 ++#: ../libedataserver/e-time-utils.c:1906 + msgid "%I %p" + msgstr "%I %p" + +@@ -5466,8 +5286,7 @@ msgid "" + "means manual proxy." + msgstr "" + "কী ধরনের প্রক্সি ব্যবহার করা হবে। \"0\" অর্থাৎ সিস্টেম, \"1\" অর্থাৎ প্রক্সি " +-"ব্যবহার করা হবে না, \"2\" " +-"অর্থাৎ ব্যবহারকারী দ্বারা নির্ধারিত প্রক্সি" ++"ব্যবহার করা হবে না, \"2\" অর্থাৎ ব্যবহারকারী দ্বারা নির্ধারিত প্রক্সি" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 + msgid "Whether to use http-proxy" +@@ -5482,7 +5301,6 @@ msgid "Whether proxy server requires aut + msgstr "প্রক্সি সার্ভারের ক্ষেত্রে অনুমোদন আবশ্যক কি না" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6 +-#| msgid "Bad authentication response from server." + msgid "Whether authentication is required to access proxy server." + msgstr "প্রক্সি সার্ভার ব্যবহারের জন্য অনুমোদন প্রয়োজন কি না।" + +@@ -5503,25 +5321,18 @@ msgid "Port number to use for HTTP reque + msgstr "HTTP অনুরোধের জন্য ব্যবহারযোগ্য পোর্ট সংখ্যা।" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11 +-#| msgid "Unknown authentication state." + msgid "Proxy authentication user name" + msgstr "প্রক্সি অনুমোদনের জন্য ব্যবহারকারীর নাম" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12 +-#| msgid "" +-#| "Unable to authenticate to IMAP server.\n" +-#| "%s\n" +-#| "\n" + msgid "User name to use to authenticate against proxy server." + msgstr "প্রক্সি সার্ভারের অনুমোদনের জন্য ব্যবহারযোগ্য ব্যবহারকারীর নাম।" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13 +-#| msgid "Temporary authentication failure" + msgid "Proxy authentication password" + msgstr "প্রক্সি অনুমোদনের পাসওয়ার্ড" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14 +-#| msgid "Cannot authenticate to server: %s" + msgid "Password to use to authenticate against proxy server." + msgstr "প্রক্সি সার্ভারের অনুমোদনের জন্য ব্যবহারযোগ্য পাসওয়ার্ড।" + +@@ -5550,7 +5361,6 @@ msgid "Port number to use for HTTPS requ + msgstr "HTTPS অনুরোধের জন্য ব্যবহারযোগ্য পোর্ট সংখ্যা" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21 +-#| msgid "Host is unreachable from SOCKS server" + msgid "Host name for SOCKS requests" + msgstr "SOCKS অনুরোধের জন্য হোস্ট-নেম" + +@@ -5574,1302 +5384,633 @@ msgstr "স্বয়ংক্রিয় � + msgid "Where to read automatic proxy configuration from." + msgstr "স্বয়ংক্রিয় প্রক্সি কনফিগারেশন কী থেকে পড়া হবে।" + +-#: ../libedataserverui/e-categories-editor.c:230 +-msgid "Currently _used categories:" +-msgstr "বর্তমানে ব্যবহৃত শ্রেণী: (_u)" +- +-#: ../libedataserverui/e-categories-editor.c:239 +-msgid "_Available Categories:" +-msgstr "উপলব্ধ শ্রেণী: (_A)" +- +-#: ../libedataserverui/e-categories-selector.c:325 +-msgid "Icon" +-msgstr "আইকন" +- +-#: ../libedataserverui/e-categories-selector.c:330 +-msgid "Category" +-msgstr "শ্রেণীবিভাগ" +- +-#: ../libedataserverui/e-category-completion.c:300 ++#: ../modules/gnome-online-accounts/e-goa-password-based.c:132 ++#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365 + #, c-format +-msgid "Create category \"%s\"" +-msgstr "\"%s\" বিভাগ নির্মাণ করা হবে" +- +-#: ../libedataserverui/e-category-editor.c:137 +-msgid "Category Icon" +-msgstr "শ্রেণীবিভাগের প্রতীক" +- +-#: ../libedataserverui/e-category-editor.c:141 +-msgid "_No Image" +-msgstr "ছবি অনুপস্থিত (_N)" +- +-#: ../libedataserverui/e-category-editor.c:178 +-msgid "Category _Name" +-msgstr "শ্রেণীর নাম (_N)" +- +-#: ../libedataserverui/e-category-editor.c:186 +-msgid "Category _Icon" +-msgstr "শ্রেণীর প্রতীক (_I)" ++msgid "No such data source for UID '%s'" ++msgstr "UID '%s' এর ক্ষেত্রে এই ধরনের কোনো ডেটা সোর্স নেই" + +-#: ../libedataserverui/e-category-editor.c:226 +-msgid "Category Properties" +-msgstr "শ্রেণীবিভাগের বৈশিষ্ট্য" +- +-#: ../libedataserverui/e-category-editor.c:287 ++#: ../modules/gnome-online-accounts/e-goa-password-based.c:144 + #, c-format + msgid "" +-"There is already a category '%s' in the configuration. Please use another " +-"name" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain a password for '%s'" + msgstr "" +-"বর্তমান কনফিগারেশনে '%s' নামক একটি বিভাগ উপস্থিত রয়েছে। অনুগ্রহ করে একটি পৃথক " +-"নাম " +-"ব্যবহার করুন" +- +-#: ../libedataserverui/e-name-selector-dialog.c:278 +-msgid "Show Contacts" +-msgstr "পরিচিতি প্রদর্শন" ++"org.gnome.OnlineAccounts পরিষেবায় একটি সংশ্লিষ্ট অ্যাকাউন্ট পাওয়া যায় না " ++"যেখান থেকে '%s' এর জন্য একটি পাসওয়ার্ড প্রাপ্ত করতে হবে" + +-#: ../libedataserverui/e-name-selector-dialog.c:300 +-msgid "Address B_ook:" +-msgstr "ঠিকানা বই: (_o)" +- +-#: ../libedataserverui/e-name-selector-dialog.c:310 +-#| msgid "Cate_gory:" +-msgid "Cat_egory:" +-msgstr "শ্রেণী: (_e)" ++#: ../modules/gnome-online-accounts/e-goa-password-based.c:216 ++#, c-format ++msgid "Invalid password for '%s'" ++msgstr "'%s' এর ক্ষেত্রে পাসওয়ার্ড অবৈধ" + +-#: ../libedataserverui/e-name-selector-dialog.c:332 +-msgid "_Search:" +-msgstr "অনুসন্ধান: (_S)" +- +-#: ../libedataserverui/e-name-selector-dialog.c:357 +-#: ../libedataserverui/e-name-selector-dialog.c:1182 +-msgid "Any Category" +-msgstr "যে কোনো শ্রেণী" +- +-#: ../libedataserverui/e-name-selector-dialog.c:359 +-msgid "Co_ntacts" +-msgstr "পরিচিতি (_n)" +- +-#: ../libedataserverui/e-name-selector-dialog.c:421 +-msgid "Search" +-msgstr "অনুসন্ধান" +- +-#: ../libedataserverui/e-name-selector-dialog.c:424 +-msgid "Address Book" +-msgstr "ঠিকানা বই" +- +-#: ../libedataserverui/e-name-selector-dialog.c:427 +-#: ../modules/google-backend/module-google-backend.c:183 +-msgid "Contacts" +-msgstr "পরিচিতি" +- +-#: ../libedataserverui/e-name-selector-dialog.c:545 +-msgid "Select Contacts from Address Book" +-msgstr "ঠিকানা বই থেকে পরিচিতি নির্বাচন করুন" +- +-#: ../libedataserverui/e-name-selector-dialog.c:917 +-msgid "_Add" +-msgstr "যোগ করুন (_A)" +- +-#: ../libedataserverui/e-name-selector-dialog.c:921 +-msgid "_Remove" +-msgstr "মুছে ফেলুন (_R)" +- +-#: ../libedataserverui/e-name-selector-dialog.c:1097 +-#, c-format +-msgid "Error loading address book: %s" +-msgstr "ঠিকানা বই লোড করতে ত্রুটি: %s" +- +-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:3008 +-#, c-format +-msgid "E_xpand %s Inline" +-msgstr "ইন-লাইন অবস্থায় %s প্রসারণ করা হবে (_x)" +- +-#. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:3024 +-#, c-format +-msgid "Cop_y %s" +-msgstr "%s কপি করুন (_y)" +- +-#. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:3035 +-#, c-format +-msgid "C_ut %s" +-msgstr "%s কাট করুন (_u)" +- +-#. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:3053 +-#, c-format +-msgid "_Edit %s" +-msgstr "%s সম্পাদনা (_E)" +- +-#: ../libedataserverui/e-name-selector-list.c:532 +-#, c-format +-msgid "_Delete %s" +-msgstr "%s মুছে ফেলুন (_D)" +- +-#: ../libedataserverui/e-passwords.c:126 +-msgid "Keyring key is unusable: no user or host name" +-msgstr "কি-রিংয়ের কি ব্যবহারযোগ্য নয়: ব্যবহারকারী অথবা হোস্ট-নেম অনুপস্থিত" +- +-#: ../libedataserverui/e-passwords.c:701 +-#: ../libedataserverui/e-passwords-win32.c:614 +-msgid "You have the Caps Lock key on." +-msgstr "ক্যাপস-লক সক্রিয়" +- +-#: ../libedataserverui/e-passwords.c:821 +-#: ../libedataserverui/e-passwords-win32.c:737 +-msgid "_Remember this passphrase" +-msgstr "পাসফ্রেস মনে রাখা হবে (_R)" +- +-#: ../libedataserverui/e-passwords.c:822 +-#: ../libedataserverui/e-passwords-win32.c:738 +-msgid "_Remember this passphrase for the remainder of this session" +-msgstr "বর্তমানে সেশানের অবশিষ্ট সময়ের জন্য পাসফ্রেস মনে রাখা হবে (_R)" +- +-#: ../libedataserverui/e-passwords.c:827 +-#: ../libedataserverui/e-passwords-win32.c:743 +-msgid "_Remember this password" +-msgstr "পাসওয়ার্ড মনে রাখা হবে (_R)" +- +-#: ../libedataserverui/e-passwords.c:828 +-#: ../libedataserverui/e-passwords-win32.c:744 +-msgid "_Remember this password for the remainder of this session" +-msgstr "বর্তমানে সেশানের অবশিষ্ট সময়ের জন্য পাসওয়ার্ড মনে রাখা হবে (_R)" +- +-#: ../libedataserverui/e-source-selector-dialog.c:224 +-msgid "_Destination" +-msgstr "গন্তব্যস্থল (_D)" +- +-#: ../libedataserverui/e-source-selector-dialog.c:326 +-msgid "Select destination" +-msgstr "গন্তব্যস্থল নির্বাচন করুন" +- +-#: ../modules/google-backend/module-google-backend.c:118 +-#: ../modules/yahoo-backend/module-yahoo-backend.c:200 +-msgid "Calendar" +-msgstr "বর্ষপঞ্জি" ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:223 ++#, c-format ++msgid "Code: %u - Unexpected response from server" ++msgstr "কোড: %u - সার্ভার থেকে প্রাপ্ত অপ্রত্যাশিত প্রতিক্রিয়া" + + #. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:184 ++#: ../modules/gnome-online-accounts/goaewsclient.c:244 + #, c-format +-#| msgid "Unexpected response from IMAP server: %s" +-msgid "Code: %u - Unexpected response from server" +-msgstr "কোড: %u - সার্ভার থেকে প্রাপ্ত অপ্রত্যাশিত প্রতিক্রিয়া" +- +-#. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:205 +-#, c-format +-#| msgid "Failed to retrieve message" + msgid "Failed to parse autodiscover response XML" + msgstr "autodiscover প্রতিক্রিয়ার XML পার্স করতে ব্যর্থ" + + #. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:214 ++#: ../modules/gnome-online-accounts/goaewsclient.c:253 + #, c-format +-#| msgid "Failed to find system calendar" + msgid "Failed to find Autodiscover element" + msgstr "Autodiscover সামগ্রী সন্ধান করতে বিফল" + + #. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:226 ++#: ../modules/gnome-online-accounts/goaewsclient.c:265 + #, c-format +-#| msgid "Failed to find system calendar" + msgid "Failed to find Response element" + msgstr "Response-র সামগ্রী সন্ধান করতে ব্যর্থ" + + #. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:238 ++#: ../modules/gnome-online-accounts/goaewsclient.c:277 + #, c-format +-#| msgid "Failed to find system calendar" + msgid "Failed to find Account element" + msgstr "Account-র সামগ্রী সন্ধান করতে ব্যর্থ" + + #. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:252 ++#: ../modules/gnome-online-accounts/goaewsclient.c:291 + #, c-format + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "autodiscover প্রতিক্রিয়ার মধ্যে ASUrl ও OABUrl সন্ধান করতে ব্যর্থ" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:215 +-msgid "Tasks" +-msgstr "কর্ম" +- +-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47 +-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51 +-msgid "Keep running after the last client is closed" +-msgstr "সর্বশেষ ক্লায়েন্ট বন্ধ করার পরেও এটি সঞ্চালিত হবে" +- +-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49 +-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53 +-msgid "Wait running until at least one client is connected" +-msgstr "অন্তত একটি ক্লায়েন্ট সংযুক্ত না হওয়া অব্দি সঞ্চালিত হবে না" +- +-#: ../tests/libedataserverui/evolution-source-viewer.c:620 +-msgid "Evolution Source Viewer" +-msgstr "Evolution Source Viewer" +- +-#: ../tests/libedataserverui/evolution-source-viewer.c:649 +-#| msgid "Family Name" +-msgid "Display Name" +-msgstr "প্রদর্শনের নাম" +- +-#: ../tests/libedataserverui/evolution-source-viewer.c:658 +-msgid "Flags" +-msgstr "ফ্ল্যাগ" +- +-#: ../tests/libedataserverui/evolution-source-viewer.c:710 +-msgid "Identity" +-msgstr "পরিচয়" +- +-#~ msgid "Authenticating with the server…" +-#~ msgstr "সার্ভারে অনুমোদন করা হচ্ছে…" +- +-#~ msgid "%s: there was no source for UID '%s' stored in GConf." +-#~ msgstr "%s: UID `%s'-র জন্য কোনো উৎস gconf-এ সংরক্ষিত নেই।" +- +-#~ msgid "On This Computer" +-#~ msgstr "ব্যবহৃত কম্পিউটারের মধ্যে" +- +-#~ msgid "Invalid source" +-#~ msgstr "বৈধ উৎস নয়" +- +-#~ msgid "Incorrect uri '%s'" +-#~ msgstr "ভুল uri '%s'" +- +-#~| msgid "Failed on message %d" +-#~ msgid "Failed to find system book" +-#~ msgstr "সিস্টেম বুক সন্ধান করতে ব্যর্থ" +- +-#~| msgid "Cannot authenticate user: %s" +-#~ msgid "Cannot authenticate user: " +-#~ msgstr "ব্যবহারকারীকে অনুমোদন করতে ব্যর্থ: " +- +-#~ msgid "Empty URI" +-#~ msgstr "ফাঁকা URI" +- +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "" +-#~ "Enter password for address book %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "%s-র জন্য পাসওয়ার্ড লিখুন (ব্যবহারকারী %s)\n" +-#~ "কারণ: %s" +- +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "Enter password for address book %s (user %s)" +-#~ msgstr "%s ঠিকানা-বইয়ের জন্য পাসওয়ার্ড লিখুন (ব্যবহারকারী %s)" +- +-#~ msgid "Enter password for %s (user %s)" +-#~ msgstr "%s'র জন্য পাসওয়ার্ড লিখুন (ব্যবহারকারী %s)" +- +-#~ msgid "Enter password for %s to enable proxy for user %s" +-#~ msgstr "" +-#~ "%s'র জন্য পাসওয়ার্ড উল্লেখ করে %s ব্যবহারকারীর জন্য প্রক্সি পরিসেবা সক্রিয় করুন" +- +-#~| msgid "Invalid source" +-#~ msgid "Invalid source type" +-#~ msgstr "উৎসের ধরন বৈধ নয়" +- +-#, fuzzy +-#~| msgid "Storing folder" +-#~ msgid "Updating %s folder" +-#~ msgstr "ফোল্ডার সংরক্ষণ করা হচ্ছে" +- +-#~ msgid "Connection to Server" +-#~ msgstr "সার্ভারের সাথে সংযোগ" +- +-#~ msgid "_Use custom command to connect to server" +-#~ msgstr "সার্ভারের সাথে সংযোগ করতে নিজস্ব কমান্ড প্রয়োগ করুন (_U)" +- +-#~ msgid "Co_mmand:" +-#~ msgstr "কমান্ড: (_m)" +- +-#~ msgid "Command:" +-#~ msgstr "কমান্ড:" +- +-#~ msgid "Numbe_r of cached connections to use" +-#~ msgstr "ক্যাশে করা ব্যবহারযোগ্য সংযোগের সংখ্যা (_r)" +- +-#~ msgid "Closing tmp stream failed: " +-#~ msgstr "tmp স্ট্রিম বন্ধ করতে ব্যর্থ: " +- +-#~ msgid "SMTP Authentication" +-#~ msgstr "SMTP অনুমোদন ব্যবস্থা" +- +-#~ msgid "Accessing LDAP Server anonymously" +-#~ msgstr "অ্যানোনিমাস রূপে LDAP ব্যবহার" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "" +-#~ "Enter password for calendar %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "%s'র জন্য পাসওয়ার্ড লিখুন (ব্যবহারকারী %s)" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "Enter password for calendar %s (user %s)" +-#~ msgstr "%s'র জন্য পাসওয়ার্ড লিখুন (ব্যবহারকারী %s)" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "" +-#~ "Enter password for task list %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "%s'র জন্য পাসওয়ার্ড লিখুন (ব্যবহারকারী %s)" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "Enter password for task list %s (user %s)" +-#~ msgstr "%s'র জন্য পাসওয়ার্ড লিখুন (ব্যবহারকারী %s)" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "" +-#~ "Enter password for memo list %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "%s'র জন্য পাসওয়ার্ড লিখুন (ব্যবহারকারী %s)" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "Enter password for memo list %s (user %s)" +-#~ msgstr "%s'র জন্য পাসওয়ার্ড লিখুন (ব্যবহারকারী %s)" +- +-#, fuzzy +-#~| msgid "Enter password" +-#~ msgid "Enter Passphrase" +-#~ msgstr "পাসওয়ার্ড লিখুন" +- +-#, fuzzy +-#~| msgid "Enter password" +-#~ msgid "Enter Password" +-#~ msgstr "পাসওয়ার্ড লিখুন" +- +-#~ msgid "Updating contacts cache (%d)... " +-#~ msgstr "পরিচিতদের তালিকার ক্যাশে আপডেট করা হচ্ছে (%d)... " +- +-#~| msgid "Cannot get message %s: %s" +-#~ msgid "Cannot get supported fields: %s" +-#~ msgstr "সমর্থিত ক্ষেত্র প্রাপ্ত করতে ব্যর্থ: %s" +- +-#~| msgid "Cannot get message %s: %s" +-#~ msgid "Cannot get required fields: %s" +-#~ msgstr "আবশ্যক ক্ষেত্রগুলি প্রাপ্ত করতে ব্যর্থ: %s" +- +-#~| msgid "Unsupported authentication method" +-#~ msgid "Cannot get supported authentication methods: %s" +-#~ msgstr "সমর্থিত অনুমোদন পদ্ধতিগুলি প্রাপ্ত করতে ব্যর্থ: %s" +- +-#~| msgid "Cannot get message %s: %s" +-#~ msgid "Cannot get changes: %s" +-#~ msgstr "পরিবর্তন প্রাপ্ত করা সম্ভব নয়: %s" +- +-#~| msgid "Operation failed: %s" +-#~ msgid "Cancel operation failed: %s" +-#~ msgstr "বাতিলের কর্ম ব্যর্থ: %s" +- +-#~ msgid "Reply Requested: by " +-#~ msgstr "উত্তরের অনুরোধ জানানো হয়েছে: চিহ্নিত সময়ের মধ্যে" +- +-#~ msgid "Reply Requested: When convenient" +-#~ msgstr "উত্তরের অনুরোধ জানানো হয়েছে: সুবিধানুযায়ী" +- +-#~| msgid "Loading %s items" +-#~ msgid "Loading Appointment items" +-#~ msgstr "সাক্ষাৎকারের তথ্য লোড করা হচ্ছে" +- +-#~| msgid "Loading %s items" +-#~ msgid "Loading Task items" +-#~ msgstr "কর্মতালিকার তথ্য লোড করা হচ্ছে" +- +-#~| msgid "Loading %s items" +-#~ msgid "Loading Note items" +-#~ msgstr "নোটের তথ্য লোড করা হচ্ছে" +- +-#~| msgid "Loading %s items" +-#~ msgid "Loading items" +-#~ msgstr "সামগ্রী লোড করা হচ্ছে" +- +-#~ msgid "Could not create thread for populating cache" +-#~ msgstr "ক্যাশের মধ্যে তথ্য পূরণের জন্য থ্রেড নির্মাণ করতে ব্যর্থ" +- +-#~| msgid "Cannot save calendar data: Malformed URI." +-#~ msgid "Cannot retrieve calendar alarm e-mail address: %s" +-#~ msgstr "বর্ষপঞ্জির অ্যালার্মের ই-মেইল ঠিকানা প্রাপ্ত করতে ব্যর্থ: %s" +- +-#~| msgid "Cannot save calendar data" +-#~ msgid "Cannot retrieve calendar's LDAP attribute: %s" +-#~ msgstr "বর্ষপঞ্জির LDAP বৈশিষ্ট্য প্রাপ্ত করতে ব্যর্থ: %s" +- +-#~| msgid "Cannot create CMS Recipient information" +-#~ msgid "Cannot retrieve calendar scheduling information: %s" +-#~ msgstr "বর্ষপঞ্জির সময়তালিকার তথ্য প্রাপ্ত করতে ব্যর্থ: %s" +- +-#~| msgid "Cannot save calendar data" +-#~ msgid "Cannot discard calendar alarm: %s" +-#~ msgstr "বর্ষপঞ্জির অ্যালার্ম বর্জন করা সম্ভব নয়: %s" +- +-#~ msgid "Cannot retrieve default calendar object path: %s" +-#~ msgstr "বর্ষপঞ্জির ডিফল্ট অবজেক্টের পাথ প্রাপ্ত করতে ব্যর্থ: %s" +- +-#~| msgid "Could not open cache directory: %s" +-#~ msgid "Could not complete calendar query: %s" +-#~ msgstr "বর্ষপঞ্জির অনুসন্ধান পূর্ণ করা সম্ভব হয়নি: %s" +- +-#~| msgid "Could not send message: %s" +-#~ msgid "Could not set default calendar time zone: %s" +-#~ msgstr "বর্ষপঞ্জির ডিফল্ট সময়ের অঞ্চল নির্ধারণ করা যায়নি: %s" +- +-#~| msgid "Cannot create folder: %s: %s" +-#~ msgid "Cannot retrieve calendar changes: %s" +-#~ msgstr "বর্ষপঞ্জির পরিবর্তনগুলি প্রাপ্ত করা সম্ভব হয়নি: %s" +- +-#~| msgid "Invalid server URI" +-#~ msgid "Invalid URI" +-#~ msgstr "URI বৈধ নয়" +- +-#~| msgid "Could not create cache file" +-#~ msgid "Could not instantiate backend" +-#~ msgstr "ব্যাক-এন্ড আরম্ভ করতে ব্যর্থ" +- +-#~| msgid "No such message available." +-#~ msgid "No stream available" +-#~ msgstr "কোনো স্ট্রিম উপলব্ধ নেই" +- +-#~ msgid "URL '%s' needs a username component" +-#~ msgstr "URL '%s'-র সাথে ব্যবহারকারীর নাম (username) উল্লেখ করা আবশ্যক" +- +-#~ msgid "URL '%s' needs a host component" +-#~ msgstr "URL '%s'-র সাথে হোস্ট (host) উল্লেখ করা আবশ্যক" +- +-#~ msgid "URL '%s' needs a path component" +-#~ msgstr "URL '%s'-র সাথে পাথ (path) উল্লেখ করা আবশ্যক" +- +-#~ msgid "" +-#~ "Could not create directory %s:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "%s ডিরেক্টরি নির্মাণ করতে ব্যর্থ:\n" +-#~ "%s" +- +-#~ msgid "" +-#~ "SSL Certificate check for %s:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "Do you wish to accept?" +-#~ msgstr "" +-#~ "SSL Certificate check for %s'র জন্য SSL সার্টিফিকেট পরীক্ষণ:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "তথাপি গ্রহণ করা হবে কি?" +- +-#~| msgid "Checking for new messages" +-#~ msgid "Checking for deleted messages %s" +-#~ msgstr "মুছে ফেলা বার্তার উপস্থিতি পরীক্ষা করা হচ্ছে %s" +- +-#~ msgid "Could not get message" +-#~ msgstr "বার্তা প্রাপ্ত করতে ব্যর্থ" +- +-#~ msgid "Cannot append message to folder '%s': %s" +-#~ msgstr "'%s' ফোল্ডারের শেষে বার্তা যোগ করা যায়নি: %s" +- +-#~ msgid "Cannot create message: %s" +-#~ msgstr "বার্তা নির্মাণ করতে ব্যর্থ: %s" +- +-#~ msgid "" +-#~ "Cannot get message: %s\n" +-#~ " %s" +-#~ msgstr "" +-#~ "বার্তা প্রাপ্ত করতে ব্যর্থ: %s\n" +-#~ " %s" +- +-#~ msgid "This message is not available in offline mode." +-#~ msgstr "অফ-লাইন অবস্থায় এই বার্তাটি উপলব্ধ নেই।" +- +-#~ msgid "Cannot get folder container %s" +-#~ msgstr "ফোল্ডার ধারণকারী %s প্রাপ্ত করতে ব্যর্থ" +- +-#~ msgid "Cannot append message in offline mode: cache unavailable" +-#~ msgstr "অফ-লাইন অবস্থায় বার্তা যোগ করতে ব্যর্থ: ক্যাশে উপলব্ধ নেই" +- +-#~| msgid "Cannot append message in offline mode: %s" +-#~ msgid "Cannot append message in offline mode: " +-#~ msgstr "অফ-লাইন অবস্থায় বার্তা যোগ করতে ব্যর্থ: " +- +-#~ msgid "Checking for new mail" +-#~ msgstr "নতুন বার্তার উপস্থিতি পরীক্ষা করা হচ্ছে" +- +-#~ msgid "Check new messages for J_unk contents" +-#~ msgstr "নতুন বার্তার মধ্যে অবাঞ্ছিত বার্তা পরীক্ষা করা হবে(_u)" +- +-#~ msgid "Automatically synchroni_ze account locally" +-#~ msgstr "স্বয়ংক্রিয়ভাবে স্থানীয়রূপে অ্যাকাউন্ট সুসংগত করা হবে(_z)" +- +-#~ msgid "SOAP Settings" +-#~ msgstr "SOAP'র বৈশিষ্ট্য" +- +-#~ msgid "Post Office Agent SOAP _Port:" +-#~ msgstr "Post Office Agent SOAP পোর্ট: (_P)" +- +-#~ msgid "Novell GroupWise" +-#~ msgstr "Novell GroupWise" +- +-#~ msgid "For accessing Novell GroupWise servers" +-#~ msgstr "Novell GroupWise সার্ভার ব্যবহারের উদ্দেশ্যে" +- +-#~ msgid "" +-#~ "This option will connect to the GroupWise server using a plaintext " +-#~ "password." +-#~ msgstr "" +-#~ "এই বিকল্পের ফলে একটি প্লেইন-টেক্সট পাসওয়ার্ড সহযোগে GroupWise সার্ভারের সাথে " +-#~ "সংযোগ করা হবে।" +- +-#~ msgid "Host or user not available in url" +-#~ msgstr "url'র মধ্যে হোস্ট অথবা ব্যবহারকারী উপলব্ধ নয়" +- +-#~ msgid "You did not enter a password." +-#~ msgstr "পাসওয়ার্ড উল্লেখ করা হয়নি।" +- +-#~ msgid "" +-#~ "Some features may not work correctly with your current server version" +-#~ msgstr "" +-#~ "বর্তমানে ব্যবহৃত সার্ভারের সংস্করণের সাথে কয়েকটি বৈশিষ্ট্য সঠিকরূপে না চলার " +-#~ "সম্ভাবনা রয়েছে" +- +-#~ msgid "Cannot create GroupWise folders in offline mode." +-#~ msgstr "অফ-লাইন অবস্থায় GroupWise ফোল্ডার নির্মাণ করতে ব্যর্থ।" +- +-#~| msgid "Cannot delete folder '%s': Special folder" +-#~ msgid "Cannot create a special system folder" +-#~ msgstr "বিশেষ সিস্টেম ফোল্ডার নির্মাণ করতে ব্যর্থ" +- +-#~ msgid "Cannot rename GroupWise folder '%s' to '%s'" +-#~ msgstr "Groupwise ফোল্ডারের নাম '%s' থেকে '%s'-এ পরিবর্তন করা যাবে না" +- +-#~ msgid "GroupWise server %s" +-#~ msgstr "GroupWise সার্ভার %s" +- +-#~ msgid "GroupWise service for %s on %s" +-#~ msgstr "%s'র জন্য GroupWise পরিসেবা %s'র উপর" +- +-#~ msgid "GroupWise mail delivery via %s" +-#~ msgstr "%s'র মাধ্যমে GroupWise মেইল বণ্টনব্যবস্থা" +- +-#~ msgid "Sending Message" +-#~ msgstr "বার্তা প্রেরণ" +- +-#~ msgid "Cannot get folder: Invalid operation on this store" +-#~ msgstr "ফোল্ডার প্রাপ্ত করতে ব্যর্থ: চিহ্নিত সংগ্রহস্থলের মধ্যে কর্ম বৈধ নয়" +- +-#~ msgid "" +-#~ "You have exceeded this account's storage limit. Your messages are queued " +-#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving " +-#~ "some of your mail.\n" +-#~ msgstr "" +-#~ "চিহ্নিত অ্যাকাউন্টে সংরক্ষণের সীমা অতিক্রান্ত। আপনার বার্তাগুলি আউটবক্সের মধ্যে " +-#~ "অপেক্ষারত। কিছু বার্তা অন্যত্র স্থানাতর করে অথবা মুছে ফেলে, প্রেরণ/প্রাপ্তি বাটন " +-#~ "টিপে বার্তাগুলি পুনরায় প্রেরণের প্রচেষ্টা করুন।\n" +- +-#~ msgid "Could not send message: %s" +-#~ msgstr "বার্তা প্রেরণ করতে ব্যর্থ: %s" +- +-#~ msgid "_Apply filters to new messages in INBOX on this server" +-#~ msgstr "চিহ্নিত সার্ভারের ইনবক্স সার্ভারের নতুন বার্তায় ফিল্টার প্রয়োগ করা হবে (_A)" +- +-#~ msgid "Check new messages for Jun_k contents" +-#~ msgstr "নতুন বার্তার মধ্যে অবাঞ্ছিত বার্তা পরীক্ষা করা হবে (_k)" +- +-#~ msgid "Could not connect to %s: %s" +-#~ msgstr "%s'র সাথে সংযোগ করতে ব্যর্থ: %s" +- +-#~ msgid "SSL unavailable" +-#~ msgstr "SSL উপলব্ধ নয়" +- +-#~ msgid "SSL negotiations failed" +-#~ msgstr "SSL মীমাংসা করতে ব্যর্থ" +- +-#~ msgid "SSL is not available in this build" +-#~ msgstr "বর্তমান বিল্ডের মধ্যে SSL উপলব্ধ নয়" +- +-#~ msgid "Use I_dle if the server supports it" +-#~ msgstr "সার্ভার দ্বারা সমর্থিত হলে Idle ব্যবহার করা হবে (_d)" +- +-#~| msgid "Could not connect to %s (port %s): %s" +-#~ msgid "Could not connect to %s (port %s): " +-#~ msgstr "%s-র (পোর্ট %s) সাথে সংযোগ করতে ব্যর্থ" +- +-#~ msgid "Authentication requested but no username provided" +-#~ msgstr "অনুমোদনের অনুরোধ জানানো হয়েছে কিন্তু ব্যবহারকারীর না উল্লিখিত হয়নি" +- +-#~ msgid "TLS negotiations failed" +-#~ msgstr "TLS মীমাংসা করতে ব্যর্থ" +- +-#~ msgid "TLS is not available in this build" +-#~ msgstr "বর্তমান বিল্ডে TLS সমর্থিত নয়" +- +-#~ msgid "" +-#~ "Unable to connect to POP server %s: No support for requested " +-#~ "authentication mechanism." +-#~ msgstr "" +-#~ "POP সার্ভার %s'র সাথে সংযোগ করতে ব্যর্থ: অনুরোধ করার অনুমোদন প্রণালী সমর্থিত নয়।" +- +-#~| msgid "SASL '%s' Login failed for POP server %s: %s" +-#~ msgid "SASL '%s' Login failed for POP server %s%s" +-#~ msgstr "SASL '%s' লগ-ইন, POP সার্ভার %s%s-4 ক্ষেত্রে বিফল" +- +-#~| msgid "" +-#~| "Unable to connect to POP server %s.\n" +-#~| "Error sending password: %s" +-#~ msgid "" +-#~ "Unable to connect to POP server %s.\n" +-#~ "Error sending password%s" +-#~ msgstr "" +-#~ "POP সার্ভার %s-র সাথে সংযোগ করতে ব্যর্থ।\n" +-#~ "পাসওয়ার্ড পাঠাতে ত্রুটি%s" +- +-#~ msgid "" +-#~ "Unable to authenticate to SMTP server.\n" +-#~ "%s\n" +-#~ "\n" +-#~ msgstr "" +-#~ "SMTP সার্ভারে অনুমোদন করতে ব্যর্থ।\n" +-#~ "%s\n" +-#~ "\n" +- +-#~ msgid "Error creating SASL authentication object." +-#~ msgstr "SASL অনুমোদনের অবজেক্ট নির্মাণ করতে ব্যর্থ।" +- +-#~ msgid "_Edit" +-#~ msgstr "সম্পাদনা (_E)" +- +-#~ msgid "Invalid connection" +-#~ msgstr "অবৈধ সংযোগ" +- +-#~ msgid "Invalid response from server" +-#~ msgstr "সার্ভার থেকে অপ্রত্যাশিত প্রত্যুত্তর" +- +-#~ msgid "Bad parameter" +-#~ msgstr "ভুল পরামিতি" +- +-#~ msgid "\"%s\" on book before \"%s\"" +-#~ msgstr "বইয়ের মধ্যে \"%s\", \"%s\"'র পূর্বে উপস্থিত" +- +-#~ msgid "book busy" +-#~ msgstr "বই বর্তমানে ব্যস্ত" +- +-#~ msgid "CORBA exception making \"%s\" call" +-#~ msgstr "\"%s\" কল করার সময় CORBA এক্সেপশন" +- +-#~ msgid "%s: there is no current operation" +-#~ msgstr "%s: বর্তমানে কোনো কর্ম উপস্থিত নেই" +- +-#~ msgid "\"%s\" on book after \"%s\"" +-#~ msgstr "বইয়ের মধ্যে \"%s\", \"%s\"'র পরে" +- +-#~ msgid "%s: canceled" +-#~ msgstr "%s: বাতিল করা হয়েছে" +- +-#~ msgid "%s: no factories available for URI `%s'" +-#~ msgstr "%s: URI `%s'-র জন্য ফ্যাক্টরি উপস্থিত নেই" +- +-#~ msgid "%s: Could not create EBookListener" +-#~ msgstr "%s: EBookListener নির্মাণ করতে ব্যর্থ" +- +-#~ msgid "%s: there was no self contact UID stored in gconf" +-#~ msgstr "%s: gconf-এ নিজস্ব যোগাযোগের UID উপস্থিত নেই" +- +-#~ msgid "Could not create thread for getting deltas" +-#~ msgstr "delta প্রাপ্ত করার জন্য থ্রেড নির্মাণ করা যায়নি" +- +-#~ msgid "Cannot open message" +-#~ msgstr "বার্তা খোলা যায়নি" +- +-#~ msgid "Unsupported operation: append message: for %s" +-#~ msgstr "অসমর্থিত কর্ম: বার্তা যোগ করা হবে: %s'র জন্য" +- +-#~ msgid "Unsupported operation: search by expression: for %s" +-#~ msgstr "অসমর্থিত কর্ম: এক্সপ্রেশন অনুযায়ী অনুসন্ধান করা হবে: %s'র জন্য" +- +-#~| msgid "Unsupported operation: search by expression: for %s" +-#~ msgid "Unsupported operation: count by expression: for %s" +-#~ msgstr "অসমর্থিত কর্ম: এক্সপ্রেশন অনুযায়ী গণনা করা হবে: %s-র জন্য" +- +-#~ msgid "Unsupported operation: search by UIDs: for %s" +-#~ msgstr "অসমর্থিত কর্ম: UID অনুসারে অনুসন্ধান করা হবে: %s'র জন্য" +- +-#~ msgid "Learning junk" +-#~ msgstr "অবাঞ্চিত বার্তার পরিচয়" +- +-#~ msgid "Learning non-junk" +-#~ msgstr "বাঞ্চিত বার্তার পরিচয়" +- +-#~ msgid "Canceled." +-#~ msgstr "বাতিল করা হয়েছে।" +- +-#~ msgid "This is a digitally signed message part" +-#~ msgstr "এটি ডিজিটাল রূপে স্বাক্ষরিত বার্তার অংশ" +- +-#~ msgid "Cannot verify message signature: could not create temp file: %s" +-#~ msgstr "বার্তার স্বাক্ষর পরীক্ষা করতে ব্যর্থ: অস্থায়ী ফাইল নির্মাণ করতে ব্যর্থ: %s" +- +-#~ msgid "Unable to parse message content" +-#~ msgstr "বার্তার বিষয় বস্তু পার্স করতে ব্যর্থ" +- +-#~ msgid "cannot create thread" +-#~ msgstr "থ্রেড নির্মাণ করতে ব্যর্থ" +- +-#~ msgid "Kerberos 4" +-#~ msgstr "Kerberos 4" +- +-#~ msgid "" +-#~ "This option will connect to the server using Kerberos 4 authentication." +-#~ msgstr "" +-#~ "এই বিকল্পের ফলে Kerberos 4 অনুমোদন সহযোগে সার্ভারের সাথে সংযোগ করা হবে।" +- +-#~ msgid "" +-#~ "Could not get Kerberos ticket:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "Kerberos টিকেট প্রাপ্ত করতে ব্যর্থ:\n" +-#~ "%s" +- +-#~ msgid "Camel session doesn't support forwarding of a message." +-#~ msgstr "Camel সেশান দ্বারা বার্তা অনুবর্তন ব্যবস্থা সমর্থিত হয় না।" +- +-#~ msgid "import keys: unimplemented" +-#~ msgstr "কি ইম্পোর্ট করা হবে: বাস্তবায়িত হয়নি" +- +-#~ msgid "export keys: unimplemented" +-#~ msgstr "কি এক্সপোর্ট করা হবে: বাস্তবায়িত হয়নি" +- +-#~ msgid "Cannot create folder: Invalid operation on this store" +-#~ msgstr "ফোল্ডার নির্মাণ করতে ব্যর্থ: চিহ্নিত অবস্থানের মধ্যে অবৈধ কর্ম" +- +-#~ msgid "Unable to get issuer's certificate" +-#~ msgstr "প্রকাশকের সার্টিফিকেট প্রাপ্ত করতে ব্যর্থ" +- +-#~ msgid "Unable to get Certificate Revocation List" +-#~ msgstr "সার্টিফিকেট প্রত্যাখ্যান তালিকা প্রাপ্ত করতে ব্যর্থ" +- +-#~ msgid "Unable to decrypt certificate signature" +-#~ msgstr "সার্টিফিকেটের স্বাক্ষর ডি-ক্রিপ্ট করতে ব্যর্থ" +- +-#~ msgid "Unable to decrypt Certificate Revocation List signature" +-#~ msgstr "সার্টিফিকের প্রত্যাখ্যান তালিকার স্বাক্ষর ডিক্রিপ্ট করতে ব্যর্থ" +- +-#~ msgid "Unable to decode issuer's public key" +-#~ msgstr "প্রকাশকের সার্বজনীন-কি ডিকোড করতে ব্যর্থ" +- +-#~ msgid "Certificate signature failure" +-#~ msgstr "সার্টিফিকেট স্বাক্ষর করতে ব্যর্থ" +- +-#~ msgid "Certificate Revocation List signature failure" +-#~ msgstr "সার্টিফিকেট প্রত্যাখ্যান তালিকার স্বাক্ষর ব্যর্থ" +- +-#~ msgid "Certificate not yet valid" +-#~ msgstr "সার্টিফিকেট এই মুহূর্তে বৈধ নয়" +- +-#~ msgid "Certificate has expired" +-#~ msgstr "সার্টিফিকেটের মেয়াদ উত্তীর্ণ হয়েছে" +- +-#~ msgid "CRL not yet valid" +-#~ msgstr "CRL এই মুহূর্তে বৈধ নয়" +- +-#~ msgid "CRL has expired" +-#~ msgstr "CRL'র মেয়াদ উত্তীর্ণ হয়েছে" +- +-#~ msgid "Error in CRL" +-#~ msgstr "CRL জড়িত ত্রুটি" +- +-#~ msgid "Out of memory" +-#~ msgstr "মেমরি অবশিষ্ট নেই" +- +-#~ msgid "Zero-depth self-signed certificate" +-#~ msgstr "জিরো-ডেপ্‌ত স্বয়ং স্বাক্ষরিত সার্টিফিকেট" +- +-#~ msgid "Self-signed certificate in chain" +-#~ msgstr "চেইনের মধ্যে স্বয়ং-স্বাক্ষরিত সার্টিফিকেট" +- +-#~ msgid "Unable to get issuer's certificate locally" +-#~ msgstr "প্রকাশকের সার্টিফিকেট স্থানীয়রূপে প্রাপ্ত করতে ব্যর্থ" +- +-#~ msgid "Unable to verify leaf signature" +-#~ msgstr "লিফ স্বাক্ষরের যথার্ততা পরীক্ষা করতে ব্যর্থ" +- +-#~ msgid "Certificate chain too long" +-#~ msgstr "সার্টিফিকেট চেইন অত্যাধিক লম্বা" +- +-# নাকী প্রতীক ?? +-#~ msgid "Certificate Revoked" +-#~ msgstr "সার্টিফিকেট প্রত্যাখ্যান করা হয়েছে" +- +-#~ msgid "Invalid Certificate Authority (CA)" +-#~ msgstr "অবৈধ সার্টিফিকেট অথোরিটি (CA)" +- +-#~ msgid "Path length exceeded" +-#~ msgstr "পাথের নির্ধারিত দৈর্ঘ্য অতিক্রান্ত হয়েছে" +- +-#~ msgid "Invalid purpose" +-#~ msgstr "অবৈধ উদ্দেশ্য" +- +-#~ msgid "Certificate untrusted" +-#~ msgstr "সার্টিফিকেট বিশ্বাসযোগ্য নয়" +- +-#~ msgid "Certificate rejected" +-#~ msgstr "সার্টিফিকেট প্রত্যাখিত" +- +-#~ msgid "Subject/Issuer mismatch" +-#~ msgstr "প্রাপক/প্রকাশকের মধ্যে গরমিল" +- +-#~ msgid "AKID/SKID mismatch" +-#~ msgstr "AKID/SKID গরমিল" +- +-#~ msgid "AKID/Issuer serial mismatch" +-#~ msgstr "AKID/প্রকাশক সিরিয়াল গরমিল" +- +-#~ msgid "Error in application verification" +-#~ msgstr "অ্যাপ্লিকেশন পরীক্ষণে সমস্যা" +- +-#~ msgid "" +-#~ "Bad certificate from %s:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "Do you wish to accept anyway?" +-#~ msgstr "" +-#~ "%s থেকে ভুল সার্টিফিকেট প্রাপ্ত হয়েছে:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "তথাপি গ্রহণ করা হবে কি?" +- +-#~ msgid "User canceled" +-#~ msgstr "ব্যবহারকারী দ্বারা বাতিল করা হয়েছে" +- +-#~ msgid "Trash Folder Full. Please Empty." +-#~ msgstr "আবর্জনার বাক্স পূর্ণ হয়ে গেছে। অনুগ্রহ করে সেটি ফাঁকা করুন।" +- +-#~ msgid "Hula" +-#~ msgstr "Hula" +- +-#~ msgid "For accessing Hula servers" +-#~ msgstr "Hula সার্ভার ব্যবহারের উদ্দেশ্যে" +- +-#~ msgid "" +-#~ "This option will connect to the Hula server using a plaintext password." +-#~ msgstr "" +-#~ "এই বিকল্পের ফলে একটি প্লেইন-টেক্সট পাসওয়ার্ড সহযোগে Hula সার্ভারের সাথে সংযোগ " +-#~ "করা হবে।" +- +-#~ msgid "Unexpected response status '%s' after APPEND command" +-#~ msgstr "APPEND কমান্ডের পরে অপ্রত্যাশিত প্রতিক্রিয়ার অবস্থা '%s'" +- +-#~ msgid "No response on continuation after APPEND command" +-#~ msgstr "APPEND কমান্ডের পরে কর্ম অগ্রসরের উদ্দেশ্যে কোনো প্রতিক্রিয়া প্রাপ্ত হয়নি" +- +-#~ msgid "Unknown error occurred during APPEND command!" +-#~ msgstr "APPEND কমান্ড সঞ্চালনকালে অজানা ত্রুটি দেখা দিয়েছে!" +- +-#~ msgid "Drafts" +-#~ msgstr "খসড়া" +- +-#~ msgid "Sent" +-#~ msgstr "প্রেরিত" +- +-#~ msgid "Templates" +-#~ msgstr "টেমপ্লেট" +- +-#~ msgid "Failed sending command to IMAP server %s: %s" +-#~ msgstr "IMAP সার্ভার %s'এ কমান্ড প্রেরণ করতে ব্যর্থ: %s" +- +-#~ msgid "Unexpected response from IMAP4 server %s: %s" +-#~ msgstr "IMAP4 সার্ভার %s থেকে অপ্রত্যাশিত প্রতিক্রিয়া প্রাপ্ত হয়েছে: %s" +- +-#~ msgid "Unexpected greeting from IMAP server %s." +-#~ msgstr "IMAP সার্ভার %s থেকে অপ্রত্যাশিত অভিবাদন প্রাপ্ত হয়েছে।" +- +-#~ msgid "Cannot select folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' ফোল্ডার নির্বাচন করতে ব্যর্থ: মেইল-বক্সের নাম বৈধ নয়" +- +-#~ msgid "Cannot select folder '%s': Bad command" +-#~ msgstr "'%s' ফোল্ডার নির্বাচন করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Failed to send command to IMAP server %s: %s" +-#~ msgstr "IMAP সার্ভার %s'এ কমান্ড প্রেরণ করতে ব্যর্থ: %s" +- +-#~ msgid "IMAP4 server %s unexpectedly disconnected: %s" +-#~ msgstr "IMAP4 সার্ভার %s'র সাথে অপ্রত্যাশিতভাবে সংযোগ বিচ্ছিন্ন হয়েছে: %s" +- +-#~ msgid "" +-#~ "Enable extended Mailing-List detection required for some filter and " +-#~ "vFolder rules" +-#~ msgstr "" +-#~ "কয়েকটি ফিল্টার অথবা vFolder নিয়মের জন্য মেইলিং-লিস্ট সনাক্তকরণের উন্নত ব্যবস্থা " +-#~ "সক্রিয় করুন" +- +-#~ msgid "Expire cached messages that haven't been read in X seconds" +-#~ msgstr "" +-#~ "X সেকেন্ডের মধ্যে পাঠ না হওয়া ক্যাশের বার্তাগুলিকে মেয়াদোত্তীর্ণ রূপে ধার্য করা হবে" +- +-#~ msgid "Expire cached messages older than X seconds" +-#~ msgstr "" +-#~ "X সেকেন্ডের থেকে পুরোনো ক্যাশের বার্তাগুলিকে মেয়াদোত্তীর্ণ রূপে ধার্য করা হবে" +- +-#~ msgid "Cannot access folder '%s': %s" +-#~ msgstr "'%s' ফোল্ডার ব্যবহার করতে ব্যর্থ: %s" +- +-#~ msgid "Cannot sync flags to folder '%s': Unknown error" +-#~ msgstr "ফোল্ডার '%s'-র সাথে ফ্ল্যাগ সুসংগত (sync) করতে ব্যর্থ: অজানা কারণ" +- +-#~ msgid "Cannot sync flags to folder '%s': Bad command" +-#~ msgstr "ফোল্ডার '%s'-র সাথে ফ্ল্যাগ সুসংগত (sync) করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot expunge folder '%s': Unknown error" +-#~ msgstr "'%s' ফোল্ডারের বিষয়বস্তু স্থায়ীরূপে বর্জন করতে ব্যর্থ: অজানা কারণ" +- +-#~ msgid "Cannot expunge folder '%s': Bad command" +-#~ msgstr "'%s' ফোল্ডারের বিষয়বস্তু স্থায়ীরূপে বর্জন করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot get message %s from folder '%s': No such message" +-#~ msgstr "বার্তা %s, ফোল্ডার '%s' থেকে প্রাপ্ত করতপ ব্যর্থ: এই ধরনের বার্তা অনুপস্থিত" +- +-#~ msgid "Cannot get message %s from folder '%s': Bad command" +-#~ msgstr "বার্তা %s, ফোল্ডার '%s' থেকে প্রাপ্ত করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot append message to folder '%s': Folder is read-only" +-#~ msgstr "ফোল্ডার '%s'-র শেষে বার্তা যোগ করতে ব্যর্থ: ফোল্ডার শুধুমাত্র পাঠযোগ্য" +- +-#~ msgid "Cannot append message to folder '%s': Unknown error" +-#~ msgstr "ফোল্ডার '%s'-র শেষে বার্তা যোগ করতে ব্যর্থ: অজানা সমস্যা" +- +-#~ msgid "Cannot append message to folder '%s': Bad command" +-#~ msgstr "ফোল্ডার '%s'-র শেষে বার্তা যোগ করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" +-#~ msgstr "ফোল্ডার '%s' থেকে '%s' ফোল্ডারে বার্তা স্থানান্তর করতে ব্যর্থ: অজানা কারণ" +- +-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" +-#~ msgstr "ফোল্ডার '%s' থেকে '%s' ফোল্ডারে বার্তা কপি করতে ব্যর্থ: অজানা কারণ" +- +-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command" +-#~ msgstr "" +-#~ "ফোল্ডার '%s' থেকে '%s' ফোল্ডারে বার্তা স্থানান্তর করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command" +-#~ msgstr "ফোল্ডার '%s' থেকে '%s' ফোল্ডারে বার্তা কপি করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Only check for Junk messa_ges in the INBOX folder" +-#~ msgstr "ইনবক্স ফোল্ডারের মধ্যে শুধুমাত্র অবাঞ্ছিত বার্তা পরীক্ষা করা হবে (_g)" +- +-#~ msgid "IMAP4rev1" +-#~ msgstr "IMAP4rev1" +- +-#~ msgid "For reading and storing mail on IMAPv4rev1 servers." +-#~ msgstr "IMAPv4rev1 সার্ভারে বার্তা পড়ার ও সংরক্ষণের উদ্দেশ্যে।" +- +-#~ msgid "" +-#~ "This option will connect to the IMAPv4rev1 server using a plaintext " +-#~ "password." +-#~ msgstr "" +-#~ "এই বিকল্পের ফলে একটি প্লেইন-টেক্সট পাসওয়ার্ড সহযোগে IMAPv4rev1 সার্ভারের সাথে " +-#~ "সংযোগ করা হবে।" +- +-#~ msgid "" +-#~ "Failed to connect to IMAP server %s in secure mode: Server does not " +-#~ "support STARTTLS" +-#~ msgstr "" +-#~ "নিরাপদ মোডে IMAP সার্ভার %s'র সাথে সংযোগ করতে ব্যর্থ: সার্ভার দ্বারা STARTTLS " +-#~ "সমর্থন করা হয় না" +- +-#~ msgid "" +-#~ "Cannot authenticate to IMAP server %s using the %s authentication " +-#~ "mechanism" +-#~ msgstr "IMAP সার্ভার %s'র মধ্যে %s অনুমোদন প্রণালী সহযোগে অনুমোদন করতে ব্যর্থ" +- +-#~ msgid "Cannot authenticate to IMAP server %s using %s" +-#~ msgstr "IMAP সার্ভার %s'র মধ্যে %s সহযোগে অনুমোদন করতে ব্যর্থ" +- +-#~ msgid "Cannot create IMAP folders in offline mode." +-#~ msgstr "অফ-লাইন অবস্থায় IMAP ফোল্ডার নির্মাণ করতে ব্যর্থ।" +- +-#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error" +-#~ msgstr "'%s' নামক ফোল্ডারটি IMAP সার্ভার %s থেকে প্রাপ্ত করতে ব্যর্থ: অজানা কারণ" +- +-#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s" +-#~ msgstr "'%s'-র জন্য IMAP সার্ভার %s থেকে LIST সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s" +- +-#~ msgid "Bad command" +-#~ msgstr "কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot create folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' ফোল্ডার নির্মাণ করতে ব্যর্থ: মেইল-বক্সের নাম বৈধ নয়" +- +-#~ msgid "Cannot create folder '%s': Bad command" +-#~ msgstr "'%s' ফোল্ডার নির্মাণ করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot delete IMAP folders in offline mode." +-#~ msgstr "অফ-লাইন অবস্থায় IMAP ফোল্ডার মুছে ফেলা যাবে না।" +- +-#~ msgid "Cannot delete folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' ফোল্ডার মুছে ফেলতে ব্যর্থ: মেইল-বক্সের নাম বৈধ নয়" +- +-#~ msgid "Cannot delete folder '%s': Bad command" +-#~ msgstr "'%s' ফোল্ডার মুছে ফেলতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot rename folder '%s' to '%s': Special folder" +-#~ msgstr "ফোল্ডারের নাম '%s' থেকে '%s'-এ পরিবর্তন করা যাবে না: বিশেষ ফোল্ডার" +- +-#~ msgid "Cannot rename IMAP folders in offline mode." +-#~ msgstr "অফ-লাইন অবস্থায় IMAP ফোল্ডারের নাম পরিবর্তন করা যাবে না।" +- +-#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name" +-#~ msgstr "" +-#~ "ফোল্ডারের নাম '%s' থেকে '%s'-এ পরিবর্তন করা যাবে না: মেইল-বক্সের নাম বৈধ নয়" +- +-#~ msgid "Cannot rename folder '%s' to '%s': Bad command" +-#~ msgstr "ফোল্ডারের নাম '%s' থেকে '%s'-এ পরিবর্তন করা যাবে না: কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" +-#~ msgstr "%s তথ্য, '%s' বিন্যাস সংক্রান্ত IMAP সার্ভার %s থেকে প্রাপ্ত করতে ব্যর্থ: %s" +- +-#~ msgid "Cannot subscribe to IMAP folders in offline mode." +-#~ msgstr "অফ-লাইন অবস্থায় IMAP ফোল্ডারের সাব-স্ক্রাইব করা সম্ভব নয়।" +- +-#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' ফোল্ডারে সাব-স্ক্রাইব করতে ব্যর্থ: মেইল-বক্সের নাম বৈধ নয়" +- +-#~ msgid "Cannot subscribe to folder '%s': Bad command" +-#~ msgstr "'%s' ফোল্ডারে সাব-স্ক্রাইব করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Cannot unsubscribe from IMAP folders in offline mode." +-#~ msgstr "অফ-লাইন অবস্থায় IMAP ফোল্ডার থেকে আন-সাবস্ক্রাইব করা সম্ভব নয়।" +- +-#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' ফোল্ডারে আন-সাবস্ক্রাইব করতে ব্যর্থ: মেইল-বক্সের নাম বৈধ নয়" +- +-#~ msgid "Cannot unsubscribe from folder '%s': Bad command" +-#~ msgstr "'%s' ফোল্ডারে আন-সাবস্ক্রাইব করতে ব্যর্থ: কমান্ড সঠিক নয়" +- +-#~ msgid "Scanning for changed messages" +-#~ msgstr "পরিবর্তিত বার্তা পরীক্ষা করা হচ্ছে" +- +-#~ msgid "IMAP server %s is in an inconsistent state." +-#~ msgstr "IMAP সার্ভার %s বিসংগত অবস্থায় রয়েছে।" +- +-#~ msgid "Fetching envelopes of new messages" +-#~ msgstr "নতুন বার্তার খাম প্রাপ্ত করা হচ্ছে" +- +-#~ msgid "Unexpected token in response from IMAP server %s: " +-#~ msgstr "IMAP সার্ভার %s থেকে প্রাপ্ত প্রত্যুত্তরের মধ্যে অপ্রত্যাশিত টোকেন উপস্থিত: " +- +-#~ msgid "No data" +-#~ msgstr "তথ্যবিহীন" +- +-#~ msgid "IMAP server %s unexpectedly disconnected: %s" +-#~ msgstr "IMAP সার্ভার %s'র সাথেত অপ্রত্যাশিতভাবে সংযোগ বিচ্ছিন্ন হয়েছে: %s" +- +-#~ msgid "" +-#~ "Experimental IMAP 4(.1) client\n" +-#~ "This is untested and unsupported code, you want to use plain imap " +-#~ "instead.\n" +-#~ "\n" +-#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n" +-#~ msgstr "" +-#~ "পরীক্ষামূলক IMAP 4(.1) ক্লায়েন্ট\n" +-#~ "এই কোড পরীক্ষা করা হয়নি ও এর জন্য কোনো ধরনের সহায়তা উপলব্ধ নয়। পরিবর্তে " +-#~ "সাধারণ imap ব্যবহার করুন।\n" +-#~ "\n" +-#~ " !!! প্রধান কর্ম ক্ষেত্র সংক্রান্ত বার্তা প্রেরণের জন্য এটি ব্যবহার করবেন না !!!\n" +- +-#~ msgid "Could not connect to POP server on %s" +-#~ msgstr "%s'র উপর POP সার্ভারের সাথে সংযোগ করতে ব্যর্থ" +- +-#~ msgid "Maildir append message canceled" +-#~ msgstr "Maildir'এ বার্তা যোগ কর্ম বাতিল করা হয়েছে" +- +-#~ msgid "Invalid message contents" +-#~ msgstr "বার্তার বিষয়বস্তু বৈধ নয়" +- +-#~ msgid "Mail append canceled" +-#~ msgstr "মেইল সংযোজন বাতিল করা হয়েছে" +- +-#~ msgid "Message construction failed." +-#~ msgstr "বার্তা গঠন করতে ব্যর্থ।" +- +-#~ msgid "MH append message canceled" +-#~ msgstr "MH'এ বার্তা যোগ কর্ম বাতিল করা হয়েছে" +- +-#~ msgid "Use cancel" +-#~ msgstr "বাতিল ব্যবহার করুন" +- +-#~ msgid "STARTTLS command failed" +-#~ msgstr "STARTTLS কমান্ড সঞ্চালনে ব্যর্থ" +- +-#~ msgid "HELO command failed" +-#~ msgstr "HELO কমান্ড ব্যর্থ" +- +-#~ msgid "AUTH command failed" +-#~ msgstr "AUTH কমান্ড ব্যর্থ" +- +-#~ msgid "Bad authentication response from server.\n" +-#~ msgstr "সার্ভার থেকে অনুমোদন সংক্রান্ত প্রাপ্ত প্রতিক্রিয় সঠিক নয়।\n" +- +-#~ msgid "MAIL FROM command failed: %s: mail not sent" +-#~ msgstr "MAIL FROM কমান্ড ব্যর্থ: %s: মেইল পাঠানো হয়নি" +- +-#~ msgid "RCPT TO command failed: %s: mail not sent" +-#~ msgstr "RCPT TO কমান্ড ব্যর্থ: %s: মেইল পাঠানো হয়নি" +- +-#~ msgid "DATA command failed: %s: mail not sent" +-#~ msgstr "DATA কমান্ড ব্যর্থ: %s: মেইল পাঠানো হয়নি" +- +-#~ msgid "RSET command failed" +-#~ msgstr "RSET কমান্ড ব্যর্থ" +- +-#~ msgid "QUIT command failed" +-#~ msgstr "QUIT কমান্ড ব্যর্থ" +- +-#~ msgid "Item(s) belong to these _categories:" +-#~ msgstr "চিহ্নিত শ্রেণীর মধ্যে বস্তু অন্তর্ভুক্ত রয়েছে:(_c)" +- +-#~ msgid "categories" +-#~ msgstr "শ্রেণীবিভাগ" +- +-#~ msgid "Color Info" +-#~ msgstr "রং সংক্রান্ত তথ্য" +- +-#~ msgid "The color to render" +-#~ msgstr "রেন্ডার করার জন্য চিহ্নিত রং" +- +-#~ msgid "*" +-#~ msgstr "*" +- +-#~ msgid "Co_ntacts" +-#~ msgstr "পরিচিতি(_n)" +- +-#~ msgid "Show Contacts" +-#~ msgstr "পরিচিতি তালিকা প্রদর্শন করা হবে" +- +-#~ msgid "Enter password for %s" +-#~ msgstr "%s-র জন্য পাসওয়ার্ড লিখুন" +- +-#~ msgid "Owner" +-#~ msgstr "মালিক" +- +-#~ msgid "Publishing Editor" +-#~ msgstr "প্রকাশনাকারী সম্পাদক" +- +-#~ msgid "Editor" +-#~ msgstr "সম্পাদক" +- +-#~ msgid "Publishing Author" +-#~ msgstr "প্রকাশনাকারী লেখক" +- +-#~ msgid "Author" +-#~ msgstr "লেখক" +- +-#~ msgid "Non-editing Author" +-#~ msgstr "সম্পাদনকারী নয়" ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1271 ++#, c-format ++msgid "" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain an access token for '%s'" ++msgstr "" ++"org.gnome.OnlineAccounts পরিষেবায় একটি সংশ্লিষ্ট অ্যাকাউন্ট পাওয়া যায় না যার " ++"থেকে '%s' এর জন্য একটি অ্যাক্সেস টোকেন প্রাপ্ত করতে হবে" + +-#~ msgid "Reviewer" +-#~ msgstr "পরিদর্শক" ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1298 ++#, c-format ++msgid "Failed to obtain an access token for '%s': " ++msgstr "'%s' এর জন্য একটি অ্যাক্সেস টোকেন পাওয়া যায়নি: " + +-#~ msgid "Contributor" +-#~ msgstr "অংশগ্রহণকারী" ++#: ../modules/google-backend/module-google-backend.c:140 ++#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:200 ++msgid "Calendar" ++msgstr "বর্ষপঞ্জি" + +-#~ msgid "None" +-#~ msgstr "শূণ্য" ++#: ../modules/google-backend/module-google-backend.c:217 ++#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 ++#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 ++msgid "Contacts" ++msgstr "পরিচিতি" + +-#~ msgid "Custom" +-#~ msgstr "নিজস্ব" ++#: ../modules/trust-prompt/certificate-viewer.c:292 ++msgid "Not part of certificate" ++msgstr "সার্টিফিকেটের অংশ নয়" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:600 ++msgid "This certificate has been verified for the following uses:" ++msgstr "এই সার্টিফিকেট নিম্নলিখিত ব্যবহারের জন্য যাচাই করা হয়েছে:" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:604 ++#: ../modules/trust-prompt/e-asn1-object.c:387 ++msgid "SSL Client Certificate" ++msgstr "SSL ক্লায়েন্ট সার্টিফিকেট" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:609 ++#: ../modules/trust-prompt/e-asn1-object.c:391 ++msgid "SSL Server Certificate" ++msgstr "SSL সার্ভার সার্টিফিকেট" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:614 ++msgid "Email Signer Certificate" ++msgstr "ই-মেইল স্বাক্ষরকারী সার্টিফিকেট" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:619 ++msgid "Email Recipient Certificate" ++msgstr "ই-মেইল প্রাপকের সার্টিফিকেট" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:634 ++msgid "Issued To" ++msgstr "এর উদ্দেশ্যে জারি করা" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:635 ++#: ../modules/trust-prompt/certificate-viewer.c:641 ++msgid "Common Name (CN)" ++msgstr "Common Name (CN)" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:636 ++#: ../modules/trust-prompt/certificate-viewer.c:642 ++msgid "Organization (O)" ++msgstr "প্রতিষ্ঠান (O)" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:637 ++#: ../modules/trust-prompt/certificate-viewer.c:643 ++msgid "Organizational Unit (OU)" ++msgstr "প্রাতিষ্ঠানিক একক (OU)" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:638 ++#: ../modules/trust-prompt/e-asn1-object.c:134 ++msgid "Serial Number" ++msgstr "ক্রমিক সংখ্যা" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:640 ++msgid "Issued By" ++msgstr "জারি করেছে" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:645 ++msgid "Validity" ++msgstr "বৈধতা" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:646 ++msgid "Issued On" ++msgstr "প্রকাশনার তারিখ" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/certificate-viewer.c:647 ++msgid "Expires On" ++msgstr "মেয়াদপূর্তী" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/certificate-viewer.c:649 ++msgid "Fingerprints" ++msgstr "ফিঙ্গারপ্রিন্ট" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/certificate-viewer.c:650 ++msgid "SHA1 Fingerprint" ++msgstr "SHA1 ফিঙ্গারপ্রিন্ট" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/certificate-viewer.c:651 ++msgid "MD5 Fingerprint" ++msgstr "MD5 ফিঙ্গারপ্রিন্ট" ++ ++# auto translated by TM merge from project: RHEL Installation Guide, version: 5.10, DocId: Ksconfig ++#: ../modules/trust-prompt/certificate-viewer.c:653 ++msgid "General" ++msgstr "সাধারণ" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/certificate-viewer.c:672 ++msgid "Certificate Hierarchy" ++msgstr "সার্টিফিকেটের অনুক্রম" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/certificate-viewer.c:676 ++msgid "Certificate Fields" ++msgstr "সার্টিফিকেট ক্ষেত্র" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/certificate-viewer.c:680 ++msgid "Field Value" ++msgstr "ক্ষেত্রের নাম" ++ ++# auto translated by TM merge from project: rhsm-web, version: 0.0, DocId: management ++#: ../modules/trust-prompt/certificate-viewer.c:682 ++msgid "Details" ++msgstr "বিবরণ" ++ ++# auto translated by TM merge from project: RHEL Release Notes, version: 6.4, DocId: Component_Versions ++#: ../modules/trust-prompt/e-asn1-object.c:95 ++msgid "Version" ++msgstr "সংস্করণ" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:110 ++msgid "Version 1" ++msgstr "ভার্সান ১" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:113 ++msgid "Version 2" ++msgstr "ভার্সান ২" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:116 ++msgid "Version 3" ++msgstr "ভার্সান ৩" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:192 ++msgid "PKCS #1 MD2 With RSA Encryption" ++msgstr "PKCS #1 MD2 RSA এনক্রিপশনসহ" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:195 ++msgid "PKCS #1 MD5 With RSA Encryption" ++msgstr "PKCS #1 MD5 RSA এনক্রিপশনসহ" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:198 ++msgid "PKCS #1 SHA-1 With RSA Encryption" ++msgstr "PKCS #1 SHA-1 RSA এনক্রিপশন" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:201 ++msgid "PKCS #1 SHA-256 With RSA Encryption" ++msgstr "PKCS #1 SHA-256 RSA এনক্রিপশন সমেত" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:204 ++msgid "PKCS #1 SHA-384 With RSA Encryption" ++msgstr "PKCS #1 SHA-384 RSA এনক্রিপশন সমেত" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:207 ++msgid "PKCS #1 SHA-512 With RSA Encryption" ++msgstr "PKCS #1 SHA-512 RSA এনক্রিপশন সমেত" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:234 ++msgid "PKCS #1 RSA Encryption" ++msgstr "PKCS #1 RSA এনক্রিপশন" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:237 ++msgid "Certificate Key Usage" ++msgstr "সার্টিফিকেট কী (key)-র ব্যবহার" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:240 ++msgid "Netscape Certificate Type" ++msgstr "নেটস্কেপ সার্টিফিকেটের ধরন" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:243 ++msgid "Certificate Authority Key Identifier" ++msgstr "সার্টিফিকেট অথোরিটি কী পরিচয়কারী" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:255 ++#, c-format ++msgid "Object Identifier (%s)" ++msgstr "অবজেক্ট পরিচয়কারী (%s)" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:306 ++msgid "Algorithm Identifier" ++msgstr "অ্যালগোরিদম পরিচয়কারী" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:314 ++msgid "Algorithm Parameters" ++msgstr "অ্যাগোরিদমের পরামিতি" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:336 ++msgid "Subject Public Key Info" ++msgstr "চিহ্নিত পরিচিতির সার্বজনীন কী সংক্রান্ত তথ্য" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:341 ++msgid "Subject Public Key Algorithm" ++msgstr "চিহ্নিত পরিচিতির সার্বজনীন কী অ্যালগোরিদম" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:356 ++msgid "Subject's Public Key" ++msgstr "চিহ্নিত পরিচিতির সার্বজনীন কী" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:378 ++#: ../modules/trust-prompt/e-asn1-object.c:428 ++msgid "Error: Unable to process extension" ++msgstr "সমস্যা: এক্সটেনশন প্রসেস করতে ব্যর্থ" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:395 ++msgid "Email" ++msgstr "ই-মেইল" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:399 ++#: ../modules/trust-prompt/e-asn1-object.c:411 ++msgid "Object Signer" ++msgstr "অবজেক্ট স্বাক্ষরকারী" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:403 ++msgid "SSL Certificate Authority" ++msgstr "SSL সার্টিফিকেট অথোরিটি" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:407 ++msgid "Email Certificate Authority" ++msgstr "ই-মেইল সার্টিফিকেট অথোরিটি" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:436 ++msgid "Signing" ++msgstr "স্বাক্ষর করা হচ্ছে" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:440 ++msgid "Non-repudiation" ++msgstr "সুনিশ্চিত পরিচিতি" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:444 ++msgid "Key Encipherment" ++msgstr "কি সাইফার করার প্রক্রিয়া" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:448 ++msgid "Data Encipherment" ++msgstr "তথ্য সাইফার করার প্রক্রিয়া" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:452 ++msgid "Key Agreement" ++msgstr "কি (Key) সংক্রান্ত চুক্তি" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:456 ++msgid "Certificate Signer" ++msgstr "সার্টিফিকেট স্বাক্ষরকারী" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:460 ++msgid "CRL Signer" ++msgstr "CRL স্বাক্ষরকারী" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:509 ++msgid "Critical" ++msgstr "সংকটপূর্ণ" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:511 ++#: ../modules/trust-prompt/e-asn1-object.c:514 ++msgid "Not Critical" ++msgstr "সংকটপূর্ণ নয়" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:535 ++msgid "Extensions" ++msgstr "এক্সটেনশন" ++ ++#. Translators: This string is used in Certificate ++#. * details for fields like Issuer or Subject, which ++#. * shows the field name on the left and its respective ++#. * value on the right, both as stored in the ++#. * certificate itself. You probably do not need to ++#. * change this string, unless changing the order of ++#. * name and value. As a result example: ++#. * "OU = VeriSign Trust Network" ++#: ../modules/trust-prompt/e-asn1-object.c:615 ++#, c-format ++msgid "%s = %s" ++msgstr "%s = %s" ++ ++# auto translated by TM merge from project: Skynet topics, version: 1, DocId: 4732-84010 ++#: ../modules/trust-prompt/e-asn1-object.c:658 ++msgid "Certificate" ++msgstr "সার্টিফিকেট" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:674 ++#: ../modules/trust-prompt/e-asn1-object.c:812 ++msgid "Certificate Signature Algorithm" ++msgstr "সার্টিফিকেট স্বাক্ষরের অ্যালগোরিদম" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:683 ++msgid "Issuer" ++msgstr "ইসুকারী" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:714 ++msgid "Subject" ++msgstr "বিষয়" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:738 ++msgid "Issuer Unique ID" ++msgstr "প্রকাশকের নিজস্ব ID" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:757 ++msgid "Subject Unique ID" ++msgstr "পরিচিতির নিজস্ব ID" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/e-asn1-object.c:818 ++msgid "Certificate Signature Value" ++msgstr "সার্টিফিকেট স্বাক্ষরের মান" ++ ++# auto translated by TM merge from project: gnome-online-accounts, version: 3.8.2, DocId: gnome-online-accounts ++#: ../modules/trust-prompt/module-trust-prompt.c:201 ++msgid "The signing certificate authority is not known." ++msgstr "স্বাক্ষরকারী সার্টিফিকেট কর্তৃত্ব অজানা।" ++ ++# auto translated by TM merge from project: gnome-online-accounts, version: 3.8.2, DocId: gnome-online-accounts ++#: ../modules/trust-prompt/module-trust-prompt.c:203 ++msgid "" ++"The certificate does not match the expected identity of the site that it was " ++"retrieved from." ++msgstr "সার্টিফিকেট সাইটের প্রত্যাশিত পরিচয়ের সংগে মিলছে না।" ++ ++# auto translated by TM merge from project: gnome-online-accounts, version: 3.8.2, DocId: gnome-online-accounts ++#: ../modules/trust-prompt/module-trust-prompt.c:205 ++msgid "The certificate's activation time is still in the future." ++msgstr "সার্টিফিকেটের সক্রিয়করণ সময় এখনও ভবিষ্যতে অাছে।" ++ ++# auto translated by TM merge from project: gnome-online-accounts, version: 3.8.2, DocId: gnome-online-accounts ++#: ../modules/trust-prompt/module-trust-prompt.c:207 ++msgid "The certificate has expired." ++msgstr "সার্টিফিকেটের মেয়াদ শেষ হয়ে গেছে।" ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:209 ++msgid "" ++"The certificate has been revoked according to the connection's certificate " ++"revocation list." ++msgstr "" ++"সংযোগের সার্টিফিকেট প্রত্যাহার তালিকা অনুসারে সার্টিফিকেট প্রত্যাহার করা " ++"হযেছে।" ++ ++# auto translated by TM merge from project: gnome-online-accounts, version: 3.8.2, DocId: gnome-online-accounts ++#: ../modules/trust-prompt/module-trust-prompt.c:211 ++msgid "The certificate's algorithm is considered insecure." ++msgstr "সার্টিফিকেটের অ্যালগরিদম অনিরাপদ বলে বিবেচনা করা হয়।" ++ ++#: ../modules/trust-prompt/trust-prompt-gtk.c:162 ++msgid "Certificate trust..." ++msgstr "সার্টিফিকেট ট্রাস্ট..." ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/trust-prompt-gtk.c:163 ++msgid "_View Certificate" ++msgstr "সার্টিফিকেট প্রত্যক্ষ করুন (_V)" + +-#~ msgid "Generic error" +-#~ msgstr "সাধারণ ত্রুটি" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:164 ++msgid "_Reject" ++msgstr "প্রত্যাখ্যান করুন (_R)" + +-#~ msgid "A folder with the same name already exists" +-#~ msgstr "এক নামের একটি ফোল্ডার বর্তমানে উপস্থিত রয়েছে" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:165 ++msgid "Accept _Temporarily" ++msgstr "সাময়িকভাবে গ্রহণ করুন (_T)" + +-#~ msgid "The specified folder type is not valid" +-#~ msgstr "উল্লিখিত ধরনের ফোল্ডার বৈধ নয়" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:166 ++msgid "_Accept Permanently" ++msgstr "স্থায়ীভাবে গ্রহণ করা হবে (_A)" + +-#~ msgid "Not enough space to create the folder" +-#~ msgstr "ফোল্ডার নির্মাণের জন্য পর্যাপ্ত স্থান নেই" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:203 ++#, c-format ++msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?" ++msgstr "'%s' এর SSL সার্টিফিকেট বিশ্বস্ত নয়। অাপনি কি এটিকে গ্রহণ করতে চান?" + +-#~ msgid "The folder is not empty" +-#~ msgstr "ফোল্ডার ফাঁকা নয়" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:209 ++msgid "Detailed information about the certificate:" ++msgstr "সার্টিফিকেটের বিষয়ে বিস্তারিত তথ্য:" + +-#~ msgid "The specified folder was not found" +-#~ msgstr "উল্লিখিত ফোল্ডার পাওয়া যায়নি" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:223 ++msgid "Issuer:" ++msgstr "ইস্যু করেছে:" + +-#~ msgid "Function not implemented in this storage" +-#~ msgstr "বর্তমানে সংগ্রস্থলের ক্ষেত্রে কর্ম সঞ্চালিত হয়নি" ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/trust-prompt/trust-prompt-gtk.c:224 ++msgid "Subject:" ++msgstr "বিষয়:" + +-#~ msgid "The specified type is not supported in this storage" +-#~ msgstr "বর্তমানে সংগ্রস্থলের ক্ষেত্রে উল্লিখিত ধরন সমর্থিত নয়" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:225 ++msgid "Fingerprint:" ++msgstr "ফিঙ্গারপ্রিন্ট:" + +-#~ msgid "The specified folder cannot be modified or removed" +-#~ msgstr "উল্লিখিত ফোল্ডার পরিবর্তন অথবা অপসারণ করা সম্ভব নয়" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:226 ++msgid "Reason:" ++msgstr "কারণ:" + +-#~ msgid "Cannot make a folder a child of one of its descendants" +-#~ msgstr "কোনো ফোল্ডারকে সেটির অধীন উপস্থিত ফোল্ডারের চাইল্ড " ++#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2 ++msgid "Integrate your calendars" ++msgstr "অাপনার ক্যালেন্ডারগুলি একত্রিত করুন" + +-#~ msgid "Cannot create a folder with that name" +-#~ msgstr "উল্লিখিত নাম সহযোগে ফোল্ডার নির্মাণ করা সম্ভব নয়" ++#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2 ++msgid "Integrate your contacts" ++msgstr "অাপনার পরিচিতিগুলি একত্রিত করুন" + +-#~ msgid "This operation cannot be performed in off-line mode" +-#~ msgstr "অফ-লাইন অবস্থায় এই কর্ম সঞ্চালন করা সম্ভব নয়" ++#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257 ++msgid "Signon service did not return a secret" ++msgstr "Signon পরিষেবা কোনো সিক্রেট ফেরত পাঠায়নি" + +-#~ msgid "%s's Folders" +-#~ msgstr "%s'র ফোল্ডার" ++#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1 ++msgid "Google Calendar" ++msgstr "Google ক্যালেন্ডার" + +-#~ msgid "Personal Folders" +-#~ msgstr "ব্যক্তিগত ফোল্ডার" ++#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1 ++msgid "Google Contacts" ++msgstr "Google পরিচিতি" + +-#~ msgid "Favorite Public Folders" +-#~ msgstr "প্রিয় সার্বজনীন ফোল্ডার" ++#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1 ++msgid "GMail" ++msgstr "GMail" + +-#~ msgid "All Public Folders" +-#~ msgstr "সমস্ত সার্বজনীন ফোল্ডার" ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1 ++msgid "Mail" ++msgstr "মেইল" + +-#~ msgid "Global Address List" +-#~ msgstr "গ্রোবাল ঠিকানা তালিকা" ++#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2 ++msgid "Integrate your mailboxes" ++msgstr "অাপনার মেলবক্সগুলি একত্রিত করুন" + +-#~ msgid "Deleted Items" +-#~ msgstr "মুছে ফেলা বস্তু" ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971 ++#, c-format ++msgid "" ++"Cannot find a corresponding account service in the accounts database from " ++"which to obtain an access token for '%s'" ++msgstr "" ++"যে অ্যাকাউন্ট ডেটাবেস থেকে '%s' এর জন্য একটি টোকেন অ্যাক্সেস করতে হবে সেখানে " ++"একটি সংশ্লিষ্ট অ্যাকাউন্ট পরিষেবা খুঁজে পাওয়া যাচ্ছে না" + +-#~ msgid "Journal" +-#~ msgstr "জার্নাল" ++# auto translated by TM merge from project: gnome-online-accounts, version: 3.8.2, DocId: gnome-online-accounts ++#: ../modules/ubuntu-online-accounts/uoa-utils.c:79 ++#, c-format ++msgid "Expected status 200 when requesting guid, instead got status %d (%s)" ++msgstr "" ++"গাইড অনুরোধ করার সময় স্ট্যাটাস ২০০ প্রত্যাশিত, কিন্তু তার পরিবর্তে, " ++"স্ট্যাটাস %d (%s) পাওয়া গেছে" + +-#~ msgid "Notes" +-#~ msgstr "নোট" ++#: ../modules/ubuntu-online-accounts/uoa-utils.c:96 ++msgid "Error parsing response as JSON: " ++msgstr "JSON হিসাবে প্রত্যুত্তর পার্জ করতে সমস্যা: " + +-#~ msgid "Outbox" +-#~ msgstr "আউটবক্স" ++#: ../modules/ubuntu-online-accounts/uoa-utils.c:112 ++msgid "Didn't find email member in JSON data" ++msgstr "JSON ডেটাতে ইমেল সদস্য পাওয়া যায়নি" + +-#~ msgid "Sent Items" +-#~ msgstr "প্রেরিত বস্তু" ++#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1 ++msgid "Yahoo! Calendar" ++msgstr "Yahoo! ক্যালেন্ডার" + +-#~ msgid "Evolution Addressbook file backend" +-#~ msgstr "Evolution ঠিকানা-বইয়ের ফাইল ব্যাক-এন্ড" ++#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1 ++msgid "Yahoo! Mail" ++msgstr "Yahoo! মেল" + +-#~ msgid "Evolution Calendar file and webcal backend" +-#~ msgstr "Evolution Calendar ফাইল ও webcal ব্যাক-এন্ড" ++#: ../modules/yahoo-backend/module-yahoo-backend.c:227 ++msgid "Tasks" ++msgstr "কর্ম" + +-#~ msgid "Evolution Data Server interface check service" +-#~ msgstr "Evolution Data Server প্রেক্ষাপট পরীক্ষণ পরিসেবা" ++#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47 ++#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51 ++#: ../services/evolution-user-prompter/evolution-user-prompter.c:31 ++msgid "Keep running after the last client is closed" ++msgstr "সর্বশেষ ক্লায়েন্ট বন্ধ করার পরেও এটি সঞ্চালিত হবে" + +-#~ msgid "Evolution Data Server logging service" +-#~ msgstr "Evolution Data Server লগিং পরিসেবা" ++#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49 ++#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53 ++msgid "Wait running until at least one client is connected" ++msgstr "অন্তত একটি ক্লায়েন্ট সংযুক্ত না হওয়া অব্দি সঞ্চালিত হবে না" + +-#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n" +-#~ msgstr "" +-#~ "একাধিক সেগমেন্টেশন ফল্ট ঘটেছে; ত্রুটি সূচক ডায়লগ বক্স প্রদর্শন করা সম্ভব নয়\n" ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1 ++msgid "Birthdays & Anniversaries" ++msgstr "জন্মদিন এবং বার্ষিকী" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1 ++msgid "CalDAV" ++msgstr "CalDAV" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1 ++msgid "Google" ++msgstr "Google" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1 ++msgid "On LDAP Servers" ++msgstr "LDAP সার্ভারের মধ্যে" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-source-registry/builtin/local.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1 ++msgid "On This Computer" ++msgstr "ব্যবহৃত কম্পিউটারের মধ্যে" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1 ++msgid "Search Folders" ++msgstr "ফোল্ডার অনুসন্ধান করুন" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1 ++msgid "Weather" ++msgstr "আবহাওয়া" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1 ++msgid "On The Web" ++msgstr "ওয়েবে" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1 ++msgid "WebDAV" ++msgstr "WebDAV" ++ ++# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32 ++#: ../services/evolution-user-prompter/prompt-user-gtk.c:122 ++msgid "_Dismiss" ++msgstr "বাতিল করুন (_D)" +diff -up evolution-data-server-3.8.5/po/de.po.translations evolution-data-server-3.8.5/po/de.po +--- evolution-data-server-3.8.5/po/de.po.translations 2013-04-02 19:49:02.000000000 +0200 ++++ evolution-data-server-3.8.5/po/de.po 2014-01-13 16:23:40.775630232 +0100 +@@ -11,24 +11,24 @@ + # Mario Blättermann , 2009-2013. + # Hendrik Knackstedt , 2012. + # Christian Kirbach , 2010, 2012, 2013. +-# ++# rgromans , 2013. #zanata + msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server master\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=" ++"evolution-data-server&keywords=I18N+L10N&component=Misc.\n" + "POT-Creation-Date: 2013-03-28 14:48+0000\n" +-"PO-Revision-Date: 2013-03-31 15:48+0100\n" +-"Last-Translator: Mario Blättermann \n" ++"PO-Revision-Date: 2013-10-31 12:32-0400\n" ++"Last-Translator: rgromans \n" + "Language-Team: Deutsch \n" +-"Language: de\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: de\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Gtranslator 2.91.6\n" +-"X-Poedit-Language: German\n" ++"X-Generator: Zanata 3.1.2\n" + "X-Poedit-Country: GERMANY\n" ++"X-Poedit-Language: German\n" + "X-Project-Style: gnome\n" + + #: ../addressbook/backends/file/e-book-backend-file.c:114 +@@ -58,7 +58,7 @@ msgstr "In hinzugefügten Kontakten wurd + + #: ../addressbook/backends/file/e-book-backend-file.c:844 + #: ../addressbook/backends/file/e-book-backend-file.c:1038 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2615 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2656 + #, c-format + msgid "Contact '%s' not found" + msgstr "Kontakt »%s« wurde nicht gefunden" +@@ -85,7 +85,7 @@ msgid "Loading..." + msgstr "Ladevorgang …" + + #: ../addressbook/backends/file/e-book-backend-file.c:1250 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4963 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4978 + msgid "Searching..." + msgstr "Suchvorgang …" + +@@ -95,8 +95,8 @@ msgid "Failed to rename old database fro + msgstr "Umbenennen der alten Datenbank von »%s« in »%s« schlug fehl: %s" + + #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1222 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4858 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4873 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:338 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 +@@ -104,58 +104,60 @@ msgstr "Umbenennen der alten Datenbank v + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:562 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:592 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 +-#: ../calendar/libecal/e-cal.c:2339 ../calendar/libecal/e-cal-client.c:275 +-#: ../camel/camel-imapx-command.c:596 ../libedataserver/e-client.c:179 ++#: ../calendar/libecal/e-cal.c:2339 ++#: ../calendar/libecal/e-cal-client.c:275 ++#: ../camel/camel-imapx-command.c:609 ++#: ../libedataserver/e-client.c:179 + msgid "Unknown error" + msgstr "Unbekannter Fehler" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:649 ++#: ../addressbook/backends/google/e-book-backend-google.c:679 + msgid "Querying for updated contacts…" + msgstr "Aktualisierte Kontakte werden abgefragt …" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:786 ++#: ../addressbook/backends/google/e-book-backend-google.c:816 + msgid "Querying for updated groups…" + msgstr "Aktualisierte Gruppen werden abgefragt …" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1235 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1653 ++#: ../addressbook/backends/google/e-book-backend-google.c:1265 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:389 + msgid "The backend does not support bulk additions" + msgstr "Das Backend unterstützt keine Massenhinzufügungen" + + #. Insert the entry on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1267 ++#: ../addressbook/backends/google/e-book-backend-google.c:1297 + msgid "Creating new contact…" + msgstr "Neuer Kontakt wird erstellt …" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1358 ++#: ../addressbook/backends/google/e-book-backend-google.c:1388 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:506 + msgid "The backend does not support bulk removals" + msgstr "Das Backend unterstützt keine Massenentfernungen" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1386 ++#: ../addressbook/backends/google/e-book-backend-google.c:1416 + msgid "Deleting contact…" + msgstr "Kontakt wird gelöscht …" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1640 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2319 ++#: ../addressbook/backends/google/e-book-backend-google.c:1670 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:567 + msgid "The backend does not support bulk modifications" + msgstr "Das Backend unterstützt keine Massenänderungen" + + #. Update the contact on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1678 ++#: ../addressbook/backends/google/e-book-backend-google.c:1708 + msgid "Modifying contact…" + msgstr "Kontakt wird geändert …" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1849 ++#: ../addressbook/backends/google/e-book-backend-google.c:1879 + msgid "Loading…" + msgstr "Ladevorgang …" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1602 ++#: ../addressbook/backends/google/e-book-google-utils.c:1606 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -164,88 +166,88 @@ msgid "Personal" + msgstr "Persönlich" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1604 ++#: ../addressbook/backends/google/e-book-google-utils.c:1608 + msgid "Friends" + msgstr "Freunde" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1606 ++#: ../addressbook/backends/google/e-book-google-utils.c:1610 + msgid "Family" + msgstr "Familie" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1608 ++#: ../addressbook/backends/google/e-book-google-utils.c:1612 + msgid "Coworkers" + msgstr "Mitarbeiter" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174 + msgid "Not connected" + msgstr "Nicht verbunden" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:950 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "Bindung sowohl mit v3- als auch mit v2-Bindungen gescheitert" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1073 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088 + msgid "Reconnecting to LDAP server..." + msgstr "Verbindung mit LDAP-Server wird erneut hergestellt …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1203 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218 + msgid "Invalid DN syntax" + msgstr "Ungültige DN-Syntax" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1219 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4857 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4872 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP-Fehler 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1737 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Adding contact to LDAP server..." + msgstr "Kontakt wird zu LDAP-Server hinzugefügt …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1875 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1890 + msgid "Removing contact from LDAP server..." + msgstr "Kontakt wird von LDAP-Server entfernt …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2019 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2431 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: Von ldap_first_entry wurde NULL zurückgegeben" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2272 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2474 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2489 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: Unbehandelter Ergebnistyp %d wurde zurückgegeben" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2341 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2356 + msgid "Modifying contact from LDAP server..." + msgstr "Kontakt auf LDAP-Server wird verändert …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2703 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2935 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2718 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2950 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: Unbehandelter Suchergebnistyp %d wurde zurückgegeben" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4806 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4821 + msgid "Receiving LDAP search results..." + msgstr "LDAP-Suchergebnisse werden empfangen …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4985 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5000 + msgid "Error performing search" + msgstr "Fehler beim Ausführen der Suche" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5108 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "Kontakte werden heruntergeladen (%d) …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5571 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5654 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "DN für Benutzer »%s« konnte nicht erhalten werden" +@@ -277,7 +279,8 @@ msgstr "Zusammenfassung des Adressbuchs + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" +-msgstr "WebDAV-Anweisung PROPFIND scheiterte mit folgendem HTTP-Status: %d (%s)" ++msgstr "" ++"WebDAV-Anweisung PROPFIND scheiterte mit folgendem HTTP-Status: %d (%s)" + + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1051 + msgid "No response body in webdav PROPFIND result" +@@ -915,7 +918,8 @@ msgstr "Ungültige Landesvorwahl" + + #: ../addressbook/libebook-contacts/e-phone-number.c:51 + msgid "" +-"Remaining text after the country calling code is too short for a phone number" ++"Remaining text after the country calling code is too short for a phone " ++"number" + msgstr "Zahlenreihe nach der Landesvorwahl ist zu kurz für eine Telefonnummer" + + # »Text« wäre hier irreführend +@@ -927,42 +931,42 @@ msgstr "Zahlenreihe ist zu kurz für ein + msgid "Text is too long for a phone number" + msgstr "Zahlenreihe ist zu kurz für eine Telefonnummer" + +-#: ../addressbook/libebook/e-book-client.c:659 ++#: ../addressbook/libebook/e-book-client.c:643 + #: ../addressbook/libedata-book/e-book-backend.c:120 + #, c-format + msgid "Unknown book property '%s'" + msgstr "Unbekannte Bucheigenschaft »%s«" + +-#: ../addressbook/libebook/e-book-client.c:674 ++#: ../addressbook/libebook/e-book-client.c:658 + #, c-format + msgid "Cannot change value of book property '%s'" + msgstr "Wert der Bucheigenschaft »%s« kann nicht geändert werden" + +-#: ../addressbook/libebook/e-book-client.c:985 +-#: ../addressbook/libebook/e-book-client.c:1158 +-#: ../calendar/libecal/e-cal-client.c:1502 +-#: ../calendar/libecal/e-cal-client.c:1682 ++#: ../addressbook/libebook/e-book-client.c:993 ++#: ../addressbook/libebook/e-book-client.c:1168 ++#: ../calendar/libecal/e-cal-client.c:1515 ++#: ../calendar/libecal/e-cal-client.c:1697 + #, c-format + msgid "Unable to connect to '%s': " + msgstr "Verbindung mit »%s« ist gescheitert:" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:752 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793 + #, c-format + msgid "Error introspecting unknown summary field '%s'" + msgstr "Fehler beim Inspizieren des unbekannten Zusammenfassungsfeldes »%s«" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1241 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289 + #: ../camel/camel-db.c:544 + #, c-format + msgid "Insufficient memory" + msgstr "Nicht ausreichender Speicher" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1374 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1422 + #, c-format + msgid "Invalid contact field '%d' specified in summary" + msgstr "Ungültiges Kontaktfeld »%d« in der Zusammenfassung " + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1408 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1456 + #, c-format + msgid "" + "Contact field '%s' of type '%s' specified in summary, but only boolean, " +@@ -971,26 +975,27 @@ msgstr "" + "Kontaktfeld »%s« vom Typ »%s« in der Zusammenfassung angegeben, aber nur " + "boolesch, Feldtypen Zeichenkette und Zeichenkettenlisten werden unterstützt" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2603 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3686 + #, c-format +-msgid "Full search_contacts are not stored in cache. vcards cannot be returned." ++msgid "" ++"Full search_contacts are not stored in cache. vcards cannot be returned." + msgstr "" + "Volle search_contacts werden nicht zwischengespeichert. vcards können nicht " + "zurückgegeben werden." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3770 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3851 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3812 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3893 + #, c-format + msgid "Query contained unsupported elements" + msgstr "Abfrage enthielt nicht unterstützte Elemente" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3774 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 + #, c-format + msgid "Invalid Query" + msgstr "Ungültige Abfrage" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3798 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3840 + #, c-format + msgid "" + "Full search_contacts are not stored in cache. Hence only summary query is " +@@ -999,24 +1004,25 @@ msgstr "" + "Volle search_contacts werden nicht zwischengespeichert. Daher wird nur die " + "Abfrage der Zusammenfassung unterstützt." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3855 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 + #: ../addressbook/libedata-book/e-data-book.c:669 + #: ../addressbook/libedata-book/e-data-book.c:809 + #: ../calendar/libedata-cal/e-data-cal.c:612 +-#: ../calendar/libedata-cal/e-data-cal.c:771 ../libedataserver/e-client.c:166 ++#: ../calendar/libedata-cal/e-data-cal.c:771 ++#: ../libedataserver/e-client.c:166 + #, c-format + msgid "Invalid query" + msgstr "Ungültige Abfrage" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3940 + #, c-format + msgid "" + "Full vcards are not stored in cache. Hence only summary query is supported." + msgstr "" +-"Volle vcards werden nicht zwischengespeichert. Daher wird nur die Abfrage der " +-"Zusammenfassung unterstützt." ++"Volle vcards werden nicht zwischengespeichert. Daher wird nur die Abfrage " ++"der Zusammenfassung unterstützt." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4598 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4643 + #, c-format + msgid "Unable to remove the db file: errno %d" + msgstr "Datenbankdatei konnte nicht entfernt werden: Fehlernummer %d" +@@ -1028,7 +1034,6 @@ msgstr "Backend-Eigenschaften können vo + + #. Translators: This is prefix to a detailed error message + #. Translators: This is a prefix to a detailed error message * +-#. + #: ../addressbook/libedata-book/e-data-book.c:691 + #: ../calendar/libedata-cal/e-data-cal.c:635 + msgid "Invalid query: " +@@ -1040,18 +1045,21 @@ msgid "Success" + msgstr "Erfolg" + + #: ../addressbook/libedata-book/e-data-book.c:794 +-#: ../calendar/libecal/e-cal.c:2307 ../calendar/libedata-cal/e-data-cal.c:753 ++#: ../calendar/libecal/e-cal.c:2307 ++#: ../calendar/libedata-cal/e-data-cal.c:753 + #: ../libedataserver/e-client.c:133 + msgid "Backend is busy" + msgstr "Backend belegt" + + #: ../addressbook/libedata-book/e-data-book.c:795 +-#: ../calendar/libedata-cal/e-data-cal.c:754 ../libedataserver/e-client.c:143 ++#: ../calendar/libedata-cal/e-data-cal.c:754 ++#: ../libedataserver/e-client.c:143 + msgid "Repository offline" + msgstr "Datenbestand ist offline" + + #: ../addressbook/libedata-book/e-data-book.c:796 +-#: ../calendar/libecal/e-cal.c:2321 ../calendar/libedata-cal/e-data-cal.c:755 ++#: ../calendar/libecal/e-cal.c:2321 ++#: ../calendar/libedata-cal/e-data-cal.c:755 + #: ../libedataserver/e-client.c:150 + msgid "Permission denied" + msgstr "Erlaubnis verweigert" +@@ -1072,12 +1080,14 @@ msgid "Unsupported field" + msgstr "Nicht unterstütztes Feld" + + #: ../addressbook/libedata-book/e-data-book.c:802 +-#: ../calendar/libedata-cal/e-data-cal.c:764 ../libedataserver/e-client.c:158 ++#: ../calendar/libedata-cal/e-data-cal.c:764 ++#: ../libedataserver/e-client.c:158 + msgid "Unsupported authentication method" + msgstr "Nicht unterstützte Legitimierungsmethode" + + #: ../addressbook/libedata-book/e-data-book.c:803 +-#: ../calendar/libedata-cal/e-data-cal.c:765 ../libedataserver/e-client.c:160 ++#: ../calendar/libedata-cal/e-data-cal.c:765 ++#: ../libedataserver/e-client.c:160 + msgid "TLS not available" + msgstr "TLS nicht verfügbar" + +@@ -1095,22 +1105,26 @@ msgid "Not available in offline mode" + msgstr "Im Offline-Modus nicht verfügbar" + + #: ../addressbook/libedata-book/e-data-book.c:807 +-#: ../calendar/libedata-cal/e-data-cal.c:769 ../libedataserver/e-client.c:162 ++#: ../calendar/libedata-cal/e-data-cal.c:769 ++#: ../libedataserver/e-client.c:162 + msgid "Search size limit exceeded" + msgstr "Suchgröße überschritten" + + #: ../addressbook/libedata-book/e-data-book.c:808 +-#: ../calendar/libedata-cal/e-data-cal.c:770 ../libedataserver/e-client.c:164 ++#: ../calendar/libedata-cal/e-data-cal.c:770 ++#: ../libedataserver/e-client.c:164 + msgid "Search time limit exceeded" + msgstr "Suchzeit überschritten" + + #: ../addressbook/libedata-book/e-data-book.c:810 +-#: ../calendar/libedata-cal/e-data-cal.c:772 ../libedataserver/e-client.c:168 ++#: ../calendar/libedata-cal/e-data-cal.c:772 ++#: ../libedataserver/e-client.c:168 + msgid "Query refused" + msgstr "Abfrage verweigert" + + #: ../addressbook/libedata-book/e-data-book.c:811 +-#: ../calendar/libedata-cal/e-data-cal.c:773 ../libedataserver/e-client.c:154 ++#: ../calendar/libedata-cal/e-data-cal.c:773 ++#: ../libedataserver/e-client.c:154 + msgid "Could not cancel" + msgstr "Abbrechen gescheitert" + +@@ -1122,22 +1136,27 @@ msgid "Invalid server version" + msgstr "Ungültige Server-Version" + + #: ../addressbook/libedata-book/e-data-book.c:815 +-#: ../calendar/libecal/e-cal.c:2305 ../calendar/libedata-cal/e-data-cal.c:776 ++#: ../calendar/libecal/e-cal.c:2305 ++#: ../calendar/libedata-cal/e-data-cal.c:776 + #: ../libedataserver/e-client.c:131 + msgid "Invalid argument" + msgstr "Argument ungültig" + + #. Translators: The string for NOT_SUPPORTED error + #: ../addressbook/libedata-book/e-data-book.c:817 +-#: ../calendar/libecal/e-cal.c:1064 ../calendar/libecal/e-cal.c:1432 +-#: ../calendar/libecal/e-cal.c:1912 ../calendar/libecal/e-cal.c:2344 +-#: ../calendar/libedata-cal/e-data-cal.c:778 ../libedataserver/e-client.c:156 ++#: ../calendar/libecal/e-cal.c:1064 ++#: ../calendar/libecal/e-cal.c:1432 ++#: ../calendar/libecal/e-cal.c:1912 ++#: ../calendar/libecal/e-cal.c:2344 ++#: ../calendar/libedata-cal/e-data-cal.c:778 ++#: ../libedataserver/e-client.c:156 + #, c-format + msgid "Not supported" + msgstr "Nicht unterstützt" + + #: ../addressbook/libedata-book/e-data-book.c:818 +-#: ../calendar/libedata-cal/e-data-cal.c:779 ../libedataserver/e-client.c:174 ++#: ../calendar/libedata-cal/e-data-cal.c:779 ++#: ../libedataserver/e-client.c:174 + msgid "Backend is not opened yet" + msgstr "Backend wurde noch nicht geöffnet" + +@@ -1148,7 +1167,8 @@ msgid "Object is out of sync" + msgstr "Objekt ist nicht abgeglichen" + + #: ../addressbook/libedata-book/e-data-book.c:827 +-#: ../calendar/libedata-cal/e-data-cal.c:787 ../libedataserver/e-client.c:172 ++#: ../calendar/libedata-cal/e-data-cal.c:787 ++#: ../libedataserver/e-client.c:172 + msgid "Other error" + msgstr "Anderer Fehler" + +@@ -1319,7 +1339,7 @@ msgid "Not a calendar." + msgstr "Kein Kalender." + + #: ../calendar/backends/http/e-cal-backend-http.c:926 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:514 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:520 + msgid "Could not create cache file" + msgstr "Datei zum Zwischenspeichern konnte nicht angelegt werden" + +@@ -1327,43 +1347,43 @@ msgstr "Datei zum Zwischenspeichern konn + msgid "Could not retrieve weather data" + msgstr "Wetterdaten konnten nicht abgerufen werden" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:278 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:284 + msgid "Weather: Fog" + msgstr "Wetter: Nebel" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:279 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:285 + msgid "Weather: Cloudy Night" + msgstr "Wetter: Wolkige Nacht" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:280 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:286 + msgid "Weather: Cloudy" + msgstr "Wetter: Wolkig" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:281 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:287 + msgid "Weather: Overcast" + msgstr "Wetter: Bedeckt" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:282 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:288 + msgid "Weather: Showers" + msgstr "Wetter: Schauer" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:283 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:289 + msgid "Weather: Snow" + msgstr "Wetter: Schnee" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:284 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:290 + msgid "Weather: Clear Night" + msgstr "Wetter: Klare Nacht" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:285 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:291 + msgid "Weather: Sunny" + msgstr "Wetter: Sonnig" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:286 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:292 + msgid "Weather: Thunderstorms" + msgstr "Wetter: Gewitter" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:410 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:416 + msgid "Forecast" + msgstr "Vorhersage" + +@@ -1372,16 +1392,19 @@ msgid "Repository is offline" + msgstr "Repository offline" + + # CHECK +-#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:262 ++#: ../calendar/libecal/e-cal.c:2311 ++#: ../calendar/libecal/e-cal-client.c:262 + msgid "No such calendar" + msgstr "Kein derartiger Kalender" + +-#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:264 ++#: ../calendar/libecal/e-cal.c:2313 ++#: ../calendar/libecal/e-cal-client.c:264 + #: ../calendar/libedata-cal/e-data-cal.c:757 + msgid "Object not found" + msgstr "Objekt nicht gefunden" + +-#: ../calendar/libecal/e-cal.c:2315 ../calendar/libecal/e-cal-client.c:266 ++#: ../calendar/libecal/e-cal.c:2315 ++#: ../calendar/libecal/e-cal-client.c:266 + #: ../calendar/libedata-cal/e-data-cal.c:758 + msgid "Invalid object" + msgstr "Objekt ungültig" +@@ -1398,7 +1421,8 @@ msgstr "URI bereits geladen" + msgid "Unknown User" + msgstr "Unbekannter Benutzer" + +-#: ../calendar/libecal/e-cal.c:2325 ../calendar/libecal/e-cal-client.c:270 ++#: ../calendar/libecal/e-cal.c:2325 ++#: ../calendar/libecal/e-cal-client.c:270 + #: ../calendar/libedata-cal/e-data-cal.c:759 + msgid "Object ID already exists" + msgstr "Objektkennung existiert bereits" +@@ -1415,12 +1439,13 @@ msgstr "Aktion wurde abgebrochen" + msgid "Could not cancel operation" + msgstr "Aktion konnte nicht abgebrochen werden" + +-#: ../calendar/libecal/e-cal.c:2333 ../libedataserver/e-client.c:139 ++#: ../calendar/libecal/e-cal.c:2333 ++#: ../libedataserver/e-client.c:139 + msgid "Authentication failed" + msgstr "Legitimierung gescheitert" + + #: ../calendar/libecal/e-cal.c:2335 +-#: ../camel/providers/smtp/camel-smtp-transport.c:923 ++#: ../camel/providers/smtp/camel-smtp-transport.c:915 + #: ../libedataserver/e-client.c:141 + msgid "Authentication required" + msgstr "Legitimierung erforderlich" +@@ -1443,13 +1468,13 @@ msgstr "Unbekannter Benutzer" + msgid "Invalid range" + msgstr "Ungültiger Bereich" + +-#: ../calendar/libecal/e-cal-client.c:936 ++#: ../calendar/libecal/e-cal-client.c:920 + #: ../calendar/libedata-cal/e-cal-backend.c:204 + #, c-format + msgid "Unknown calendar property '%s'" + msgstr "Unbekannte Kalendereigenschaft »%s«" + +-#: ../calendar/libecal/e-cal-client.c:951 ++#: ../calendar/libecal/e-cal-client.c:935 + #, c-format + msgid "Cannot change value of calendar property '%s'" + msgstr "Wert der Kalendereigenschaft »%s« kann nicht geändert werden" +@@ -1582,17 +1607,20 @@ msgstr "30." + msgid "31st" + msgstr "31." + +-#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734 ++#: ../calendar/libecal/e-cal-util.c:707 ++#: ../calendar/libecal/e-cal-util.c:734 + msgctxt "Priority" + msgid "High" + msgstr "Hoch" + +-#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736 ++#: ../calendar/libecal/e-cal-util.c:709 ++#: ../calendar/libecal/e-cal-util.c:736 + msgctxt "Priority" + msgid "Normal" + msgstr "Normal" + +-#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738 ++#: ../calendar/libecal/e-cal-util.c:711 ++#: ../calendar/libecal/e-cal-util.c:738 + msgctxt "Priority" + msgid "Low" + msgstr "Niedrig" +@@ -1697,8 +1725,8 @@ msgstr "»%s« erwartet mindestens ein A + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:893 + #, c-format + msgid "" +-"\"%s\" expects all arguments to be strings or one and only one argument to be " +-"a boolean false (#f)" ++"\"%s\" expects all arguments to be strings or one and only one argument to " ++"be a boolean false (#f)" + msgstr "" + "»%s« erwartet als Argumente Zeichenketten, oder aber ein einziges Argument " + "mit dem Wahrheitswert »falsch« (#f)" +@@ -1707,7 +1735,8 @@ msgstr "" + #, c-format + msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" + msgstr "" +-"»%s« erwartet als erstes Argument eine Datum-/Zeit-Zeichenkette nach ISO 8601" ++"»%s« erwartet als erstes Argument eine Datum-/Zeit-Zeichenkette nach ISO " ++"8601" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450 + #, c-format +@@ -1884,7 +1913,8 @@ msgstr "" + msgid "Resynchronizing with server" + msgstr "Neu abgleichen mit dem Server" + +-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93 ++#: ../camel/camel-disco-folder.c:76 ++#: ../camel/camel-offline-folder.c:93 + msgid "Downloading new messages for offline mode" + msgstr "Neue Nachrichten werden für Offline-Modus abgerufen" + +@@ -1893,23 +1923,33 @@ msgstr "Neue Nachrichten werden für Off + msgid "Preparing folder '%s' for offline" + msgstr "Ordner »%s« wird für den Offline-Modus vorbereitet" + +-#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336 ++#: ../camel/camel-disco-folder.c:489 ++#: ../camel/camel-offline-folder.c:336 + msgid "Copy folder content locally for _offline operation" + msgstr "Den Ordnerinhalt lokal zum Arbeiten im _Offline-Modus kopieren" + +-#: ../camel/camel-disco-store.c:475 ../camel/camel-imapx-folder.c:478 +-#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553 +-#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748 +-#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993 +-#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:368 +-#: ../camel/camel-imapx-store.c:1592 ../camel/camel-imapx-store.c:1681 ++#: ../camel/camel-disco-store.c:475 ++#: ../camel/camel-imapx-folder.c:478 ++#: ../camel/camel-imapx-folder.c:514 ++#: ../camel/camel-imapx-folder.c:553 ++#: ../camel/camel-imapx-folder.c:613 ++#: ../camel/camel-imapx-folder.c:748 ++#: ../camel/camel-imapx-folder.c:933 ++#: ../camel/camel-imapx-folder.c:993 ++#: ../camel/camel-imapx-folder.c:1032 ++#: ../camel/camel-imapx-store.c:368 ++#: ../camel/camel-imapx-store.c:1592 ++#: ../camel/camel-imapx-store.c:1681 + #: ../camel/camel-imapx-store.c:1730 +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 +-#: ../camel/providers/pop3/camel-pop3-folder.c:677 +-#: ../camel/providers/pop3/camel-pop3-folder.c:906 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1106 +-#: ../camel/providers/pop3/camel-pop3-store.c:472 +-#: ../camel/providers/pop3/camel-pop3-store.c:896 ++#: ../camel/providers/pop3/camel-pop3-folder.c:555 ++#: ../camel/providers/pop3/camel-pop3-folder.c:705 ++#: ../camel/providers/pop3/camel-pop3-folder.c:940 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1150 ++#: ../camel/providers/pop3/camel-pop3-store.c:291 ++#: ../camel/providers/pop3/camel-pop3-store.c:519 ++#: ../camel/providers/pop3/camel-pop3-store.c:567 ++#: ../camel/providers/pop3/camel-pop3-store.c:652 ++#: ../camel/providers/pop3/camel-pop3-store.c:1052 + #, c-format + msgid "You must be working online to complete this operation" + msgstr "Sie müssen online arbeiten, um diesen Vorgang abzuschließen" +@@ -1919,7 +1959,8 @@ msgstr "Sie müssen online arbeiten, um + msgid "Canceled" + msgstr "Abgesagt" + +-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797 ++#: ../camel/camel-filter-driver.c:916 ++#: ../camel/camel-filter-search.c:797 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "Kindprozess »%s« konnte nicht erstellt werden: %s" +@@ -1929,69 +1970,74 @@ msgstr "Kindprozess »%s« konnte nicht + msgid "Invalid message stream received from %s: %s" + msgstr "Ungültiger Nachrichten-Datenstrom von %s erhalten: %s" + +-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1179 ++#: ../camel/camel-filter-driver.c:1171 ++#: ../camel/camel-filter-driver.c:1180 + msgid "Syncing folders" + msgstr "Ordner werden abgeglichen" + +-#: ../camel/camel-filter-driver.c:1277 ++#: ../camel/camel-filter-driver.c:1278 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "Fehler beim Analysieren der Filtersyntax: %s: %s" + +-#: ../camel/camel-filter-driver.c:1288 ++#: ../camel/camel-filter-driver.c:1289 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "Fehler beim Ausführen des Filters: %s: %s" + +-#: ../camel/camel-filter-driver.c:1384 ++#: ../camel/camel-filter-driver.c:1385 + #, c-format + msgid "Unable to open spool folder" + msgstr "Der Spool-Ordner konnte nicht geöffnet werden" + +-#: ../camel/camel-filter-driver.c:1396 ++#: ../camel/camel-filter-driver.c:1397 + #, c-format + msgid "Unable to process spool folder" + msgstr "Der Spool-Ordner konnte nicht verarbeitet werden" + +-#: ../camel/camel-filter-driver.c:1419 ++#: ../camel/camel-filter-driver.c:1420 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "Nachricht %d wird abgerufen (%d%%)" + +-#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1450 ++#: ../camel/camel-filter-driver.c:1429 ++#: ../camel/camel-filter-driver.c:1451 + #, c-format + msgid "Failed on message %d" + msgstr "Fehlgeschlagen bei Nachricht %d" + +-#: ../camel/camel-filter-driver.c:1469 ../camel/camel-filter-driver.c:1583 ++#: ../camel/camel-filter-driver.c:1470 ++#: ../camel/camel-filter-driver.c:1584 + msgid "Syncing folder" + msgstr "Ordner wird abgeglichen" + +-#: ../camel/camel-filter-driver.c:1474 ../camel/camel-filter-driver.c:1591 ++#: ../camel/camel-filter-driver.c:1475 ++#: ../camel/camel-filter-driver.c:1592 + msgid "Complete" + msgstr "Abgeschlossen" + +-#: ../camel/camel-filter-driver.c:1537 ++#: ../camel/camel-filter-driver.c:1538 + #, c-format + msgid "Getting message %d of %d" + msgstr "Nachricht %d von %d wird abgerufen" + +-#: ../camel/camel-filter-driver.c:1555 ++#: ../camel/camel-filter-driver.c:1556 + #, c-format + msgid "Failed at message %d of %d" + msgstr "Fehlgeschlagen bei Nachricht %d von %d" + +-#: ../camel/camel-filter-driver.c:1751 ../camel/camel-filter-driver.c:1785 ++#: ../camel/camel-filter-driver.c:1752 ++#: ../camel/camel-filter-driver.c:1786 + #, c-format + msgid "Execution of filter '%s' failed: " + msgstr "Ausführen des Filters »%s« ist gescheitert:" + +-#: ../camel/camel-filter-driver.c:1775 ++#: ../camel/camel-filter-driver.c:1776 + #, c-format + msgid "Error parsing filter '%s': %s: %s" + msgstr "Fehler beim Analysieren des Filters »%s«: %s: %s" + +-#: ../camel/camel-filter-driver.c:1794 ++#: ../camel/camel-filter-driver.c:1795 + #, c-format + msgid "Error executing filter '%s': %s: %s" + msgstr "Fehler beim Ausführen des Filters »%s«: %s: %s" +@@ -2008,68 +2054,70 @@ msgstr "Ungültige Argumente bei (system + msgid "Invalid arguments to (user-tag)" + msgstr "Ungültige Argumente bei (user-tag)" + +-#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055 ++#: ../camel/camel-filter-search.c:1046 ++#: ../camel/camel-filter-search.c:1055 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s" + +-#: ../camel/camel-folder.c:291 ++#: ../camel/camel-folder.c:310 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" + msgstr[0] "Unerwünschte Nachricht wird in »%s« gesucht" + msgstr[1] "Unerwünschte Nachrichten werden in »%s« gesucht" + +-#: ../camel/camel-folder.c:331 ++#: ../camel/camel-folder.c:350 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" + msgstr[0] "Erwünschte Nachricht wird in »%s« gesucht" + msgstr[1] "Erwünschte Nachrichten werden in »%s« gesucht" + +-#: ../camel/camel-folder.c:379 ++#: ../camel/camel-folder.c:398 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "Neue Nachricht in »%s« wird gefiltert" + msgstr[1] "Neue Nachrichten in »%s« werden gefiltert" + +-#: ../camel/camel-folder.c:953 ++#: ../camel/camel-folder.c:972 + #: ../camel/providers/local/camel-maildir-folder.c:321 + msgid "Moving messages" + msgstr "Nachrichten werden verschoben" + +-#: ../camel/camel-folder.c:956 ++#: ../camel/camel-folder.c:975 + msgid "Copying messages" + msgstr "Nachrichten werden kopiert" + +-#: ../camel/camel-folder.c:1276 ++#: ../camel/camel-folder.c:1295 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "Kontingent-Informationen werden für Ordner »%s« nicht unterstützt" + +-#: ../camel/camel-folder.c:3509 ++#: ../camel/camel-folder.c:3528 + #, c-format + msgid "Expunging folder '%s'" + msgstr "Ordner »%s« wird gesäubert" + +-#: ../camel/camel-folder.c:3741 ++#: ../camel/camel-folder.c:3760 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "Nachricht »%s« in %s wird abgerufen" + +-#: ../camel/camel-folder.c:3892 ++#: ../camel/camel-folder.c:3911 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "Kontingent-Informationen für »%s« werden abgerufen" + +-#: ../camel/camel-folder.c:4124 ++#: ../camel/camel-folder.c:4143 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "Ordner »%s« wird aktualisiert" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:838 ../camel/camel-folder-search.c:881 ++#: ../camel/camel-folder-search.c:838 ++#: ../camel/camel-folder-search.c:881 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) erfordert einen einzelnen Boole'schen Wert als Ergebnis" +@@ -2081,7 +2129,8 @@ msgid "(%s) not allowed inside %s" + msgstr "(%s) nicht erlaubt innerhalb von %s" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:923 ../camel/camel-folder-search.c:931 ++#: ../camel/camel-folder-search.c:923 ++#: ../camel/camel-folder-search.c:931 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) erfordert den Treffertyp Zeichenkette" +@@ -2098,83 +2147,78 @@ msgstr "(%s) erwartet ein Array-Ergebnis + msgid "(%s) requires the folder set" + msgstr "(%s) erfordert, dass der Ordner festgelegt ist" + +-#: ../camel/camel-folder-search.c:1862 ../camel/camel-folder-search.c:2029 ++#: ../camel/camel-folder-search.c:1862 ++#: ../camel/camel-folder-search.c:2029 + #, c-format +-msgid "" +-"Cannot parse search expression: %s:\n" ++msgid "Cannot parse search expression: %s:\n" + "%s" +-msgstr "" +-"Syntax des Suchausdrucks konnte nicht analysiert werden: %s:\n" ++msgstr "Syntax des Suchausdrucks konnte nicht analysiert werden: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1874 ../camel/camel-folder-search.c:2041 ++#: ../camel/camel-folder-search.c:1874 ++#: ../camel/camel-folder-search.c:2041 + #, c-format +-msgid "" +-"Error executing search expression: %s:\n" ++msgid "Error executing search expression: %s:\n" + "%s" +-msgstr "" +-"Fehler beim Ausführen eines Suchausdrucks: %s:\n" ++msgstr "Fehler beim Ausführen eines Suchausdrucks: %s:\n" + "%s" + +-#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696 +-#: ../camel/camel-gpg-context.c:1359 ++#: ../camel/camel-gpg-context.c:730 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/camel-gpg-context.c:1398 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "gpg konnte nicht ausgeführt werden: %s" + +-#: ../camel/camel-gpg-context.c:696 +-#: ../camel/providers/smtp/camel-smtp-transport.c:926 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/providers/smtp/camel-smtp-transport.c:918 + msgid "Unknown" + msgstr "Unbekannt" + +-#: ../camel/camel-gpg-context.c:761 ++#: ../camel/camel-gpg-context.c:800 + #, c-format +-msgid "" +-"Unexpected GnuPG status message encountered:\n" ++msgid "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" +-msgstr "" +-"Nicht erwartete GnuPG-Statusmeldung erhalten:\n" ++msgstr "Nicht erwartete GnuPG-Statusmeldung erhalten:\n" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:797 ++#: ../camel/camel-gpg-context.c:836 + #, c-format + msgid "Failed to parse gpg userid hint." + msgstr "" + "Die Syntax des gpg-Wink auf die Benutzerkennung konnte nicht analysiert " + "werden." + +-#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837 ++#: ../camel/camel-gpg-context.c:861 ++#: ../camel/camel-gpg-context.c:876 + #, c-format + msgid "Failed to parse gpg passphrase request." + msgstr "" + "Die Syntax des gpg-Winks auf das Passwort konnte nicht analysiert werden." + +-#: ../camel/camel-gpg-context.c:858 ++#: ../camel/camel-gpg-context.c:897 + #, c-format +-msgid "" +-"You need a PIN to unlock the key for your\n" ++msgid "You need a PIN to unlock the key for your\n" + "SmartCard: \"%s\"" +-msgstr "" +-"Für das Entsperren Ihrer SmartCard\n" ++msgstr "Für das Entsperren Ihrer SmartCard\n" + "»%s« ist ein Passwort erforderlich" + +-#: ../camel/camel-gpg-context.c:862 ++#: ../camel/camel-gpg-context.c:901 + #, c-format +-msgid "" +-"You need a passphrase to unlock the key for\n" ++msgid "You need a passphrase to unlock the key for\n" + "user: \"%s\"" + msgstr "" + "Für das Entsperren des Schlüssels für den\n" + "Benutzer %s ist ein Passwort erforderlich." + +-#: ../camel/camel-gpg-context.c:868 ++#: ../camel/camel-gpg-context.c:907 + #, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "Unerwartete Anfrage von GnuPG für »%s«" + +-#: ../camel/camel-gpg-context.c:880 ++#: ../camel/camel-gpg-context.c:919 + msgid "" + "Note the encrypted content doesn't contain information about a recipient, " + "thus there will be a password prompt for each of stored private key." +@@ -2183,46 +2227,54 @@ msgstr "" + "Empfänger enthält, daher erscheint ein Dialog zur Passworteingabe für jeden " + "gespeicherten geheimen Schlüssel." + +-#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523 ++#: ../camel/camel-gpg-context.c:950 ++#: ../camel/camel-net-utils.c:524 + #: ../camel/camel-tcp-stream-raw.c:268 +-#: ../camel/providers/nntp/camel-nntp-summary.c:388 ++#: ../camel/providers/nntp/camel-nntp-summary.c:402 + #: ../libedataserver/e-client.c:152 + #, c-format + msgid "Cancelled" + msgstr "Abgebrochen" + +-#: ../camel/camel-gpg-context.c:932 ++#: ../camel/camel-gpg-context.c:971 + #, c-format + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "" + "Geheimschlüssel konnte nicht entsperrt werden: 3 falsche Passwörter " + "eingegeben." + +-#: ../camel/camel-gpg-context.c:945 ++#: ../camel/camel-gpg-context.c:984 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "Unerwartete GnuPG-Antwort: %s" + +-#: ../camel/camel-gpg-context.c:1076 ++#: ../camel/camel-gpg-context.c:1115 + #, c-format + msgid "Failed to encrypt: No valid recipients specified." + msgstr "" + "Nachricht konnte nicht verschlüsselt werden: keine gültigen Empfänger " + "angegeben." + +-#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846 ++#: ../camel/camel-gpg-context.c:1665 ++#: ../camel/camel-smime-context.c:846 + msgid "Could not generate signing data: " + msgstr "Signaturdaten konnten nicht erzeugt werden:" + +-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879 +-#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136 +-#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284 ++#: ../camel/camel-gpg-context.c:1714 ++#: ../camel/camel-gpg-context.c:1918 ++#: ../camel/camel-gpg-context.c:2028 ++#: ../camel/camel-gpg-context.c:2179 ++#: ../camel/camel-gpg-context.c:2279 ++#: ../camel/camel-gpg-context.c:2327 + msgid "Failed to execute gpg." + msgstr "gpg konnte nicht ausgeführt werden." + +-#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762 +-#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790 +-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987 ++#: ../camel/camel-gpg-context.c:1793 ++#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1809 ++#: ../camel/camel-gpg-context.c:1829 ++#: ../camel/camel-smime-context.c:973 ++#: ../camel/camel-smime-context.c:987 + #: ../camel/camel-smime-context.c:996 + #, c-format + msgid "Cannot verify message signature: Incorrect message format" +@@ -2230,31 +2282,33 @@ msgstr "" + "Nachrichtensignatur konnte nicht verifiziert werden: Nachrichtenformat " + "fehlerhaft" + +-#: ../camel/camel-gpg-context.c:1832 ++#: ../camel/camel-gpg-context.c:1871 + msgid "Cannot verify message signature: " + msgstr "Nachrichtensignatur konnte nicht verifiziert werden:" + +-#: ../camel/camel-gpg-context.c:1955 ++#: ../camel/camel-gpg-context.c:1994 + msgid "Could not generate encrypting data: " + msgstr "Verschlüsselungsdaten konnten nicht erzeugt werden:" + +-#: ../camel/camel-gpg-context.c:2008 ++#: ../camel/camel-gpg-context.c:2047 + msgid "This is a digitally encrypted message part" + msgstr "Dies ist ein digital verschlüsselter Nachrichtenteil" + +-#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075 +-#: ../camel/camel-gpg-context.c:2098 ++#: ../camel/camel-gpg-context.c:2105 ++#: ../camel/camel-gpg-context.c:2114 ++#: ../camel/camel-gpg-context.c:2137 + #, c-format + msgid "Cannot decrypt message: Incorrect message format" + msgstr "" + "Nachricht konnte nicht entschlüsselt werden: Nachrichtenformat fehlerhaft" + +-#: ../camel/camel-gpg-context.c:2086 ++#: ../camel/camel-gpg-context.c:2125 + #, c-format + msgid "Failed to decrypt MIME part: protocol error" + msgstr "MIME-Teil konnte nicht entschlüsselt werden: Protokollfehler" + +-#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1287 ++#: ../camel/camel-gpg-context.c:2220 ++#: ../camel/camel-smime-context.c:1287 + msgid "Encrypted content" + msgstr "Verschlüsselter Inhalt" + +@@ -2263,7 +2317,8 @@ msgstr "Verschlüsselter Inhalt" + msgid "No quota information available for folder '%s'" + msgstr "Kontingent-Informationen sind für Ordner »%s« nicht verfügbar" + +-#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882 ++#: ../camel/camel-imapx-folder.c:809 ++#: ../camel/camel-imapx-folder.c:882 + #, c-format + msgid "No destination folder specified" + msgstr "Kein Zielordner angegeben" +@@ -2277,7 +2332,7 @@ msgid "Unable to move deleted messages" + msgstr "Gelöschte Nachrichten konnten nicht verschoben werden" + + #: ../camel/camel-imapx-folder.c:1119 +-#: ../camel/providers/nntp/camel-nntp-folder.c:738 ++#: ../camel/providers/nntp/camel-nntp-folder.c:794 + msgid "Apply message _filters to this folder" + msgstr "Nachrichten_filter auf diesen Ordner anwenden" + +@@ -2291,121 +2346,123 @@ msgstr "Zusammenfassung für %s konnte n + msgid "Could not create cache for %s: " + msgstr "Zwischenspeicher konnte nicht für »%s« angelegt werden:" + +-#: ../camel/camel-imapx-server.c:1282 ++#: ../camel/camel-imapx-server.c:1283 + msgid "Server disconnected" + msgstr "Serververbindung wurde getrennt" + +-#: ../camel/camel-imapx-server.c:1790 ++#: ../camel/camel-imapx-server.c:1772 + msgid "Error writing to cache stream" + msgstr "Fehler beim Schreiben in den Zwischenspeicher-Datenstrom" + +-#: ../camel/camel-imapx-server.c:2443 ++#: ../camel/camel-imapx-server.c:2441 + #, c-format +-msgid "" +-"Alert from IMAP server %s:\n" ++msgid "Alert from IMAP server %s:\n" + "%s" +-msgstr "" +-"Warnung von IMAP-Server %s:\n" ++msgstr "Warnung von IMAP-Server %s:\n" + "%s" + +-#: ../camel/camel-imapx-server.c:3031 ++#: ../camel/camel-imapx-server.c:3029 + #, c-format + msgid "Not authenticated" + msgstr "Nicht legitimiert" + +-#: ../camel/camel-imapx-server.c:3109 ++#: ../camel/camel-imapx-server.c:3107 + msgid "Error performing IDLE" + msgstr "Fehler beim Ausführen von IDLE" + +-#: ../camel/camel-imapx-server.c:4066 ++#: ../camel/camel-imapx-server.c:3994 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert: %s" + +-#: ../camel/camel-imapx-server.c:4067 +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/camel-imapx-server.c:3995 ++#: ../camel/providers/smtp/camel-smtp-transport.c:203 + msgid "STARTTLS not supported" + msgstr "STARTTLS nicht unterstützt" + +-#: ../camel/camel-imapx-server.c:4106 ++#: ../camel/camel-imapx-server.c:4034 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert:" + +-#: ../camel/camel-imapx-server.c:4186 ++#: ../camel/camel-imapx-server.c:4114 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP-Server %s unterstützt den Legitimierungstyp %s nicht" + +-#: ../camel/camel-imapx-server.c:4197 ../camel/camel-session.c:495 +-#: ../camel/providers/pop3/camel-pop3-store.c:272 +-#: ../camel/providers/pop3/camel-pop3-store.c:654 +-#: ../camel/providers/smtp/camel-smtp-transport.c:517 ++#: ../camel/camel-imapx-server.c:4125 ++#: ../camel/camel-session.c:495 ++#: ../camel/providers/pop3/camel-pop3-store.c:303 ++#: ../camel/providers/pop3/camel-pop3-store.c:737 ++#: ../camel/providers/smtp/camel-smtp-transport.c:509 + #, c-format + msgid "No support for %s authentication" + msgstr "Keine Unterstützung für Legitimierungstyp %s" + +-#: ../camel/camel-imapx-server.c:4216 +-#: ../camel/providers/nntp/camel-nntp-store.c:362 +-#: ../camel/providers/nntp/camel-nntp-store.c:562 ++#: ../camel/camel-imapx-server.c:4144 ++#: ../camel/providers/nntp/camel-nntp-store.c:407 ++#: ../camel/providers/nntp/camel-nntp-store.c:595 + msgid "Cannot authenticate without a username" + msgstr "Legitimierung ohne Benutzername ist nicht möglich" + +-#: ../camel/camel-imapx-server.c:4225 +-#: ../camel/providers/nntp/camel-nntp-store.c:571 +-#: ../camel/providers/pop3/camel-pop3-store.c:579 +-#: ../camel/providers/pop3/camel-pop3-store.c:599 ++#: ../camel/camel-imapx-server.c:4153 ++#: ../camel/providers/nntp/camel-nntp-store.c:604 ++#: ../camel/providers/pop3/camel-pop3-store.c:662 ++#: ../camel/providers/pop3/camel-pop3-store.c:682 + msgid "Authentication password not available" + msgstr "Legitimierungspasswort ist nicht verfügbar" + +-#: ../camel/camel-imapx-server.c:4433 ++#: ../camel/camel-imapx-server.c:4360 + msgid "Error fetching message" + msgstr "Fehler beim Abrufen der Nachricht" + +-#: ../camel/camel-imapx-server.c:4515 +-msgid "Failed to copy the tmp file" +-msgstr "Temporäre Datei konnte nicht kopiert werden" +- +-#: ../camel/camel-imapx-server.c:4529 ++#: ../camel/camel-imapx-server.c:4410 ++#: ../camel/camel-imapx-server.c:4418 + msgid "Failed to close the tmp stream" + msgstr "Temporärer Datenstrom konnte nicht geschlossen werden" + +-#: ../camel/camel-imapx-server.c:4650 ++#: ../camel/camel-imapx-server.c:4447 ++msgid "Failed to copy the tmp file" ++msgstr "Temporäre Datei konnte nicht kopiert werden" ++ ++#: ../camel/camel-imapx-server.c:4571 + msgid "Error copying messages" + msgstr "Fehler beim Kopieren von Nachrichten" + +-#: ../camel/camel-imapx-server.c:4816 ++#: ../camel/camel-imapx-server.c:4740 + msgid "Error appending message" + msgstr "Fehler beim Anhängen der Nachricht" + +-#: ../camel/camel-imapx-server.c:5015 ++#: ../camel/camel-imapx-server.c:4939 + msgid "Error fetching message headers" + msgstr "Fehler beim Holen der Nachrichtenkopfzeilen" + +-#: ../camel/camel-imapx-server.c:5166 ++#: ../camel/camel-imapx-server.c:5090 + msgid "Error retrieving message" + msgstr "Fehler beim Abrufen der Nachricht" + +-#: ../camel/camel-imapx-server.c:5297 ../camel/camel-imapx-server.c:5525 ++#: ../camel/camel-imapx-server.c:5221 ++#: ../camel/camel-imapx-server.c:5449 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "" + "Zusammenfassende Informationen für neue Nachrichten in »%s« werden abgerufen" + +-#: ../camel/camel-imapx-server.c:5361 ++#: ../camel/camel-imapx-server.c:5285 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "Geänderte Nachrichten werden in »%s« gesucht" + +-#: ../camel/camel-imapx-server.c:5414 ++#: ../camel/camel-imapx-server.c:5338 + msgid "Error fetching new messages" + msgstr "Fehler beim Abrufen neuer Nachrichten" + +-#: ../camel/camel-imapx-server.c:5627 ++#: ../camel/camel-imapx-server.c:5551 + msgid "Error while fetching messages" + msgstr "Fehler beim Abholen von Nachrichten" + +-#: ../camel/camel-imapx-server.c:5635 ../camel/camel-imapx-server.c:5668 ++#: ../camel/camel-imapx-server.c:5559 ++#: ../camel/camel-imapx-server.c:5592 + #, c-format + msgid "Fetching summary information for %d message in '%s'" + msgid_plural "Fetching summary information for %d messages in '%s'" +@@ -2414,64 +2471,66 @@ msgstr[0] "" + msgstr[1] "" + "Zusammenfassende Informationen für %d Nachrichten in »%s« werden abgerufen" + +-#: ../camel/camel-imapx-server.c:5804 ../camel/camel-imapx-server.c:5834 ++#: ../camel/camel-imapx-server.c:5728 ++#: ../camel/camel-imapx-server.c:5758 + msgid "Error refreshing folder" + msgstr "Fehler beim Aktualisieren des Ordners" + +-#: ../camel/camel-imapx-server.c:5958 ++#: ../camel/camel-imapx-server.c:5882 + msgid "Error expunging message" + msgstr "Fehler beim Löschen der Nachricht" + +-#: ../camel/camel-imapx-server.c:6069 ++#: ../camel/camel-imapx-server.c:5993 + msgid "Error fetching folders" + msgstr "Fehler beim Abrufen der Ordner" + +-#: ../camel/camel-imapx-server.c:6151 ++#: ../camel/camel-imapx-server.c:6075 + msgid "Error subscribing to folder" + msgstr "Fehler beim Abonnieren des Ordners" + +-#: ../camel/camel-imapx-server.c:6216 ++#: ../camel/camel-imapx-server.c:6140 + msgid "Error creating folder" + msgstr "Fehler beim Anlegen des Ordners" + +-#: ../camel/camel-imapx-server.c:6270 ++#: ../camel/camel-imapx-server.c:6194 + msgid "Error deleting folder" + msgstr "Fehler beim Löschen des Ordners" + +-#: ../camel/camel-imapx-server.c:6344 ++#: ../camel/camel-imapx-server.c:6268 + msgid "Error renaming folder" + msgstr "Fehler beim Umbenennen des Ordners" + +-#: ../camel/camel-imapx-server.c:6419 ++#: ../camel/camel-imapx-server.c:6343 + msgid "Error retrieving quota information" + msgstr "Fehler beim Abrufen der Kontingent-Informationen" + +-#: ../camel/camel-imapx-server.c:6484 ++#: ../camel/camel-imapx-server.c:6408 + msgid "Search failed" + msgstr "Suche fehlgeschlagen" + +-#: ../camel/camel-imapx-server.c:6547 ++#: ../camel/camel-imapx-server.c:6471 + msgid "Error performing NOOP" + msgstr "Fehler beim Ausführen von NOOP" + +-#: ../camel/camel-imapx-server.c:6656 ++#: ../camel/camel-imapx-server.c:6580 + msgid "Error syncing changes" + msgstr "Fehler beim Abgleichen der Änderungen" + +-#: ../camel/camel-imapx-server.c:7474 ++#: ../camel/camel-imapx-server.c:7385 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "Nachricht mit Kennung %s konnte nicht abgerufen werden: %s" + +-#: ../camel/camel-imapx-server.c:7475 ++#: ../camel/camel-imapx-server.c:7386 + msgid "No such message available." + msgstr "Nachricht nicht verfügbar." + +-#: ../camel/camel-imapx-server.c:7633 ../camel/camel-imapx-server.c:7648 ++#: ../camel/camel-imapx-server.c:7547 ++#: ../camel/camel-imapx-server.c:7562 + msgid "Cannot create spool file: " + msgstr "Spool-Datei konnte nicht angelegt werden:" + +-#: ../camel/camel-imapx-server.c:8390 ++#: ../camel/camel-imapx-server.c:8304 + msgid "IMAP server does not support quotas" + msgstr "IMAP-Server unterstützt keine Kontingente" + +@@ -2492,7 +2551,8 @@ msgid "Password" + msgstr "Passwort" + + #: ../camel/camel-imapx-store.c:345 +-msgid "This option will connect to the IMAP server using a plaintext password." ++msgid "" ++"This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Dies stellt unter Verwendung eines unverschlüsselten Passworts eine " + "Verbindung mit dem IMAP-Server her." +@@ -2503,7 +2563,8 @@ msgid "No such folder %s" + msgstr "Ordner »%s« nicht vorhanden" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/camel-imapx-store.c:478 ../camel/camel-imapx-store.c:968 ++#: ../camel/camel-imapx-store.c:478 ++#: ../camel/camel-imapx-store.c:968 + #: ../camel/providers/local/camel-maildir-folder.c:473 + #: ../camel/providers/local/camel-maildir-store.c:316 + #: ../camel/providers/local/camel-maildir-store.c:750 +@@ -2520,8 +2581,7 @@ msgstr "Ordnerliste für »%s« wird abg + + #: ../camel/camel-imapx-store.c:1614 + #, c-format +-msgid "" +-"The folder name \"%s\" is invalid because it contains the character \"%c\"" ++msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält" + + #: ../camel/camel-imapx-store.c:1625 +@@ -2576,7 +2636,8 @@ msgstr "Weiterleitung an Sperrhilfsprogr + msgid "Cannot fork locking helper: %s" + msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s" + +-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239 ++#: ../camel/camel-lock-client.c:211 ++#: ../camel/camel-lock-client.c:239 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" + msgstr "»%s« konnte nicht gesperrt werden: Protokollfehler mit lock-helper" +@@ -2635,7 +2696,8 @@ msgstr "Fehler beim Lesen der E-Mail-Dat + msgid "Error writing mail temp file: %s" + msgstr "Fehler beim Schreiben der temporären E-Mail-Datei: %s" + +-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562 ++#: ../camel/camel-movemail.c:493 ++#: ../camel/camel-movemail.c:562 + #, c-format + msgid "Error copying mail temp file: %s" + msgstr "Fehler beim Kopieren der temporären E-Mail-Datei: %s" +@@ -2655,42 +2717,42 @@ msgstr "Keine Signatur verfügbar" + msgid "parse error" + msgstr "Fehler bei der Syntaxanalyse" + +-#: ../camel/camel-net-utils.c:703 ++#: ../camel/camel-net-utils.c:704 + #, c-format + msgid "Resolving: %s" + msgstr "%s wird aufgelöst" + +-#: ../camel/camel-net-utils.c:726 ++#: ../camel/camel-net-utils.c:727 + msgid "Host lookup failed" + msgstr "Finden eines Rechners gescheitert" + +-#: ../camel/camel-net-utils.c:732 ++#: ../camel/camel-net-utils.c:733 + #, c-format + msgid "Host lookup '%s' failed. Check your host name for spelling errors." + msgstr "" + "Finden des Rechners »%s« ist fehlgeschlagen. Überprüfen Sie den Rechnernamen " + "auf Rechtschreibfehler." + +-#: ../camel/camel-net-utils.c:736 ++#: ../camel/camel-net-utils.c:737 + #, c-format + msgid "Host lookup '%s' failed: %s" + msgstr "Finden des Rechners »%s« fehlgeschlagen: %s" + +-#: ../camel/camel-net-utils.c:857 ++#: ../camel/camel-net-utils.c:858 + msgid "Resolving address" + msgstr "Adresse wird aufgelöst" + +-#: ../camel/camel-net-utils.c:878 ++#: ../camel/camel-net-utils.c:879 + msgid "Name lookup failed" + msgstr "Namenssuche fehlgeschlagen" + +-#: ../camel/camel-net-utils.c:885 ++#: ../camel/camel-net-utils.c:886 + msgid "Name lookup failed. Check your host name for spelling errors." + msgstr "" + "Namenssuche ist fehlgeschlagen. Überprüfen Sie den Rechnernamen auf " + "Rechtschreibfehler." + +-#: ../camel/camel-net-utils.c:889 ++#: ../camel/camel-net-utils.c:890 + #, c-format + msgid "Name lookup failed: %s" + msgstr "Namenssuche fehlgeschlagen: %s" +@@ -2705,7 +2767,8 @@ msgstr "Verbindung mit »%s:%s« geschei + msgid "Syncing messages in folder '%s' to disk" + msgstr "Nachrichten im Ordner »%s« werden auf Festplatte abgeglichen" + +-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177 ++#: ../camel/camel-offline-journal.c:145 ++#: ../camel/camel-offline-journal.c:177 + #, c-format + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "Offline-Journal für Ordner »%s« konnte nicht geschrieben werden: %s" +@@ -2735,7 +2798,8 @@ msgstr "%s konnte nicht geladen werden: + msgid "Could not load %s: No initialization code in module." + msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul." + +-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:407 ++#: ../camel/camel-provider.c:429 ++#: ../camel/camel-session.c:407 + #, c-format + msgid "No provider available for protocol '%s'" + msgstr "Kein Treiber für Protokoll »%s« verfügbar" +@@ -2758,29 +2822,23 @@ msgstr "Legitimierung gescheitert." + + #: ../camel/camel-sasl-anonymous.c:81 + #, c-format +-msgid "" +-"Invalid email address trace information:\n" ++msgid "Invalid email address trace information:\n" + "%s" +-msgstr "" +-"Ungültige E-Mail-Adressverfolgungsinformationen:\n" ++msgstr "Ungültige E-Mail-Adressverfolgungsinformationen:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:95 + #, c-format +-msgid "" +-"Invalid opaque trace information:\n" ++msgid "Invalid opaque trace information:\n" + "%s" +-msgstr "" +-"Ungültige opake Verfolgungsinformationen:\n" ++msgstr "Ungültige opake Verfolgungsinformationen:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:109 + #, c-format +-msgid "" +-"Invalid trace information:\n" ++msgid "Invalid trace information:\n" + "%s" +-msgstr "" +-"Ungültige Verfolgungsinformationen:\n" ++msgstr "Ungültige Verfolgungsinformationen:\n" + "%s" + + #: ../camel/camel-sasl-cram-md5.c:46 +@@ -2801,8 +2859,8 @@ msgstr "DIGEST-MD5" + + #: ../camel/camel-sasl-digest-md5.c:61 + msgid "" +-"This option will connect to the server using a secure DIGEST-MD5 password, if " +-"the server supports it." ++"This option will connect to the server using a secure DIGEST-MD5 password, " ++"if the server supports it." + msgstr "" + "Dies stellt eine Verbindung mit dem SMTP-Server her und verwendet dazu ein " + "sicheres DIGEST-MD5-Passwort, falls der Server dies unterstützt." +@@ -2844,7 +2902,8 @@ msgid "GSSAPI" + msgstr "GSSAPI" + + #: ../camel/camel-sasl-gssapi.c:93 +-msgid "This option will connect to the server using Kerberos 5 authentication." ++msgid "" ++"This option will connect to the server using Kerberos 5 authentication." + msgstr "" + "Dies stellt eine Verbindung mit dem Server her und verwendet zur " + "Legitimierung Kerberos 5" +@@ -2860,7 +2919,8 @@ msgstr "" + #: ../camel/camel-sasl-gssapi.c:139 + msgid "The provided target_name parameter was ill-formed." + msgstr "" +-"Der übergebene Parameter »target_name« liegt in fehlerhafter Formatierung vor." ++"Der übergebene Parameter »target_name« liegt in fehlerhafter Formatierung " ++"vor." + + #: ../camel/camel-sasl-gssapi.c:142 + msgid "" +@@ -2918,9 +2978,11 @@ msgstr "" + "Die Berechtigungsnachweise, auf die Bezug genommen wurde, sind nicht mehr " + "gültig." + +-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340 +-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405 +-#: ../camel/providers/smtp/camel-smtp-transport.c:624 ++#: ../camel/camel-sasl-gssapi.c:175 ++#: ../camel/camel-sasl-gssapi.c:340 ++#: ../camel/camel-sasl-gssapi.c:388 ++#: ../camel/camel-sasl-gssapi.c:405 ++#: ../camel/providers/smtp/camel-smtp-transport.c:616 + #, c-format + msgid "Bad authentication response from server." + msgstr "Fehlerhafte Legitimierungsantwort vom Server." +@@ -2934,7 +2996,8 @@ msgstr "Nicht unterstützte Sicherheitse + msgid "Login" + msgstr "Anmelden" + +-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46 ++#: ../camel/camel-sasl-login.c:42 ++#: ../camel/camel-sasl-plain.c:46 + msgid "This option will connect to the server using a simple password." + msgstr "" + "Dies stellt unter Verwendung eines einfachen Passworts eine Verbindung mit " +@@ -2945,17 +3008,17 @@ msgstr "" + msgid "Unknown authentication state." + msgstr "Unbekannter Legitimierungszustand." + +-#: ../camel/camel-sasl-ntlm.c:47 ++#: ../camel/camel-sasl-ntlm.c:48 + msgid "NTLM / SPA" + msgstr "NTLM/SPA" + +-#: ../camel/camel-sasl-ntlm.c:49 ++#: ../camel/camel-sasl-ntlm.c:50 + msgid "" + "This option will connect to a Windows-based server using NTLM / Secure " + "Password Authentication." + msgstr "" +-"Mit dieser Option werden Sie mit einem Windows-basierten Server, der " +-"NTLM/»Secure Password Authentication« verwendet, verbunden." ++"Mit dieser Option werden Sie mit einem Windows-basierten Server, der NTLM/" ++"»Secure Password Authentication« verwendet, verbunden." + + #: ../camel/camel-sasl-plain.c:44 + msgid "PLAIN" +@@ -2976,9 +3039,11 @@ msgstr "POP-Quell-UID" + #: ../camel/camel-sasl-popb4smtp.c:98 + #, c-format + msgid "POP Before SMTP authentication using an unknown transport" +-msgstr "POP-vor-SMTP-Legitimierung mit einem unbekannten Übertragungsverfahren" ++msgstr "" ++"POP-vor-SMTP-Legitimierung mit einem unbekannten Übertragungsverfahren" + +-#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119 ++#: ../camel/camel-sasl-popb4smtp.c:110 ++#: ../camel/camel-sasl-popb4smtp.c:119 + #, c-format + msgid "POP Before SMTP authentication attempted with a %s service" + msgstr "POP-vor-SMTP-Legitimierung wurde mit einem %s-Dienst versucht" +@@ -3010,7 +3075,8 @@ msgstr "Weiterleitung von Nachrichten wi + msgid "Please enter the %s password for %s on host %s." + msgstr "Bitte geben Sie das %s-Passwort für %s auf dem Rechner %s ein." + +-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074 ++#: ../camel/camel-smime-context.c:351 ++#: ../camel/camel-smime-context.c:1074 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "Es konnte kein Zertifikat für »%s« gefunden werden" +@@ -3043,7 +3109,8 @@ msgstr "Zertifikatkette konnte nicht gef + msgid "Cannot add CMS Signing time" + msgstr "CMS-Unterzeichnungszeit konnte nicht hinzugefügt werden" + +-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454 ++#: ../camel/camel-smime-context.c:439 ++#: ../camel/camel-smime-context.c:454 + #, c-format + msgid "Encryption certificate for '%s' does not exist" + msgstr "Es existiert kein Verschlüsselungszertifikat für »%s«" +@@ -3113,15 +3180,18 @@ msgstr "Keine signierten Daten in Signat + msgid "Digests missing from enveloped data" + msgstr "Digest der kuvertieren Daten fehlt" + +-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602 ++#: ../camel/camel-smime-context.c:591 ++#: ../camel/camel-smime-context.c:602 + msgid "Cannot calculate digests" + msgstr "Digests konnten nicht berechnet werden" + +-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613 ++#: ../camel/camel-smime-context.c:609 ++#: ../camel/camel-smime-context.c:613 + msgid "Cannot set message digests" + msgstr "Nachrichten-Digests konnten nicht festgelegt werden" + +-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628 ++#: ../camel/camel-smime-context.c:623 ++#: ../camel/camel-smime-context.c:628 + msgid "Certificate import failed" + msgstr "Zertifikatimport gescheitert" + +@@ -3146,7 +3216,8 @@ msgstr "Signatur-Digest konnte nicht gef + msgid "Signer: %s <%s>: %s\n" + msgstr "Unterzeichner: %s <%s>: %s\n" + +-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148 ++#: ../camel/camel-smime-context.c:858 ++#: ../camel/camel-smime-context.c:1148 + msgid "Cannot create encoder context" + msgstr "Verschlüsselungskontext konnte nicht angelegt werden" + +@@ -3154,11 +3225,13 @@ msgstr "Verschlüsselungskontext konnte + msgid "Failed to add data to CMS encoder" + msgstr "Daten konnten nicht zu CMS-Kodierer hinzugefügt werden" + +-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165 ++#: ../camel/camel-smime-context.c:869 ++#: ../camel/camel-smime-context.c:1165 + msgid "Failed to encode data" + msgstr "Datenverschlüsselung gescheitert" + +-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262 ++#: ../camel/camel-smime-context.c:1013 ++#: ../camel/camel-smime-context.c:1262 + msgid "Decoder failed" + msgstr "Dekodiervorgang gescheitert" + +@@ -3222,12 +3295,14 @@ msgstr "Ordner »%s« wird geöffnet" + msgid "Scanning folders in '%s'" + msgstr "Ordner in »%s« werden eingelesen" + +-#: ../camel/camel-store.c:2115 ../camel/camel-store.c:2146 ++#: ../camel/camel-store.c:2115 ++#: ../camel/camel-store.c:2146 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Trash" + msgstr "Müll" + +-#: ../camel/camel-store.c:2127 ../camel/camel-store.c:2162 ++#: ../camel/camel-store.c:2127 ++#: ../camel/camel-store.c:2162 + #: ../camel/camel-vtrash-folder.c:50 + msgid "Junk" + msgstr "Unerwünscht" +@@ -3242,13 +3317,15 @@ msgstr "Ordner konnte nicht angelegt wer + msgid "Creating folder '%s'" + msgstr "Ordner »%s« wird angelegt" + +-#: ../camel/camel-store.c:2747 ../camel/camel-vee-store.c:416 ++#: ../camel/camel-store.c:2747 ++#: ../camel/camel-vee-store.c:416 + #: ../camel/providers/local/camel-maildir-store.c:315 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang" + +-#: ../camel/camel-store.c:2890 ../camel/camel-vee-store.c:466 ++#: ../camel/camel-store.c:2890 ++#: ../camel/camel-vee-store.c:466 + #: ../camel/providers/local/camel-maildir-store.c:839 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" +@@ -3261,7 +3338,8 @@ msgstr "" + + #: ../camel/camel-stream-null.c:78 + msgid "Only reset to beginning is supported with CamelHttpStream" +-msgstr "Mit CamelHttpStream wird nur das Zurücksetzen an den Beginn unterstützt" ++msgstr "" ++"Mit CamelHttpStream wird nur das Zurücksetzen an den Beginn unterstützt" + + #: ../camel/camel-stream-process.c:275 + #, c-format +@@ -3288,7 +3366,8 @@ msgstr "Ordner »%s« wird abbestellt" + msgid "NSPR error code %d" + msgstr "NSPR-Fehlercode %d" + +-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662 ++#: ../camel/camel-tcp-stream-raw.c:649 ++#: ../camel/camel-tcp-stream-raw.c:662 + #, c-format + msgid "The proxy host does not support SOCKS4" + msgstr "Der Proxy-Rechner unterstützt nicht SOCKS4" +@@ -3298,7 +3377,8 @@ msgstr "Der Proxy-Rechner unterstützt n + msgid "The proxy host denied our request: code %d" + msgstr "Der Proxy-Rechner hat die Anfrage abgewiesen: Code %d" + +-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781 ++#: ../camel/camel-tcp-stream-raw.c:773 ++#: ../camel/camel-tcp-stream-raw.c:781 + #, c-format + msgid "The proxy host does not support SOCKS5" + msgstr "Der Proxy-Rechner unterstützt nicht SOCKS5" +@@ -3361,7 +3441,8 @@ msgstr "Der Rechnername ist zu lang (max + + #. SOCKS5 + #. reserved - must be 0 +-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922 ++#: ../camel/camel-tcp-stream-raw.c:912 ++#: ../camel/camel-tcp-stream-raw.c:922 + #, c-format + msgid "Invalid reply from proxy server" + msgstr "Ungültige Antwort vom Proxy-Server" +@@ -3376,7 +3457,8 @@ msgstr "Syntax der Adresse »%s« konnte + msgid "Updating folder '%s'" + msgstr "Ordner »%s« wird aktualisiert" + +-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965 ++#: ../camel/camel-vee-folder.c:855 ++#: ../camel/camel-vee-folder.c:965 + #, c-format + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "" +@@ -3484,7 +3566,8 @@ msgstr "Neue Nachrichten auf _unerwünsc + + #: ../camel/providers/imapx/camel-imapx-provider.c:67 + msgid "Only check for Junk messages in the IN_BOX folder" +-msgstr "A_usschließlich den Eingangsordner auf unerwünschte Nachrichten prüfen" ++msgstr "" ++"A_usschließlich den Eingangsordner auf unerwünschte Nachrichten prüfen" + + #: ../camel/providers/imapx/camel-imapx-provider.c:69 + msgid "Automatically synchroni_ze remote mail locally" +@@ -3528,11 +3611,9 @@ msgstr "Rumpfdaten der Nachricht _indizi + + #: ../camel/providers/local/camel-local-folder.c:727 + #, c-format +-msgid "" +-"Cannot get message %s from folder %s\n" ++msgid "Cannot get message %s from folder %s\n" + "%s" +-msgstr "" +-"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\n" ++msgstr "Nachricht %s konnte nicht aus Ordner %s abgerufen werden\n" + "%s" + + #: ../camel/providers/local/camel-local-provider.c:43 +@@ -3653,7 +3734,8 @@ msgstr "»%s« konnte nicht umbenannt we + #, c-format + msgid "Unable to add message to summary: unknown reason" + msgstr "" +-"Nachricht konnte nicht zur Zusammenfassung hinzugefügt werden: Grund unbekannt" ++"Nachricht konnte nicht zur Zusammenfassung hinzugefügt werden: Grund " ++"unbekannt" + + #: ../camel/providers/local/camel-maildir-folder.c:100 + #: ../camel/providers/local/camel-maildir-folder.c:335 +@@ -3698,14 +3780,14 @@ msgstr "Ordner »%s« konnte nicht angel + + #: ../camel/providers/local/camel-maildir-store.c:245 + #: ../camel/providers/local/camel-mbox-store.c:369 +-#: ../camel/providers/local/camel-mh-store.c:522 ++#: ../camel/providers/local/camel-mh-store.c:514 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "Ordner »%s« konnte nicht abgerufen werden: %s" + + #: ../camel/providers/local/camel-maildir-store.c:251 + #: ../camel/providers/local/camel-mbox-store.c:379 +-#: ../camel/providers/local/camel-mh-store.c:531 ++#: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "Ordner »%s« konnte nicht abgerufen werden: Ordner existiert nicht." +@@ -3717,14 +3799,14 @@ msgstr "Ordner »%s« konnte nicht abger + + #: ../camel/providers/local/camel-maildir-store.c:283 + #: ../camel/providers/local/camel-mbox-store.c:442 +-#: ../camel/providers/local/camel-mh-store.c:564 ++#: ../camel/providers/local/camel-mh-store.c:556 + #, c-format + msgid "Cannot create folder '%s': folder exists." + msgstr "Ordner »%s« konnte nicht angelegt werden: Ordner existiert." + + #: ../camel/providers/local/camel-maildir-store.c:347 + #: ../camel/providers/local/camel-maildir-store.c:387 +-#: ../camel/providers/local/camel-mh-store.c:682 ++#: ../camel/providers/local/camel-mh-store.c:674 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "Ordner »%s« konnte nicht gelöscht werden: %s" +@@ -3812,11 +3894,9 @@ msgstr "Ordner existiert bereits" + #: ../camel/providers/local/camel-mbox-store.c:672 + #: ../camel/providers/local/camel-mbox-store.c:701 + #, c-format +-msgid "" +-"Could not delete folder '%s':\n" ++msgid "Could not delete folder '%s':\n" + "%s" +-msgstr "" +-"Ordner »%s« konnte nicht gelöscht werden:\n" ++msgstr "Ordner »%s« konnte nicht gelöscht werden:\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:682 +@@ -3859,8 +3939,8 @@ msgstr "Ordner konnte nicht geöffnet we + #, c-format + msgid "Fatal mail parser error near position %s in folder %s" + msgstr "" +-"Schwerwiegender Fehler beim Verarbeiten der E-Mail nahe Position %s im Ordner " +-"%s" ++"Schwerwiegender Fehler beim Verarbeiten der E-Mail nahe Position %s im " ++"Ordner %s" + + #: ../camel/providers/local/camel-mbox-summary.c:607 + #, c-format +@@ -3942,12 +4022,12 @@ msgstr "Fehler beim Schreiben in tempor� + msgid "Cannot append message to mh folder: %s: " + msgstr "Nachricht konnte nicht an mh-Ordner angehängt werden: %s:" + +-#: ../camel/providers/local/camel-mh-store.c:541 ++#: ../camel/providers/local/camel-mh-store.c:533 + #, c-format + msgid "Could not create folder '%s': %s" + msgstr "Ordner »%s« konnte nicht angelegt werden: %s" + +-#: ../camel/providers/local/camel-mh-store.c:557 ++#: ../camel/providers/local/camel-mh-store.c:549 + #, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "Ordner »%s« konnte nicht abgerufen werden: kein Ordner." +@@ -3988,11 +4068,9 @@ msgstr "Ordner »%s/%s« existiert nicht + + #: ../camel/providers/local/camel-spool-store.c:505 + #, c-format +-msgid "" +-"Could not open folder '%s':\n" ++msgid "Could not open folder '%s':\n" + "%s" +-msgstr "" +-"Ordner »%s« konnte nicht geöffnet werden:\n" ++msgstr "Ordner »%s« konnte nicht geöffnet werden:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:511 +@@ -4002,11 +4080,9 @@ msgstr "Ordner »%s« existiert nicht." + + #: ../camel/providers/local/camel-spool-store.c:519 + #, c-format +-msgid "" +-"Could not create folder '%s':\n" ++msgid "Could not create folder '%s':\n" + "%s" +-msgstr "" +-"Ordner »%s« konnte nicht angelegt werden:\n" ++msgstr "Ordner »%s« konnte nicht angelegt werden:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:532 +@@ -4052,52 +4128,51 @@ msgstr "" + "Spool-Ordner %s konnte nicht abgeglichen werden: %s\n" + "Ordner könnte fehlerhaft sein, Kopie in »%s« gespeichert" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:278 +-#: ../camel/providers/nntp/camel-nntp-folder.c:360 +-#: ../camel/providers/nntp/camel-nntp-folder.c:481 ++#: ../camel/providers/nntp/camel-nntp-folder.c:285 ++#: ../camel/providers/nntp/camel-nntp-folder.c:388 ++#: ../camel/providers/nntp/camel-nntp-folder.c:510 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "Interner Fehler: UID-Format ungültig: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:332 +-#: ../camel/providers/pop3/camel-pop3-folder.c:633 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1065 ++#: ../camel/providers/nntp/camel-nntp-folder.c:349 ++#: ../camel/providers/nntp/camel-nntp-folder.c:354 ++#: ../camel/providers/pop3/camel-pop3-folder.c:657 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1107 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Nachricht %s konnte nicht abgerufen werden: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:339 +-#: ../camel/providers/nntp/camel-nntp-folder.c:504 +-#: ../camel/providers/pop3/camel-pop3-folder.c:558 +-#: ../camel/providers/pop3/camel-pop3-folder.c:623 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/nntp/camel-nntp-folder.c:361 ++#: ../camel/providers/nntp/camel-nntp-folder.c:536 ++#: ../camel/providers/pop3/camel-pop3-folder.c:582 ++#: ../camel/providers/pop3/camel-pop3-folder.c:647 ++#: ../camel/providers/pop3/camel-pop3-folder.c:666 + #, c-format + msgid "Cannot get message %s: " + msgstr "Nachricht %s konnte nicht abgerufen werden:" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:493 ++#: ../camel/providers/nntp/camel-nntp-folder.c:525 + #, c-format + msgid "This message is not currently available" + msgstr "Diese Nachricht ist derzeit nicht verfügbar" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:559 +-#: ../camel/providers/nntp/camel-nntp-folder.c:565 +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:593 ++#: ../camel/providers/nntp/camel-nntp-folder.c:599 + #, c-format + msgid "Posting failed: %s" + msgstr "Veröffentlichung gescheitert: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:606 ++#: ../camel/providers/nntp/camel-nntp-folder.c:664 + msgid "Posting failed: " + msgstr "Veröffentlichung gescheitert:" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:633 ++#: ../camel/providers/nntp/camel-nntp-folder.c:689 + #, c-format + msgid "You cannot post NNTP messages while working offline!" + msgstr "Sie können im Offline-Modus keine NNTP-Nachrichten veröffentlichen!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:653 ++#: ../camel/providers/nntp/camel-nntp-folder.c:709 + #, c-format + msgid "You cannot copy messages from a NNTP folder!" + msgstr "Nachrichten können nicht aus NNTP-Ordnern kopiert werden!" +@@ -4105,7 +4180,8 @@ msgstr "Nachrichten können nicht aus NN + #: ../camel/providers/nntp/camel-nntp-provider.c:48 + msgid "" + "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" +-msgstr "Ordner in _Kurznotation verwenden (also c.o.linux statt comp.os.linux)" ++msgstr "" ++"Ordner in _Kurznotation verwenden (also c.o.linux statt comp.os.linux)" + + #: ../camel/providers/nntp/camel-nntp-provider.c:51 + msgid "In the subscription _dialog, show relative folder names" +@@ -4138,140 +4214,143 @@ msgstr "" + + #: ../camel/providers/nntp/camel-nntp-provider.c:97 + msgid "" +-"This option will authenticate with the NNTP server using a plaintext password." ++"This option will authenticate with the NNTP server using a plaintext " ++"password." + msgstr "" + "Dies führt die Legitimierung am NNTP-Server mit einem unverschlüsselten " + "Passwort durch." + +-#: ../camel/providers/nntp/camel-nntp-store.c:333 ++#: ../camel/providers/nntp/camel-nntp-store.c:386 + #, c-format + msgid "Could not read greeting from %s: " + msgstr "Begrüßung von %s konnte nicht gelesen werden:" + +-#: ../camel/providers/nntp/camel-nntp-store.c:345 ++#: ../camel/providers/nntp/camel-nntp-store.c:394 + #, c-format + msgid "NNTP server %s returned error code %d: %s" + msgstr "NNTP-Server %s antwortete mit Fehler-Code %d: %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:522 ++#: ../camel/providers/nntp/camel-nntp-store.c:555 + #, c-format + msgid "USENET News via %s" + msgstr "USENET-News über %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1123 ++#: ../camel/providers/nntp/camel-nntp-store.c:1218 + #, c-format +-msgid "" +-"Error retrieving newsgroups:\n" ++msgid "Error retrieving newsgroups:\n" + "\n" + "%s" +-msgstr "" +-"Fehler beim Abrufen von Newsgroups:\n" ++msgstr "Fehler beim Abrufen von Newsgroups:\n" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1217 ++#: ../camel/providers/nntp/camel-nntp-store.c:1319 + #, c-format + msgid "You cannot create a folder in a News store: subscribe instead." + msgstr "" +-"Sie können in Newsgroups keine Ordner anlegen: Abonnieren Sie sie stattdessen." ++"Sie können in Newsgroups keine Ordner anlegen: Abonnieren Sie sie " ++"stattdessen." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1233 ++#: ../camel/providers/nntp/camel-nntp-store.c:1335 + #, c-format + msgid "You cannot rename a folder in a News store." + msgstr "Sie können in Newsgroups keine Ordner umbenennen." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1256 ++#: ../camel/providers/nntp/camel-nntp-store.c:1358 + #, c-format + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "" + "Sie können in Newsgroups keine Ordner entfernen: Bestellen Sie sie " + "stattdessen ab." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1455 ++#: ../camel/providers/nntp/camel-nntp-store.c:1577 + #, c-format + msgid "" + "You cannot subscribe to this newsgroup:\n" + "\n" + "No such newsgroup. The selected item is a probably a parent folder." + msgstr "" +-"Sie können diese Newsgroup nicht abonnieren, da sie nicht existiert.\n" +-"Vermutlich ist das gewählte Objekt ein Elternordner." ++"Sie können diese Newsgroup nicht abonnieren:\n" ++"\n" ++"Sie existiert nicht. Vermutlich ist das gewählte Objekt ein Elternordner." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1503 ++#: ../camel/providers/nntp/camel-nntp-store.c:1644 + #, c-format +-msgid "" +-"You cannot unsubscribe to this newsgroup:\n" ++msgid "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" +-msgstr "Sie können diese Newsgroup nicht abonnieren, da sie nicht existiert." ++msgstr "" ++"Sie können diese Newsgroup nicht abbestellen:\n" ++"\n" ++"Newsgroup existiert nicht!." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1707 ++#: ../camel/providers/nntp/camel-nntp-store.c:2081 + msgid "NNTP Command failed: " + msgstr "NNTP-Befehl gescheitert:" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1794 ++#: ../camel/providers/nntp/camel-nntp-store.c:2178 + #, c-format + msgid "Not connected." + msgstr "Nicht verbunden." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1856 ++#: ../camel/providers/nntp/camel-nntp-store.c:2272 + #, c-format + msgid "No such folder: %s" + msgstr "Ordner existiert nicht: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:198 +-#: ../camel/providers/nntp/camel-nntp-summary.c:328 ++#: ../camel/providers/nntp/camel-nntp-summary.c:200 ++#: ../camel/providers/nntp/camel-nntp-summary.c:339 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: neue Nachrichten werden eingelesen" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:216 ++#: ../camel/providers/nntp/camel-nntp-summary.c:222 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "Unerwartete Server-Antwort von xover: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:346 ++#: ../camel/providers/nntp/camel-nntp-summary.c:360 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "Unerwartete Server-Antwort von head: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:393 ++#: ../camel/providers/nntp/camel-nntp-summary.c:407 + #, c-format + msgid "Operation failed: %s" + msgstr "Vorgang gescheitert: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:453 +-#: ../camel/providers/pop3/camel-pop3-folder.c:526 ++#: ../camel/providers/pop3/camel-pop3-folder.c:468 ++#: ../camel/providers/pop3/camel-pop3-folder.c:547 + #, c-format + msgid "No message with UID %s" + msgstr "Keine Nachricht mit der Kennung %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:542 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 + #, c-format + msgid "Retrieving POP message %d" + msgstr "POP-Nachricht %d wird abgerufen" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:634 ++#: ../camel/providers/pop3/camel-pop3-folder.c:658 + msgid "Unknown reason" + msgstr "Unbekannter Grund" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:682 ++#: ../camel/providers/pop3/camel-pop3-folder.c:710 + msgid "Retrieving POP summary" + msgstr "POP-Zusammenfassung wird abgerufen" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:741 +-#: ../camel/providers/pop3/camel-pop3-folder.c:744 +-#: ../camel/providers/pop3/camel-pop3-folder.c:757 +-#: ../camel/providers/pop3/camel-pop3-folder.c:770 +-#: ../camel/providers/pop3/camel-pop3-folder.c:784 ++#: ../camel/providers/pop3/camel-pop3-folder.c:771 ++#: ../camel/providers/pop3/camel-pop3-folder.c:774 ++#: ../camel/providers/pop3/camel-pop3-folder.c:787 ++#: ../camel/providers/pop3/camel-pop3-folder.c:800 ++#: ../camel/providers/pop3/camel-pop3-folder.c:814 + msgid "Cannot get POP summary: " + msgstr "POP-Zusammenfassung konnte nicht abgerufen werden:" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:891 ++#: ../camel/providers/pop3/camel-pop3-folder.c:925 + msgid "Expunging old messages" + msgstr "Alte Nachrichten werden gelöscht" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:911 ++#: ../camel/providers/pop3/camel-pop3-folder.c:945 + msgid "Expunging deleted messages" + msgstr "Gelöschte Nachrichten werden ausgeräumt" + +@@ -4326,8 +4405,8 @@ msgstr "" + #: ../camel/providers/pop3/camel-pop3-provider.c:95 + msgid "" + "This option will connect to the POP server using an encrypted password via " +-"the APOP protocol. This may not work for all users even on servers that claim " +-"to support it." ++"the APOP protocol. This may not work for all users even on servers that " ++"claim to support it." + msgstr "" + "Dies stellt unter Verwendung eines verschlüsselten Passworts eine Verbindung " + "mit dem POP-Server über das APO-Protokoll her. Das funktioniert " +@@ -4335,76 +4414,75 @@ msgstr "" + "zu unterstützen." + + #. Translators: This is the separator between an error and an explanation +-#: ../camel/providers/pop3/camel-pop3-store.c:89 ++#: ../camel/providers/pop3/camel-pop3-store.c:99 + msgid ": " + msgstr ": " + +-#: ../camel/providers/pop3/camel-pop3-store.c:150 ++#: ../camel/providers/pop3/camel-pop3-store.c:161 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "Es konnte keine gültige Begrüßung durch POP-Server %s gelesen werden" + +-#: ../camel/providers/pop3/camel-pop3-store.c:165 ++#: ../camel/providers/pop3/camel-pop3-store.c:176 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "" + "Verbindung mit POP-Server %s konnte im sicheren Modus nicht hergestellt " + "werden: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:166 ++#: ../camel/providers/pop3/camel-pop3-store.c:177 + msgid "STLS not supported by server" + msgstr "STLS wird vom Server nicht unterstützt" + + #. Translators: Last %s is an optional + #. * explanation beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:187 ++#: ../camel/providers/pop3/camel-pop3-store.c:198 + #, c-format + msgid "Failed to connect to POP server %s in secure mode%s" + msgstr "" + "Verbindung mit POP-Server %s konnte im sicheren Modus nicht hergestellt " + "werden %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:200 ++#: ../camel/providers/pop3/camel-pop3-store.c:211 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: " + msgstr "" + "Verbindung mit POP-Server %s konnte im sicheren Modus nicht hergestellt " + "werden:" + +-#: ../camel/providers/pop3/camel-pop3-store.c:311 ++#: ../camel/providers/pop3/camel-pop3-store.c:351 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "Anmeldung an POP-Server %s gescheitert: SASL-Protokollfehler" + +-#: ../camel/providers/pop3/camel-pop3-store.c:333 ++#: ../camel/providers/pop3/camel-pop3-store.c:373 + #, c-format + msgid "Failed to authenticate on POP server %s: " + msgstr "Legitimierung am POP-Server %s gescheitert:" + +-#: ../camel/providers/pop3/camel-pop3-store.c:435 ++#: ../camel/providers/pop3/camel-pop3-store.c:481 + #, c-format + msgid "POP3 server %s" + msgstr "POP3-Server %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:438 ++#: ../camel/providers/pop3/camel-pop3-store.c:484 + #, c-format + msgid "POP3 server for %s on %s" + msgstr "POP3-Dienst für %s auf %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:613 ++#: ../camel/providers/pop3/camel-pop3-store.c:696 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " + "attack suspected. Please contact your admin." + msgstr "" + "Verbindung mit POP-Server %s konnte nicht hergestellt werden: Ungültige APOP-" +-"Kennung erhalten. Es könnte sich um einen sogenannten »Man in the Middle«-" ++"Kennung erhalten. Es könnte sich um einen sogenannten \"Man in the Middle\" " + "Angriff handeln. Bitte kontaktieren Sie Ihren System-Administrator." + +-#: ../camel/providers/pop3/camel-pop3-store.c:665 ++#: ../camel/providers/pop3/camel-pop3-store.c:748 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending password: " + msgstr "" + "Verbindung mit POP-Server %s konnte nicht hergestellt werden.\n" +@@ -4412,21 +4490,20 @@ msgstr "" + + #. Translators: Last %s is an optional explanation + #. * beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:680 ++#: ../camel/providers/pop3/camel-pop3-store.c:763 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending username%s" + msgstr "" + "Verbindung mit POP-Server %s konnte nicht hergestellt werden.\n" + "Fehler beim Übermitteln des Benutzernamens %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:751 ++#: ../camel/providers/pop3/camel-pop3-store.c:845 + #, c-format + msgid "No such folder '%s'." + msgstr "Ordner »%s« existiert nicht." + +-#: ../camel/providers/pop3/camel-pop3-store.c:768 ++#: ../camel/providers/pop3/camel-pop3-store.c:862 + #, c-format + msgid "POP3 stores have no folder hierarchy" + msgstr "POP3-Postfächer haben keine Ordnerstruktur" +@@ -4514,221 +4591,222 @@ msgid "For delivering mail by connecting + msgstr "" + "Zum Zustellen von E-Mails per SMTP über einen entfernten E-Mail-Knotenpunkt." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:160 +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:158 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 + msgid "Welcome response error: " + msgstr "Fehler bei Welcome-Antwort:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:207 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist gescheitert: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 +-#: ../camel/providers/smtp/camel-smtp-transport.c:229 +-#: ../camel/providers/smtp/camel-smtp-transport.c:236 ++#: ../camel/providers/smtp/camel-smtp-transport.c:211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:224 ++#: ../camel/providers/smtp/camel-smtp-transport.c:231 + msgid "STARTTLS command failed: " + msgstr "STARTTLS-Befehl gescheitert:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:247 ++#: ../camel/providers/smtp/camel-smtp-transport.c:242 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: " + msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist gescheitert:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:349 ++#: ../camel/providers/smtp/camel-smtp-transport.c:342 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP-Server %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:352 ++#: ../camel/providers/smtp/camel-smtp-transport.c:345 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "SMTP-E-Mail-Auslieferung über %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:426 ++#: ../camel/providers/smtp/camel-smtp-transport.c:419 + #, c-format + msgid "SMTP server %s does not support %s authentication" + msgstr "SMTP-Server %s unterstützt den Legitimierungstypen %s nicht" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:508 ++#: ../camel/providers/smtp/camel-smtp-transport.c:500 + #, c-format + msgid "No SASL mechanism was specified" + msgstr "Kein gültiger SASL-Mechanismus wurde angegeben" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:538 +-#: ../camel/providers/smtp/camel-smtp-transport.c:549 +-#: ../camel/providers/smtp/camel-smtp-transport.c:562 ++#: ../camel/providers/smtp/camel-smtp-transport.c:530 ++#: ../camel/providers/smtp/camel-smtp-transport.c:541 ++#: ../camel/providers/smtp/camel-smtp-transport.c:554 + msgid "AUTH command failed: " + msgstr "AUTH-Befehl gescheitert:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:695 + #, c-format + msgid "Cannot send message: service not connected." + msgstr "Nachricht konnte nicht verschickt werden: Dienst nicht verbunden." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:710 ++#: ../camel/providers/smtp/camel-smtp-transport.c:702 + #, c-format + msgid "Cannot send message: sender address not valid." +-msgstr "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig." ++msgstr "" ++"Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:714 ++#: ../camel/providers/smtp/camel-smtp-transport.c:706 + msgid "Sending message" + msgstr "Nachricht wird verschickt" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:731 + #, c-format + msgid "Cannot send message: no recipients defined." + msgstr "Nachricht konnte nicht verschickt werden: Keine Empfänger angegeben." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:752 ++#: ../camel/providers/smtp/camel-smtp-transport.c:744 + #, c-format + msgid "Cannot send message: one or more invalid recipients" + msgstr "" + "Nachricht konnte nicht verschickt werden: Mindestens ein Empfänger ungültig" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:873 ++#: ../camel/providers/smtp/camel-smtp-transport.c:865 + msgid "Syntax error, command unrecognized" + msgstr "Syntaxfehler, Befehl nicht erkannt" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:875 ++#: ../camel/providers/smtp/camel-smtp-transport.c:867 + msgid "Syntax error in parameters or arguments" + msgstr "Syntaxfehler in Parametern oder Argumenten" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:877 ++#: ../camel/providers/smtp/camel-smtp-transport.c:869 + msgid "Command not implemented" + msgstr "Befehl nicht implementiert" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:879 ++#: ../camel/providers/smtp/camel-smtp-transport.c:871 + msgid "Command parameter not implemented" + msgstr "Befehlsparameter nicht implementiert" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:881 ++#: ../camel/providers/smtp/camel-smtp-transport.c:873 + msgid "System status, or system help reply" + msgstr "Systemstatus- oder Systemhilfe-Antwort" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:883 ++#: ../camel/providers/smtp/camel-smtp-transport.c:875 + msgid "Help message" + msgstr "Hilfemeldung" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:885 ++#: ../camel/providers/smtp/camel-smtp-transport.c:877 + msgid "Service ready" + msgstr "Dienst ist bereit" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:887 ++#: ../camel/providers/smtp/camel-smtp-transport.c:879 + msgid "Service closing transmission channel" + msgstr "Dienst schließt Übertragungskanal" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:889 ++#: ../camel/providers/smtp/camel-smtp-transport.c:881 + msgid "Service not available, closing transmission channel" + msgstr "Dienst nicht verfügbar, Übertragungskanal wird geschlossen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:891 ++#: ../camel/providers/smtp/camel-smtp-transport.c:883 + msgid "Requested mail action okay, completed" + msgstr "Angeforderte E-Mail-Aktion in Ordnung, abgeschlossen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:893 ++#: ../camel/providers/smtp/camel-smtp-transport.c:885 + msgid "User not local; will forward to " + msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:895 ++#: ../camel/providers/smtp/camel-smtp-transport.c:887 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "Angeforderte E-Mail-Aktion nicht ausgeführt: Postfach nicht verfügbar" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:897 ++#: ../camel/providers/smtp/camel-smtp-transport.c:889 + msgid "Requested action not taken: mailbox unavailable" + msgstr "Angeforderte Aktion nicht ausgeführt: Postfach nicht verfügbar" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:899 ++#: ../camel/providers/smtp/camel-smtp-transport.c:891 + msgid "Requested action aborted: error in processing" + msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:901 ++#: ../camel/providers/smtp/camel-smtp-transport.c:893 + msgid "User not local; please try " + msgstr "Benutzer nicht lokal; probieren Sie es mit " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:903 ++#: ../camel/providers/smtp/camel-smtp-transport.c:895 + msgid "Requested action not taken: insufficient system storage" + msgstr "Angeforderte Aktion nicht ausgeführt: unzureichender Systemspeicher" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:905 ++#: ../camel/providers/smtp/camel-smtp-transport.c:897 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "Angeforderte Aktion abgebrochen: Speicherzuteilung überschritten" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:907 ++#: ../camel/providers/smtp/camel-smtp-transport.c:899 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "Angeforderte Aktion nicht ausgeführt: Postfachname nicht erlaubt" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:909 ++#: ../camel/providers/smtp/camel-smtp-transport.c:901 + msgid "Start mail input; end with ." + msgstr "E-Mail-Eingabe beginnen; Ende mit ." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:911 ++#: ../camel/providers/smtp/camel-smtp-transport.c:903 + msgid "Transaction failed" + msgstr "Transaktion gescheitert" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:915 ++#: ../camel/providers/smtp/camel-smtp-transport.c:907 + msgid "A password transition is needed" + msgstr "Ein Passwortübergang ist notwendig" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:917 ++#: ../camel/providers/smtp/camel-smtp-transport.c:909 + msgid "Authentication mechanism is too weak" + msgstr "Legitimierungsmechanismus ist zu schwach" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:919 ++#: ../camel/providers/smtp/camel-smtp-transport.c:911 + msgid "Encryption required for requested authentication mechanism" + msgstr "" + "Für den verlangten Legitimierungsmechanismus ist eine Verschlüsselung " + "erforderlich." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:921 ++#: ../camel/providers/smtp/camel-smtp-transport.c:913 + msgid "Temporary authentication failure" + msgstr "Legitimierung vorübergehend gescheitert" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1170 + msgid "SMTP Greeting" + msgstr "SMTP-Begrüßung" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1205 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1223 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1231 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1197 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1219 + msgid "HELO command failed: " + msgstr "HELO-Befehl gescheitert:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1306 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1321 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1331 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1294 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1309 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1319 + msgid "MAIL FROM command failed: " + msgstr "MAIL FROM-Befehl gescheitert:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1358 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1346 + msgid "RCPT TO command failed: " + msgstr "RCPT TO-Befehl gescheitert:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1375 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1385 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1363 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1373 + #, c-format + msgid "RCPT TO <%s> failed: " + msgstr "RCPT TO <%s> gescheitert:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1428 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1439 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1450 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1509 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1529 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1543 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1552 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1416 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1427 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1438 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1497 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1517 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1531 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1540 + msgid "DATA command failed: " + msgstr "DATA-Befehl gescheitert:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1577 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1592 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1601 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1565 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1580 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1589 + msgid "RSET command failed: " + msgstr "RSET-Befehl gescheitert:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1626 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1640 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1647 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1614 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1628 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1635 + msgid "QUIT command failed: " + msgstr "QUIT-Befehl gescheitert:" + +@@ -4742,7 +4820,8 @@ msgstr "Erinnerung an Geburts- und Jahre + + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2 + msgid "Whether to set a reminder for birthdays and anniversaries" +-msgstr "Soll eine Erinnerung für Geburtstage und Jahrestage festgelegt werden?" ++msgstr "" ++"Soll eine Erinnerung für Geburtstage und Jahrestage festgelegt werden?" + + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3 + msgid "Birthday and anniversary reminder value" +@@ -4751,8 +4830,8 @@ msgstr "Wert der Erinnerung an Geburts- + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4 + msgid "Number of units for determining a birthday or anniversary reminder" + msgstr "" +-"Anzahl der Einheiten zur Festlegung einer Erinnerung an einen Geburtstag oder " +-"Jahrestag" ++"Anzahl der Einheiten zur Festlegung einer Erinnerung an einen Geburtstag " ++"oder Jahrestag" + + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5 + msgid "Birthday and anniversary reminder units" +@@ -4760,8 +4839,8 @@ msgstr "Einheiten der Erinnerung an Gebu + + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6 + msgid "" +-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days" +-"\"" ++"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or " ++"\"days\"" + msgstr "" + "Einheit für Erinnerungen an Geburtstage oder Jahrestage (»minutes«, »hours« " + "oder »days«)." +@@ -4788,11 +4867,11 @@ msgstr "Vorgang wurde vom Client abgebro + msgid "Client reports password was rejected" + msgstr "Der Client meldet, dass das Passwort abgelehnt wurde" + +-#: ../libebackend/e-authentication-session.c:532 ++#: ../libebackend/e-authentication-session.c:543 + msgid "Add this password to your keyring" + msgstr "Fügen Sie dieses Passwort zu Ihrem Schlüsselbund hinzu" + +-#: ../libebackend/e-authentication-session.c:622 ++#: ../libebackend/e-authentication-session.c:648 + msgid "Password was incorrect" + msgstr "Das Passwort war nicht korrekt" + +@@ -4822,7 +4901,8 @@ msgstr "Kein Backend-Name für Prüfsumm + msgid "Data source is missing a [%s] group" + msgstr "In der Quelldatei fehlt eine [%s]-Gruppe" + +-#: ../libebackend/e-server-side-source.c:1008 ../libedataserver/e-source.c:1120 ++#: ../libebackend/e-server-side-source.c:1008 ++#: ../libedataserver/e-source.c:1138 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "" +@@ -4830,12 +4910,14 @@ msgstr "" + + #: ../libebackend/e-server-side-source.c:1022 + #, c-format +-msgid "Data source '%s' has no collection backend to create the remote resource" ++msgid "" ++"Data source '%s' has no collection backend to create the remote resource" + msgstr "" + "Datenquelle »%s« hat kein Sammel-Backend zum Erstellen der entfernten " + "Ressource" + +-#: ../libebackend/e-server-side-source.c:1050 ../libedataserver/e-source.c:1227 ++#: ../libebackend/e-server-side-source.c:1050 ++#: ../libedataserver/e-source.c:1251 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "" +@@ -4843,11 +4925,14 @@ msgstr "" + + #: ../libebackend/e-server-side-source.c:1064 + #, c-format +-msgid "Data source '%s' has no collection backend to delete the remote resource" ++msgid "" ++"Data source '%s' has no collection backend to delete the remote resource" + msgstr "" +-"Datenquelle »%s« hat kein Sammel-Backend zum Löschen der entfernten Ressource" ++"Datenquelle »%s« hat kein Sammel-Backend zum Löschen der entfernten " ++"Ressource" + +-#: ../libebackend/e-server-side-source.c:1095 ../libedataserver/e-source.c:1317 ++#: ../libebackend/e-server-side-source.c:1095 ++#: ../libedataserver/e-source.c:1347 + #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" +@@ -4859,7 +4944,7 @@ msgid "File must have a '.source' extens + msgstr "Die Datei muss die Endung ».source« haben" + + #: ../libebackend/e-source-registry-server.c:523 +-#: ../libedataserver/e-source-registry.c:1625 ++#: ../libedataserver/e-source-registry.c:1882 + msgid "The user declined to authenticate" + msgstr "Der Benutzer hat die Legitimierung verweigert" + +@@ -5056,22 +5141,22 @@ msgstr "Bitte geben Sie das Passwort fü + msgid "Please enter the password for account \"%s\"." + msgstr "Bitte geben Sie das Passwort für das Konto »%s« ein." + +-#: ../libedataserver/e-source.c:622 ++#: ../libedataserver/e-source.c:627 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "In der Quelldatei fehlt eine [%s]-Gruppe" + +-#: ../libedataserver/e-source.c:943 ++#: ../libedataserver/e-source.c:949 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "Datenquelle »%s« ist nicht entfernbar" + +-#: ../libedataserver/e-source.c:1029 ++#: ../libedataserver/e-source.c:1041 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "Datenquelle »%s« ist schreibgeschützt" + +-#: ../libedataserver/e-source.c:1523 ++#: ../libedataserver/e-source.c:1559 + msgid "Unnamed" + msgstr "Unbenannt" + +@@ -5101,8 +5186,8 @@ msgstr "" + #: ../libedataserver/e-source-webdav.c:1547 + #, c-format + msgid "" +-"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do you " +-"wish to accept it?" ++"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " ++"you wish to accept it?" + msgstr "" + "Dem SSL-Zertifikat für »%s« (von der Notizliste »%s« verwendet) wird nicht " + "vertraut. Wollen Sie es akzeptieren?" +@@ -5110,17 +5195,18 @@ msgstr "" + #: ../libedataserver/e-source-webdav.c:1556 + #, c-format + msgid "" +-"SSL certificate for host '%s', used by task list '%s', is not trusted. Do you " +-"wish to accept it?" ++"SSL certificate for host '%s', used by task list '%s', is not trusted. Do " ++"you wish to accept it?" + msgstr "" +-"Dem SSL-Zertifikat für »%s« (von der Aufgabenliste »%s« verwendet) wird nicht " +-"vertraut. Wollen Sie es akzeptieren?" ++"Dem SSL-Zertifikat für »%s« (von der Aufgabenliste »%s« verwendet) wird " ++"nicht vertraut. Wollen Sie es akzeptieren?" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962 ++#: ../libedataserver/e-time-utils.c:1663 ++#: ../libedataserver/e-time-utils.c:1962 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%a, %d.%m.%Y %I:%M:%S %p" + +@@ -5128,15 +5214,17 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p" + #. * in 24-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953 ++#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1953 + msgid "%a %m/%d/%Y %H:%M:%S" +-msgstr "%a, %d. %m %Y %k:%M:%S" ++msgstr "%a, %d. %m %Y %H:%M:%S" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958 ++#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1958 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%a, %d.%m.%Y, %I:%M %p" + +@@ -5144,9 +5232,10 @@ msgstr "%a, %d.%m.%Y, %I:%M %p" + #. * in 24-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949 ++#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1949 + msgid "%a %m/%d/%Y %H:%M" +-msgstr "%a, %d.%m.%Y, %k:%M" ++msgstr "%a, %d.%m.%Y, %H:%M" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format, without minutes or seconds. +@@ -5158,11 +5247,12 @@ msgstr "%a, %d.%m.%Y %I %p" + #. * in 24-hour format, without minutes or seconds. + #: ../libedataserver/e-time-utils.c:1688 + msgid "%a %m/%d/%Y %H" +-msgstr "%a, %d.%m.%Y %k" ++msgstr "%a, %d.%m.%Y %H" + + #. strptime format of a weekday and a date. + #. strftime format of a weekday and a date. +-#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811 ++#: ../libedataserver/e-time-utils.c:1691 ++#: ../libedataserver/e-time-utils.c:1811 + #: ../libedataserver/e-time-utils.c:1944 + msgid "%a %m/%d/%Y" + msgstr "%a, %d.%m.%Y" +@@ -5175,7 +5265,7 @@ msgstr "%d.%m.%Y %I:%M:%S %p" + #. strptime format of a date and a time, in 24-hour format. + #: ../libedataserver/e-time-utils.c:1702 + msgid "%m/%d/%Y %H:%M:%S" +-msgstr "%d.%m.%Y %k:%M:%S" ++msgstr "%d.%m.%Y %H:%M:%S" + + #. strptime format of a date and a time, in 12-hour format, + #. * without seconds. +@@ -5187,7 +5277,7 @@ msgstr "%d.%m.%Y / %I:%M %p" + #. * without seconds. + #: ../libedataserver/e-time-utils.c:1712 + msgid "%m/%d/%Y %H:%M" +-msgstr "%d.%m.%Y %k:%M" ++msgstr "%d.%m.%Y %H:%M" + + #. strptime format of a date and a time, in 12-hour format, + #. * without minutes or seconds. +@@ -5199,46 +5289,51 @@ msgstr "%d.%m.%Y %I %p" + #. * without minutes or seconds. + #: ../libedataserver/e-time-utils.c:1722 + msgid "%m/%d/%Y %H" +-msgstr "%d.%m.%Y %k" ++msgstr "%d.%m.%Y %H" + + #. strptime format of a weekday and a date. + #. This is the preferred date format for the locale. +-#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814 ++#: ../libedataserver/e-time-utils.c:1725 ++#: ../libedataserver/e-time-utils.c:1814 + msgid "%m/%d/%Y" + msgstr "%d.%m.%Y" + + #. strptime format for a time of day, in 12-hour format. + #. strftime format of a time in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006 ++#: ../libedataserver/e-time-utils.c:1885 ++#: ../libedataserver/e-time-utils.c:2006 + msgid "%I:%M:%S %p" + msgstr "%I:%M:%S %p" + + #. strptime format for a time of day, in 24-hour format. + #. strftime format of a time in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998 ++#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1998 + msgid "%H:%M:%S" +-msgstr "%k:%M:%S" ++msgstr "%H:%M:%S" + + #. strptime format for time of day, without seconds, + #. * in 12-hour format. + #. strftime format of a time in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003 ++#: ../libedataserver/e-time-utils.c:1894 ++#: ../libedataserver/e-time-utils.c:2003 + msgid "%I:%M %p" + msgstr "%I:%M %p" + + #. strptime format for time of day, without seconds 24-hour format. + #. strftime format of a time in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995 ++#: ../libedataserver/e-time-utils.c:1898 ++#: ../libedataserver/e-time-utils.c:1995 + msgid "%H:%M" +-msgstr "%k:%M" ++msgstr "%H:%M" + + #. strptime format for time of day, without seconds 24-hour format, + #. * and no colon. + #: ../libedataserver/e-time-utils.c:1902 + msgid "%H%M" +-msgstr "%k%M" ++msgstr "%H%M" + + #. strptime format for hour and AM/PM, 12-hour format. + #: ../libedataserver/e-time-utils.c:1906 +@@ -5251,11 +5346,11 @@ msgstr "Typ des zu verwendenden Proxys" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2 + msgid "" +-"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" means " +-"manual proxy." ++"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" " ++"means manual proxy." + msgstr "" +-"Typ des zu verwendenden Proxys. »0« bedeutet System, »1« bedeutet kein Proxy, " +-"»2« bedeutet manuelle Proxy-Konfiguration." ++"Typ des zu verwendenden Proxys. »0« bedeutet System, »1« bedeutet kein " ++"Proxy, »2« bedeutet manuelle Proxy-Konfiguration." + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 + msgid "Whether to use http-proxy" +@@ -5411,7 +5506,7 @@ msgid "Failed to find ASUrl and OABUrl i + msgstr "" + "In der Autodiscover-Anwort konnten weder ASUrl noch OABUrl gefunden werden" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1237 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1271 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " +@@ -5420,7 +5515,7 @@ msgstr "" + "Ein »%s« zugehöriges Konto, aus welchem ein Zugriffs-Token bezogen werden " + "könnte, konnte im Dienst org.gnome.OnlineAccounts nicht gefunden werden" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1264 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1298 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "Zugriffs-Token für »%s« konnte nicht erlangt werden:" +@@ -5921,311 +6016,3 @@ msgstr "WebDAV" + #: ../services/evolution-user-prompter/prompt-user-gtk.c:122 + msgid "_Dismiss" + msgstr "_Verwerfen" +- +-#~ msgid "Failed to run book factory" +-#~ msgstr "Ausführung der Buch-Factory ist gescheitert" +- +-#~ msgid "Cannot get connection to view" +-#~ msgstr "Verbindung zur Ansicht kann nicht aufgebaut werden" +- +-#~ msgid "Cannot process, book backend is opening" +-#~ msgstr "Fortsetzen nicht möglich, Adressbuch-Backend wird geöffnet" +- +-#~ msgid "Empty query: " +-#~ msgstr "Leere Anfrage:" +- +-#~ msgid "Cannot get backend property: " +-#~ msgstr "Backend-Eigenschaft kann nicht ermittelt werden:" +- +-#~ msgid "Invalid backend name '%s' in source '%s'" +-#~ msgstr "Ungültiger Backend-Name »%s« in Quelle »%s«" +- +-#~ msgid "" +-#~ "Failed to connect to a server using SSL. One possible reason is an invalid " +-#~ "certificate being used by the server. If this is expected, like self-" +-#~ "signed certificate being used on the server, then disable certificate " +-#~ "validity tests by selecting 'Ignore invalid SSL certificate' option in " +-#~ "Properties" +-#~ msgstr "" +-#~ "SSL-Verbindung zum Server konnte nicht aufgebaut werden. Ein möglicher " +-#~ "Grund ist ein vom Server verwendetes ungültiges Zertifikat. Falls dies " +-#~ "erwartet wird, wie beispielsweise ein vom Server selbst signiertes " +-#~ "Zertifikat, dann deaktivieren Sie die Gültigkeitsüberprüfungen für " +-#~ "Zertifikate, indem Sie in den Eigenschaften die Option »Ungültiges SSL-" +-#~ "Zertifikat ignorieren« aktivieren." +- +-#~ msgid "Failed to run calendar factory" +-#~ msgstr "Ausführung der Kalender-Factory ist gescheitert" +- +-#~ msgid "Cannot process, calendar backend is opening" +-#~ msgstr "Fortsetzen nicht möglich, Kalender-Backend wird geöffnet" +- +-#~ msgid "Invalid call" +-#~ msgstr "Ungültiger Aufruf" +- +-#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot" +-#~ msgstr "" +-#~ "Ordner konnte nicht angelegt werden: %s: Ordnername enthält einen Punkt" +- +-#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot" +-#~ msgstr "" +-#~ "Ordner konnte nicht umbenannt werden: %s: Ordnername darf keinen Punkt " +-#~ "enthalten" +- +-#~ msgid "Using Distinguished Name (DN)" +-#~ msgstr "Eindeutiger Name (EN) wird verwendet" +- +-#~ msgid "Using Email Address" +-#~ msgstr "E-Mail-Adresse wird verwendet" +- +-#~ msgid "Cannot create local store" +-#~ msgstr "Lokaler Speicher kann nicht angelegt werden:" +- +-#~ msgid "Could not connect to %s: " +-#~ msgstr "Verbindung mit %s gescheitert:" +- +-#~ msgid "" +-#~ " Issuer: %s\n" +-#~ " Subject: %s\n" +-#~ " Fingerprint: %s\n" +-#~ " Signature: %s" +-#~ msgstr "" +-#~ " Aussteller: %s\n" +-#~ " Empfänger: %s\n" +-#~ " Fingerabdruck: %s\n" +-#~ " Signatur: %s" +- +-#~ msgid "GOOD" +-#~ msgstr "GUT" +- +-#~ msgid "BAD" +-#~ msgstr "SCHLECHT" +- +-#~ msgid "" +-#~ "Certificate problem: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "Zertifikatproblem: %s\n" +-#~ "Aussteller: %s" +- +-#~ msgid "" +-#~ "Bad certificate domain: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "Fehlerhafte Zertifikatdomäne: %s\n" +-#~ "Aussteller: %s" +- +-#~ msgid "" +-#~ "Certificate expired: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "Zertifikat nicht mehr gültig: %s\n" +-#~ "Aussteller: %s" +- +-#~ msgid "" +-#~ "Certificate revocation list expired: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "Zertifikatrücknahmeliste nicht mehr gültig: %s\n" +-#~ "Aussteller: %s" +- +-#~ msgid "No output stream" +-#~ msgstr "Kein Ausgangsdatenstrom" +- +-#~ msgid "No input stream" +-#~ msgstr "Kein Eingangsdatenstrom" +- +-#~ msgid "Server unexpectedly disconnected: %s" +-#~ msgstr "Server-Verbindung unerwartet getrennt: %s" +- +-#~ msgid "" +-#~ "Alert from IMAP server %s@%s in folder %s:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "Warnung von IMAP-Server %s@%s im Ordner %s:\n" +-#~ "%s" +- +-#~ msgid "Unexpected response from IMAP server: %s" +-#~ msgstr "Unerwartete Antwort von IMAP-Server: %s" +- +-#~ msgid "IMAP command failed: %s" +-#~ msgstr "IMAP-Befehl gescheitert: %s" +- +-#~ msgid "Server response ended too soon." +-#~ msgstr "Antwort des Servers endete zu früh." +- +-#~ msgid "IMAP server response did not contain %s information" +-#~ msgstr "Antwort des IMAP-Servers enthielt keine %s-Informationen" +- +-#~ msgid "Unexpected OK response from IMAP server: %s" +-#~ msgstr "Unerwartete OK-Antwort von IMAP-Server: %s" +- +-#~ msgid "Always check for _new mail in this folder" +-#~ msgstr "Immer in diesem Ordner nach _neuen E-Mails schauen" +- +-#~ msgid "Could not create directory %s: %s" +-#~ msgstr "Ordner %s konnte nicht angelegt werden: %s" +- +-#~ msgid "Could not load summary for %s" +-#~ msgstr "Zusammenfassung für %s konnte nicht geladen werden" +- +-#~ msgid "Scanning for changed messages in %s" +-#~ msgstr "Geänderte Nachrichten werden in %s gesucht" +- +-#~ msgid "Fetching summary information for new messages in %s" +-#~ msgstr "" +-#~ "Zusammenfassende Informationen für neue Nachrichten in %s werden abgerufen" +- +-#~ msgid "Incomplete server response: no information provided for message %d" +-#~ msgstr "" +-#~ "Unvollständige Server-Antwort: Keine Informationen zu Nachricht %d erhalten" +- +-#~ msgid "Incomplete server response: no UID provided for message %d" +-#~ msgstr "Unvollständige Server-Antwort: Keine UID für Nachricht %d erhalten" +- +-#~ msgid "Could not find message body in FETCH response." +-#~ msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden." +- +-#~ msgid "Could not open cache directory: " +-#~ msgstr "Cache-Ordner konnte nicht geöffnet werden:" +- +-#~ msgid "Failed to cache message %s: %s" +-#~ msgstr "Nachricht %s konnte nicht in den Zwischenspeicher geladen werden: %s" +- +-#~ msgid "Failed to cache message %s: " +-#~ msgstr "Nachricht %s konnte nicht in den Zwischenspeicher geladen werden:" +- +-#~ msgid "Failed to cache %s: " +-#~ msgstr "%s konnte nicht in den Zwischenspeicher geladen werden:" +- +-#~ msgid "Names_pace:" +-#~ msgstr "Namens_raum:" +- +-#~ msgid "IMAP default port" +-#~ msgstr "IMAP-Vorgabeport" +- +-#~ msgid "IMAP" +-#~ msgstr "IMAP" +- +-#~ msgid "Retrieving list of folders at '%s'" +-#~ msgstr "Liste der Ordner auf »%s« wird abgerufen" +- +-#~ msgid "Server unexpectedly disconnected" +-#~ msgstr "Server-Verbindung wurde unerwartet getrennt" +- +-#~ msgid "Server unexpectedly disconnected: " +-#~ msgstr "Server-Verbindung unerwartet getrennt: " +- +-#~ msgid "Could not connect to POP server %s" +-#~ msgstr "Verbindung mit POP-Server %s konnte nicht hergestellt werden" +- +-#~ msgid "Currently _used categories:" +-#~ msgstr "Gegenwärtig gen_utzte Kategorien:" +- +-#~ msgid "_Available Categories:" +-#~ msgstr "Ver_fügbare Kategorien:" +- +-#~ msgid "Icon" +-#~ msgstr "Symbol" +- +-#~ msgid "Category" +-#~ msgstr "Kategorie" +- +-#~ msgid "Create category \"%s\"" +-#~ msgstr "Kategorie »%s« erstellen" +- +-#~ msgid "Category Icon" +-#~ msgstr "Kategoriesymbol" +- +-#~ msgid "_No Image" +-#~ msgstr "_Kein Bild" +- +-#~ msgid "Category _Name" +-#~ msgstr "Kategorie_name" +- +-#~ msgid "Category _Icon" +-#~ msgstr "Kategories_ymbol" +- +-#~ msgid "Category Properties" +-#~ msgstr "Kategorieeigenschaften" +- +-#~ msgid "" +-#~ "There is already a category '%s' in the configuration. Please use another " +-#~ "name" +-#~ msgstr "" +-#~ "Es gibt bereits eine Kategorie »%s« in dieser Konfiguration. Bitte einen " +-#~ "anderen Namen verwenden." +- +-#~ msgid "Show Contacts" +-#~ msgstr "Kontakte anzeigen" +- +-#~ msgid "Address B_ook:" +-#~ msgstr "Adress_buch:" +- +-#~ msgid "Cat_egory:" +-#~ msgstr "Ka_tegorie:" +- +-#~ msgid "_Search:" +-#~ msgstr "_Suchen:" +- +-#~ msgid "Any Category" +-#~ msgstr "Jede Kategorie" +- +-#~ msgid "Co_ntacts" +-#~ msgstr "Ko_ntakte" +- +-#~ msgid "Search" +-#~ msgstr "Suchen" +- +-#~ msgid "Address Book" +-#~ msgstr "Adressbuch" +- +-#~ msgid "Select Contacts from Address Book" +-#~ msgstr "Kontakte aus dem Adressbuch wählen" +- +-#~ msgid "_Add" +-#~ msgstr "_Hinzufügen" +- +-#~ msgid "_Remove" +-#~ msgstr "_Entfernen" +- +-#~ msgid "Error loading address book: %s" +-#~ msgstr "Fehler beim Laden des Adressbuchs: %s" +- +-#~ msgid "E_xpand %s Inline" +-#~ msgstr "%s aus_klappen" +- +-#~ msgid "Cop_y %s" +-#~ msgstr "%s _kopieren" +- +-#~ msgid "C_ut %s" +-#~ msgstr "%s ausschnei_den" +- +-#~ msgid "_Edit %s" +-#~ msgstr "%s _bearbeiten" +- +-#~ msgid "_Delete %s" +-#~ msgstr "%s _löschen" +- +-#~ msgid "Keyring key is unusable: no user or host name" +-#~ msgstr "" +-#~ "Schlüssel des Schlüsselbundes kann nicht genutzt werden: Kein Benutzer- " +-#~ "oder Servername" +- +-#~ msgid "You have the Caps Lock key on." +-#~ msgstr "Die Umschalttaste ist aktiviert." +- +-#~ msgid "_Remember this passphrase" +-#~ msgstr "An dieses Passwort _erinnern" +- +-#~ msgid "_Remember this passphrase for the remainder of this session" +-#~ msgstr "Für den Rest dieser Sitzung an dieses Passwort _erinnern" +- +-#~ msgid "_Remember this password" +-#~ msgstr "An dieses Passwort _erinnern" +- +-#~ msgid "_Remember this password for the remainder of this session" +-#~ msgstr "Für den Rest dieser Sitzung an dieses Passwort _erinnern" +- +-#~ msgid "_Destination" +-#~ msgstr "_Ziel" +diff -up evolution-data-server-3.8.5/po/it.po.translations evolution-data-server-3.8.5/po/it.po +--- evolution-data-server-3.8.5/po/it.po.translations 2013-03-17 13:46:02.000000000 +0100 ++++ evolution-data-server-3.8.5/po/it.po 2014-01-13 16:23:40.778630232 +0100 +@@ -6,9 +6,9 @@ + # Marco Ciampa , 2003, 2004, 2005. + # Alessio Dessi , 2003. + # Monica Badia , 2003. +-# ++# + # ### Glossario ### +-# ++# + # journal -> diario (Exchange) + # task -> attività + # list -> elenco +@@ -18,307 +18,315 @@ + # (contrapposto a lavoro) + # Luca Ferretti , 2006, 2007, 2008, 2009, 2010, 2011, 2012. + # Milo Casagrande , 2012. +-# ++# fvalen , 2013. #zanata + msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=" ++"evolution-data-server&keywords=I18N+L10N&component=Misc.\n" + "POT-Creation-Date: 2012-10-05 23:36+0000\n" +-"PO-Revision-Date: 2012-10-07 21:24+0200\n" +-"Last-Translator: Milo Casagrande \n" ++"PO-Revision-Date: 2013-12-03 09:04-0500\n" ++"Last-Translator: fvalen \n" + "Language-Team: Italian \n" +-"Language: it\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8-bit\n" ++"Language: it\n" + "Plural-Forms: nplurals=2; plural=(n!=1);\n" ++"X-Generator: Zanata 3.1.2\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:116 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1232 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4785 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:931 +-#: ../addressbook/libebook/e-book-client.c:106 +-#: ../addressbook/libedata-book/e-data-book.c:432 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:570 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619 +-#: ../calendar/libecal/e-cal.c:4033 ../calendar/libecal/e-cal-client.c:148 +-#: ../camel/camel-imapx-command.c:594 +-#: ../camel/providers/imap/camel-imap-command.c:525 +-#: ../camel/providers/imap/camel-imap-store.c:469 +-#: ../libedataserver/e-client.c:165 +-msgid "Unknown error" +-msgstr "Errore sconosciuto" +- +-#: ../addressbook/backends/file/e-book-backend-file.c:141 ++#: ../addressbook/backends/file/e-book-backend-file.c:114 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "Rimozione del file «%s» non riuscita: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:164 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:616 ++#: ../addressbook/backends/file/e-book-backend-file.c:138 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "Creazione della directory %s non riuscita: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:459 ++#: ../addressbook/backends/file/e-book-backend-file.c:385 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "Creazione collegamento fisico per la risorsa «%s» non riuscito: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:561 +-#: ../addressbook/backends/file/e-book-backend-file.c:1127 ++#: ../addressbook/backends/file/e-book-backend-file.c:487 ++#: ../addressbook/backends/file/e-book-backend-file.c:911 + msgid "No UID in the contact" + msgstr "Nessun UID nel contatto" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1569 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508 ++#: ../addressbook/backends/file/e-book-backend-file.c:757 ++#, c-format ++msgid "Conflicting UIDs found in added contacts" ++msgstr "Trovate UID in conflitto nei contatti aggiunti" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:844 ++#: ../addressbook/backends/file/e-book-backend-file.c:1038 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2656 ++#, c-format ++msgid "Contact '%s' not found" ++msgstr "Contatto «%s» non trovato" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:940 ++#, c-format ++msgid "Tried to modify contact '%s' with out of sync revision" ++msgstr "" ++"Provato a modificare il contatto '%s' con una revisione non sincronizzata" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:1089 ++#: ../addressbook/backends/file/e-book-backend-file.c:1139 ++#, c-format ++msgid "Query '%s' not supported" ++msgstr "Interrogazione '%s' non supportata" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:1098 ++#: ../addressbook/backends/file/e-book-backend-file.c:1148 ++#, c-format ++msgid "Invalid Query '%s'" ++msgstr "Interrogazione '%s' non valida " ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:1248 + msgid "Loading..." + msgstr "Caricamento..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1572 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510 ++#: ../addressbook/backends/file/e-book-backend-file.c:1250 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4978 + msgid "Searching..." + msgstr "Ricerca..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:2115 ++#: ../addressbook/backends/file/e-book-backend-file.c:1568 + #, c-format +-msgid "Failed to build summary for an address book %s" +-msgstr "Creazione del sommario per una rubrica %s non riuscita" ++msgid "Failed to rename old database from '%s' to '%s': %s" ++msgstr "Impossibile cambiare nome al vecchio database da '%s' a '%s': %s" ++ ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4873 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:338 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 ++#: ../addressbook/libebook-contacts/e-phone-number.c:58 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:562 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:592 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 ++#: ../calendar/libecal/e-cal.c:2339 ++#: ../calendar/libecal/e-cal-client.c:275 ++#: ../camel/camel-imapx-command.c:609 ++#: ../libedataserver/e-client.c:179 ++msgid "Unknown error" ++msgstr "Errore sconosciuto" + + # infedele, ma meglio di "Interrogazione" + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:645 ++#: ../addressbook/backends/google/e-book-backend-google.c:679 + msgid "Querying for updated contacts…" + msgstr "Verifica dei contatti aggiornati..." + + # infedele, ma meglio di "Interrogazione"< + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:782 ++#: ../addressbook/backends/google/e-book-backend-google.c:816 + msgid "Querying for updated groups…" + msgstr "Verifica dei gruppi aggiornati..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1202 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326 ++#: ../addressbook/backends/google/e-book-backend-google.c:1265 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:389 + msgid "The backend does not support bulk additions" + msgstr "Il backend non supporta le aggiunte in serie" + + #. Insert the entry on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1234 ++#: ../addressbook/backends/google/e-book-backend-google.c:1297 + msgid "Creating new contact…" + msgstr "Creazione nuovo contatto..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1323 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433 ++#: ../addressbook/backends/google/e-book-backend-google.c:1388 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:506 + msgid "The backend does not support bulk removals" + msgstr "Il backend non supporta le rimozioni in serie" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1351 ++#: ../addressbook/backends/google/e-book-backend-google.c:1416 + msgid "Deleting contact…" + msgstr "Eliminazione del contatto..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1601 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487 ++#: ../addressbook/backends/google/e-book-backend-google.c:1670 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:567 + msgid "The backend does not support bulk modifications" + msgstr "Il backend non supporta le modifiche in serie" + + #. Update the contact on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1639 ++#: ../addressbook/backends/google/e-book-backend-google.c:1708 + msgid "Modifying contact…" + msgstr "Modifica del contatto..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1809 ++#: ../addressbook/backends/google/e-book-backend-google.c:1879 + msgid "Loading…" + msgstr "Caricamento..." + +-#: ../addressbook/backends/google/e-book-google-utils.c:1562 ++#. System Group: My Contacts ++#: ../addressbook/backends/google/e-book-google-utils.c:1606 ++#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1 + msgid "Personal" + msgstr "Personale" + +-#. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1563 ++#. System Group: Friends ++#: ../addressbook/backends/google/e-book-google-utils.c:1608 + msgid "Friends" + msgstr "Amici" + +-#. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1564 ++#. System Group: Family ++#: ../addressbook/backends/google/e-book-google-utils.c:1610 + msgid "Family" + msgstr "Famiglia" + +-#. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1565 ++#. System Group: Coworkers ++#: ../addressbook/backends/google/e-book-google-utils.c:1612 + msgid "Coworkers" + msgstr "Collaboratori" + +-#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165 ++#. Translators: An error message shown to a user when trying to do an ++#. * operation on the LDAP address book which is not connected to the server ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174 + msgid "Not connected" + msgstr "Non connesso" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793 +-msgid "Using Distinguished Name (DN)" +-msgstr "Uso nome distintivo (DN)" +- +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796 +-msgid "Using Email Address" +-msgstr "Uso indirizzo email" +- +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "Bind non riuscito usando sia i bind v3 che v2" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088 + msgid "Reconnecting to LDAP server..." + msgstr "Riconnessione al server LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218 + msgid "Invalid DN syntax" + msgstr "Sintassi DN non valida" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1231 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4784 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4872 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "Errore LDAP 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Adding contact to LDAP server..." + msgstr "Aggiunta contatto al server LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1890 + msgid "Removing contact from LDAP server..." + msgstr "Rimozione del contatto dal server LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2022 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2405 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2431 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: restituito NULL da ldap_first_entry" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2265 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2456 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2489 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: restituito tipo di risultato %d non gestito" + + # o "sul server" ? -Luca +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2356 + msgid "Modifying contact from LDAP server..." + msgstr "Modifica contatto dal server LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2673 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2886 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2718 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2950 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: restituito tipo di risultato di ricerca %d non gestito" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4821 + msgid "Receiving LDAP search results..." + msgstr "Ricezione risultati della ricerca LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5000 + msgid "Error performing search" + msgstr "Errore nell'eseguire la ricerca" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "Scaricamento contatti (%d)... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5654 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "Recupero del DN per l'utente \"%s\" non riuscito" + +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:645 +-#, c-format +-msgid "Failed to open addressbook at '%s': %s" +-msgstr "Apertura della rubrica presso \"%s\" non riuscita: %s" +- +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:420 + #, c-format +-msgid "Create resource '%s' failed with HTTP status: %d (%s)" +-msgstr "Creazione della risorsa «%s» non riuscita con stato HTTP: %d (%s)" ++msgid "Create resource '%s' failed with HTTP status %d (%s)" ++msgstr "Creazione della risorsa '%s' non riuscita con stato HTTP %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:522 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "DELETE non riuscita con stato HTTP %d" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588 + msgid "Contact on server changed -> not modifying" + msgstr "Contatto sul server cambiato → non modificato" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:597 + #, c-format +-msgid "Modify contact failed with HTTP status: %d (%s)" +-msgstr "Modifica del contatto non riuscita con stato HTTP: %d (%s)" ++msgid "Modify contact failed with HTTP status %d (%s)" ++msgstr "Modifica contatto non riuscita con stato HTTP %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1007 + msgid "Loading Addressbook summary..." + msgstr "Caricamento sommario rubrica..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "PROPFIND su webdav non riuscita con stato HTTP %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1051 + msgid "No response body in webdav PROPFIND result" + msgstr "Nessun corpo della risposta nel risultato webdav PROPFIND" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1083 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "Caricamento contatti (%d%%)..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1416 + msgid "Cannot transform SoupURI to string" + msgstr "Impossibile trasformare il SoupURI in stringa" + +-#: ../addressbook/libebook/e-book-client.c:95 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24 + msgid "No such book" + msgstr "Rubric inesistente" + +-#: ../addressbook/libebook/e-book-client.c:97 +-#: ../addressbook/libedata-book/e-data-book.c:306 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26 ++#: ../addressbook/libedata-book/e-data-book.c:797 + msgid "Contact not found" + msgstr "Contatto non trovato" + +-#: ../addressbook/libebook/e-book-client.c:99 +-#: ../addressbook/libedata-book/e-data-book.c:307 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28 ++#: ../addressbook/libedata-book/e-data-book.c:798 + msgid "Contact ID already exists" + msgstr "L'ID del contatto esiste già" + +-#: ../addressbook/libebook/e-book-client.c:101 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30 + msgid "No such source" + msgstr "Sorgente inesistente" + + # almeno credo... (NdT) +-#: ../addressbook/libebook/e-book-client.c:103 +-#: ../addressbook/libedata-book/e-data-book.c:323 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32 ++#: ../addressbook/libedata-book/e-data-book.c:814 + msgid "No space" + msgstr "Spazio non sufficiente" + +-#: ../addressbook/libebook/e-book-client.c:488 +-msgid "Failed to run book factory" +-msgstr "Esecuzione della fabbrica della rubrica non riuscita" +- +-#: ../addressbook/libebook/e-book-client.c:2244 +-#: ../calendar/libecal/e-cal-client.c:4602 +-msgid "Cannot get connection to view" +-msgstr "Impossibile ottenere la connessione alla vista" +- + #. Dummy row as EContactField starts from 1 +-#: ../addressbook/libebook/e-contact.c:121 ++#: ../addressbook/libebook-contacts/e-contact.c:120 + msgid "Unique ID" + msgstr "ID univoco" + +@@ -326,228 +334,226 @@ msgstr "ID univoco" + #. * so we can generate its value if necessary in the getter + #. Translators: This is an EContact field description, in this case it's a + #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here. +-#: ../addressbook/libebook/e-contact.c:126 ++#: ../addressbook/libebook-contacts/e-contact.c:125 + msgid "File Under" + msgstr "Registra come" + + #. URI of the book to which the contact belongs to +-#: ../addressbook/libebook/e-contact.c:128 ++#: ../addressbook/libebook-contacts/e-contact.c:127 + msgid "Book UID" + msgstr "UID rubrica" + + # full name in en_GB indica generalità... + # Sarebbe da vedere l'esatto significato en_US + # -Luca +-# + #. Name fields + #. FN isn't really a structured field - we use a getter/setter + #. * so we can set the N property (since evo 1.4 works fine with + #. * vcards that don't even have a N attribute. *sigh*) +-#: ../addressbook/libebook/e-contact.c:134 ++#: ../addressbook/libebook-contacts/e-contact.c:133 + msgid "Full Name" + msgstr "Nome completo" + + # dal dizionario given name (americ.) nome di battesimo -Luca + # Solo che non sono affatto sicuro sia politicamente + # corretto mettere "battesimo"... +-#: ../addressbook/libebook/e-contact.c:135 ++#: ../addressbook/libebook-contacts/e-contact.c:134 + msgid "Given Name" + msgstr "Nome" + +-#: ../addressbook/libebook/e-contact.c:136 ++#: ../addressbook/libebook-contacts/e-contact.c:135 + msgid "Family Name" + msgstr "Cognome" + +-#: ../addressbook/libebook/e-contact.c:137 ++#: ../addressbook/libebook-contacts/e-contact.c:136 + msgid "Nickname" + msgstr "Soprannome" + + #. Email fields +-#: ../addressbook/libebook/e-contact.c:140 ++#: ../addressbook/libebook-contacts/e-contact.c:139 + msgid "Email 1" + msgstr "Email 1" + +-#: ../addressbook/libebook/e-contact.c:141 ++#: ../addressbook/libebook-contacts/e-contact.c:140 + msgid "Email 2" + msgstr "Email 2" + +-#: ../addressbook/libebook/e-contact.c:142 ++#: ../addressbook/libebook-contacts/e-contact.c:141 + msgid "Email 3" + msgstr "Email 3" + +-#: ../addressbook/libebook/e-contact.c:143 ++#: ../addressbook/libebook-contacts/e-contact.c:142 + msgid "Email 4" + msgstr "Email 4" + +-#: ../addressbook/libebook/e-contact.c:145 ++#: ../addressbook/libebook-contacts/e-contact.c:144 + msgid "Mailer" + msgstr "Gestore di posta" + + #. Address Labels +-#: ../addressbook/libebook/e-contact.c:148 ++#: ../addressbook/libebook-contacts/e-contact.c:147 + msgid "Home Address Label" + msgstr "Etichetta indirizzo abitazione" + +-#: ../addressbook/libebook/e-contact.c:149 ++#: ../addressbook/libebook-contacts/e-contact.c:148 + msgid "Work Address Label" + msgstr "Etichetta indirizzo lavoro" + +-#: ../addressbook/libebook/e-contact.c:150 ++#: ../addressbook/libebook-contacts/e-contact.c:149 + msgid "Other Address Label" + msgstr "Etichetta altro indirizzo" + + #. Phone fields +-#: ../addressbook/libebook/e-contact.c:153 ++#: ../addressbook/libebook-contacts/e-contact.c:152 + msgid "Assistant Phone" + msgstr "Telefono assistente" + +-#: ../addressbook/libebook/e-contact.c:154 ++#: ../addressbook/libebook-contacts/e-contact.c:153 + msgid "Business Phone" + msgstr "Telefono ufficio" + +-#: ../addressbook/libebook/e-contact.c:155 ++#: ../addressbook/libebook-contacts/e-contact.c:154 + msgid "Business Phone 2" + msgstr "Telefono ufficio 2" + +-#: ../addressbook/libebook/e-contact.c:156 ++#: ../addressbook/libebook-contacts/e-contact.c:155 + msgid "Business Fax" + msgstr "Fax ufficio" + +-#: ../addressbook/libebook/e-contact.c:157 ++#: ../addressbook/libebook-contacts/e-contact.c:156 + msgid "Callback Phone" + msgstr "Telefono a cui richiamare" + +-#: ../addressbook/libebook/e-contact.c:158 ++#: ../addressbook/libebook-contacts/e-contact.c:157 + msgid "Car Phone" + msgstr "Telefono auto" + +-#: ../addressbook/libebook/e-contact.c:159 ++#: ../addressbook/libebook-contacts/e-contact.c:158 + msgid "Company Phone" + msgstr "Telefono ditta" + +-#: ../addressbook/libebook/e-contact.c:160 ++#: ../addressbook/libebook-contacts/e-contact.c:159 + msgid "Home Phone" + msgstr "Telefono abitazione" + +-#: ../addressbook/libebook/e-contact.c:161 ++#: ../addressbook/libebook-contacts/e-contact.c:160 + msgid "Home Phone 2" + msgstr "Telefono abitazione 2" + +-#: ../addressbook/libebook/e-contact.c:162 ++#: ../addressbook/libebook-contacts/e-contact.c:161 + msgid "Home Fax" + msgstr "Fax abitazione" + +-#: ../addressbook/libebook/e-contact.c:163 ++#: ../addressbook/libebook-contacts/e-contact.c:162 + msgid "ISDN" + msgstr "ISDN" + + # credo questo sia il risultato di una recente + # discussione su tp -Luca +-#: ../addressbook/libebook/e-contact.c:164 ++#: ../addressbook/libebook-contacts/e-contact.c:163 + msgid "Mobile Phone" + msgstr "Telefono cellulare" + +-#: ../addressbook/libebook/e-contact.c:165 ++#: ../addressbook/libebook-contacts/e-contact.c:164 + msgid "Other Phone" + msgstr "Altro telefono" + +-#: ../addressbook/libebook/e-contact.c:166 ++#: ../addressbook/libebook-contacts/e-contact.c:165 + msgid "Other Fax" + msgstr "Altro fax" + +-#: ../addressbook/libebook/e-contact.c:167 ++#: ../addressbook/libebook-contacts/e-contact.c:166 + msgid "Pager" + msgstr "Cercapersone" + +-#: ../addressbook/libebook/e-contact.c:168 ++#: ../addressbook/libebook-contacts/e-contact.c:167 + msgid "Primary Phone" + msgstr "Telefono principale" + +-#: ../addressbook/libebook/e-contact.c:169 ++#: ../addressbook/libebook-contacts/e-contact.c:168 + msgid "Radio" + msgstr "Radio" + +-#: ../addressbook/libebook/e-contact.c:170 ++#: ../addressbook/libebook-contacts/e-contact.c:169 + msgid "Telex" + msgstr "Telex" + + #. To translators: TTY is Teletypewriter +-#: ../addressbook/libebook/e-contact.c:172 ++#: ../addressbook/libebook-contacts/e-contact.c:171 + msgid "TTY" + msgstr "TTY" + + #. Organizational fields +-#: ../addressbook/libebook/e-contact.c:175 ++#: ../addressbook/libebook-contacts/e-contact.c:174 + msgid "Organization" + msgstr "Organizzazione" + +-#: ../addressbook/libebook/e-contact.c:176 ++#: ../addressbook/libebook-contacts/e-contact.c:175 + msgid "Organizational Unit" + msgstr "Unità organizzativa" + +-#: ../addressbook/libebook/e-contact.c:177 ++#: ../addressbook/libebook-contacts/e-contact.c:176 + msgid "Office" + msgstr "Ufficio" + + # I titoli (dott, prof, ing) di una persona sono diversi + # dalle qualifiche (responsabile delle risorse umane, + # megadirigente naturale...) -Luca +-#: ../addressbook/libebook/e-contact.c:178 ++#: ../addressbook/libebook-contacts/e-contact.c:177 + msgid "Title" + msgstr "Titolo" + + # magari qui si potrebbe usare quel qualifica + # tolto sopra al posto di Ruolo +-#: ../addressbook/libebook/e-contact.c:179 ++#: ../addressbook/libebook-contacts/e-contact.c:178 + msgid "Role" + msgstr "Qualifica" + +-#: ../addressbook/libebook/e-contact.c:180 ++#: ../addressbook/libebook-contacts/e-contact.c:179 + msgid "Manager" + msgstr "Manager" + +-#: ../addressbook/libebook/e-contact.c:181 ++#: ../addressbook/libebook-contacts/e-contact.c:180 + msgid "Assistant" + msgstr "Assistente" + + #. Web fields +-#: ../addressbook/libebook/e-contact.c:184 ++#: ../addressbook/libebook-contacts/e-contact.c:183 + msgid "Homepage URL" + msgstr "URL della homepage" + +-#: ../addressbook/libebook/e-contact.c:185 ++#: ../addressbook/libebook-contacts/e-contact.c:184 + msgid "Weblog URL" + msgstr "URL del blog" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:188 +-#: ../libedataserverui/e-categories-dialog.c:90 ++#: ../addressbook/libebook-contacts/e-contact.c:187 + msgid "Categories" + msgstr "Categorie" + + #. Collaboration fields +-#: ../addressbook/libebook/e-contact.c:191 ++#: ../addressbook/libebook-contacts/e-contact.c:190 + msgid "Calendar URI" + msgstr "URI del calendario" + +-#: ../addressbook/libebook/e-contact.c:192 ++#: ../addressbook/libebook-contacts/e-contact.c:191 + msgid "Free/Busy URL" + msgstr "URL per libero/occupato" + +-#: ../addressbook/libebook/e-contact.c:193 ++#: ../addressbook/libebook-contacts/e-contact.c:192 + msgid "ICS Calendar" + msgstr "Calendario ICS" + +-#: ../addressbook/libebook/e-contact.c:194 ++#: ../addressbook/libebook-contacts/e-contact.c:193 + msgid "Video Conferencing URL" + msgstr "URL per video conferenza" + + #. Misc fields +-#: ../addressbook/libebook/e-contact.c:197 ++#: ../addressbook/libebook-contacts/e-contact.c:196 + msgid "Spouse's Name" + msgstr "Nome del coniuge" + +-#: ../addressbook/libebook/e-contact.c:198 ++#: ../addressbook/libebook-contacts/e-contact.c:197 + msgid "Note" + msgstr "Annotazione" + +@@ -557,237 +563,237 @@ msgstr "Annotazione" + # o mettiamo nominativo pubblico che è l'unica traduzione + # che centra il significato + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:201 ++#: ../addressbook/libebook-contacts/e-contact.c:200 + msgid "AIM Home Screen Name 1" + msgstr "Nominativo pubblico AIM personale 1" + +-#: ../addressbook/libebook/e-contact.c:202 ++#: ../addressbook/libebook-contacts/e-contact.c:201 + msgid "AIM Home Screen Name 2" + msgstr "Nominativo pubblico AIM personale 2" + +-#: ../addressbook/libebook/e-contact.c:203 ++#: ../addressbook/libebook-contacts/e-contact.c:202 + msgid "AIM Home Screen Name 3" + msgstr "Nominativo pubblico AIM personale 3" + +-#: ../addressbook/libebook/e-contact.c:204 ++#: ../addressbook/libebook-contacts/e-contact.c:203 + msgid "AIM Work Screen Name 1" + msgstr "Nominativo pubblico AIM lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:205 ++#: ../addressbook/libebook-contacts/e-contact.c:204 + msgid "AIM Work Screen Name 2" + msgstr "Nominativo pubblico AIM lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:206 ++#: ../addressbook/libebook-contacts/e-contact.c:205 + msgid "AIM Work Screen Name 3" + msgstr "Nominativo pubblico AIM lavoro 3" + +-#: ../addressbook/libebook/e-contact.c:207 ++#: ../addressbook/libebook-contacts/e-contact.c:206 + msgid "GroupWise Home Screen Name 1" + msgstr "Nominativo pubblico GroupWise personale 1" + +-#: ../addressbook/libebook/e-contact.c:208 ++#: ../addressbook/libebook-contacts/e-contact.c:207 + msgid "GroupWise Home Screen Name 2" + msgstr "Nominativo pubblico GroupWise personale 2" + +-#: ../addressbook/libebook/e-contact.c:209 ++#: ../addressbook/libebook-contacts/e-contact.c:208 + msgid "GroupWise Home Screen Name 3" + msgstr "Nominativo pubblico GroupWise personale 3" + +-#: ../addressbook/libebook/e-contact.c:210 ++#: ../addressbook/libebook-contacts/e-contact.c:209 + msgid "GroupWise Work Screen Name 1" + msgstr "Nominativo pubblico GroupWise lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:211 ++#: ../addressbook/libebook-contacts/e-contact.c:210 + msgid "GroupWise Work Screen Name 2" + msgstr "Nominativo pubblico GroupWise lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:212 ++#: ../addressbook/libebook-contacts/e-contact.c:211 + msgid "GroupWise Work Screen Name 3" + msgstr "Nominativo pubblico GroupWise lavoro 3" + +-#: ../addressbook/libebook/e-contact.c:213 ++#: ../addressbook/libebook-contacts/e-contact.c:212 + msgid "Jabber Home ID 1" + msgstr "ID Jabber personale 1" + +-#: ../addressbook/libebook/e-contact.c:214 ++#: ../addressbook/libebook-contacts/e-contact.c:213 + msgid "Jabber Home ID 2" + msgstr "ID Jabber personale 2" + +-#: ../addressbook/libebook/e-contact.c:215 ++#: ../addressbook/libebook-contacts/e-contact.c:214 + msgid "Jabber Home ID 3" + msgstr "ID Jabber personale 3" + +-#: ../addressbook/libebook/e-contact.c:216 ++#: ../addressbook/libebook-contacts/e-contact.c:215 + msgid "Jabber Work ID 1" + msgstr "ID Jabber lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:217 ++#: ../addressbook/libebook-contacts/e-contact.c:216 + msgid "Jabber Work ID 2" + msgstr "ID Jabber lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:218 ++#: ../addressbook/libebook-contacts/e-contact.c:217 + msgid "Jabber Work ID 3" + msgstr "ID Jabber lavoro 3" + +-#: ../addressbook/libebook/e-contact.c:219 ++#: ../addressbook/libebook-contacts/e-contact.c:218 + msgid "Yahoo! Home Screen Name 1" + msgstr "Nominativo pubblico Yahoo! personale 1" + +-#: ../addressbook/libebook/e-contact.c:220 ++#: ../addressbook/libebook-contacts/e-contact.c:219 + msgid "Yahoo! Home Screen Name 2" + msgstr "Nominativo pubblico Yahoo! personale 2" + +-#: ../addressbook/libebook/e-contact.c:221 ++#: ../addressbook/libebook-contacts/e-contact.c:220 + msgid "Yahoo! Home Screen Name 3" + msgstr "Nominativo pubblico Yahoo! personale 3" + +-#: ../addressbook/libebook/e-contact.c:222 ++#: ../addressbook/libebook-contacts/e-contact.c:221 + msgid "Yahoo! Work Screen Name 1" + msgstr "Nominativo pubblico Yahoo! lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:223 ++#: ../addressbook/libebook-contacts/e-contact.c:222 + msgid "Yahoo! Work Screen Name 2" + msgstr "Nominativo pubblico Yahoo! lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:224 ++#: ../addressbook/libebook-contacts/e-contact.c:223 + msgid "Yahoo! Work Screen Name 3" + msgstr "Nominativo pubblico Yahoo! lavoro 3" + +-#: ../addressbook/libebook/e-contact.c:225 ++#: ../addressbook/libebook-contacts/e-contact.c:224 + msgid "MSN Home Screen Name 1" + msgstr "Nominativo pubblico MSN personale 1" + +-#: ../addressbook/libebook/e-contact.c:226 ++#: ../addressbook/libebook-contacts/e-contact.c:225 + msgid "MSN Home Screen Name 2" + msgstr "Nominativo pubblico MSN personale 2" + +-#: ../addressbook/libebook/e-contact.c:227 ++#: ../addressbook/libebook-contacts/e-contact.c:226 + msgid "MSN Home Screen Name 3" + msgstr "Nominativo pubblico MSN personale 3" + +-#: ../addressbook/libebook/e-contact.c:228 ++#: ../addressbook/libebook-contacts/e-contact.c:227 + msgid "MSN Work Screen Name 1" + msgstr "Nominativo pubblico MSN lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:229 ++#: ../addressbook/libebook-contacts/e-contact.c:228 + msgid "MSN Work Screen Name 2" + msgstr "Nominativo pubblico MSN lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:230 ++#: ../addressbook/libebook-contacts/e-contact.c:229 + msgid "MSN Work Screen Name 3" + msgstr "Nominativo pubblico MSN lavoro 3" + +-#: ../addressbook/libebook/e-contact.c:231 ++#: ../addressbook/libebook-contacts/e-contact.c:230 + msgid "ICQ Home ID 1" + msgstr "ID ICQ personale 1" + +-#: ../addressbook/libebook/e-contact.c:232 ++#: ../addressbook/libebook-contacts/e-contact.c:231 + msgid "ICQ Home ID 2" + msgstr "ID ICQ personale 2" + +-#: ../addressbook/libebook/e-contact.c:233 ++#: ../addressbook/libebook-contacts/e-contact.c:232 + msgid "ICQ Home ID 3" + msgstr "ID ICQ personale 3" + +-#: ../addressbook/libebook/e-contact.c:234 ++#: ../addressbook/libebook-contacts/e-contact.c:233 + msgid "ICQ Work ID 1" + msgstr "ID ICQ lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:235 ++#: ../addressbook/libebook-contacts/e-contact.c:234 + msgid "ICQ Work ID 2" + msgstr "ID ICQ lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:236 ++#: ../addressbook/libebook-contacts/e-contact.c:235 + msgid "ICQ Work ID 3" + msgstr "ID ICQ lavoro 3" + + #. Last modified time +-#: ../addressbook/libebook/e-contact.c:239 ++#: ../addressbook/libebook-contacts/e-contact.c:238 + msgid "Last Revision" + msgstr "Ultima revisione" + + #. Translators: This is an EContact field description, in this case it's a + #. * virtual field, which returns either name of the contact or the organization + #. * name, recognized by multiple other fields, where the first filled is used. +-#: ../addressbook/libebook/e-contact.c:243 ++#: ../addressbook/libebook-contacts/e-contact.c:242 + msgid "Name or Org" + msgstr "Nome od org." + + #. Address fields +-#: ../addressbook/libebook/e-contact.c:246 ++#: ../addressbook/libebook-contacts/e-contact.c:245 + msgid "Address List" + msgstr "Elenco indirizzi" + +-#: ../addressbook/libebook/e-contact.c:247 ++#: ../addressbook/libebook-contacts/e-contact.c:246 + msgid "Home Address" + msgstr "Indirizzo abitazione" + +-#: ../addressbook/libebook/e-contact.c:248 ++#: ../addressbook/libebook-contacts/e-contact.c:247 + msgid "Work Address" + msgstr "Indirizzo lavoro" + +-#: ../addressbook/libebook/e-contact.c:249 ++#: ../addressbook/libebook-contacts/e-contact.c:248 + msgid "Other Address" + msgstr "Altro indirizzo" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:252 ++#: ../addressbook/libebook-contacts/e-contact.c:251 + msgid "Category List" + msgstr "Elenco delle categorie" + + #. Photo/Logo +-#: ../addressbook/libebook/e-contact.c:255 ++#: ../addressbook/libebook-contacts/e-contact.c:254 + msgid "Photo" + msgstr "Fotografia" + +-#: ../addressbook/libebook/e-contact.c:256 ++#: ../addressbook/libebook-contacts/e-contact.c:255 + msgid "Logo" + msgstr "Logo" + + #. Translators: This is an EContact field description, in this case it's a name + #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2 +-#: ../addressbook/libebook/e-contact.c:260 ++#: ../addressbook/libebook-contacts/e-contact.c:259 + msgid "Name" + msgstr "Nome" + +-#: ../addressbook/libebook/e-contact.c:261 ++#: ../addressbook/libebook-contacts/e-contact.c:260 + msgid "Email List" + msgstr "Elenco delle email" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:264 ++#: ../addressbook/libebook-contacts/e-contact.c:263 + msgid "AIM Screen Name List" + msgstr "Elenco dei nominativi pubblici AIM" + + # FIXME: prima usa screen name... da segnalare +-#: ../addressbook/libebook/e-contact.c:265 ++#: ../addressbook/libebook-contacts/e-contact.c:264 + msgid "GroupWise ID List" + msgstr "Elenco degli ID GroupWise" + +-#: ../addressbook/libebook/e-contact.c:266 ++#: ../addressbook/libebook-contacts/e-contact.c:265 + msgid "Jabber ID List" + msgstr "Elenco degli ID Jabber" + +-#: ../addressbook/libebook/e-contact.c:267 ++#: ../addressbook/libebook-contacts/e-contact.c:266 + msgid "Yahoo! Screen Name List" + msgstr "Elenco dei nominativi pubblici Yahoo!" + +-#: ../addressbook/libebook/e-contact.c:268 ++#: ../addressbook/libebook-contacts/e-contact.c:267 + msgid "MSN Screen Name List" + msgstr "Elenco dei nominativi pubblici MSN" + +-#: ../addressbook/libebook/e-contact.c:269 ++#: ../addressbook/libebook-contacts/e-contact.c:268 + msgid "ICQ ID List" + msgstr "Elenco degli ID ICQ" + +-#: ../addressbook/libebook/e-contact.c:271 ++#: ../addressbook/libebook-contacts/e-contact.c:270 + msgid "Wants HTML Mail" + msgstr "Vuole posta in HTML" + + #. Translators: This is an EContact field description, in this case it's a + #. * field describing whether it's a Contact list (list of email addresses) or a + #. * regular contact for one person/organization/... +-#: ../addressbook/libebook/e-contact.c:276 ++#: ../addressbook/libebook-contacts/e-contact.c:275 + msgid "List" + msgstr "Elenco" + +@@ -795,404 +801,486 @@ msgstr "Elenco" + #. * used to determine whether when sending to Contact lists the addresses should be + #. * shown or not to other recipients - basically whether to use BCC field or CC + #. * message header when sending messages to this Contact list. +-#: ../addressbook/libebook/e-contact.c:281 ++#: ../addressbook/libebook-contacts/e-contact.c:280 + msgid "List Shows Addresses" + msgstr "Elenco mostra indirizzi" + +-#: ../addressbook/libebook/e-contact.c:283 ++#: ../addressbook/libebook-contacts/e-contact.c:282 + msgid "Birth Date" + msgstr "Data di nascita" + +-#: ../addressbook/libebook/e-contact.c:284 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919 ++#: ../addressbook/libebook-contacts/e-contact.c:283 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:875 + msgid "Anniversary" + msgstr "Anniversario" + + #. Security fields +-#: ../addressbook/libebook/e-contact.c:287 ++#: ../addressbook/libebook-contacts/e-contact.c:286 + msgid "X.509 Certificate" + msgstr "Certificato X.509" + +-#: ../addressbook/libebook/e-contact.c:289 ++#: ../addressbook/libebook-contacts/e-contact.c:288 + msgid "Gadu-Gadu Home ID 1" + msgstr "ID Gadu-Gadu personale 1" + +-#: ../addressbook/libebook/e-contact.c:290 ++#: ../addressbook/libebook-contacts/e-contact.c:289 + msgid "Gadu-Gadu Home ID 2" + msgstr "ID Gadu-Gadu personale 2" + +-#: ../addressbook/libebook/e-contact.c:291 ++#: ../addressbook/libebook-contacts/e-contact.c:290 + msgid "Gadu-Gadu Home ID 3" + msgstr "ID Gadu-Gadu personale 3" + +-#: ../addressbook/libebook/e-contact.c:292 ++#: ../addressbook/libebook-contacts/e-contact.c:291 + msgid "Gadu-Gadu Work ID 1" + msgstr "ID Gadu-Gadu lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:293 ++#: ../addressbook/libebook-contacts/e-contact.c:292 + msgid "Gadu-Gadu Work ID 2" + msgstr "ID Gadu-Gadu lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:294 ++#: ../addressbook/libebook-contacts/e-contact.c:293 + msgid "Gadu-Gadu Work ID 3" + msgstr "ID Gadu-Gadu lavoro 3" + +-#: ../addressbook/libebook/e-contact.c:295 ++#: ../addressbook/libebook-contacts/e-contact.c:294 + msgid "Gadu-Gadu ID List" + msgstr "Elenco degli ID Gadu-Gadu" + + #. Geo information +-#: ../addressbook/libebook/e-contact.c:298 ++#: ../addressbook/libebook-contacts/e-contact.c:297 + msgid "Geographic Information" + msgstr "Informazioni geografiche" + +-#: ../addressbook/libebook/e-contact.c:300 ++#: ../addressbook/libebook-contacts/e-contact.c:299 + msgid "Telephone" + msgstr "Telefono" + +-#: ../addressbook/libebook/e-contact.c:302 ++#: ../addressbook/libebook-contacts/e-contact.c:301 + msgid "Skype Home Name 1" + msgstr "Nominativo Skype personale 1" + +-#: ../addressbook/libebook/e-contact.c:303 ++#: ../addressbook/libebook-contacts/e-contact.c:302 + msgid "Skype Home Name 2" + msgstr "Nominativo Skype personale 2" + +-#: ../addressbook/libebook/e-contact.c:304 ++#: ../addressbook/libebook-contacts/e-contact.c:303 + msgid "Skype Home Name 3" + msgstr "Nominativo Skype personale 3" + +-#: ../addressbook/libebook/e-contact.c:305 ++#: ../addressbook/libebook-contacts/e-contact.c:304 + msgid "Skype Work Name 1" + msgstr "Nominativo Skype lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:306 ++#: ../addressbook/libebook-contacts/e-contact.c:305 + msgid "Skype Work Name 2" + msgstr "Nominativo Skype lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:307 ++#: ../addressbook/libebook-contacts/e-contact.c:306 + msgid "Skype Work Name 3" + msgstr "Nominativo Skype lavoro 3" + +-#: ../addressbook/libebook/e-contact.c:308 ++#: ../addressbook/libebook-contacts/e-contact.c:307 + msgid "Skype Name List" + msgstr "Elenco dei nominativi Skype" + +-#: ../addressbook/libebook/e-contact.c:310 ++#: ../addressbook/libebook-contacts/e-contact.c:309 + msgid "SIP address" + msgstr "Indirizzo SIP" + +-#: ../addressbook/libebook/e-contact.c:312 ++#: ../addressbook/libebook-contacts/e-contact.c:311 + msgid "Google Talk Home Name 1" + msgstr "Nominativo Google Talk personale 1" + +-#: ../addressbook/libebook/e-contact.c:313 ++#: ../addressbook/libebook-contacts/e-contact.c:312 + msgid "Google Talk Home Name 2" + msgstr "Nominativo Google Talk personale 2" + +-#: ../addressbook/libebook/e-contact.c:314 ++#: ../addressbook/libebook-contacts/e-contact.c:313 + msgid "Google Talk Home Name 3" + msgstr "Nominativo Google Talk personale 3" + +-#: ../addressbook/libebook/e-contact.c:315 ++#: ../addressbook/libebook-contacts/e-contact.c:314 + msgid "Google Talk Work Name 1" + msgstr "Nominativo Google Talk lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:316 ++#: ../addressbook/libebook-contacts/e-contact.c:315 + msgid "Google Talk Work Name 2" + msgstr "Nominativo Google Talk lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:317 ++#: ../addressbook/libebook-contacts/e-contact.c:316 + msgid "Google Talk Work Name 3" + msgstr "Nominativo Google Talk lavoro 3" + +-#: ../addressbook/libebook/e-contact.c:318 ++#: ../addressbook/libebook-contacts/e-contact.c:317 + msgid "Google Talk Name List" + msgstr "Elenco dei nominativi Google Talk" + +-#: ../addressbook/libebook/e-contact.c:320 ++#: ../addressbook/libebook-contacts/e-contact.c:319 + msgid "Twitter Name List" + msgstr "Elenco dei nominativi Twitter" + +-#: ../addressbook/libebook/e-contact.c:1623 +-#: ../addressbook/libebook/e-destination.c:879 ++#: ../addressbook/libebook-contacts/e-contact.c:1624 ++#: ../addressbook/libebook/e-destination.c:884 + msgid "Unnamed List" + msgstr "Elenco senza nome" + +-#: ../addressbook/libedata-book/e-book-backend.c:17 +-msgid "Cannot process, book backend is opening" +-msgstr "Impossibile elaborare, il backend della rubrica è in apertura" ++#: ../addressbook/libebook-contacts/e-phone-number.c:43 ++msgid "The library was built without phone number support." ++msgstr "Libreria creata senza il supporto del numero telefonico" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:45 ++msgid "The phone number parser reported an yet unkown error code." ++msgstr "" ++"Il parser del numero telefonico ha riportato un codice d'errore sconosciuto." ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:47 ++msgid "Not a phone number" ++msgstr "Non è un numero telefonico" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:49 ++msgid "Invalid country calling code" ++msgstr "Codice di chiamata del paese non valido" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:51 ++msgid "" ++"Remaining text after the country calling code is too short for a phone " ++"number" ++msgstr "" ++"Il testo dopo il codice di chiamata del paese è troppo corto per un numero " ++"telefonico" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:53 ++msgid "Text is too short for a phone number" ++msgstr "Il testo è troppo corto come numero telefonico" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:55 ++msgid "Text is too long for a phone number" ++msgstr "Il testo è troppo lungo come numero telefonico" + +-#: ../addressbook/libedata-book/e-book-backend.c:90 ++#: ../addressbook/libebook/e-book-client.c:643 ++#: ../addressbook/libedata-book/e-book-backend.c:120 + #, c-format + msgid "Unknown book property '%s'" + msgstr "Proprietà di rubrica «%s» sconosciuta" + +-#: ../addressbook/libedata-book/e-book-backend.c:107 ++#: ../addressbook/libebook/e-book-client.c:658 + #, c-format + msgid "Cannot change value of book property '%s'" + msgstr "Impossibile cambiare valore della proprietà di rubrica «%s»" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500 +-#: ../camel/camel-db.c:503 ++#: ../addressbook/libebook/e-book-client.c:993 ++#: ../addressbook/libebook/e-book-client.c:1168 ++#: ../calendar/libecal/e-cal-client.c:1515 ++#: ../calendar/libecal/e-cal-client.c:1697 ++#, c-format ++msgid "Unable to connect to '%s': " ++msgstr "impossibile connettersi a '%s':" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793 ++#, c-format ++msgid "Error introspecting unknown summary field '%s'" ++msgstr "Errore durante l'analisi del campo del sommario '%s' sconosciuto" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289 ++#: ../camel/camel-db.c:544 + #, c-format + msgid "Insufficient memory" + msgstr "Memoria non sufficiente" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1422 + #, c-format +-msgid "Contact '%s' not found" +-msgstr "Contatto «%s» non trovato" ++msgid "Invalid contact field '%d' specified in summary" ++msgstr "Campo del contatto '%d' non valido specificato nel sommario" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1456 ++#, c-format ++msgid "" ++"Contact field '%s' of type '%s' specified in summary, but only boolean, " ++"string and string list field types are supported" ++msgstr "" ++"Campo del contatto '%s' di tipo '%s' specificato nel sommario, ma sono " ++"supportati solo campi per valori booleani, stringhe ed elenchi di stringhe" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3686 ++#, c-format ++msgid "" ++"Full search_contacts are not stored in cache. vcards cannot be returned." ++msgstr "" ++"I search_contacts completi non sono archiviati in cache. Impossibile " ++"ritornare le vcards." ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3812 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3893 ++#, c-format ++msgid "Query contained unsupported elements" ++msgstr "L'interrogazione contiene elementi non supportati" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 ++#, c-format ++msgid "Invalid Query" ++msgstr "Interrogazione non valida" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3840 ++#, c-format ++msgid "" ++"Full search_contacts are not stored in cache. Hence only summary query is " ++"supported." ++msgstr "" ++"I search_contacts completi non sono archiviati in cache. Per questo motivo " ++"sono supportate solo le interrogazioni del sommario." ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 ++#: ../addressbook/libedata-book/e-data-book.c:669 ++#: ../addressbook/libedata-book/e-data-book.c:809 ++#: ../calendar/libedata-cal/e-data-cal.c:612 ++#: ../calendar/libedata-cal/e-data-cal.c:771 ++#: ../libedataserver/e-client.c:166 ++#, c-format ++msgid "Invalid query" ++msgstr "Interrogazione non valida" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3940 ++#, c-format ++msgid "" ++"Full vcards are not stored in cache. Hence only summary query is supported." ++msgstr "" ++"Le vcards complete non sono archiviate in cache. Per questo motivo sono " ++"supportate solo le interrogazioni del sommario." ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4643 ++#, c-format ++msgid "Unable to remove the db file: errno %d" ++msgstr "Impossibile rimuovere il file db: errno %d" ++ ++#: ../addressbook/libedata-book/e-book-backend-sync.c:179 ++#: ../calendar/libedata-cal/e-cal-backend-sync.c:182 ++msgid "Clients cannot set backend properties" ++msgstr "I client non possono impostare le proprietà backend" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:201 +-#: ../addressbook/libedata-book/e-data-book.c:214 +-#: ../addressbook/libedata-book/e-data-book.c:724 ++#. Translators: This is a prefix to a detailed error message * ++#: ../addressbook/libedata-book/e-data-book.c:691 ++#: ../calendar/libedata-cal/e-data-cal.c:635 + msgid "Invalid query: " + msgstr "Interrogazione non valida: " + +-#: ../addressbook/libedata-book/e-data-book.c:302 +-#: ../calendar/libedata-cal/e-data-cal.c:415 ++#: ../addressbook/libedata-book/e-data-book.c:793 ++#: ../calendar/libedata-cal/e-data-cal.c:752 + msgid "Success" + msgstr "Riuscito" + +-#: ../addressbook/libedata-book/e-data-book.c:303 +-#: ../calendar/libecal/e-cal.c:4001 ../calendar/libedata-cal/e-data-cal.c:416 +-#: ../libedataserver/e-client.c:122 ++#: ../addressbook/libedata-book/e-data-book.c:794 ++#: ../calendar/libecal/e-cal.c:2307 ++#: ../calendar/libedata-cal/e-data-cal.c:753 ++#: ../libedataserver/e-client.c:133 + msgid "Backend is busy" + msgstr "Il backend è occupato" + +-#: ../addressbook/libedata-book/e-data-book.c:304 +-#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132 ++#: ../addressbook/libedata-book/e-data-book.c:795 ++#: ../calendar/libedata-cal/e-data-cal.c:754 ++#: ../libedataserver/e-client.c:143 + msgid "Repository offline" + msgstr "Repository fuori rete" + +-#: ../addressbook/libedata-book/e-data-book.c:305 +-#: ../calendar/libecal/e-cal.c:4015 ../calendar/libedata-cal/e-data-cal.c:418 +-#: ../libedataserver/e-client.c:138 ++#: ../addressbook/libedata-book/e-data-book.c:796 ++#: ../calendar/libecal/e-cal.c:2321 ++#: ../calendar/libedata-cal/e-data-cal.c:755 ++#: ../libedataserver/e-client.c:150 + msgid "Permission denied" + msgstr "Permesso negato" + +-#: ../addressbook/libedata-book/e-data-book.c:308 +-#: ../calendar/libedata-cal/e-data-cal.c:423 ++#: ../addressbook/libedata-book/e-data-book.c:799 ++#: ../calendar/libedata-cal/e-data-cal.c:760 + msgid "Authentication Failed" + msgstr "Autenticazione non riuscita" + +-#: ../addressbook/libedata-book/e-data-book.c:309 +-#: ../calendar/libedata-cal/e-data-cal.c:424 ++#: ../addressbook/libedata-book/e-data-book.c:800 ++#: ../calendar/libedata-cal/e-data-cal.c:761 + msgid "Authentication Required" + msgstr "Autenticazione richiesta" + +-#: ../addressbook/libedata-book/e-data-book.c:310 +-#: ../calendar/libedata-cal/e-data-cal.c:425 ++#: ../addressbook/libedata-book/e-data-book.c:801 ++#: ../calendar/libedata-cal/e-data-cal.c:762 + msgid "Unsupported field" + msgstr "Campo non supportato" + +-#: ../addressbook/libedata-book/e-data-book.c:311 +-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146 ++#: ../addressbook/libedata-book/e-data-book.c:802 ++#: ../calendar/libedata-cal/e-data-cal.c:764 ++#: ../libedataserver/e-client.c:158 + msgid "Unsupported authentication method" + msgstr "Metodo di autenticazione non supportato" + +-#: ../addressbook/libedata-book/e-data-book.c:312 +-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148 ++#: ../addressbook/libedata-book/e-data-book.c:803 ++#: ../calendar/libedata-cal/e-data-cal.c:765 ++#: ../libedataserver/e-client.c:160 + msgid "TLS not available" + msgstr "TLS non disponibile" + +-#: ../addressbook/libedata-book/e-data-book.c:313 ++#: ../addressbook/libedata-book/e-data-book.c:804 + msgid "Address book does not exist" + msgstr "La rubrica non esiste" + +-#: ../addressbook/libedata-book/e-data-book.c:314 ++#: ../addressbook/libedata-book/e-data-book.c:805 + msgid "Book removed" + msgstr "Rubrica rimossa" + +-#: ../addressbook/libedata-book/e-data-book.c:315 +-#: ../calendar/libedata-cal/e-data-cal.c:431 ++#: ../addressbook/libedata-book/e-data-book.c:806 ++#: ../calendar/libedata-cal/e-data-cal.c:768 + msgid "Not available in offline mode" + msgstr "Non è disponibile in modalità fuori rete" + +-#: ../addressbook/libedata-book/e-data-book.c:316 +-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150 ++#: ../addressbook/libedata-book/e-data-book.c:807 ++#: ../calendar/libedata-cal/e-data-cal.c:769 ++#: ../libedataserver/e-client.c:162 + msgid "Search size limit exceeded" + msgstr "Limite dimensione ricerca superato" + +-#: ../addressbook/libedata-book/e-data-book.c:317 +-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152 ++#: ../addressbook/libedata-book/e-data-book.c:808 ++#: ../calendar/libedata-cal/e-data-cal.c:770 ++#: ../libedataserver/e-client.c:164 + msgid "Search time limit exceeded" + msgstr "Limite tempo ricerca superato" + +-#: ../addressbook/libedata-book/e-data-book.c:318 +-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154 +-msgid "Invalid query" +-msgstr "Interrogazione non valida" +- +-#: ../addressbook/libedata-book/e-data-book.c:319 +-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156 ++#: ../addressbook/libedata-book/e-data-book.c:810 ++#: ../calendar/libedata-cal/e-data-cal.c:772 ++#: ../libedataserver/e-client.c:168 + msgid "Query refused" + msgstr "Interrogazione rifiutata" + +-#: ../addressbook/libedata-book/e-data-book.c:320 +-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142 ++#: ../addressbook/libedata-book/e-data-book.c:811 ++#: ../calendar/libedata-cal/e-data-cal.c:773 ++#: ../libedataserver/e-client.c:154 + msgid "Could not cancel" + msgstr "Impossibile annullare" + + #. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") }, + #. { OtherError, N_("Other error") }, +-#: ../addressbook/libedata-book/e-data-book.c:322 +-#: ../calendar/libedata-cal/e-data-cal.c:438 ++#: ../addressbook/libedata-book/e-data-book.c:813 ++#: ../calendar/libedata-cal/e-data-cal.c:775 + msgid "Invalid server version" + msgstr "Versione del server non valida" + +-#: ../addressbook/libedata-book/e-data-book.c:324 +-#: ../calendar/libecal/e-cal.c:3999 ../calendar/libedata-cal/e-data-cal.c:439 +-#: ../libedataserver/e-client.c:120 ++#: ../addressbook/libedata-book/e-data-book.c:815 ++#: ../calendar/libecal/e-cal.c:2305 ++#: ../calendar/libedata-cal/e-data-cal.c:776 ++#: ../libedataserver/e-client.c:131 + msgid "Invalid argument" + msgstr "Argomento non valido" + + #. Translators: The string for NOT_SUPPORTED error +-#: ../addressbook/libedata-book/e-data-book.c:326 +-#: ../calendar/libecal/e-cal.c:4038 ../calendar/libedata-cal/e-data-cal.c:441 +-#: ../libedataserver/e-client.c:144 ++#: ../addressbook/libedata-book/e-data-book.c:817 ++#: ../calendar/libecal/e-cal.c:1064 ++#: ../calendar/libecal/e-cal.c:1432 ++#: ../calendar/libecal/e-cal.c:1912 ++#: ../calendar/libecal/e-cal.c:2344 ++#: ../calendar/libedata-cal/e-data-cal.c:778 ++#: ../libedataserver/e-client.c:156 ++#, c-format + msgid "Not supported" + msgstr "Non supportato" + +-#: ../addressbook/libedata-book/e-data-book.c:327 +-#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162 ++#: ../addressbook/libedata-book/e-data-book.c:818 ++#: ../calendar/libedata-cal/e-data-cal.c:779 ++#: ../libedataserver/e-client.c:174 + msgid "Backend is not opened yet" + msgstr "Il backend non è ancora aperto" + +-#: ../addressbook/libedata-book/e-data-book.c:335 +-#: ../calendar/libecal/e-cal-client.c:619 +-#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160 ++#: ../addressbook/libedata-book/e-data-book.c:819 ++#: ../libedataserver/e-client.c:176 ++msgid "Object is out of sync" ++msgstr "L'oggetto non è sincronizzato" ++ ++#: ../addressbook/libedata-book/e-data-book.c:827 ++#: ../calendar/libedata-cal/e-data-cal.c:787 ++#: ../libedataserver/e-client.c:172 + msgid "Other error" + msgstr "Altro errore" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:542 +-#: ../addressbook/libedata-book/e-data-book.c:909 +-msgid "Cannot get contact: " +-msgstr "Impossibile ottenere il contatto: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:567 +-#: ../addressbook/libedata-book/e-data-book.c:592 +-msgid "Empty query: " +-msgstr "Interrogazione vuota: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:617 +-#: ../addressbook/libedata-book/e-data-book.c:1007 +-msgid "Cannot add contact: " +-msgstr "Impossibile aggiungere il contatto: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:642 +-#: ../addressbook/libedata-book/e-data-book.c:1041 +-msgid "Cannot modify contacts: " +-msgstr "Impossibile modificare i contatti: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:796 ++#: ../addressbook/libedata-book/e-data-book.c:1133 + msgid "Cannot open book: " + msgstr "Impossibile aprire la rubrica: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:812 +-msgid "Cannot remove book: " +-msgstr "Impossibile rimuovere la rubrica: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:839 ++#: ../addressbook/libedata-book/e-data-book.c:1217 + msgid "Cannot refresh address book: " + msgstr "Impossibile aggiornare il calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:865 +-msgid "Cannot get backend property: " +-msgstr "Impossibile ottenere la proprietà del backend: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:890 +-#: ../calendar/libedata-cal/e-data-cal.c:1016 +-msgid "Cannot set backend property: " +-msgstr "Impossibile impostare la proprietà del backend: " ++#: ../addressbook/libedata-book/e-data-book.c:1298 ++msgid "Cannot get contact: " ++msgstr "Impossibile ottenere il contatto: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:927 ++#: ../addressbook/libedata-book/e-data-book.c:1364 + msgid "Cannot get contact list: " + msgstr "Impossibile ottenere l'elenco di contatti: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:961 ++#: ../addressbook/libedata-book/e-data-book.c:1456 + msgid "Cannot get contact list uids: " + msgstr "Impossibile ottenere gli UID dell'elenco di contatti: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1066 ++#: ../addressbook/libedata-book/e-data-book.c:1536 ++msgid "Cannot add contact: " ++msgstr "Impossibile aggiungere il contatto: " ++ ++#. Translators: This is prefix to a detailed error message ++#: ../addressbook/libedata-book/e-data-book.c:1599 ++msgid "Cannot modify contacts: " ++msgstr "Impossibile modificare i contatti: " ++ ++#. Translators: This is prefix to a detailed error message ++#: ../addressbook/libedata-book/e-data-book.c:1640 + msgid "Cannot remove contacts: " + msgstr "Impossibile rimuovere i contatti: " + +-#: ../addressbook/libedata-book/e-data-book-factory.c:103 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:114 ++#: ../addressbook/libedata-book/e-data-book-factory.c:94 ++#: ../calendar/libedata-cal/e-data-cal-factory.c:97 + #, c-format + msgid "No backend name in source '%s'" + msgstr "Nessun nome di backend nella sorgente \"%s\"" + +-#: ../addressbook/libedata-book/e-data-book-factory.c:115 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:127 ++#: ../addressbook/libedata-book/e-data-book-factory.c:185 ++#: ../calendar/libedata-cal/e-data-cal-factory.c:191 + #, c-format +-msgid "Invalid backend name '%s' in source '%s'" +-msgstr "Nome di backend \"%s\" non valido nella sorgente \"%s\"" +- +-#: ../addressbook/libedata-book/e-data-book-factory.c:319 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:230 + msgid "Missing source UID" + msgstr "UID sorgente mancante" + +-#: ../addressbook/libedata-book/e-data-book-factory.c:332 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:243 ++#: ../addressbook/libedata-book/e-data-book-factory.c:196 ++#: ../calendar/libedata-cal/e-data-cal-factory.c:201 + #, c-format + msgid "No such source for UID '%s'" + msgstr "Nessuna sorgente per l'UID \"%s\"" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:560 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "Il server è irragiungibile (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:598 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:590 + #, c-format + msgid "Failed to connect to a server using SSL: %s" + msgstr "Connessione a un server usando SSL non riuscita: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603 +-msgid "" +-"Failed to connect to a server using SSL. One possible reason is an invalid " +-"certificate being used by the server. If this is expected, like self-signed " +-"certificate being used on the server, then disable certificate validity " +-"tests by selecting 'Ignore invalid SSL certificate' option in Properties" +-msgstr "" +-"Connessione a un server usando SSL non riuscita. Uno dei motivi possibili è " +-"un certificato non valido usato dal server. Se questa condizione era attesa, " +-"come nel caso di certificato auto-firmato usato sul server, allora " +-"disabilitare il test di validità del certificato selezionando l'opzione " +-"\"Ignorare i certificati SSL non validi\" nelle proprietà." +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:601 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "Restituito codice di stato HTTP %d inatteso (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:620 + msgid "CalDAV backend is not loaded yet" + msgstr "Il backend CalDAV non è ancora caricato" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1009 + msgid "Invalid Redirect URL" + msgstr "URL di redirezione non valida" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2722 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2491 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2849 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1202,469 +1290,449 @@ msgstr "" + "lettura.\n" + "Messaggio d'errore: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2663 +-msgid "Cannot create local store" +-msgstr "Impossibile creare lo store locale" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2801 + #, c-format + msgid "Cannot create local cache folder '%s'" + msgstr "Impossibile creare la cartella cache locale «%s»" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2683 +-msgid "Could not create synch slave thread" +-msgstr "Impossibile creare il thread synch slave" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3677 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3893 + msgid "CalDAV does not support bulk additions" + msgstr "CalDAV non supporta le aggiunte in serie" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3779 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3996 + msgid "CalDAV does not support bulk modifications" + msgstr "CalDAV non supporta le modifiche in serie" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3947 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4165 + msgid "CalDAV does not support bulk removals" + msgstr "CalDAV non supporta le rimozioni in serie" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4606 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4837 + msgid "Calendar doesn't support Free/Busy" + msgstr "Il calendario non supporta libero/occupato" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4614 +-#, fuzzy ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4846 + msgid "Schedule outbox url not found" + msgstr "URL schedule outbox non trovato" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4713 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4945 + msgid "Unexpected result in schedule-response" + msgstr "Risultato inatteso in schedule-response" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:877 + msgid "Birthday" + msgstr "Compleanno" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:913 + #, c-format + msgid "Birthday: %s" + msgstr "Compleanno: %s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:944 + #, c-format + msgid "Anniversary: %s" + msgstr "Anniversario: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:235 ++#: ../calendar/backends/file/e-cal-backend-file.c:243 + msgid "Cannot save calendar data: Malformed URI." + msgstr "Impossibile salvare i dati del calendario: URI malformato." + +-#: ../calendar/backends/file/e-cal-backend-file.c:242 +-#: ../calendar/backends/file/e-cal-backend-file.c:248 ++#: ../calendar/backends/file/e-cal-backend-file.c:250 ++#: ../calendar/backends/file/e-cal-backend-file.c:256 + msgid "Cannot save calendar data" + msgstr "Impossibile salvare i dati del calendario" + +-#: ../calendar/backends/http/e-cal-backend-http.c:482 ++#: ../calendar/backends/http/e-cal-backend-http.c:477 + #, c-format + msgid "Malformed URI: %s" + msgstr "URI malformato: %s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:543 ++#: ../calendar/backends/http/e-cal-backend-http.c:568 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "Rediretto a un URI non valido" + +-#: ../calendar/backends/http/e-cal-backend-http.c:580 ++#: ../calendar/backends/http/e-cal-backend-http.c:605 + #, c-format + msgid "Bad file format." + msgstr "Formato di file errato." + +-#: ../calendar/backends/http/e-cal-backend-http.c:590 ++#: ../calendar/backends/http/e-cal-backend-http.c:615 + #, c-format + msgid "Not a calendar." + msgstr "Non è un calendario." + +-#: ../calendar/backends/http/e-cal-backend-http.c:887 +-#: ../calendar/backends/http/e-cal-backend-http.c:891 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:511 ++#: ../calendar/backends/http/e-cal-backend-http.c:926 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:520 + msgid "Could not create cache file" + msgstr "Impossibile creare il file cache" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:171 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:173 + msgid "Could not retrieve weather data" + msgstr "Impossibile recuperare i dati meteo" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:276 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:284 + msgid "Weather: Fog" + msgstr "Meteo: nebbia" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:277 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:285 + msgid "Weather: Cloudy Night" + msgstr "Meteo: nuvoloso (notte)" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:278 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:286 + msgid "Weather: Cloudy" + msgstr "Meteo: nuvoloso" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:279 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:287 + msgid "Weather: Overcast" + msgstr "Meteo: nuvoloso" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:280 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:288 + msgid "Weather: Showers" + msgstr "Meteo: acquazzoni" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:281 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:289 + msgid "Weather: Snow" + msgstr "Meteo: neve" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:282 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:290 + msgid "Weather: Clear Night" + msgstr "Meteo: sereno (notte)" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:283 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:291 + msgid "Weather: Sunny" + msgstr "Meteo: soleggiato" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:284 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:292 + msgid "Weather: Thunderstorms" + msgstr "Meteo: temporali" + + # stando a garzantlinguistica.it il weather + # può essere sottinteso +-#: ../calendar/backends/weather/e-cal-backend-weather.c:408 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:416 + msgid "Forecast" + msgstr "Previsioni meteo" + +-#: ../calendar/libecal/e-cal.c:4003 ++#: ../calendar/libecal/e-cal.c:2309 + msgid "Repository is offline" + msgstr "Il repository è fuori rete" + +-#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135 ++#: ../calendar/libecal/e-cal.c:2311 ++#: ../calendar/libecal/e-cal-client.c:262 + msgid "No such calendar" + msgstr "Calendario inesistente" + +-#: ../calendar/libecal/e-cal.c:4007 ../calendar/libecal/e-cal-client.c:137 +-#: ../calendar/libedata-cal/e-data-cal.c:420 ++#: ../calendar/libecal/e-cal.c:2313 ++#: ../calendar/libecal/e-cal-client.c:264 ++#: ../calendar/libedata-cal/e-data-cal.c:757 + msgid "Object not found" + msgstr "Oggetto non trovato" + +-#: ../calendar/libecal/e-cal.c:4009 ../calendar/libecal/e-cal-client.c:139 +-#: ../calendar/libedata-cal/e-data-cal.c:421 ++#: ../calendar/libecal/e-cal.c:2315 ++#: ../calendar/libecal/e-cal-client.c:266 ++#: ../calendar/libedata-cal/e-data-cal.c:758 + msgid "Invalid object" + msgstr "Oggetto non valido" + +-#: ../calendar/libecal/e-cal.c:4011 ++#: ../calendar/libecal/e-cal.c:2317 + msgid "URI not loaded" + msgstr "URI non caricato" + +-#: ../calendar/libecal/e-cal.c:4013 ++#: ../calendar/libecal/e-cal.c:2319 + msgid "URI already loaded" + msgstr "URI già caricato" + +-#: ../calendar/libecal/e-cal.c:4017 ++#: ../calendar/libecal/e-cal.c:2323 + msgid "Unknown User" + msgstr "Utente sconosciuto" + +-#: ../calendar/libecal/e-cal.c:4019 ../calendar/libecal/e-cal-client.c:143 +-#: ../calendar/libedata-cal/e-data-cal.c:422 ++#: ../calendar/libecal/e-cal.c:2325 ++#: ../calendar/libecal/e-cal-client.c:270 ++#: ../calendar/libedata-cal/e-data-cal.c:759 + msgid "Object ID already exists" + msgstr "L'ID dell'oggetto esiste già" + +-#: ../calendar/libecal/e-cal.c:4021 ++#: ../calendar/libecal/e-cal.c:2327 + msgid "Protocol not supported" + msgstr "Protocollo non supportato" + +-#: ../calendar/libecal/e-cal.c:4023 ++#: ../calendar/libecal/e-cal.c:2329 + msgid "Operation has been canceled" + msgstr "L'operazione è stata annullata" + +-#: ../calendar/libecal/e-cal.c:4025 ++#: ../calendar/libecal/e-cal.c:2331 + msgid "Could not cancel operation" + msgstr "Impossibile annullare l'operazione" + +-#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128 ++#: ../calendar/libecal/e-cal.c:2333 ++#: ../libedataserver/e-client.c:139 + msgid "Authentication failed" + msgstr "Autenticazione non riuscita" + +-#: ../calendar/libecal/e-cal.c:4029 +-#: ../camel/providers/smtp/camel-smtp-transport.c:857 +-#: ../libedataserver/e-client.c:130 ++#: ../calendar/libecal/e-cal.c:2335 ++#: ../camel/providers/smtp/camel-smtp-transport.c:915 ++#: ../libedataserver/e-client.c:141 + msgid "Authentication required" + msgstr "Autenticazione richiesta" + +-#: ../calendar/libecal/e-cal.c:4031 ++#: ../calendar/libecal/e-cal.c:2337 + msgid "A D-Bus exception has occurred" + msgstr "È occorsa un'eccezione D-Bus" + +-#: ../calendar/libecal/e-cal.c:4035 ++#: ../calendar/libecal/e-cal.c:2341 + msgid "No error" + msgstr "Nessun errore" + +-#: ../calendar/libecal/e-cal-client.c:141 +-#: ../calendar/libedata-cal/e-data-cal.c:430 ++#: ../calendar/libecal/e-cal-client.c:268 ++#: ../calendar/libedata-cal/e-data-cal.c:767 + msgid "Unknown user" + msgstr "Utente sconosciuto" + +-#: ../calendar/libecal/e-cal-client.c:145 +-#: ../calendar/libedata-cal/e-data-cal.c:419 ++#: ../calendar/libecal/e-cal-client.c:272 ++#: ../calendar/libedata-cal/e-data-cal.c:756 + msgid "Invalid range" + msgstr "Intervallo non valido" + +-#: ../calendar/libecal/e-cal-client.c:610 +-msgid "Failed to run calendar factory" +-msgstr "Esecuzione della fabbrica del calendario non riuscita" ++#: ../calendar/libecal/e-cal-client.c:920 ++#: ../calendar/libedata-cal/e-cal-backend.c:204 ++#, c-format ++msgid "Unknown calendar property '%s'" ++msgstr "Proprietà di calendario «%s» sconosciuta" ++ ++#: ../calendar/libecal/e-cal-client.c:935 ++#, c-format ++msgid "Cannot change value of calendar property '%s'" ++msgstr "Impossibile cambiare valore della proprietà di caledario «%s»" + +-#: ../calendar/libecal/e-cal-component.c:1339 ++#: ../calendar/libecal/e-cal-component.c:1340 + msgid "Untitled appointment" + msgstr "Appuntamento senza titolo" + +-#: ../calendar/libecal/e-cal-recur.c:3987 ++#: ../calendar/libecal/e-cal-recur.c:4036 + msgid "1st" + msgstr "1" + +-#: ../calendar/libecal/e-cal-recur.c:3988 ++#: ../calendar/libecal/e-cal-recur.c:4037 + msgid "2nd" + msgstr "2" + +-#: ../calendar/libecal/e-cal-recur.c:3989 ++#: ../calendar/libecal/e-cal-recur.c:4038 + msgid "3rd" + msgstr "3" + +-#: ../calendar/libecal/e-cal-recur.c:3990 ++#: ../calendar/libecal/e-cal-recur.c:4039 + msgid "4th" + msgstr "4" + +-#: ../calendar/libecal/e-cal-recur.c:3991 ++#: ../calendar/libecal/e-cal-recur.c:4040 + msgid "5th" + msgstr "5" + +-#: ../calendar/libecal/e-cal-recur.c:3992 ++#: ../calendar/libecal/e-cal-recur.c:4041 + msgid "6th" + msgstr "6" + +-#: ../calendar/libecal/e-cal-recur.c:3993 ++#: ../calendar/libecal/e-cal-recur.c:4042 + msgid "7th" + msgstr "7" + +-#: ../calendar/libecal/e-cal-recur.c:3994 ++#: ../calendar/libecal/e-cal-recur.c:4043 + msgid "8th" + msgstr "8" + +-#: ../calendar/libecal/e-cal-recur.c:3995 ++#: ../calendar/libecal/e-cal-recur.c:4044 + msgid "9th" + msgstr "9" + +-#: ../calendar/libecal/e-cal-recur.c:3996 ++#: ../calendar/libecal/e-cal-recur.c:4045 + msgid "10th" + msgstr "10" + +-#: ../calendar/libecal/e-cal-recur.c:3997 ++#: ../calendar/libecal/e-cal-recur.c:4046 + msgid "11th" + msgstr "11" + +-#: ../calendar/libecal/e-cal-recur.c:3998 ++#: ../calendar/libecal/e-cal-recur.c:4047 + msgid "12th" + msgstr "12" + +-#: ../calendar/libecal/e-cal-recur.c:3999 ++#: ../calendar/libecal/e-cal-recur.c:4048 + msgid "13th" + msgstr "13" + +-#: ../calendar/libecal/e-cal-recur.c:4000 ++#: ../calendar/libecal/e-cal-recur.c:4049 + msgid "14th" + msgstr "14" + +-#: ../calendar/libecal/e-cal-recur.c:4001 ++#: ../calendar/libecal/e-cal-recur.c:4050 + msgid "15th" + msgstr "15" + +-#: ../calendar/libecal/e-cal-recur.c:4002 ++#: ../calendar/libecal/e-cal-recur.c:4051 + msgid "16th" + msgstr "16" + +-#: ../calendar/libecal/e-cal-recur.c:4003 ++#: ../calendar/libecal/e-cal-recur.c:4052 + msgid "17th" + msgstr "17" + +-#: ../calendar/libecal/e-cal-recur.c:4004 ++#: ../calendar/libecal/e-cal-recur.c:4053 + msgid "18th" + msgstr "18" + +-#: ../calendar/libecal/e-cal-recur.c:4005 ++#: ../calendar/libecal/e-cal-recur.c:4054 + msgid "19th" + msgstr "19" + +-#: ../calendar/libecal/e-cal-recur.c:4006 ++#: ../calendar/libecal/e-cal-recur.c:4055 + msgid "20th" + msgstr "20" + +-#: ../calendar/libecal/e-cal-recur.c:4007 ++#: ../calendar/libecal/e-cal-recur.c:4056 + msgid "21st" + msgstr "21" + +-#: ../calendar/libecal/e-cal-recur.c:4008 ++#: ../calendar/libecal/e-cal-recur.c:4057 + msgid "22nd" + msgstr "22" + +-#: ../calendar/libecal/e-cal-recur.c:4009 ++#: ../calendar/libecal/e-cal-recur.c:4058 + msgid "23rd" + msgstr "23" + +-#: ../calendar/libecal/e-cal-recur.c:4010 ++#: ../calendar/libecal/e-cal-recur.c:4059 + msgid "24th" + msgstr "24" + +-#: ../calendar/libecal/e-cal-recur.c:4011 ++#: ../calendar/libecal/e-cal-recur.c:4060 + msgid "25th" + msgstr "25" + +-#: ../calendar/libecal/e-cal-recur.c:4012 ++#: ../calendar/libecal/e-cal-recur.c:4061 + msgid "26th" + msgstr "26" + +-#: ../calendar/libecal/e-cal-recur.c:4013 ++#: ../calendar/libecal/e-cal-recur.c:4062 + msgid "27th" + msgstr "27" + +-#: ../calendar/libecal/e-cal-recur.c:4014 ++#: ../calendar/libecal/e-cal-recur.c:4063 + msgid "28th" + msgstr "28" + +-#: ../calendar/libecal/e-cal-recur.c:4015 ++#: ../calendar/libecal/e-cal-recur.c:4064 + msgid "29th" + msgstr "29" + +-#: ../calendar/libecal/e-cal-recur.c:4016 ++#: ../calendar/libecal/e-cal-recur.c:4065 + msgid "30th" + msgstr "30" + +-#: ../calendar/libecal/e-cal-recur.c:4017 ++#: ../calendar/libecal/e-cal-recur.c:4066 + msgid "31st" + msgstr "31" + +-#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723 ++#: ../calendar/libecal/e-cal-util.c:707 ++#: ../calendar/libecal/e-cal-util.c:734 + msgctxt "Priority" + msgid "High" + msgstr "Alta" + +-#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725 ++#: ../calendar/libecal/e-cal-util.c:709 ++#: ../calendar/libecal/e-cal-util.c:736 + msgctxt "Priority" + msgid "Normal" + msgstr "Normale" + +-#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727 ++#: ../calendar/libecal/e-cal-util.c:711 ++#: ../calendar/libecal/e-cal-util.c:738 + msgctxt "Priority" + msgid "Low" + msgstr "Bassa" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:721 ++#: ../calendar/libecal/e-cal-util.c:732 + msgctxt "Priority" + msgid "Undefined" + msgstr "Non definita" + +-#: ../calendar/libedata-cal/e-cal-backend.c:36 +-msgid "Cannot process, calendar backend is opening" +-msgstr "Impossibile elaborare, il backend di calendario è in apertura" +- +-#: ../calendar/libedata-cal/e-cal-backend.c:135 +-#, c-format +-msgid "Unknown calendar property '%s'" +-msgstr "Proprietà di calendario «%s» sconosciuta" +- +-#: ../calendar/libedata-cal/e-cal-backend.c:152 +-#, c-format +-msgid "Cannot change value of calendar property '%s'" +-msgstr "Impossibile cambiare valore della proprietà di caledario «%s»" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215 +-#, c-format +-msgid "\"%s\" expects no arguments" +-msgstr "\"%s\" non prevede alcun argomento" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541 + #, c-format + msgid "\"%s\" expects one argument" + msgstr "\"%s\" prevede un argomento" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380 + #, c-format + msgid "\"%s\" expects the first argument to be a string" + msgstr "\"%s\" prevede che il primo argomento sia una stringa" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134 +-#, c-format +-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" +-msgstr "" +-"\"%s\" prevede che il primo argomento sia una stringa data/ora ISO 8601" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160 + #, c-format +-msgid "\"%s\" expects two arguments" +-msgstr "\"%s\" prevede due argomenti" ++msgid "\"%s\" expects two or three arguments" ++msgstr "\"%s\" prevede due o tre argomenti" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548 + #, c-format + msgid "\"%s\" expects the first argument to be a time_t" + msgstr "\"%s\" prevede che il primo argomento sia un time_t" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190 +-#, c-format +-msgid "\"%s\" expects the second argument to be an integer" +-msgstr "\"%s\" prevede che il secondo argomento sia un intero" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395 +-#, c-format +-msgid "\"%s\" expects two or three arguments" +-msgstr "\"%s\" prevede due o tre argomenti" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826 + #, c-format + msgid "\"%s\" expects the second argument to be a time_t" + msgstr "\"%s\" prevede che il secondo argomento sia un time_t" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186 + #, c-format + msgid "\"%s\" expects the third argument to be a string" + msgstr "\"%s\" prevede che il terzo argomento sia una stringa" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248 + #, c-format + msgid "\"%s\" expects none or two arguments" + msgstr "\"%s\" prevede due argomenti o nessuno" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434 ++#, c-format ++msgid "\"%s\" expects two arguments" ++msgstr "\"%s\" prevede due argomenti" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326 ++#, c-format ++msgid "\"%s\" expects no arguments" ++msgstr "\"%s\" non prevede alcun argomento" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676 + #, c-format + msgid "\"%s\" expects the second argument to be a string" + msgstr "\"%s\" prevede che il secondo argomento sia una stringa" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707 + #, c-format + msgid "" + "\"%s\" expects the first argument to be either \"any\", \"summary\", or " +@@ -1672,15 +1740,15 @@ msgid "" + "\"classification\"" + msgstr "" + "\"%s\" prevede che il primo argomento sia uno tra \"any\", \"summary\", " +-"\"description\", \"location\", \"attendee\", \"organizer\" o \"classification" +-"\"" ++"\"description\", \"location\", \"attendee\", \"organizer\" o " ++"\"classification\"" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 + #, c-format + msgid "\"%s\" expects at least one argument" + msgstr "\"%s\" prevede almeno un argomento" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893 + #, c-format + msgid "" + "\"%s\" expects all arguments to be strings or one and only one argument to " +@@ -1689,144 +1757,144 @@ msgstr "" + "\"%s\" prevede che tutti gli argomenti siano stringhe o uno e soltanto uno " + "falso booleano (#f)" + +-#: ../calendar/libedata-cal/e-data-cal.c:426 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389 ++#, c-format ++msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" ++msgstr "\"%s\" prevede che il primo argomento sia una stringa data/ora ISO 8601" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450 ++#, c-format ++msgid "\"%s\" expects the second argument to be an integer" ++msgstr "\"%s\" prevede che il secondo argomento sia un intero" ++ ++#: ../calendar/libedata-cal/e-data-cal.c:763 + msgid "Unsupported method" + msgstr "Metodo non supportato" + +-#: ../calendar/libedata-cal/e-data-cal.c:429 ++#: ../calendar/libedata-cal/e-data-cal.c:766 + msgid "Calendar does not exist" + msgstr "Il calendario non esiste" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:909 ++#: ../calendar/libedata-cal/e-data-cal.c:1237 + msgid "Cannot open calendar: " + msgstr "Impossibile aprire il calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:934 +-msgid "Cannot remove calendar: " +-msgstr "Impossibile rimuovere il calendario: " +- +-#. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:961 ++#: ../calendar/libedata-cal/e-data-cal.c:1298 + msgid "Cannot refresh calendar: " + msgstr "Impossibile aggiornare il calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:990 ++#: ../calendar/libedata-cal/e-data-cal.c:1337 + msgid "Cannot retrieve backend property: " + msgstr "Impossibile recuperare la proprietà del backend: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1045 ++#: ../calendar/libedata-cal/e-data-cal.c:1395 + msgid "Cannot retrieve calendar object path: " + msgstr "Impossibile recuperare il percorso dell'oggetto di calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1075 ++#: ../calendar/libedata-cal/e-data-cal.c:1441 + msgid "Cannot retrieve calendar object list: " + msgstr "Impossibile recuperare l'elenco degli oggetti di calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1104 ++#: ../calendar/libedata-cal/e-data-cal.c:1494 + msgid "Cannot retrieve calendar free/busy list: " + msgstr "Impossibile recuperare l'elenco libero/occupato del calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1142 ++#: ../calendar/libedata-cal/e-data-cal.c:1535 + msgid "Cannot create calendar object: " + msgstr "Impossibile creare l'oggetto di calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1177 ++#: ../calendar/libedata-cal/e-data-cal.c:1604 + msgid "Cannot modify calendar object: " + msgstr "Impossibile modificare l'oggetto di calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1217 ++#: ../calendar/libedata-cal/e-data-cal.c:1666 + msgid "Cannot remove calendar object: " + msgstr "Impossibile rimuovere l'oggetto di calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1254 ++#: ../calendar/libedata-cal/e-data-cal.c:1727 + msgid "Cannot receive calendar objects: " + msgstr "Impossibile ricevere oggetti di calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1285 ++#: ../calendar/libedata-cal/e-data-cal.c:1768 + msgid "Cannot send calendar objects: " + msgstr "Impossibile inviare oggetti di calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1317 ++#: ../calendar/libedata-cal/e-data-cal.c:1828 + msgid "Could not retrieve attachment uris: " + msgstr "Impossibile recuperare gli URI degli allegati: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1345 ++#: ../calendar/libedata-cal/e-data-cal.c:1878 + msgid "Could not discard reminder: " + msgstr "Impossibile scartare il promemoria: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1374 ++#: ../calendar/libedata-cal/e-data-cal.c:1917 + msgid "Could not get calendar view path: " + msgstr "Impossibile recuperare il percorso della vista calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1404 ++#: ../calendar/libedata-cal/e-data-cal.c:1963 + msgid "Could not retrieve calendar time zone: " + msgstr "Impossibile recuperare il fuso orario del calendario: " + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1430 ++#: ../calendar/libedata-cal/e-data-cal.c:2007 + msgid "Could not add calendar time zone: " + msgstr "Impossibile aggiungere il fuso orario del calendario: " + +-#: ../calendar/libedata-cal/e-data-cal-factory.c:220 +-#, c-format +-msgid "Invalid call" +-msgstr "Chiamata non valida" +- + # ... ma che intende per cifrario??? -Luca +-#: ../camel/camel-cipher-context.c:206 ++#: ../camel/camel-cipher-context.c:208 + #, c-format + msgid "Signing is not supported by this cipher" + msgstr "Questo cifrario non consente la firma" + +-#: ../camel/camel-cipher-context.c:219 ++#: ../camel/camel-cipher-context.c:221 + #, c-format + msgid "Verifying is not supported by this cipher" + msgstr "Questo cifrario non consente la verifica" + +-#: ../camel/camel-cipher-context.c:235 ++#: ../camel/camel-cipher-context.c:237 + #, c-format + msgid "Encryption is not supported by this cipher" + msgstr "Questo cifrario non supporta la cifratura" + +-#: ../camel/camel-cipher-context.c:249 ++#: ../camel/camel-cipher-context.c:251 + #, c-format + msgid "Decryption is not supported by this cipher" + msgstr "Questo cifrario non supporta la decifratura" + +-#: ../camel/camel-cipher-context.c:262 ++#: ../camel/camel-cipher-context.c:264 + #, c-format + msgid "You may not import keys with this cipher" + msgstr "Impossibile importare chiavi con questo cifrario" + +-#: ../camel/camel-cipher-context.c:276 ++#: ../camel/camel-cipher-context.c:278 + #, c-format + msgid "You may not export keys with this cipher" + msgstr "Impossibile esportare chiavi con questo cifrario" + +-#: ../camel/camel-cipher-context.c:817 ++#: ../camel/camel-cipher-context.c:819 + msgid "Signing message" + msgstr "Firma messaggio" + +-#: ../camel/camel-cipher-context.c:1058 ++#: ../camel/camel-cipher-context.c:1060 + msgid "Encrypting message" + msgstr "Cifratura messaggio" + +-#: ../camel/camel-cipher-context.c:1185 ++#: ../camel/camel-cipher-context.c:1187 + msgid "Decrypting message" + msgstr "Decifratura messaggio" + +@@ -1855,8 +1923,7 @@ msgstr "" + "Ulteriori operazioni su questo server non saranno replicate\n" + "quando ci si riconnette alla rete." + +-#: ../camel/camel-disco-diary.c:271 +-#: ../camel/providers/imap/camel-imap-journal.c:312 ++#: ../camel/camel-disco-diary.c:279 + #, c-format + msgid "" + "Could not open '%s':\n" +@@ -1867,44 +1934,50 @@ msgstr "" + "%s\n" + "Le modifiche apportate a questa cartella non saranno risincronizzate." + +-#: ../camel/camel-disco-diary.c:315 ++#: ../camel/camel-disco-diary.c:326 + msgid "Resynchronizing with server" + msgstr "Risincronizzazione con il server" + +-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93 ++#: ../camel/camel-disco-folder.c:76 ++#: ../camel/camel-offline-folder.c:93 + msgid "Downloading new messages for offline mode" + msgstr "Scaricamento dei nuovi messaggi per la modalità fuori rete" + +-#: ../camel/camel-disco-folder.c:420 ++#: ../camel/camel-disco-folder.c:422 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "Preparazione della cartella «%s» per l'accesso fuori rete" + +-#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334 ++#: ../camel/camel-disco-folder.c:489 ++#: ../camel/camel-offline-folder.c:336 + msgid "Copy folder content locally for _offline operation" + msgstr "" + "Copiare localmente il contenuto della cartella per operazioni _fuori rete" + + # Umoristica: se in linea --> i ciccioni non possono completare + # questa operazione :-) -Luca +-# +-#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413 +-#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482 +-#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:614 +-#: ../camel/camel-imapx-folder.c:648 ../camel/camel-imapx-folder.c:688 +-#: ../camel/camel-imapx-folder.c:724 ../camel/camel-imapx-store.c:276 +-#: ../camel/camel-imapx-store.c:1398 ../camel/camel-imapx-store.c:1487 +-#: ../camel/camel-imapx-store.c:1536 +-#: ../camel/providers/imap/camel-imap-store.c:1270 +-#: ../camel/providers/imap/camel-imap-store.c:2033 +-#: ../camel/providers/imap/camel-imap-store.c:2509 +-#: ../camel/providers/imap/camel-imap-store.c:3289 +-#: ../camel/providers/pop3/camel-pop3-folder.c:531 +-#: ../camel/providers/pop3/camel-pop3-folder.c:674 +-#: ../camel/providers/pop3/camel-pop3-folder.c:874 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1074 +-#: ../camel/providers/pop3/camel-pop3-store.c:408 +-#: ../camel/providers/pop3/camel-pop3-store.c:831 ++#: ../camel/camel-disco-store.c:475 ++#: ../camel/camel-imapx-folder.c:478 ++#: ../camel/camel-imapx-folder.c:514 ++#: ../camel/camel-imapx-folder.c:553 ++#: ../camel/camel-imapx-folder.c:613 ++#: ../camel/camel-imapx-folder.c:748 ++#: ../camel/camel-imapx-folder.c:933 ++#: ../camel/camel-imapx-folder.c:993 ++#: ../camel/camel-imapx-folder.c:1032 ++#: ../camel/camel-imapx-store.c:368 ++#: ../camel/camel-imapx-store.c:1592 ++#: ../camel/camel-imapx-store.c:1681 ++#: ../camel/camel-imapx-store.c:1730 ++#: ../camel/providers/pop3/camel-pop3-folder.c:555 ++#: ../camel/providers/pop3/camel-pop3-folder.c:705 ++#: ../camel/providers/pop3/camel-pop3-folder.c:940 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1150 ++#: ../camel/providers/pop3/camel-pop3-store.c:291 ++#: ../camel/providers/pop3/camel-pop3-store.c:519 ++#: ../camel/providers/pop3/camel-pop3-store.c:567 ++#: ../camel/providers/pop3/camel-pop3-store.c:652 ++#: ../camel/providers/pop3/camel-pop3-store.c:1052 + #, c-format + msgid "You must be working online to complete this operation" + msgstr "È necessario non essere fuori rete per completare questa operazione" +@@ -1914,7 +1987,8 @@ msgstr "È necessario non essere fuori r + msgid "Canceled" + msgstr "Annullato" + +-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772 ++#: ../camel/camel-filter-driver.c:916 ++#: ../camel/camel-filter-search.c:797 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "Creazione del processo figlio «%s» non riuscita: %s" +@@ -1924,234 +1998,253 @@ msgstr "Creazione del processo figlio « + msgid "Invalid message stream received from %s: %s" + msgstr "Flusso di messaggi non valido ricevuto da %s: %s" + +-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178 ++#: ../camel/camel-filter-driver.c:1171 ++#: ../camel/camel-filter-driver.c:1180 + msgid "Syncing folders" + msgstr "Sincronizzazione cartelle" + +-#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761 ++#: ../camel/camel-filter-driver.c:1278 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "Errore nell'analizzare il filtro: %s: %s" + +-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774 ++#: ../camel/camel-filter-driver.c:1289 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "Errore nell'eseguire il filtro: %s: %s" + +-#: ../camel/camel-filter-driver.c:1383 ++#: ../camel/camel-filter-driver.c:1385 + #, c-format + msgid "Unable to open spool folder" + msgstr "Impossibile aprire la cartella di spool" + +-#: ../camel/camel-filter-driver.c:1395 ++#: ../camel/camel-filter-driver.c:1397 + #, c-format + msgid "Unable to process spool folder" + msgstr "Impossibile esaminare la cartella di spool" + +-#: ../camel/camel-filter-driver.c:1415 ++#: ../camel/camel-filter-driver.c:1420 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "Ricezione del messaggio %d (%d%%)" + +-#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446 ++#: ../camel/camel-filter-driver.c:1429 ++#: ../camel/camel-filter-driver.c:1451 + #, c-format + msgid "Failed on message %d" + msgstr "Non riuscito al messaggio %d" + +-#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573 ++#: ../camel/camel-filter-driver.c:1470 ++#: ../camel/camel-filter-driver.c:1584 + msgid "Syncing folder" + msgstr "Sincronizzazione cartella" + +-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581 ++#: ../camel/camel-filter-driver.c:1475 ++#: ../camel/camel-filter-driver.c:1592 + msgid "Complete" + msgstr "Completato" + +-#: ../camel/camel-filter-driver.c:1529 ++#: ../camel/camel-filter-driver.c:1538 + #, c-format + msgid "Getting message %d of %d" + msgstr "Ricezione del messaggio %d di %d" + +-#: ../camel/camel-filter-driver.c:1547 ++#: ../camel/camel-filter-driver.c:1556 + #, c-format + msgid "Failed at message %d of %d" + msgstr "Non riuscito al messaggio %d di %d" + ++#: ../camel/camel-filter-driver.c:1752 ++#: ../camel/camel-filter-driver.c:1786 ++#, c-format ++msgid "Execution of filter '%s' failed: " ++msgstr "Esecuzione filtro '%s' fallita: " ++ ++#: ../camel/camel-filter-driver.c:1776 ++#, c-format ++msgid "Error parsing filter '%s': %s: %s" ++msgstr "Errore durante l'analisi del filtro '%s': %s: %s" ++ ++#: ../camel/camel-filter-driver.c:1795 ++#, c-format ++msgid "Error executing filter '%s': %s: %s" ++msgstr "Errore durante l'esecuzione del filtro '%s': %s: %s" ++ + #: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" + msgstr "Recupero del messaggio non riuscito" + +-#: ../camel/camel-filter-search.c:512 ++#: ../camel/camel-filter-search.c:537 + msgid "Invalid arguments to (system-flag)" + msgstr "Argomenti non validi per (system-flag)" + +-#: ../camel/camel-filter-search.c:530 ++#: ../camel/camel-filter-search.c:555 + msgid "Invalid arguments to (user-tag)" + msgstr "Argomenti non validi per (user-tag)" + +-#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958 ++#: ../camel/camel-filter-search.c:1046 ++#: ../camel/camel-filter-search.c:1055 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "Errore nell'eseguire la ricerca nei filtri: %s: %s" + +-#: ../camel/camel-folder.c:270 ++#: ../camel/camel-folder.c:310 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" + msgstr[0] "Apprendimento nuovo messaggio indesiderato in «%s»" + msgstr[1] "Apprendimento nuovi messaggi indesiderati in «%s»" + +-#: ../camel/camel-folder.c:310 ++#: ../camel/camel-folder.c:350 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" + msgstr[0] "Apprendimento nuovo messaggio attendibile in «%s»" + msgstr[1] "Apprendimento nuovi messaggi attendibili in «%s»" + +-#: ../camel/camel-folder.c:358 ++#: ../camel/camel-folder.c:398 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "Filtraggio nuovo messaggio in «%s»" + msgstr[1] "Filtraggio nuovi messaggi in «%s»" + +-#: ../camel/camel-folder.c:930 ++#: ../camel/camel-folder.c:972 + #: ../camel/providers/local/camel-maildir-folder.c:321 + msgid "Moving messages" + msgstr "Spostamento messaggi" + +-#: ../camel/camel-folder.c:933 ++#: ../camel/camel-folder.c:975 + msgid "Copying messages" + msgstr "Copia messaggi" + +-#: ../camel/camel-folder.c:1253 ++#: ../camel/camel-folder.c:1295 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "Informazioni sulla quota non supportate per la cartella «%s»" + +-#: ../camel/camel-folder.c:3372 ++#: ../camel/camel-folder.c:3528 + #, c-format + msgid "Expunging folder '%s'" + msgstr "Svuotamento cartella «%s»" + +-#: ../camel/camel-folder.c:3604 ++#: ../camel/camel-folder.c:3760 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "Ricezione messaggio «%s» in %s" + +-#: ../camel/camel-folder.c:3755 ++#: ../camel/camel-folder.c:3911 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "Recupero informazioni di quota per «%s»" + +-#: ../camel/camel-folder.c:3987 ++#: ../camel/camel-folder.c:4143 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "Aggiornamento cartella «%s»" + +-#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587 +-#, c-format +-msgid "" +-"Cannot parse search expression: %s:\n" +-"%s" +-msgstr "" +-"Impossibile analizzare l'espressione di ricerca: %s:\n" +-"%s" +- +-#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599 +-#, c-format +-msgid "" +-"Error executing search expression: %s:\n" +-"%s" +-msgstr "" +-"Errore nell'eseguire l'espressione di ricerca: %s:\n" +-"%s" +- + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865 ++#: ../camel/camel-folder-search.c:838 ++#: ../camel/camel-folder-search.c:881 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) richiede un singolo risultato booleano" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:932 ++#: ../camel/camel-folder-search.c:916 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) non consentito all'interno di %s" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947 ++#: ../camel/camel-folder-search.c:923 ++#: ../camel/camel-folder-search.c:931 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) richiede una stringa di tipo match" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:975 ++#: ../camel/camel-folder-search.c:959 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) attende un risultato array" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:985 ++#: ../camel/camel-folder-search.c:969 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) richiede il set di cartelle" + +-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668 +-#: ../camel/camel-gpg-context.c:1331 ++#: ../camel/camel-folder-search.c:1862 ++#: ../camel/camel-folder-search.c:2029 ++#, c-format ++msgid "Cannot parse search expression: %s:\n" ++"%s" ++msgstr "Impossibile analizzare l'espressione di ricerca: %s:\n" ++"%s" ++ ++#: ../camel/camel-folder-search.c:1874 ++#: ../camel/camel-folder-search.c:2041 ++#, c-format ++msgid "Error executing search expression: %s:\n" ++"%s" ++msgstr "Errore nell'eseguire l'espressione di ricerca: %s:\n" ++"%s" ++ ++#: ../camel/camel-gpg-context.c:730 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/camel-gpg-context.c:1398 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "Esecuzione di gpg non riuscita: %s" + +-#: ../camel/camel-gpg-context.c:668 +-#: ../camel/providers/smtp/camel-smtp-transport.c:860 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/providers/smtp/camel-smtp-transport.c:918 + msgid "Unknown" + msgstr "Sconosciuto" + +-#: ../camel/camel-gpg-context.c:733 ++#: ../camel/camel-gpg-context.c:800 + #, c-format +-msgid "" +-"Unexpected GnuPG status message encountered:\n" ++msgid "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" +-msgstr "" +-"È stato riscontrato un messaggio di stato GnuPG inatteso:\n" ++msgstr "È stato riscontrato un messaggio di stato GnuPG inatteso:\n" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:769 ++#: ../camel/camel-gpg-context.c:836 + #, c-format + msgid "Failed to parse gpg userid hint." + msgstr "Analisi hint ID utente gpg non riuscita." + +-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809 ++#: ../camel/camel-gpg-context.c:861 ++#: ../camel/camel-gpg-context.c:876 + #, c-format + msgid "Failed to parse gpg passphrase request." + msgstr "Analisi richiesta passphrase gpg non riuscita." + +-#: ../camel/camel-gpg-context.c:830 ++#: ../camel/camel-gpg-context.c:897 + #, c-format +-msgid "" +-"You need a PIN to unlock the key for your\n" ++msgid "You need a PIN to unlock the key for your\n" + "SmartCard: \"%s\"" + msgstr "" + "È necessario un PIN per sbloccare la chiave\n" + "della propria SmartCard: «%s»" + +-#: ../camel/camel-gpg-context.c:834 ++#: ../camel/camel-gpg-context.c:901 + #, c-format +-msgid "" +-"You need a passphrase to unlock the key for\n" ++msgid "You need a passphrase to unlock the key for\n" + "user: \"%s\"" + msgstr "" + "È necessaria una passphrase per sbloccare la chiave\n" + "per l'utente: «%s»" + +-#: ../camel/camel-gpg-context.c:840 ++#: ../camel/camel-gpg-context.c:907 + #, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "Richiesta inattesa da GnuPG per «%s»" + +-#: ../camel/camel-gpg-context.c:852 ++#: ../camel/camel-gpg-context.c:919 + msgid "" + "Note the encrypted content doesn't contain information about a recipient, " + "thus there will be a password prompt for each of stored private key." +@@ -2160,351 +2253,379 @@ msgstr "" + "destinatario, perciò verrà chiesta una password per ciascuna della chiavi " + "private memorizzate." + +-#: ../camel/camel-gpg-context.c:883 ../camel/camel-net-utils.c:523 ++#: ../camel/camel-gpg-context.c:950 ++#: ../camel/camel-net-utils.c:524 + #: ../camel/camel-tcp-stream-raw.c:268 +-#: ../camel/providers/nntp/camel-nntp-summary.c:388 +-#: ../libedataserver/e-client.c:140 ++#: ../camel/providers/nntp/camel-nntp-summary.c:402 ++#: ../libedataserver/e-client.c:152 + #, c-format + msgid "Cancelled" + msgstr "Annullato" + +-#: ../camel/camel-gpg-context.c:904 ++#: ../camel/camel-gpg-context.c:971 + #, c-format + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "" + "Sblocco della chiave segreta non riuscito: sono state fornite 3 passphrase " + "errate." + +-#: ../camel/camel-gpg-context.c:917 ++#: ../camel/camel-gpg-context.c:984 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "Risposta inattesa da GnuPG: %s" + +-#: ../camel/camel-gpg-context.c:1048 ++#: ../camel/camel-gpg-context.c:1115 + #, c-format + msgid "Failed to encrypt: No valid recipients specified." + msgstr "Cifratura non riuscita: nessun destinatario valido specificato." + +-#: ../camel/camel-gpg-context.c:1595 ../camel/camel-smime-context.c:832 ++#: ../camel/camel-gpg-context.c:1665 ++#: ../camel/camel-smime-context.c:846 + msgid "Could not generate signing data: " + msgstr "Impossibile generare i dati per la firma: " + +-#: ../camel/camel-gpg-context.c:1644 ../camel/camel-gpg-context.c:1848 +-#: ../camel/camel-gpg-context.c:1958 ../camel/camel-gpg-context.c:2105 +-#: ../camel/camel-gpg-context.c:2205 ../camel/camel-gpg-context.c:2253 ++#: ../camel/camel-gpg-context.c:1714 ++#: ../camel/camel-gpg-context.c:1918 ++#: ../camel/camel-gpg-context.c:2028 ++#: ../camel/camel-gpg-context.c:2179 ++#: ../camel/camel-gpg-context.c:2279 ++#: ../camel/camel-gpg-context.c:2327 + msgid "Failed to execute gpg." + msgstr "Esecuzione di gpg non riuscita." + +-#: ../camel/camel-gpg-context.c:1723 ../camel/camel-gpg-context.c:1731 +-#: ../camel/camel-gpg-context.c:1739 ../camel/camel-gpg-context.c:1759 +-#: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973 +-#: ../camel/camel-smime-context.c:982 ++#: ../camel/camel-gpg-context.c:1793 ++#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1809 ++#: ../camel/camel-gpg-context.c:1829 ++#: ../camel/camel-smime-context.c:973 ++#: ../camel/camel-smime-context.c:987 ++#: ../camel/camel-smime-context.c:996 + #, c-format + msgid "Cannot verify message signature: Incorrect message format" + msgstr "" +-"Impossibile verificare la firma del messaggio: formato messaggio non corretto" ++"Impossibile verificare la firma del messaggio: formato messaggio non " ++"corretto" + +-#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1871 + msgid "Cannot verify message signature: " + msgstr "Impossibile verificare la firma del messaggio: " + +-#: ../camel/camel-gpg-context.c:1924 ++#: ../camel/camel-gpg-context.c:1994 + msgid "Could not generate encrypting data: " + msgstr "Impossibile generare i dati per la cifratura: " + +-#: ../camel/camel-gpg-context.c:1977 ++#: ../camel/camel-gpg-context.c:2047 + msgid "This is a digitally encrypted message part" + msgstr "Questa è una parte del messaggio cifrata digitalmente" + +-#: ../camel/camel-gpg-context.c:2035 ../camel/camel-gpg-context.c:2044 +-#: ../camel/camel-gpg-context.c:2067 ++#: ../camel/camel-gpg-context.c:2105 ++#: ../camel/camel-gpg-context.c:2114 ++#: ../camel/camel-gpg-context.c:2137 + #, c-format + msgid "Cannot decrypt message: Incorrect message format" + msgstr "Impossibile decifrare il messaggio: formato del messaggio non valido" + +-#: ../camel/camel-gpg-context.c:2055 ++#: ../camel/camel-gpg-context.c:2125 + #, c-format + msgid "Failed to decrypt MIME part: protocol error" + msgstr "Decifratura della parte MIME non riuscita: errore di protocollo" + +-#: ../camel/camel-gpg-context.c:2146 ../camel/camel-smime-context.c:1273 ++#: ../camel/camel-gpg-context.c:2220 ++#: ../camel/camel-smime-context.c:1287 + msgid "Encrypted content" + msgstr "Contenuto cifrato" + +-#: ../camel/camel-imapx-folder.c:104 ++#: ../camel/camel-imapx-folder.c:710 ++#, c-format ++msgid "No quota information available for folder '%s'" ++msgstr "Non è disponibile alcuna informazione sul quota per la cartella '%s'" ++ ++#: ../camel/camel-imapx-folder.c:809 ++#: ../camel/camel-imapx-folder.c:882 ++#, c-format ++msgid "No destination folder specified" ++msgstr "Nessuna cartella di destinazione specificata" ++ ++#: ../camel/camel-imapx-folder.c:828 ++msgid "Unable to move junk messages" ++msgstr "Impossibile spostare i messaggi indesiderati" ++ ++#: ../camel/camel-imapx-folder.c:901 ++msgid "Unable to move deleted messages" ++msgstr "Impossibile spostare i messaggi cancellati" ++ ++#: ../camel/camel-imapx-folder.c:1119 ++#: ../camel/providers/nntp/camel-nntp-folder.c:794 ++msgid "Apply message _filters to this folder" ++msgstr "_Applicare i filtri di messaggio a questa cartella" ++ ++#: ../camel/camel-imapx-folder.c:1228 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "Impossibile l'indice di cartella per %s" + +-#: ../camel/camel-imapx-folder.c:112 ++#: ../camel/camel-imapx-folder.c:1236 + #, c-format + msgid "Could not create cache for %s: " + msgstr "Impossibile creare la cache per %s: " + +-#: ../camel/camel-imapx-folder.c:794 +-#: ../camel/providers/imap/camel-imap-folder.c:367 +-#: ../camel/providers/nntp/camel-nntp-folder.c:738 +-msgid "Apply message _filters to this folder" +-msgstr "_Applicare i filtri di messaggio a questa cartella" +- +-#: ../camel/camel-imapx-server.c:1094 ++#: ../camel/camel-imapx-server.c:1283 + msgid "Server disconnected" + msgstr "Server disconnesso" + +-#: ../camel/camel-imapx-server.c:1549 +-msgid "Error writing to cache stream: " +-msgstr "Errore nello scrivere sullo stream di cache: " ++#: ../camel/camel-imapx-server.c:1772 ++msgid "Error writing to cache stream" ++msgstr "Errore durante la scrittura sul flusso di cache" ++ ++#: ../camel/camel-imapx-server.c:2441 ++#, c-format ++msgid "Alert from IMAP server %s:\n" ++"%s" ++msgstr "Allerta dal server IMAP %s:\n" ++"%s" + +-#: ../camel/camel-imapx-server.c:2500 ++#: ../camel/camel-imapx-server.c:3029 + #, c-format + msgid "Not authenticated" + msgstr "Non autenticato" + +-#: ../camel/camel-imapx-server.c:2580 ++#: ../camel/camel-imapx-server.c:3107 + msgid "Error performing IDLE" + msgstr "Errore nell'eseguire IDLE" + +-#: ../camel/camel-imapx-server.c:3462 +-#: ../camel/providers/imap/camel-imap-store.c:414 +-#: ../camel/providers/imap/camel-imap-store.c:468 ++#: ../camel/camel-imapx-server.c:3994 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Connessione al server IMAP %s in modalità sicura non riuscita: %s" + +-#: ../camel/camel-imapx-server.c:3463 +-#: ../camel/providers/imap/camel-imap-store.c:415 +-#: ../camel/providers/smtp/camel-smtp-transport.c:202 ++#: ../camel/camel-imapx-server.c:3995 ++#: ../camel/providers/smtp/camel-smtp-transport.c:203 + msgid "STARTTLS not supported" + msgstr "STARTTLS non supportato" + +-#: ../camel/camel-imapx-server.c:3502 +-#: ../camel/providers/imap/camel-imap-store.c:440 ++#: ../camel/camel-imapx-server.c:4034 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "Connessione al server IMAP %s in modalità sicura non riuscita: " + +-#: ../camel/camel-imapx-server.c:3582 +-#: ../camel/providers/imap/camel-imap-store.c:749 ++#: ../camel/camel-imapx-server.c:4114 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "Il server IMAP %s non supporta l'autenticazione %s" + +-#: ../camel/camel-imapx-server.c:3593 ../camel/camel-session.c:494 +-#: ../camel/providers/imap/camel-imap-store.c:1174 +-#: ../camel/providers/pop3/camel-pop3-store.c:259 +-#: ../camel/providers/pop3/camel-pop3-store.c:587 +-#: ../camel/providers/smtp/camel-smtp-transport.c:467 ++#: ../camel/camel-imapx-server.c:4125 ++#: ../camel/camel-session.c:495 ++#: ../camel/providers/pop3/camel-pop3-store.c:303 ++#: ../camel/providers/pop3/camel-pop3-store.c:737 ++#: ../camel/providers/smtp/camel-smtp-transport.c:509 + #, c-format + msgid "No support for %s authentication" + msgstr "Nessun supporto per l'autenticazione %s" + +-#: ../camel/camel-imapx-server.c:3612 +-#: ../camel/providers/imap/camel-imap-store.c:1142 +-#: ../camel/providers/nntp/camel-nntp-store.c:502 ++#: ../camel/camel-imapx-server.c:4144 ++#: ../camel/providers/nntp/camel-nntp-store.c:407 ++#: ../camel/providers/nntp/camel-nntp-store.c:595 + msgid "Cannot authenticate without a username" + msgstr "Impossibile effettuare l'autenticazione senza un nome utente" + +-#: ../camel/camel-imapx-server.c:3621 +-#: ../camel/providers/imap/camel-imap-store.c:1150 +-#: ../camel/providers/nntp/camel-nntp-store.c:511 +-#: ../camel/providers/pop3/camel-pop3-store.c:512 +-#: ../camel/providers/pop3/camel-pop3-store.c:532 ++#: ../camel/camel-imapx-server.c:4153 ++#: ../camel/providers/nntp/camel-nntp-store.c:604 ++#: ../camel/providers/pop3/camel-pop3-store.c:662 ++#: ../camel/providers/pop3/camel-pop3-store.c:682 + msgid "Authentication password not available" + msgstr "Password di autenticazione non disponibile" + +-#: ../camel/camel-imapx-server.c:3823 ++#: ../camel/camel-imapx-server.c:4360 + msgid "Error fetching message" + msgstr "Errore nel recuperare il messaggio" + +-#: ../camel/camel-imapx-server.c:3905 +-msgid "Failed to copy the tmp file" +-msgstr "Copia del file tmp non riuscito" +- +-#: ../camel/camel-imapx-server.c:3919 ++#: ../camel/camel-imapx-server.c:4410 ++#: ../camel/camel-imapx-server.c:4418 + msgid "Failed to close the tmp stream" + msgstr "Chiusura dello stream tmp non riuscita" + +-#: ../camel/camel-imapx-server.c:4017 ++#: ../camel/camel-imapx-server.c:4447 ++msgid "Failed to copy the tmp file" ++msgstr "Copia del file tmp non riuscito" ++ ++#: ../camel/camel-imapx-server.c:4571 + msgid "Error copying messages" + msgstr "Errore nel copiare i messaggi" + +-#: ../camel/camel-imapx-server.c:4152 ++#: ../camel/camel-imapx-server.c:4740 + msgid "Error appending message" + msgstr "Errore nell'accodare il messaggio" + +-#: ../camel/camel-imapx-server.c:4335 ++#: ../camel/camel-imapx-server.c:4939 + msgid "Error fetching message headers" + msgstr "Errore nel recuperare le intestazioni di messaggio" + + # chiesto su #evolution, solo una svista sul termine, è == fetch +-#: ../camel/camel-imapx-server.c:4470 ++#: ../camel/camel-imapx-server.c:5090 + msgid "Error retrieving message" + msgstr "Errore nel recuperare il messaggio" + +-#: ../camel/camel-imapx-server.c:4592 ../camel/camel-imapx-server.c:4785 ++#: ../camel/camel-imapx-server.c:5221 ++#: ../camel/camel-imapx-server.c:5449 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "Recupero informazioni di indice per nuovi messaggi in «%s»" + +-#: ../camel/camel-imapx-server.c:4643 ++#: ../camel/camel-imapx-server.c:5285 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "Scansione per messaggi cambiati in «%s»" + +-#: ../camel/camel-imapx-server.c:4686 ++#: ../camel/camel-imapx-server.c:5338 + msgid "Error fetching new messages" + msgstr "Errore nel recuperare i nuovi messaggi" + +-#: ../camel/camel-imapx-server.c:4876 ++#: ../camel/camel-imapx-server.c:5551 + msgid "Error while fetching messages" + msgstr "Errore durante il recupero dei messaggi" + +-#: ../camel/camel-imapx-server.c:4884 ../camel/camel-imapx-server.c:4920 ++#: ../camel/camel-imapx-server.c:5559 ++#: ../camel/camel-imapx-server.c:5592 + #, c-format + msgid "Fetching summary information for %d message in '%s'" + msgid_plural "Fetching summary information for %d messages in '%s'" + msgstr[0] "Recupero informazioni di indice per %d messaggio in «%s»" + msgstr[1] "Recupero informazioni di indice per %d messaggi in «%s»" + +-#: ../camel/camel-imapx-server.c:5045 ../camel/camel-imapx-server.c:5081 ++#: ../camel/camel-imapx-server.c:5728 ++#: ../camel/camel-imapx-server.c:5758 + msgid "Error refreshing folder" + msgstr "Errore nell'aggiornare la cartella" + + # prima era "ripulire" +-#: ../camel/camel-imapx-server.c:5174 ++#: ../camel/camel-imapx-server.c:5882 + msgid "Error expunging message" + msgstr "Errore nel rimuovere il messaggio" + +-#: ../camel/camel-imapx-server.c:5271 ++#: ../camel/camel-imapx-server.c:5993 + msgid "Error fetching folders" + msgstr "Errore nel recuperare le cartelle" + +-#: ../camel/camel-imapx-server.c:5350 ++#: ../camel/camel-imapx-server.c:6075 + msgid "Error subscribing to folder" + msgstr "Errore nell'eseguire la sottoscrizione alla cartella" + +-#: ../camel/camel-imapx-server.c:5411 ++#: ../camel/camel-imapx-server.c:6140 + msgid "Error creating folder" + msgstr "Errore nel creare la cartella" + +-#: ../camel/camel-imapx-server.c:5460 ++#: ../camel/camel-imapx-server.c:6194 + msgid "Error deleting folder" + msgstr "Errore nell'eliminare la cartella" + +-#: ../camel/camel-imapx-server.c:5521 ++#: ../camel/camel-imapx-server.c:6268 + msgid "Error renaming folder" + msgstr "Errore nel rinominare la cartelle" + +-#: ../camel/camel-imapx-server.c:5582 ++#: ../camel/camel-imapx-server.c:6343 ++msgid "Error retrieving quota information" ++msgstr "Errore durante il ripristino delle informazioni sul quota" ++ ++#: ../camel/camel-imapx-server.c:6408 ++msgid "Search failed" ++msgstr "Ricerca fallita" ++ ++#: ../camel/camel-imapx-server.c:6471 + msgid "Error performing NOOP" + msgstr "Errore nell'eseguire NOOP" + +-#: ../camel/camel-imapx-server.c:5678 ++#: ../camel/camel-imapx-server.c:6580 + msgid "Error syncing changes" + msgstr "Errore nel sincronizzare le modifiche" + +-#: ../camel/camel-imapx-server.c:6449 +-#: ../camel/providers/imap/camel-imap-folder.c:3531 ++#: ../camel/camel-imapx-server.c:7385 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "Impossibile ottenere il messaggio avente ID %s: %s" + + # eeeeeeeehhh???? + # che ci sta a fare il such? +-#: ../camel/camel-imapx-server.c:6450 +-#: ../camel/providers/imap/camel-imap-folder.c:3532 ++#: ../camel/camel-imapx-server.c:7386 + msgid "No such message available." + msgstr "Nessun messaggio disponibile." + +-#: ../camel/camel-imapx-server.c:6605 ../camel/camel-imapx-server.c:6620 ++#: ../camel/camel-imapx-server.c:7547 ++#: ../camel/camel-imapx-server.c:7562 + msgid "Cannot create spool file: " + msgstr "Impossibile creare il file di spool: " + +-#: ../camel/camel-imapx-store.c:157 +-#: ../camel/providers/imap/camel-imap-store.c:827 ++#: ../camel/camel-imapx-server.c:8304 ++msgid "IMAP server does not support quotas" ++msgstr "Il server IMAP non supporta i quota" ++ ++#: ../camel/camel-imapx-store.c:249 + #, c-format + msgid "IMAP server %s" + msgstr "Server IMAP %s" + +-#: ../camel/camel-imapx-store.c:160 +-#: ../camel/providers/imap/camel-imap-store.c:830 ++#: ../camel/camel-imapx-store.c:252 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "Servizio IMAP per %s su %s" + +-#: ../camel/camel-imapx-store.c:251 +-#: ../camel/providers/imap/camel-imap-provider.c:98 +-#: ../camel/providers/nntp/camel-nntp-provider.c:85 ++#: ../camel/camel-imapx-store.c:343 ++#: ../camel/providers/nntp/camel-nntp-provider.c:95 + #: ../camel/providers/pop3/camel-pop3-provider.c:83 + msgid "Password" + msgstr "Password" + +-#: ../camel/camel-imapx-store.c:253 +-#: ../camel/providers/imap/camel-imap-provider.c:100 +-msgid "This option will connect to the IMAP server using a plaintext password." ++#: ../camel/camel-imapx-store.c:345 ++msgid "" ++"This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Opzione per connessioni al server IMAP usando una password di testo semplice." ++"" + +-#: ../camel/camel-imapx-store.c:351 +-#: ../camel/providers/imap/camel-imap-store.c:2064 +-#: ../camel/providers/imap/camel-imap-store.c:2262 ++#: ../camel/camel-imapx-store.c:453 + #, c-format + msgid "No such folder %s" + msgstr "Cartella %s inesistente" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/camel-imapx-store.c:376 ../camel/camel-imapx-store.c:866 +-#: ../camel/providers/imap/camel-imap-store.c:275 +-#: ../camel/providers/imap/camel-imap-store.c:2684 ++#: ../camel/camel-imapx-store.c:478 ++#: ../camel/camel-imapx-store.c:968 + #: ../camel/providers/local/camel-maildir-folder.c:473 +-#: ../camel/providers/local/camel-maildir-store.c:307 +-#: ../camel/providers/local/camel-maildir-store.c:699 +-#: ../camel/providers/local/camel-maildir-store.c:705 +-#: ../camel/providers/local/camel-maildir-store.c:789 ++#: ../camel/providers/local/camel-maildir-store.c:316 ++#: ../camel/providers/local/camel-maildir-store.c:750 ++#: ../camel/providers/local/camel-maildir-store.c:756 ++#: ../camel/providers/local/camel-maildir-store.c:840 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "In arrivo" + +-#: ../camel/camel-imapx-store.c:1099 ++#: ../camel/camel-imapx-store.c:1231 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "Recupero elenco cartelle per %s" + +-#: ../camel/camel-imapx-store.c:1203 +-#: ../camel/providers/nntp/camel-nntp-store.c:1771 +-#, c-format +-msgid "No such folder: %s" +-msgstr "Cartella inesistente: %s" +- +-#: ../camel/camel-imapx-store.c:1420 +-#: ../camel/providers/imap/camel-imap-store.c:2077 +-#: ../camel/providers/imap/camel-imap-store.c:2524 ++#: ../camel/camel-imapx-store.c:1614 + #, c-format +-msgid "" +-"The folder name \"%s\" is invalid because it contains the character \"%c\"" ++msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "" + "Il nome della cartella «%s» non è valido perché contiene il carattere '%c'" + +-#: ../camel/camel-imapx-store.c:1431 +-#: ../camel/providers/imap/camel-imap-store.c:2537 ++#: ../camel/camel-imapx-store.c:1625 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "Cartella di livello superiore sconosciuta: %s" + +-#: ../camel/camel-imapx-store.c:1441 +-#: ../camel/providers/imap/camel-imap-store.c:2140 +-#: ../camel/providers/imap/camel-imap-store.c:2589 ++#: ../camel/camel-imapx-store.c:1635 + #, c-format + msgid "The parent folder is not allowed to contain subfolders" + msgstr "" + "Alla cartella di livello superiore non è permesso contenere sottocartelle" + +-#: ../camel/camel-imapx-stream.c:97 ++#: ../camel/camel-imapx-stream.c:98 + #, c-format + msgid "Source stream returned no data" + msgstr "Lo stream sorgente non ha restituito alcun dato" + +-#: ../camel/camel-imapx-stream.c:106 ++#: ../camel/camel-imapx-stream.c:107 + #, c-format + msgid "Source stream unavailable" + msgstr "Stream sorgente non disponibile" +@@ -2541,7 +2662,8 @@ msgstr "Impossibile creare una pipe help + msgid "Cannot fork locking helper: %s" + msgstr "Impossibile eseguire un fork per l'helper di blocco: %s" + +-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239 ++#: ../camel/camel-lock-client.c:211 ++#: ../camel/camel-lock-client.c:239 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" + msgstr "Impossibile bloccare «%s»: errore di protocollo con il lock-helper" +@@ -2600,7 +2722,8 @@ msgstr "Errore nel leggere il file di po + msgid "Error writing mail temp file: %s" + msgstr "Errore nello scrivere il file temporaneo di posta: %s" + +-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562 ++#: ../camel/camel-movemail.c:493 ++#: ../camel/camel-movemail.c:562 + #, c-format + msgid "Error copying mail temp file: %s" + msgstr "Errore nel copiare il file temporaneo di posta: %s" +@@ -2620,44 +2743,58 @@ msgstr "Nessuna firma disponibile" + msgid "parse error" + msgstr "errore di analisi" + +-#: ../camel/camel-net-utils.c:703 ++#: ../camel/camel-net-utils.c:704 + #, c-format + msgid "Resolving: %s" + msgstr "Risoluzione: %s" + +-#: ../camel/camel-net-utils.c:726 ++#: ../camel/camel-net-utils.c:727 + msgid "Host lookup failed" + msgstr "Ricerca dell'host non riuscita" + +-#: ../camel/camel-net-utils.c:732 ++#: ../camel/camel-net-utils.c:733 ++#, c-format ++msgid "Host lookup '%s' failed. Check your host name for spelling errors." ++msgstr "" ++"Ricerca host '%s' fallita. Controlla il nome dell'host per eventuali errori " ++"di battitura." ++ ++#: ../camel/camel-net-utils.c:737 + #, c-format +-msgid "Host lookup failed: %s: %s" +-msgstr "Ricerca dell'host non riuscita: %s: %s" ++msgid "Host lookup '%s' failed: %s" ++msgstr "Ricerca nome host '%s' fallita: %s" + +-#: ../camel/camel-net-utils.c:853 ++#: ../camel/camel-net-utils.c:858 + msgid "Resolving address" + msgstr "Risoluzione indirizzo" + +-#: ../camel/camel-net-utils.c:874 ++#: ../camel/camel-net-utils.c:879 + msgid "Name lookup failed" + msgstr "Ricerca del nome non riuscita" + +-#: ../camel/camel-net-utils.c:880 ++#: ../camel/camel-net-utils.c:886 ++msgid "Name lookup failed. Check your host name for spelling errors." ++msgstr "" ++"Ricerca nome fallita. Controlla il nome dell'host per eventuali errori di " ++"battitura." ++ ++#: ../camel/camel-net-utils.c:890 + #, c-format + msgid "Name lookup failed: %s" + msgstr "Ricerca del nome non riuscita: %s" + +-#: ../camel/camel-network-service.c:114 ++#: ../camel/camel-network-service.c:350 + #, c-format +-msgid "Could not connect to %s: " +-msgstr "Impossibile connettersi a %s: " ++msgid "Could not connect to '%s:%s': " ++msgstr "Impossibile collegarsi a '%s:%s': " + +-#: ../camel/camel-offline-folder.c:210 ++#: ../camel/camel-offline-folder.c:212 + #, c-format + msgid "Syncing messages in folder '%s' to disk" + msgstr "Sincronizzazione dei messaggi nella cartella «%s» su disco" + +-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177 ++#: ../camel/camel-offline-journal.c:145 ++#: ../camel/camel-offline-journal.c:177 + #, c-format + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "" +@@ -2672,29 +2809,32 @@ msgid "For reading mail as a query of an + msgstr "" + "Per leggere la posta come una interrogazione su altro gruppo di cartelle" + +-#: ../camel/camel-provider.c:195 ++#: ../camel/camel-provider.c:263 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." + msgstr "" + "Impossibile caricare %s: il sistema in uso non supporta il caricamento dei " + "moduli." + +-#: ../camel/camel-provider.c:204 ++#: ../camel/camel-provider.c:272 + #, c-format + msgid "Could not load %s: %s" + msgstr "Impossibile caricare %s: %s" + +-#: ../camel/camel-provider.c:213 ++#: ../camel/camel-provider.c:281 + #, c-format + msgid "Could not load %s: No initialization code in module." +-msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo." ++msgstr "" ++"Impossibile caricare %s: nessun codice di inizializzazione nel modulo." + +-#: ../camel/camel-provider.c:412 ../camel/camel-session.c:406 ++#: ../camel/camel-provider.c:429 ++#: ../camel/camel-session.c:407 + #, c-format + msgid "No provider available for protocol '%s'" + msgstr "Nessun fornitore disponibile per il protocollo «%s»" + + #: ../camel/camel-sasl-anonymous.c:35 ++#: ../camel/providers/nntp/camel-nntp-provider.c:85 + msgid "Anonymous" + msgstr "Anonimo" + +@@ -2710,29 +2850,23 @@ msgstr "Autenticazione non riuscita." + # trace info: see http://tools.ietf.org/html/rfc4505 + #: ../camel/camel-sasl-anonymous.c:81 + #, c-format +-msgid "" +-"Invalid email address trace information:\n" ++msgid "Invalid email address trace information:\n" + "%s" +-msgstr "" +-"Informazioni tracciamento dell'indirizzo email non valide:\n" ++msgstr "Informazioni tracciamento dell'indirizzo email non valide:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:95 + #, c-format +-msgid "" +-"Invalid opaque trace information:\n" ++msgid "Invalid opaque trace information:\n" + "%s" +-msgstr "" +-"Informazioni di tracciamento opaco non valide:\n" ++msgstr "Informazioni di tracciamento opaco non valide:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:109 + #, c-format +-msgid "" +-"Invalid trace information:\n" ++msgid "Invalid trace information:\n" + "%s" +-msgstr "" +-"Informazioni di tracciamento non valide:\n" ++msgstr "Informazioni di tracciamento non valide:\n" + "%s" + + #: ../camel/camel-sasl-cram-md5.c:46 +@@ -2795,7 +2929,8 @@ msgid "GSSAPI" + msgstr "GSSAPI" + + #: ../camel/camel-sasl-gssapi.c:93 +-msgid "This option will connect to the server using Kerberos 5 authentication." ++msgid "" ++"This option will connect to the server using Kerberos 5 authentication." + msgstr "" + "Opzione per connessioni al server usando Kerberos 5 per l'autenticazione." + +@@ -2859,9 +2994,11 @@ msgstr "Verifiche di coerenza eseguite s + msgid "The referenced credentials have expired." + msgstr "Le credenziali di riferimento sono scadute." + +-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340 +-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405 +-#: ../camel/providers/smtp/camel-smtp-transport.c:575 ++#: ../camel/camel-sasl-gssapi.c:175 ++#: ../camel/camel-sasl-gssapi.c:340 ++#: ../camel/camel-sasl-gssapi.c:388 ++#: ../camel/camel-sasl-gssapi.c:405 ++#: ../camel/providers/smtp/camel-smtp-transport.c:616 + #, c-format + msgid "Bad authentication response from server." + msgstr "Risposta di autenticazione dal server errata." +@@ -2875,7 +3012,8 @@ msgstr "Livello di sicurezza non support + msgid "Login" + msgstr "Login" + +-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46 ++#: ../camel/camel-sasl-login.c:42 ++#: ../camel/camel-sasl-plain.c:46 + msgid "This option will connect to the server using a simple password." + msgstr "Opzione per connessioni al server usando una semplice password." + +@@ -2884,11 +3022,11 @@ msgstr "Opzione per connessioni al serve + msgid "Unknown authentication state." + msgstr "Stato di autenticazione sconosciuto." + +-#: ../camel/camel-sasl-ntlm.c:47 ++#: ../camel/camel-sasl-ntlm.c:48 + msgid "NTLM / SPA" + msgstr "NTLM / SPA" + +-#: ../camel/camel-sasl-ntlm.c:49 ++#: ../camel/camel-sasl-ntlm.c:50 + msgid "" + "This option will connect to a Windows-based server using NTLM / Secure " + "Password Authentication." +@@ -2912,41 +3050,46 @@ msgstr "Opzione per autorizzare una conn + msgid "POP Source UID" + msgstr "UID sorgente POP" + +-#: ../camel/camel-sasl-popb4smtp.c:96 ++#: ../camel/camel-sasl-popb4smtp.c:98 + #, c-format + msgid "POP Before SMTP authentication using an unknown transport" + msgstr "Autenticazione POP prima di SMTP usando un trasporto sconosciuto" + +-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117 ++#: ../camel/camel-sasl-popb4smtp.c:110 ++#: ../camel/camel-sasl-popb4smtp.c:119 + #, c-format + msgid "POP Before SMTP authentication attempted with a %s service" + msgstr "Tentata autenticazione POP prima di SMTP con un servizio %s" + +-#: ../camel/camel-search-private.c:112 ++#: ../camel/camel-search-private.c:116 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "Compilazione dell'espressione regolare non riuscita: %s: %s" + +-#: ../camel/camel-session.c:415 ++#: ../camel/camel-session.c:416 + #, c-format + msgid "Invalid GType registered for protocol '%s'" + msgstr "GType non valido registato per il protocollo «%s»" + +-#: ../camel/camel-session.c:509 ++#: ../camel/camel-session.c:510 + #, c-format + msgid "%s authentication failed" + msgstr "Autenticazione %s non riuscita" + +-#: ../camel/camel-session.c:645 ++#: ../camel/camel-session.c:646 + msgid "Forwarding messages is not supported" + msgstr "Inoltro dei messaggi non supportato" + +-#: ../camel/camel-session.c:1362 ++#. Translators: The first argument is the account type ++#. * (e.g. "IMAP"), the second is the user name, and the ++#. * third is the host name. ++#: ../camel/camel-session.c:1423 + #, c-format + msgid "Please enter the %s password for %s on host %s." + msgstr "Inserire la password %s per %s sull'host %s." + +-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060 ++#: ../camel/camel-smime-context.c:351 ++#: ../camel/camel-smime-context.c:1074 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "Impossibile trovare il certificato per «%s»" +@@ -2979,7 +3122,8 @@ msgstr "Impossibile trovare la catena di + msgid "Cannot add CMS Signing time" + msgstr "Impossibile aggiungere la data CMS Signing" + +-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454 ++#: ../camel/camel-smime-context.c:439 ++#: ../camel/camel-smime-context.c:454 + #, c-format + msgid "Encryption certificate for '%s' does not exist" + msgstr "Il certificato di cifratura per «%s» non esiste" +@@ -3051,15 +3195,18 @@ msgstr "Nessun dato firmato nella firma" + msgid "Digests missing from enveloped data" + msgstr "Digest mancanti dai dati raccolti (enveloped)" + +-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602 ++#: ../camel/camel-smime-context.c:591 ++#: ../camel/camel-smime-context.c:602 + msgid "Cannot calculate digests" + msgstr "Impossibile calcolare i digest" + +-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613 ++#: ../camel/camel-smime-context.c:609 ++#: ../camel/camel-smime-context.c:613 + msgid "Cannot set message digests" + msgstr "Impossibile impostare i digest di messaggio" + +-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628 ++#: ../camel/camel-smime-context.c:623 ++#: ../camel/camel-smime-context.c:628 + msgid "Certificate import failed" + msgstr "Importazione certificato non riuscita" + +@@ -3072,7 +3219,8 @@ msgstr "" + #: ../camel/camel-smime-context.c:641 + #, c-format + msgid "Certificate is the only message, certificates imported and verified" +-msgstr "Il certificato è il solo messaggio, certificati importati e verificati" ++msgstr "" ++"Il certificato è il solo messaggio, certificati importati e verificati" + + #: ../camel/camel-smime-context.c:645 + msgid "Cannot find signature digests" +@@ -3083,113 +3231,118 @@ msgstr "Impossibile trovare i digest fir + msgid "Signer: %s <%s>: %s\n" + msgstr "Firmatario: %s <%s>: %s\n" + +-#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134 ++#: ../camel/camel-smime-context.c:858 ++#: ../camel/camel-smime-context.c:1148 + msgid "Cannot create encoder context" + msgstr "Impossibile creare il contesto del codificatore" + +-#: ../camel/camel-smime-context.c:850 ++#: ../camel/camel-smime-context.c:864 + msgid "Failed to add data to CMS encoder" + msgstr "Aggiunta dei dati al codificatore CMS non riuscita" + +-#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151 ++#: ../camel/camel-smime-context.c:869 ++#: ../camel/camel-smime-context.c:1165 + msgid "Failed to encode data" + msgstr "Codifica dei dati non riuscita" + +-#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248 ++#: ../camel/camel-smime-context.c:1013 ++#: ../camel/camel-smime-context.c:1262 + msgid "Decoder failed" + msgstr "Decodificatore non riuscito" + + # GNOME-2-26 (milo) +-#: ../camel/camel-smime-context.c:1068 ++#: ../camel/camel-smime-context.c:1082 + msgid "Cannot find common bulk encryption algorithm" + msgstr "Impossibile trovare un algoritmo di cifratura di massa comune" + + # GNOME-2-26 (milo) + # http://en.wikipedia.org/wiki/Link_encryption + # https://www.ccn-cert.cni.es/publico/2008/401/en/b/bulk_encryption.htm +-#: ../camel/camel-smime-context.c:1076 ++#: ../camel/camel-smime-context.c:1090 + msgid "Cannot allocate slot for encryption bulk key" + msgstr "Impossibile allocare spazio per la chiave di cifratura di massa" + + # Nota: esiste un altro messaggio con message minuscolo, suppongo che qui + # sia una parola "chiave" +-#: ../camel/camel-smime-context.c:1087 ++#: ../camel/camel-smime-context.c:1101 + msgid "Cannot create CMS Message" + msgstr "Impossibile creare il CMS Message" + +-#: ../camel/camel-smime-context.c:1093 ++#: ../camel/camel-smime-context.c:1107 + msgid "Cannot create CMS Enveloped data" + msgstr "Impossibile creare i dati CMS Enveloped" + +-#: ../camel/camel-smime-context.c:1099 ++#: ../camel/camel-smime-context.c:1113 + msgid "Cannot attach CMS Enveloped data" + msgstr "Impossibile allegare i dati CMS Enveloped" + +-#: ../camel/camel-smime-context.c:1105 ++#: ../camel/camel-smime-context.c:1119 + msgid "Cannot attach CMS data object" + msgstr "Impossibile allegare l'oggetto dati CMS" + +-#: ../camel/camel-smime-context.c:1114 ++#: ../camel/camel-smime-context.c:1128 + msgid "Cannot create CMS Recipient information" + msgstr "Impossibile creare le informazioni CMS Recipient" + +-#: ../camel/camel-smime-context.c:1119 ++#: ../camel/camel-smime-context.c:1133 + msgid "Cannot add CMS Recipient information" + msgstr "Impossibile aggiungere le informazioni CMS Recipient" + +-#: ../camel/camel-smime-context.c:1145 ++#: ../camel/camel-smime-context.c:1159 + msgid "Failed to add data to encoder" + msgstr "Aggiunta dei dati al codificatore non riuscita" + +-#: ../camel/camel-smime-context.c:1255 ++#: ../camel/camel-smime-context.c:1269 + msgid "S/MIME Decrypt: No encrypted content found" + msgstr "Decifratura S/MIME: non è stato trovato alcun contenuto cifrato" + +-#: ../camel/camel-store.c:1838 ++#: ../camel/camel-store.c:1871 + #, c-format + msgid "Cannot create folder '%s': folder exists" + msgstr "Impossibile creare la cartella «%s»: la cartella esiste" + +-#: ../camel/camel-store.c:1881 ++#: ../camel/camel-store.c:1914 + #, c-format + msgid "Opening folder '%s'" + msgstr "Apertura cartella «%s»" + +-#: ../camel/camel-store.c:2066 ++#: ../camel/camel-store.c:2099 + #, c-format + msgid "Scanning folders in '%s'" + msgstr "Scansione cartelle in «%s»" + +-#. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088 ++#: ../camel/camel-store.c:2115 ++#: ../camel/camel-store.c:2146 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Trash" + msgstr "Cestino" + +-#. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092 ++#: ../camel/camel-store.c:2127 ++#: ../camel/camel-store.c:2162 + #: ../camel/camel-vtrash-folder.c:50 + msgid "Junk" + msgstr "Indesiderata" + +-#: ../camel/camel-store.c:2540 ++#: ../camel/camel-store.c:2615 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "Impossibile creare la cartella «%s»: la cartella esiste già" + +-#: ../camel/camel-store.c:2554 ++#: ../camel/camel-store.c:2629 + #, c-format + msgid "Creating folder '%s'" + msgstr "Creazione cartella «%s»" + +-#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410 +-#: ../camel/providers/local/camel-maildir-store.c:306 ++#: ../camel/camel-store.c:2747 ++#: ../camel/camel-vee-store.c:416 ++#: ../camel/providers/local/camel-maildir-store.c:315 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Impossibile eliminare la cartella: %s: operazione non valida" + +-#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460 +-#: ../camel/providers/local/camel-maildir-store.c:788 ++#: ../camel/camel-store.c:2890 ++#: ../camel/camel-vee-store.c:466 ++#: ../camel/providers/local/camel-maildir-store.c:839 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Impossibile rinominare la cartella: %s: operazione non valida" +@@ -3214,12 +3367,12 @@ msgstr "Connessione annullata" + msgid "Could not connect with command \"%s\": %s" + msgstr "Impossibile connettersi con il comando «%s»: %s" + +-#: ../camel/camel-subscribable.c:386 ++#: ../camel/camel-subscribable.c:397 + #, c-format + msgid "Subscribing to folder '%s'" + msgstr "Sottoscrizione alla cartella «%s»" + +-#: ../camel/camel-subscribable.c:518 ++#: ../camel/camel-subscribable.c:529 + #, c-format + msgid "Unsubscribing from folder '%s'" + msgstr "Annullamento sottoscrizione alla cartella «%s»" +@@ -3229,7 +3382,8 @@ msgstr "Annullamento sottoscrizione alla + msgid "NSPR error code %d" + msgstr "Codice d'errore NSPR %d" + +-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662 ++#: ../camel/camel-tcp-stream-raw.c:649 ++#: ../camel/camel-tcp-stream-raw.c:662 + #, c-format + msgid "The proxy host does not support SOCKS4" + msgstr "L'host proxy non supporta SOCKS4" +@@ -3239,7 +3393,8 @@ msgstr "L'host proxy non supporta SOCKS4 + msgid "The proxy host denied our request: code %d" + msgstr "L'host proxy ha negato la richiesta: codice %d" + +-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781 ++#: ../camel/camel-tcp-stream-raw.c:773 ++#: ../camel/camel-tcp-stream-raw.c:781 + #, c-format + msgid "The proxy host does not support SOCKS5" + msgstr "L'host proxy non supporta SOCKS5" +@@ -3303,95 +3458,12 @@ msgstr "Nome host troppo lungo (massimo + + #. SOCKS5 + #. reserved - must be 0 +-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922 ++#: ../camel/camel-tcp-stream-raw.c:912 ++#: ../camel/camel-tcp-stream-raw.c:922 + #, c-format + msgid "Invalid reply from proxy server" + msgstr "Risposta non valida dal server proxy" + +-#: ../camel/camel-tcp-stream-ssl.c:505 +-#, c-format +-msgid "" +-" Issuer: %s\n" +-" Subject: %s\n" +-" Fingerprint: %s\n" +-" Signature: %s" +-msgstr "" +-" Emittente: %s\n" +-" Oggetto: %s\n" +-" Impronta digitale: %s\n" +-" Firma: %s" +- +-#: ../camel/camel-tcp-stream-ssl.c:512 +-msgid "GOOD" +-msgstr "CORRETTO" +- +-#: ../camel/camel-tcp-stream-ssl.c:512 +-msgid "BAD" +-msgstr "NON CORRETTO" +- +-#: ../camel/camel-tcp-stream-ssl.c:517 +-#, c-format +-msgid "" +-"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n" +-"\n" +-"Detailed information about the certificate:\n" +-"%s" +-msgstr "" +-"Il certificato SSL per «%s» non è fidato. Accettarlo?\n" +-"\n" +-"Informazioni dettagliate sul certificato:\n" +-"%s" +- +-#: ../camel/camel-tcp-stream-ssl.c:523 +-msgid "_Reject" +-msgstr "_Rifiuta" +- +-#: ../camel/camel-tcp-stream-ssl.c:524 +-msgid "Accept _Temporarily" +-msgstr "Accetta _temporanaemente" +- +-#: ../camel/camel-tcp-stream-ssl.c:525 +-msgid "_Accept Permanently" +-msgstr "_Accetta permanentemente" +- +-#: ../camel/camel-tcp-stream-ssl.c:586 +-#, c-format +-msgid "" +-"Certificate problem: %s\n" +-"Issuer: %s" +-msgstr "" +-"Problema di certificato: %s\n" +-"Emittente: %s" +- +-# a chi è riferito bad??? +-# credo a certificate, ma solo perché ci sono 2 messaggi simili prima... +-#: ../camel/camel-tcp-stream-ssl.c:638 +-#, c-format +-msgid "" +-"Bad certificate domain: %s\n" +-"Issuer: %s" +-msgstr "" +-"Dominio del certificato non corretto: %s\n" +-"Emittente: %s" +- +-#: ../camel/camel-tcp-stream-ssl.c:656 +-#, c-format +-msgid "" +-"Certificate expired: %s\n" +-"Issuer: %s" +-msgstr "" +-"Certificato scaduto: %s\n" +-"Emittente: %s" +- +-#: ../camel/camel-tcp-stream-ssl.c:673 +-#, c-format +-msgid "" +-"Certificate revocation list expired: %s\n" +-"Issuer: %s" +-msgstr "" +-"Elenco revoche dei certificati scaduto: %s\n" +-"Emittente: %s" +- + #: ../camel/camel-url.c:331 + #, c-format + msgid "Could not parse URL '%s'" +@@ -3402,7 +3474,8 @@ msgstr "Impossibile analizzare l'URL «% + msgid "Updating folder '%s'" + msgstr "Aggiornamento della cartella «%s»" + +-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965 ++#: ../camel/camel-vee-folder.c:855 ++#: ../camel/camel-vee-folder.c:965 + #, c-format + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "" +@@ -3419,27 +3492,27 @@ msgstr "Messaggio %s in %s inesistente" + msgid "Error storing '%s': " + msgstr "Errore nell'archiviare «%s»: " + +-#: ../camel/camel-vee-folder.c:1169 ++#: ../camel/camel-vee-folder.c:1171 + msgid "Automatically _update on change in source folders" + msgstr "A_ggiornamento automatico con modifiche nelle cartelle sorgenti" + + #. Translators: 'Unmatched' is a folder name under Search folders where are shown + #. * all messages not belonging into any other configured search folder +-#: ../camel/camel-vee-store.c:38 ++#: ../camel/camel-vee-store.c:42 + msgid "Unmatched" + msgstr "Non corrispondenti" + +-#: ../camel/camel-vee-store.c:436 ++#: ../camel/camel-vee-store.c:442 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Impossibile eliminare la cartella: %s: cartella inesistente" + +-#: ../camel/camel-vee-store.c:470 ++#: ../camel/camel-vee-store.c:476 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Impossibile rinominare la cartella: %s: cartella inesistente" + +-#: ../camel/camel-vee-store.c:532 ++#: ../camel/camel-vee-store.c:538 + msgid "Enable _Unmatched folder" + msgstr "Abilitare cartella senza corrisponden_za" + +@@ -3451,277 +3524,93 @@ msgstr "Impossibile copiare i messaggi n + msgid "Cannot copy messages to the Junk folder" + msgstr "Impossibile copiare i messaggi nella cartella «Indesiderata»" + +-#: ../camel/providers/imap/camel-imap-command.c:200 +-#: ../camel/providers/imap/camel-imap-command.c:299 +-#, c-format +-msgid "No output stream" +-msgstr "Nessuno stream di output" +- +-#: ../camel/providers/imap/camel-imap-command.c:208 +-#: ../camel/providers/imap/camel-imap-command.c:307 +-#, c-format +-msgid "No input stream" +-msgstr "Nessuno stream di input" +- +-#: ../camel/providers/imap/camel-imap-command.c:392 +-#, c-format +-msgid "Server unexpectedly disconnected: %s" +-msgstr "Disconnessione inattesa del server: %s" +- +-#: ../camel/providers/imap/camel-imap-command.c:425 +-#, c-format +-msgid "" +-"Alert from IMAP server %s@%s in folder %s:\n" +-"%s" +-msgstr "" +-"Allerta dal server IMAP %s@%s nella cartella %s:\n" +-"%s" +- +-#: ../camel/providers/imap/camel-imap-command.c:429 +-#, c-format +-msgid "" +-"Alert from IMAP server %s@%s:\n" +-"%s" +-msgstr "" +-"Allerta dal server IMAP %s@%s:\n" +-"%s" +- +-#: ../camel/providers/imap/camel-imap-command.c:512 +-#, c-format +-msgid "Unexpected response from IMAP server: %s" +-msgstr "Risposta inattesa dal server IMAP: %s" +- +-#: ../camel/providers/imap/camel-imap-command.c:524 +-#, c-format +-msgid "IMAP command failed: %s" +-msgstr "Comando IMAP non riuscito: %s" +- +-#: ../camel/providers/imap/camel-imap-command.c:607 +-#, c-format +-msgid "Server response ended too soon." +-msgstr "La risposta del server è terminata troppo presto." +- +-#: ../camel/providers/imap/camel-imap-command.c:822 +-#, c-format +-msgid "IMAP server response did not contain %s information" +-msgstr "La risposta del server IMAP non contiene l'informazione %s" +- +-#: ../camel/providers/imap/camel-imap-command.c:860 +-#, c-format +-msgid "Unexpected OK response from IMAP server: %s" +-msgstr "Risposta OK inattesa dal server IMAP: %s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:356 +-msgid "Always check for _new mail in this folder" +-msgstr "Controllare sempre i _nuovi messaggi in questa cartella" +- +-#: ../camel/providers/imap/camel-imap-folder.c:447 +-#, c-format +-msgid "Could not create directory %s: %s" +-msgstr "Impossibile creare la directory %s: %s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:468 +-#, c-format +-msgid "Could not load summary for %s" +-msgstr "Impossibile caricare l'indice per %s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:1137 +-#, c-format +-msgid "Scanning for changed messages in %s" +-msgstr "Scansione per messaggi cambiati in %s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:3494 +-msgid "Unable to retrieve message: " +-msgstr "Impossibile recuperare il messaggio: " +- +-#: ../camel/providers/imap/camel-imap-folder.c:3620 +-#: ../camel/providers/imap/camel-imap-folder.c:4512 +-#: ../camel/providers/nntp/camel-nntp-folder.c:493 +-#, c-format +-msgid "This message is not currently available" +-msgstr "Questo messaggio non è al momento disponibile" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4085 +-#: ../camel/providers/imap/camel-imap-folder.c:4167 +-#, c-format +-msgid "Fetching summary information for new messages in %s" +-msgstr "Recupero informazioni di indice per nuovi messaggi in %s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4299 +-#, c-format +-msgid "Incomplete server response: no information provided for message %d" +-msgstr "" +-"Risposta del server incompleta: non è stata fornita alcuna informazione per " +-"il messaggio %d" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4309 +-#, c-format +-msgid "Incomplete server response: no UID provided for message %d" +-msgstr "" +-"Risposta del server incompleta: non è stato fornito alcun UID per il " +-"messaggio %d" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4549 +-#, c-format +-msgid "Could not find message body in FETCH response." +-msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH." +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:196 +-#: ../camel/providers/imap/camel-imap-message-cache.c:253 +-msgid "Could not open cache directory: " +-msgstr "Impossibile aprire la directory cache: " +- +-# il primo %s è l'UID del messaggio +-#: ../camel/providers/imap/camel-imap-message-cache.c:331 +-#, c-format +-msgid "Failed to cache message %s: %s" +-msgstr "Inserimento del messaggio %s nella cache non riuscito: %s" +- +-# il primo %s è l'UID del messaggio +-#: ../camel/providers/imap/camel-imap-message-cache.c:397 +-#, c-format +-msgid "Failed to cache message %s: " +-msgstr "Inserimento del messaggio %s nella cache non riuscito: " +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:539 +-#, c-format +-msgid "Failed to cache %s: " +-msgstr "Inserimento di %s nella cache non riuscito: " +- +-#: ../camel/providers/imap/camel-imap-provider.c:40 + #: ../camel/providers/imapx/camel-imapx-provider.c:38 + msgid "Checking for New Mail" + msgstr "Controllo nuova posta" + +-#: ../camel/providers/imap/camel-imap-provider.c:42 + #: ../camel/providers/imapx/camel-imapx-provider.c:40 + msgid "C_heck for new messages in all folders" + msgstr "Controllare la presen_za di nuovi messaggi in tutte le cartelle" + +-#: ../camel/providers/imap/camel-imap-provider.c:44 + #: ../camel/providers/imapx/camel-imapx-provider.c:42 + msgid "Ch_eck for new messages in subscribed folders" +-msgstr "Controllare la pr_esenza di nuovi messaggi nelle cartelle sottoscritte" ++msgstr "" ++"Controllare la pr_esenza di nuovi messaggi nelle cartelle sottoscritte" ++ ++# FIXME?!?!? ++# Quick Resync è parola chiave da non tradurre? ++#: ../camel/providers/imapx/camel-imapx-provider.c:44 ++msgid "Use _Quick Resync if the server supports it" ++msgstr "Usare _Quick Resync se il server lo supporta" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:46 ++msgid "_Listen for server change notifications" ++msgstr "_Restare in ascolto per le notifiche di modifica del server" + +-#: ../camel/providers/imap/camel-imap-provider.c:47 + #: ../camel/providers/imapx/camel-imapx-provider.c:49 + #: ../camel/providers/nntp/camel-nntp-provider.c:46 + msgid "Folders" + msgstr "Cartelle" + +-#: ../camel/providers/imap/camel-imap-provider.c:49 + #: ../camel/providers/imapx/camel-imapx-provider.c:51 + msgid "_Show only subscribed folders" + msgstr "Mostrare _solo le cartelle a cui si è effettuata la sottoscrizione" + +-#: ../camel/providers/imap/camel-imap-provider.c:51 + #: ../camel/providers/imapx/camel-imapx-provider.c:54 + msgid "O_verride server-supplied folder namespace" + msgstr "So_vrascrivere lo spazio nomi cartelle fornito dal server" + +-#: ../camel/providers/imap/camel-imap-provider.c:53 +-msgid "Names_pace:" +-msgstr "S_pazio dei nomi:" ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++msgid "Namespace:" ++msgstr "Spazio dei nomi:" + +-#: ../camel/providers/imap/camel-imap-provider.c:55 + #: ../camel/providers/imapx/camel-imapx-provider.c:59 + #: ../camel/providers/local/camel-local-provider.c:41 +-#: ../camel/providers/local/camel-local-provider.c:77 +-#: ../camel/providers/local/camel-local-provider.c:97 ++#: ../camel/providers/local/camel-local-provider.c:81 ++#: ../camel/providers/local/camel-local-provider.c:101 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Options" + msgstr "Opzioni" + +-#: ../camel/providers/imap/camel-imap-provider.c:57 + #: ../camel/providers/imapx/camel-imapx-provider.c:61 + #: ../camel/providers/nntp/camel-nntp-provider.c:43 + msgid "Apply _filters to new messages in all folders" + msgstr "Applicare i _filtri ai nuovi messaggi in tutte le cartelle" + + # TO SYNC +-#: ../camel/providers/imap/camel-imap-provider.c:59 + #: ../camel/providers/imapx/camel-imapx-provider.c:63 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "A_pplicare i filtri ai nuovi messaggi in «In arrivo» su questo server" + + # TO SYNC +-#: ../camel/providers/imap/camel-imap-provider.c:61 + #: ../camel/providers/imapx/camel-imapx-provider.c:65 + msgid "Check new messages for _Junk contents" + msgstr "Controllare contenuti in_desiderati nei nuovi messaggi" + +-#: ../camel/providers/imap/camel-imap-provider.c:63 + #: ../camel/providers/imapx/camel-imapx-provider.c:67 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Controllare i messa_ggi indesiderati solo nella cartella «In arrivo»" + +-#: ../camel/providers/imap/camel-imap-provider.c:65 + #: ../camel/providers/imapx/camel-imapx-provider.c:69 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "Sincroni_zzare localmente la posta remota in modo automatico" + +-#: ../camel/providers/imap/camel-imap-provider.c:71 +-msgid "IMAP default port" ++#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++msgid "Default IMAP port" + msgstr "Porta predefinita IMAP" + +-#: ../camel/providers/imap/camel-imap-provider.c:72 + #: ../camel/providers/imapx/camel-imapx-provider.c:76 + msgid "IMAP over SSL" + msgstr "IMAP su SSL" + +-#: ../camel/providers/imap/camel-imap-provider.c:78 +-msgid "IMAP" +-msgstr "IMAP" ++#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++msgid "IMAP+" ++msgstr "IMAP+" + +-#: ../camel/providers/imap/camel-imap-provider.c:80 + #: ../camel/providers/imapx/camel-imapx-provider.c:85 + msgid "For reading and storing mail on IMAP servers." + msgstr "Per leggere e memorizzare la posta su server IMAP." + +-#: ../camel/providers/imap/camel-imap-store.c:2191 +-#: ../camel/providers/local/camel-maildir-store.c:274 +-#: ../camel/providers/local/camel-mbox-store.c:442 +-#: ../camel/providers/local/camel-mh-store.c:564 +-#, c-format +-msgid "Cannot create folder '%s': folder exists." +-msgstr "Impossibile creare la cartella «%s»: la cartella esiste." +- +-#: ../camel/providers/imap/camel-imap-store.c:2984 +-#, c-format +-msgid "Retrieving list of folders at '%s'" +-msgstr "Recupero elenco delle cartelle da «%s»" +- +-#: ../camel/providers/imap/camel-imap-store.c:3334 +-#, c-format +-msgid "Server unexpectedly disconnected" +-msgstr "Disconnessione inattesa del server" +- +-#: ../camel/providers/imap/camel-imap-store.c:3338 +-msgid "Server unexpectedly disconnected: " +-msgstr "Disconnessione inattesa del server: " +- +-# FIXME?!?!? +-# Quick Resync è parola chiave da non tradurre? +-#: ../camel/providers/imapx/camel-imapx-provider.c:44 +-msgid "Use _Quick Resync if the server supports it" +-msgstr "Usare _Quick Resync se il server lo supporta" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:46 +-msgid "_Listen for server change notifications" +-msgstr "_Restare in ascolto per le notifiche di modifica del server" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 +-msgid "Namespace:" +-msgstr "Spazio dei nomi:" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 +-msgid "Default IMAP port" +-msgstr "Porta predefinita IMAP" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 +-msgid "IMAP+" +-msgstr "IMAP+" +- + #: ../camel/providers/local/camel-local-folder.c:194 + #, c-format + msgid "~%s (%s)" +@@ -3739,7 +3628,7 @@ msgid "%s (%s)" + msgstr "%s (%s)" + + # ########################## +-# ++# + # ricontrollare tutti i messaggi del provider local + #: ../camel/providers/local/camel-local-folder.c:499 + msgid "_Index message body data" +@@ -3747,11 +3636,9 @@ msgstr "_Indicizzare i dati nel corpo de + + #: ../camel/providers/local/camel-local-folder.c:727 + #, c-format +-msgid "" +-"Cannot get message %s from folder %s\n" ++msgid "Cannot get message %s from folder %s\n" + "%s" +-msgstr "" +-"Impossibile ottenere il messaggio: %s dalla cartella: %s\n" ++msgstr "Impossibile ottenere il messaggio: %s dalla cartella: %s\n" + "%s" + + #: ../camel/providers/local/camel-local-provider.c:43 +@@ -3766,11 +3653,11 @@ msgstr "Directory in formato MH" + msgid "For storing local mail in MH-like mail directories." + msgstr "Per memorizzare la posta locale in directory tipo MH" + +-#: ../camel/providers/local/camel-local-provider.c:64 ++#: ../camel/providers/local/camel-local-provider.c:68 + msgid "Local delivery" + msgstr "Consegne locali" + +-#: ../camel/providers/local/camel-local-provider.c:65 ++#: ../camel/providers/local/camel-local-provider.c:69 + msgid "" + "For retrieving (moving) local mail from standard mbox-formatted spools into " + "folders managed by Evolution." +@@ -3778,29 +3665,29 @@ msgstr "" + "Per ricevere (spostare) la posta locale dallo spool nel formato standard " + "mbox sulle cartelle gestite da Evolution." + +-#: ../camel/providers/local/camel-local-provider.c:79 +-#: ../camel/providers/local/camel-local-provider.c:99 ++#: ../camel/providers/local/camel-local-provider.c:83 ++#: ../camel/providers/local/camel-local-provider.c:103 + msgid "_Apply filters to new messages in Inbox" + msgstr "_Applicare i filtri ai nuovi messaggi in «In arrivo»" + +-#: ../camel/providers/local/camel-local-provider.c:86 ++#: ../camel/providers/local/camel-local-provider.c:90 + msgid "Maildir-format mail directories" + msgstr "Directory in formato Maildir" + +-#: ../camel/providers/local/camel-local-provider.c:87 ++#: ../camel/providers/local/camel-local-provider.c:91 + msgid "For storing local mail in maildir directories." + msgstr "Per memorizzare la posta locale in directory maildir." + +-#: ../camel/providers/local/camel-local-provider.c:100 ++#: ../camel/providers/local/camel-local-provider.c:104 + msgid "_Store status headers in Elm/Pine/Mutt format" + msgstr "Arc_hiviare le intestazioni di stato nel formato Elm/Pine/Mutt" + +-#: ../camel/providers/local/camel-local-provider.c:107 ++#: ../camel/providers/local/camel-local-provider.c:111 + msgid "Standard Unix mbox spool file" + msgstr "File spool mbox stardard Unix" + +-#: ../camel/providers/local/camel-local-provider.c:108 +-#: ../camel/providers/local/camel-local-provider.c:120 ++#: ../camel/providers/local/camel-local-provider.c:112 ++#: ../camel/providers/local/camel-local-provider.c:126 + msgid "" + "For reading and storing local mail in external standard mbox spool files.\n" + "May also be used to read a tree of Elm, Pine, or Mutt style folders." +@@ -3809,7 +3696,7 @@ msgstr "" + "Può anche essere usata per leggere un albero di cartelle stile Elm, Pine o " + "Mutt." + +-#: ../camel/providers/local/camel-local-provider.c:119 ++#: ../camel/providers/local/camel-local-provider.c:125 + msgid "Standard Unix mbox spool directory" + msgstr "Directory spool mbox standard Unix" + +@@ -3825,7 +3712,7 @@ msgstr "File di posta locale: %s" + + #: ../camel/providers/local/camel-local-store.c:223 + #: ../camel/providers/local/camel-local-store.c:383 +-#: ../camel/providers/local/camel-maildir-store.c:104 ++#: ../camel/providers/local/camel-maildir-store.c:117 + #: ../camel/providers/local/camel-mbox-store.c:581 + #: ../camel/providers/local/camel-spool-store.c:89 + #, c-format +@@ -3840,7 +3727,7 @@ msgstr "La radice di archiviazione %s no + #: ../camel/providers/local/camel-local-store.c:244 + #: ../camel/providers/local/camel-local-store.c:254 + #: ../camel/providers/local/camel-local-store.c:396 +-#: ../camel/providers/local/camel-maildir-store.c:137 ++#: ../camel/providers/local/camel-maildir-store.c:145 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "Impossibile ottenere la cartella: %s: %s" +@@ -3871,7 +3758,7 @@ msgstr "Impossibile eliminare il meta fi + msgid "Could not rename '%s': %s" + msgstr "Impossibile rinominare la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-local-summary.c:543 ++#: ../camel/providers/local/camel-local-summary.c:567 + #, c-format + msgid "Unable to add message to summary: unknown reason" + msgstr "Impossibile aggiungere il messaggio all'indice: motivo sconosciuto" +@@ -3901,93 +3788,87 @@ msgstr "Impossibile ottenere il messaggi + #: ../camel/providers/local/camel-maildir-folder.c:353 + #, c-format + msgid "Cannot transfer message to destination folder: %s" +-msgstr "Impossibile trasferire il messaggio nella cartella di destinazione: %s" +- +-#: ../camel/providers/local/camel-maildir-store.c:112 +-#, c-format +-msgid "Cannot create folder: %s: Folder name cannot contain a dot" + msgstr "" +-"Impossibile creare la cartella: %s: il nome di cartella non può contenere un " +-"punto." ++"Impossibile trasferire il messaggio nella cartella di destinazione: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:122 +-#: ../camel/providers/local/camel-maildir-store.c:806 ++#: ../camel/providers/local/camel-maildir-store.c:125 ++#: ../camel/providers/local/camel-maildir-store.c:848 + #, c-format + msgid "Folder %s already exists" + msgstr "La cartella «%s» esiste già" + +-#: ../camel/providers/local/camel-maildir-store.c:221 +-#: ../camel/providers/local/camel-maildir-store.c:252 ++#: ../camel/providers/local/camel-maildir-store.c:230 ++#: ../camel/providers/local/camel-maildir-store.c:261 + #: ../camel/providers/local/camel-mbox-store.c:403 + #: ../camel/providers/local/camel-mbox-store.c:424 + #, c-format + msgid "Cannot create folder '%s': %s" + msgstr "Impossibile creare la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:236 ++#: ../camel/providers/local/camel-maildir-store.c:245 + #: ../camel/providers/local/camel-mbox-store.c:369 +-#: ../camel/providers/local/camel-mh-store.c:522 ++#: ../camel/providers/local/camel-mh-store.c:514 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "Impossibile ottenere la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:242 ++#: ../camel/providers/local/camel-maildir-store.c:251 + #: ../camel/providers/local/camel-mbox-store.c:379 +-#: ../camel/providers/local/camel-mh-store.c:531 ++#: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "Impossibile ottenere la cartella «%s»: la cartella non esiste." + +-#: ../camel/providers/local/camel-maildir-store.c:269 ++#: ../camel/providers/local/camel-maildir-store.c:278 + #, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "Impossibile ottenere la cartella «%s»: non è una directory maildir." + +-#: ../camel/providers/local/camel-maildir-store.c:338 +-#: ../camel/providers/local/camel-maildir-store.c:378 +-#: ../camel/providers/local/camel-mh-store.c:682 ++#: ../camel/providers/local/camel-maildir-store.c:283 ++#: ../camel/providers/local/camel-mbox-store.c:442 ++#: ../camel/providers/local/camel-mh-store.c:556 ++#, c-format ++msgid "Cannot create folder '%s': folder exists." ++msgstr "Impossibile creare la cartella «%s»: la cartella esiste." ++ ++#: ../camel/providers/local/camel-maildir-store.c:347 ++#: ../camel/providers/local/camel-maildir-store.c:387 ++#: ../camel/providers/local/camel-mh-store.c:674 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "Impossibile eliminare la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:340 ++#: ../camel/providers/local/camel-maildir-store.c:349 + msgid "not a maildir directory" + msgstr "non è una directory maildir" + +-#: ../camel/providers/local/camel-maildir-store.c:589 +-#: ../camel/providers/local/camel-maildir-store.c:1003 ++#: ../camel/providers/local/camel-maildir-store.c:628 ++#: ../camel/providers/local/camel-maildir-store.c:1063 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format + msgid "Could not scan folder '%s': %s" + msgstr "Impossibile scansionare la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:797 +-#, c-format +-msgid "Cannot rename the folder: %s: Folder name cannot contain a dot" +-msgstr "" +-"Impossibile rinominare la cartella «%s»: il nome della cartella non può " +-"contenere un punto" +- +-#: ../camel/providers/local/camel-maildir-summary.c:434 +-#: ../camel/providers/local/camel-maildir-summary.c:567 ++#: ../camel/providers/local/camel-maildir-summary.c:458 ++#: ../camel/providers/local/camel-maildir-summary.c:591 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "Impossibile aprire il percorso della directory maildir: %s: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:558 ++#: ../camel/providers/local/camel-maildir-summary.c:582 + msgid "Checking folder consistency" + msgstr "Controllo coerenza cartella" + +-#: ../camel/providers/local/camel-maildir-summary.c:651 ++#: ../camel/providers/local/camel-maildir-summary.c:675 + msgid "Checking for new messages" + msgstr "Controllo nuovi messaggi" + +-#: ../camel/providers/local/camel-maildir-summary.c:746 +-#: ../camel/providers/local/camel-mbox-summary.c:418 +-#: ../camel/providers/local/camel-mbox-summary.c:650 +-#: ../camel/providers/local/camel-mbox-summary.c:794 +-#: ../camel/providers/local/camel-spool-summary.c:132 ++#: ../camel/providers/local/camel-maildir-summary.c:770 ++#: ../camel/providers/local/camel-mbox-summary.c:450 ++#: ../camel/providers/local/camel-mbox-summary.c:682 ++#: ../camel/providers/local/camel-mbox-summary.c:830 ++#: ../camel/providers/local/camel-spool-summary.c:141 + msgid "Storing folder" + msgstr "Archiviazione cartella" + +@@ -4012,7 +3893,7 @@ msgid "Cannot create folder lock on %s: + msgstr "Impossibile creare il lock di cartella per %s: %s" + + # Nota: esiste un altro messaggio con "with this name" +-# ++# + # Option 1: "by this" è errato + # Option 2: "by this" significa qualcosa che non so + #: ../camel/providers/local/camel-mbox-store.c:391 +@@ -4044,11 +3925,9 @@ msgstr "La cartella esiste già" + #: ../camel/providers/local/camel-mbox-store.c:672 + #: ../camel/providers/local/camel-mbox-store.c:701 + #, c-format +-msgid "" +-"Could not delete folder '%s':\n" ++msgid "Could not delete folder '%s':\n" + "%s" +-msgstr "" +-"Impossibile eliminare la cartella «%s»:\n" ++msgstr "Impossibile eliminare la cartella «%s»:\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:682 +@@ -4069,7 +3948,6 @@ msgid "Could not delete folder summary f + msgstr "Impossibile eliminare il file dell'indice della cartella «%s»: %s" + + # glossario: illegal -> non lecito +-# + #: ../camel/providers/local/camel-mbox-store.c:815 + #, c-format + msgid "The new folder name is illegal." +@@ -4088,60 +3966,60 @@ msgstr "Impossibile rinominare «%s» co + msgid "Could not rename '%s' to %s: %s" + msgstr "Impossibile rinominare «%s» come «%s»: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:428 ++#: ../camel/providers/local/camel-mbox-summary.c:460 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "Impossibile aprire la cartella: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:490 ++#: ../camel/providers/local/camel-mbox-summary.c:522 + #, c-format + msgid "Fatal mail parser error near position %s in folder %s" + msgstr "" + "Errore irrimediabile di analisi della posta vicino alla posizione %s nella " + "cartella %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:575 ++#: ../camel/providers/local/camel-mbox-summary.c:607 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Impossibile controllare la cartella: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:663 +-#: ../camel/providers/local/camel-mbox-summary.c:803 +-#: ../camel/providers/local/camel-spool-summary.c:139 ++#: ../camel/providers/local/camel-mbox-summary.c:695 ++#: ../camel/providers/local/camel-mbox-summary.c:839 ++#: ../camel/providers/local/camel-spool-summary.c:148 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Impossibile aprire il file: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:677 +-#: ../camel/providers/local/camel-spool-summary.c:154 ++#: ../camel/providers/local/camel-mbox-summary.c:709 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Impossibile aprire la mailbox temporanea: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:694 +-#: ../camel/providers/local/camel-mbox-summary.c:920 ++#: ../camel/providers/local/camel-mbox-summary.c:726 ++#: ../camel/providers/local/camel-mbox-summary.c:956 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Impossibile chiudere la cartella sorgente %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:705 ++#: ../camel/providers/local/camel-mbox-summary.c:739 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Impossibile chiudere la cartella temporanea: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:722 ++#: ../camel/providers/local/camel-mbox-summary.c:758 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Impossibile rinominare la cartella: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:817 +-#: ../camel/providers/local/camel-mbox-summary.c:1086 ++#: ../camel/providers/local/camel-mbox-summary.c:853 ++#: ../camel/providers/local/camel-mbox-summary.c:1122 + #, c-format + msgid "Could not store folder: %s" + msgstr "Impossibile archiviare la cartella: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:856 +-#: ../camel/providers/local/camel-mbox-summary.c:1123 ++#: ../camel/providers/local/camel-mbox-summary.c:892 ++#: ../camel/providers/local/camel-mbox-summary.c:1162 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " +@@ -4150,27 +4028,27 @@ msgstr "" + "Il file MBOX è danneggiato, correggerlo (attesa una riga From, ma non è " + "stata ottenuta)." + +-#: ../camel/providers/local/camel-mbox-summary.c:866 +-#: ../camel/providers/local/camel-mbox-summary.c:1136 ++#: ../camel/providers/local/camel-mbox-summary.c:902 ++#: ../camel/providers/local/camel-mbox-summary.c:1174 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "Indice e cartella non corrispondono, anche dopo una sincronizzazione" + +-#: ../camel/providers/local/camel-mbox-summary.c:1031 +-#: ../camel/providers/local/camel-spool-summary.c:347 ++#: ../camel/providers/local/camel-mbox-summary.c:1067 ++#: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "Errore sconosciuto: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1194 +-#: ../camel/providers/local/camel-mbox-summary.c:1224 ++#: ../camel/providers/local/camel-mbox-summary.c:1232 ++#: ../camel/providers/local/camel-mbox-summary.c:1262 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Scrittura su mailbox temporanea non riuscita: %s" + + # il primo %s dovrebbe essere il nome, con percorso + # della mailbox in questione +-#: ../camel/providers/local/camel-mbox-summary.c:1213 ++#: ../camel/providers/local/camel-mbox-summary.c:1251 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Scrittura su mailbox temporanea %s non riuscita: %s" +@@ -4180,12 +4058,12 @@ msgstr "Scrittura su mailbox temporanea + msgid "Cannot append message to mh folder: %s: " + msgstr "Impossibile accodare il messaggio sulla cartella mh: %s: " + +-#: ../camel/providers/local/camel-mh-store.c:541 ++#: ../camel/providers/local/camel-mh-store.c:533 + #, c-format + msgid "Could not create folder '%s': %s" + msgstr "Impossibile creare la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-mh-store.c:557 ++#: ../camel/providers/local/camel-mh-store.c:549 + #, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "Impossibile ottenere la cartella «%s»: non è una directory" +@@ -4226,11 +4104,9 @@ msgstr "La cartella «%s/%s» non esiste + + #: ../camel/providers/local/camel-spool-store.c:505 + #, c-format +-msgid "" +-"Could not open folder '%s':\n" ++msgid "Could not open folder '%s':\n" + "%s" +-msgstr "" +-"Impossibile aprire la cartella «%s»:\n" ++msgstr "Impossibile aprire la cartella «%s»:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:511 +@@ -4240,11 +4116,9 @@ msgstr "La cartella «%s» non esiste." + + #: ../camel/providers/local/camel-spool-store.c:519 + #, c-format +-msgid "" +-"Could not create folder '%s':\n" ++msgid "Could not create folder '%s':\n" + "%s" +-msgstr "" +-"Impossibile creare la cartella «%s»:\n" ++msgstr "Impossibile creare la cartella «%s»:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:532 +@@ -4267,21 +4141,21 @@ msgstr "Le cartelle spool non possono es + msgid "Spool folders cannot be renamed" + msgstr "Le cartelle spool non possono essere rinominate" + +-#: ../camel/providers/local/camel-spool-summary.c:170 +-#: ../camel/providers/local/camel-spool-summary.c:182 +-#: ../camel/providers/local/camel-spool-summary.c:194 ++#: ../camel/providers/local/camel-spool-summary.c:179 ++#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:203 + #, c-format + msgid "Could not synchronize temporary folder %s: %s" + msgstr "Impossibile sincronizzare la cartella temporanea %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:212 ++#: ../camel/providers/local/camel-spool-summary.c:221 + #, c-format + msgid "Could not synchronize spool folder %s: %s" + msgstr "Impossibile sincronizzare la cartella spool %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:244 +-#: ../camel/providers/local/camel-spool-summary.c:263 +-#: ../camel/providers/local/camel-spool-summary.c:276 ++#: ../camel/providers/local/camel-spool-summary.c:253 ++#: ../camel/providers/local/camel-spool-summary.c:272 ++#: ../camel/providers/local/camel-spool-summary.c:285 + #, c-format + msgid "" + "Could not synchronize spool folder %s: %s\n" +@@ -4290,48 +4164,52 @@ msgstr "" + "Impossibile sincronizzare la cartella spool %s: %s\n" + "La cartella potrebbe essere danneggiata, copia salvata in «%s»" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:278 +-#: ../camel/providers/nntp/camel-nntp-folder.c:360 +-#: ../camel/providers/nntp/camel-nntp-folder.c:481 ++#: ../camel/providers/nntp/camel-nntp-folder.c:285 ++#: ../camel/providers/nntp/camel-nntp-folder.c:388 ++#: ../camel/providers/nntp/camel-nntp-folder.c:510 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "Errore interno: UID in formato non valido: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:332 +-#: ../camel/providers/pop3/camel-pop3-folder.c:630 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1033 ++#: ../camel/providers/nntp/camel-nntp-folder.c:349 ++#: ../camel/providers/nntp/camel-nntp-folder.c:354 ++#: ../camel/providers/pop3/camel-pop3-folder.c:657 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1107 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Impossibile ottenere il messaggio «%s»: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:339 +-#: ../camel/providers/nntp/camel-nntp-folder.c:504 +-#: ../camel/providers/pop3/camel-pop3-folder.c:555 +-#: ../camel/providers/pop3/camel-pop3-folder.c:620 +-#: ../camel/providers/pop3/camel-pop3-folder.c:639 ++#: ../camel/providers/nntp/camel-nntp-folder.c:361 ++#: ../camel/providers/nntp/camel-nntp-folder.c:536 ++#: ../camel/providers/pop3/camel-pop3-folder.c:582 ++#: ../camel/providers/pop3/camel-pop3-folder.c:647 ++#: ../camel/providers/pop3/camel-pop3-folder.c:666 + #, c-format + msgid "Cannot get message %s: " + msgstr "Impossibile ottenere il messaggio «%s»: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:559 +-#: ../camel/providers/nntp/camel-nntp-folder.c:565 +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:525 ++#, c-format ++msgid "This message is not currently available" ++msgstr "Questo messaggio non è al momento disponibile" ++ ++#: ../camel/providers/nntp/camel-nntp-folder.c:593 ++#: ../camel/providers/nntp/camel-nntp-folder.c:599 + #, c-format + msgid "Posting failed: %s" + msgstr "Pubblicazione non riuscita: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:606 ++#: ../camel/providers/nntp/camel-nntp-folder.c:664 + msgid "Posting failed: " + msgstr "Pubblicazione non riuscita: " + + # to post -> pubblicare +-#: ../camel/providers/nntp/camel-nntp-folder.c:633 ++#: ../camel/providers/nntp/camel-nntp-folder.c:689 + #, c-format + msgid "You cannot post NNTP messages while working offline!" + msgstr "Impossibile pubblicare messaggi NNTP mentre si lavora fuori rete!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:653 ++#: ../camel/providers/nntp/camel-nntp-folder.c:709 + #, c-format + msgid "You cannot copy messages from a NNTP folder!" + msgstr "Impossibile copiare messaggi da una cartella NNTP!" +@@ -4367,52 +4245,58 @@ msgstr "" + + #: ../camel/providers/nntp/camel-nntp-provider.c:87 + msgid "" ++"This option will connect to the NNTP server anonymously, without " ++"authentication." ++msgstr "" ++"Questa opzione consente di connettersi al server NNTP in modo anonimo senza " ++"alcuna autenticazione." ++ ++#: ../camel/providers/nntp/camel-nntp-provider.c:97 ++msgid "" + "This option will authenticate with the NNTP server using a plaintext " + "password." + msgstr "" + "Opzione per l'autenticazione con il server NNTP usando una password in testo " + "semplice." + +-#: ../camel/providers/nntp/camel-nntp-store.c:286 ++#: ../camel/providers/nntp/camel-nntp-store.c:386 + #, c-format + msgid "Could not read greeting from %s: " + msgstr "Impossibile leggere i saluti da %s: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:298 ++#: ../camel/providers/nntp/camel-nntp-store.c:394 + #, c-format + msgid "NNTP server %s returned error code %d: %s" + msgstr "Il server NNTP %s ha restituito il codice di errore %d: %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:463 ++#: ../camel/providers/nntp/camel-nntp-store.c:555 + #, c-format + msgid "USENET News via %s" + msgstr "News USENET via %s" + + # usato . invece di : +-#: ../camel/providers/nntp/camel-nntp-store.c:1058 ++#: ../camel/providers/nntp/camel-nntp-store.c:1218 + #, c-format +-msgid "" +-"Error retrieving newsgroups:\n" ++msgid "Error retrieving newsgroups:\n" + "\n" + "%s" +-msgstr "" +-"Errore nella ricezione dei newsgroup.\n" ++msgstr "Errore nella ricezione dei newsgroup.\n" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1152 ++#: ../camel/providers/nntp/camel-nntp-store.c:1319 + #, c-format + msgid "You cannot create a folder in a News store: subscribe instead." + msgstr "" + "Impossibile creare una cartella in un archivio di news: piuttosto effettuare " + "una sottoscrizione." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1168 ++#: ../camel/providers/nntp/camel-nntp-store.c:1335 + #, c-format + msgid "You cannot rename a folder in a News store." + msgstr "Impossibile rinominare una cartella in un archivio di news." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1191 ++#: ../camel/providers/nntp/camel-nntp-store.c:1358 + #, c-format + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "" +@@ -4420,7 +4304,7 @@ msgstr "" + "annullare la sottoscrizione." + + # usato . invece di : +-#: ../camel/providers/nntp/camel-nntp-store.c:1390 ++#: ../camel/providers/nntp/camel-nntp-store.c:1577 + #, c-format + msgid "" + "You cannot subscribe to this newsgroup:\n" +@@ -4433,10 +4317,9 @@ msgstr "" + "di livello superiore." + + # usato . invece di : +-#: ../camel/providers/nntp/camel-nntp-store.c:1438 ++#: ../camel/providers/nntp/camel-nntp-store.c:1644 + #, c-format +-msgid "" +-"You cannot unsubscribe to this newsgroup:\n" ++msgid "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" + msgstr "" +@@ -4444,65 +4327,74 @@ msgstr "" + "\n" + "Il newsgroup non esiste!" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1628 ++#: ../camel/providers/nntp/camel-nntp-store.c:2081 + msgid "NNTP Command failed: " + msgstr "Comando NNTP non riuscito: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:1713 ++#: ../camel/providers/nntp/camel-nntp-store.c:2178 + #, c-format + msgid "Not connected." + msgstr "Non connesso." + +-#: ../camel/providers/nntp/camel-nntp-summary.c:198 +-#: ../camel/providers/nntp/camel-nntp-summary.c:328 ++#: ../camel/providers/nntp/camel-nntp-store.c:2272 ++#, c-format ++msgid "No such folder: %s" ++msgstr "Cartella inesistente: %s" ++ ++#: ../camel/providers/nntp/camel-nntp-summary.c:200 ++#: ../camel/providers/nntp/camel-nntp-summary.c:339 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: scansione nuovi messaggi" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:216 ++#: ../camel/providers/nntp/camel-nntp-summary.c:222 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "Risposta server inattesa dallo xover: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:346 ++#: ../camel/providers/nntp/camel-nntp-summary.c:360 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "Risposta server inattesa dall'intestazione: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:393 ++#: ../camel/providers/nntp/camel-nntp-summary.c:407 + #, c-format + msgid "Operation failed: %s" + msgstr "Operazione non riuscita: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:450 +-#: ../camel/providers/pop3/camel-pop3-folder.c:523 ++#: ../camel/providers/pop3/camel-pop3-folder.c:468 ++#: ../camel/providers/pop3/camel-pop3-folder.c:547 + #, c-format + msgid "No message with UID %s" + msgstr "Nessun messaggio con UID %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:539 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 + #, c-format + msgid "Retrieving POP message %d" + msgstr "Ricezione messaggio POP %d" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:631 ++#: ../camel/providers/pop3/camel-pop3-folder.c:658 + msgid "Unknown reason" + msgstr "Motivo sconosciuto" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:679 ++#: ../camel/providers/pop3/camel-pop3-folder.c:710 + msgid "Retrieving POP summary" + msgstr "Ricezione indice POP" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:740 ++#: ../camel/providers/pop3/camel-pop3-folder.c:771 ++#: ../camel/providers/pop3/camel-pop3-folder.c:774 ++#: ../camel/providers/pop3/camel-pop3-folder.c:787 ++#: ../camel/providers/pop3/camel-pop3-folder.c:800 ++#: ../camel/providers/pop3/camel-pop3-folder.c:814 + msgid "Cannot get POP summary: " + msgstr "Impossibile ottenere l'indice POP: " + + # prima era "ripulire" +-#: ../camel/providers/pop3/camel-pop3-folder.c:859 ++#: ../camel/providers/pop3/camel-pop3-folder.c:925 + msgid "Expunging old messages" + msgstr "Rimozione vecchi messaggi" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:879 ++#: ../camel/providers/pop3/camel-pop3-folder.c:945 + msgid "Expunging deleted messages" + msgstr "Rimozione messaggi eliminati" + +@@ -4564,54 +4456,55 @@ msgstr "" + "server che affermano di supportarlo." + + #. Translators: This is the separator between an error and an explanation +-#: ../camel/providers/pop3/camel-pop3-store.c:83 ++#: ../camel/providers/pop3/camel-pop3-store.c:99 + msgid ": " + msgstr ": " + +-#: ../camel/providers/pop3/camel-pop3-store.c:139 ++#: ../camel/providers/pop3/camel-pop3-store.c:161 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "" + "Lettura di un messaggio di benvenuto valido dal server POP %s non riuscita" + +-#: ../camel/providers/pop3/camel-pop3-store.c:154 ++#: ../camel/providers/pop3/camel-pop3-store.c:176 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "Connessione al server POP %s in modalità sicura non riuscita: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:155 ++#: ../camel/providers/pop3/camel-pop3-store.c:177 + msgid "STLS not supported by server" + msgstr "STLS non supportato dal server" + + #. Translators: Last %s is an optional + #. * explanation beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:176 ++#: ../camel/providers/pop3/camel-pop3-store.c:198 + #, c-format + msgid "Failed to connect to POP server %s in secure mode%s" + msgstr "Connessione al server POP %s in modalità sicura non riuscita%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:189 ++#: ../camel/providers/pop3/camel-pop3-store.c:211 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: " + msgstr "Connessione al server POP %s in modalità sicura non riuscita: " + +-#: ../camel/providers/pop3/camel-pop3-store.c:298 ++#: ../camel/providers/pop3/camel-pop3-store.c:351 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "" +-"Impossibile effettuare l'accesso sul server POP %s: errore di protocollo SASL" ++"Impossibile effettuare l'accesso sul server POP %s: errore di protocollo " ++"SASL" + +-#: ../camel/providers/pop3/camel-pop3-store.c:320 ++#: ../camel/providers/pop3/camel-pop3-store.c:373 + #, c-format + msgid "Failed to authenticate on POP server %s: " + msgstr "Autenticazione sul server POP %s non riuscita: " + +-#: ../camel/providers/pop3/camel-pop3-store.c:371 ++#: ../camel/providers/pop3/camel-pop3-store.c:481 + #, c-format + msgid "POP3 server %s" + msgstr "Server POP3 %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:374 ++#: ../camel/providers/pop3/camel-pop3-store.c:484 + #, c-format + msgid "POP3 server for %s on %s" + msgstr "Servizio POP3 per %s su %s" +@@ -4619,7 +4512,7 @@ msgstr "Servizio POP3 per %s su %s" + # credo che sostituzione di persona sia un po' meglio di + # personificazione + # imitazione +-#: ../camel/providers/pop3/camel-pop3-store.c:546 ++#: ../camel/providers/pop3/camel-pop3-store.c:696 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " +@@ -4629,10 +4522,9 @@ msgstr "" + "Possibile attacco di sostituzione di persona. Contattare il proprio " + "amministratore." + +-#: ../camel/providers/pop3/camel-pop3-store.c:598 ++#: ../camel/providers/pop3/camel-pop3-store.c:748 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending password: " + msgstr "" + "Impossibile connettersi al server POP %s.\n" +@@ -4640,31 +4532,26 @@ msgstr "" + + #. Translators: Last %s is an optional explanation + #. * beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:613 ++#: ../camel/providers/pop3/camel-pop3-store.c:763 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending username%s" + msgstr "" + "Impossibile connettersi al server POP %s.\n" + "Errore nell'inviare il nome utente%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:673 +-#, c-format +-msgid "Could not connect to POP server %s" +-msgstr "Impossibile connettersi al server POP %s" +- +-#: ../camel/providers/pop3/camel-pop3-store.c:701 ++#: ../camel/providers/pop3/camel-pop3-store.c:845 + #, c-format + msgid "No such folder '%s'." + msgstr "Cartella «%s» inesistente." + +-#: ../camel/providers/pop3/camel-pop3-store.c:718 ++#: ../camel/providers/pop3/camel-pop3-store.c:862 + #, c-format + msgid "POP3 stores have no folder hierarchy" + msgstr "L'archivio POP3 non ha gerarchia di cartelle" + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:36 ++#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1 + msgid "Sendmail" + msgstr "Sendmail" + +@@ -4676,47 +4563,52 @@ msgstr "" + "Per consegnare la posta passandola al programma \"sendmail\" sul sistema " + "locale." + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:49 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:50 + msgid "sendmail" + msgstr "sendmail" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:51 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:52 + msgid "Mail delivery via the sendmail program" + msgstr "Consegna della posta attraverso il programma sendmail" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:93 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:165 + #, c-format + msgid "Could not parse recipient list" + msgstr "Impossibile analizzare l'elenco dei destinatari" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:126 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:182 ++#, c-format ++msgid "Could not parse arguments" ++msgstr "Impossibile analizzare gli argomenti" ++ ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:213 + #, c-format +-msgid "Could not create pipe to sendmail: %s: mail not sent" +-msgstr "Impossibile creare la pipe verso sendmail: %s: posta non inviata" ++msgid "Could not create pipe to '%s': %s: mail not sent" ++msgstr "Impossibile creare la pipe verso '%s': %s: posta non inviata" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:148 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:238 + #, c-format +-msgid "Could not fork sendmail: %s: mail not sent" +-msgstr "Impossibile effettuare il fork di sendmail: %s: posta non inviata" ++msgid "Could not fork '%s': %s: mail not sent" ++msgstr "Impossibile effettuare fork di '%s': %s: posta non inviata" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:287 + msgid "Could not send message: " + msgstr "Impossibile inviare il messaggio: " + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:317 + #, c-format +-msgid "sendmail exited with signal %s: mail not sent." +-msgstr "sendmail uscito con segnale %s: posta non inviata." ++msgid "'%s' exited with signal %s: mail not sent." ++msgstr "'%s' è uscito con segnale %s: posta non inviata." + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:327 + #, c-format +-msgid "Could not execute %s: mail not sent." +-msgstr "Impossibile eseguire %s: posta non inviata." ++msgid "Could not execute '%s': mail not sent." ++msgstr "Impossibile eseguire '%s': posta non inviata." + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:332 + #, c-format +-msgid "sendmail exited with status %d: mail not sent." +-msgstr "sendmail uscito con stato %d: posta non inviata." ++msgid "'%s' exited with status %d: mail not sent." ++msgstr "'%s' è uscito con stato %d: posta non inviata." + + #: ../camel/providers/smtp/camel-smtp-provider.c:42 + msgid "Default SMTP port" +@@ -4739,219 +4631,219 @@ msgid "For delivering mail by connecting + msgstr "" + "Per consegnare la posta connettendosi a un mail hub remoto usando SMTP." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:154 +-#: ../camel/providers/smtp/camel-smtp-transport.c:162 ++#: ../camel/providers/smtp/camel-smtp-transport.c:158 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 + msgid "Welcome response error: " + msgstr "Errore nella risposta di benvenuto: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:201 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "Connessione al server SMTP %s in modalità sicura non riuscita: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:210 +-#: ../camel/providers/smtp/camel-smtp-transport.c:223 +-#: ../camel/providers/smtp/camel-smtp-transport.c:230 ++#: ../camel/providers/smtp/camel-smtp-transport.c:211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:224 ++#: ../camel/providers/smtp/camel-smtp-transport.c:231 + msgid "STARTTLS command failed: " + msgstr "Comando STARTTLS non riuscito: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:241 ++#: ../camel/providers/smtp/camel-smtp-transport.c:242 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: " + msgstr "Connessione al server SMTP %s in modalità sicura non riuscita: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:301 ++#: ../camel/providers/smtp/camel-smtp-transport.c:342 + #, c-format + msgid "SMTP server %s" + msgstr "Server SMTP %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:304 ++#: ../camel/providers/smtp/camel-smtp-transport.c:345 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "Posta SMTP consegnata attraverso %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:378 ++#: ../camel/providers/smtp/camel-smtp-transport.c:419 + #, c-format + msgid "SMTP server %s does not support %s authentication" + msgstr "Il server SMTP %s non supporta l'autenticazione %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:458 ++#: ../camel/providers/smtp/camel-smtp-transport.c:500 + #, c-format + msgid "No SASL mechanism was specified" + msgstr "Non è stato specificato alcun meccanismo SASL" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:488 +-#: ../camel/providers/smtp/camel-smtp-transport.c:499 +-#: ../camel/providers/smtp/camel-smtp-transport.c:512 ++#: ../camel/providers/smtp/camel-smtp-transport.c:530 ++#: ../camel/providers/smtp/camel-smtp-transport.c:541 ++#: ../camel/providers/smtp/camel-smtp-transport.c:554 + msgid "AUTH command failed: " + msgstr "Comando AUTH non riuscito: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:654 ++#: ../camel/providers/smtp/camel-smtp-transport.c:695 + #, c-format + msgid "Cannot send message: service not connected." + msgstr "Impossibile inviare il messaggio: servizio non connesso." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:661 ++#: ../camel/providers/smtp/camel-smtp-transport.c:702 + #, c-format + msgid "Cannot send message: sender address not valid." + msgstr "Impossibile inviare il messaggio: indirizzo mittente non valido." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:665 ++#: ../camel/providers/smtp/camel-smtp-transport.c:706 + msgid "Sending message" + msgstr "Invio messaggio" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:690 ++#: ../camel/providers/smtp/camel-smtp-transport.c:731 + #, c-format + msgid "Cannot send message: no recipients defined." + msgstr "Impossibile inviare il messaggio: nessun destinatario definito." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:744 + #, c-format + msgid "Cannot send message: one or more invalid recipients" + msgstr "Impossibile inviare il messaggio: uno o più destinatari non validi" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:807 ++#: ../camel/providers/smtp/camel-smtp-transport.c:865 + msgid "Syntax error, command unrecognized" + msgstr "Errore di sintassi, comando non riconosciuto" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:809 ++#: ../camel/providers/smtp/camel-smtp-transport.c:867 + msgid "Syntax error in parameters or arguments" + msgstr "Errore di sintassi nei parametri o negli argomenti" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:811 ++#: ../camel/providers/smtp/camel-smtp-transport.c:869 + msgid "Command not implemented" + msgstr "Comando non implementato" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:813 ++#: ../camel/providers/smtp/camel-smtp-transport.c:871 + msgid "Command parameter not implemented" + msgstr "Parametro del comando non implementato" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:815 ++#: ../camel/providers/smtp/camel-smtp-transport.c:873 + msgid "System status, or system help reply" + msgstr "Stato del sistema o risposta di aiuto del sistema" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:817 ++#: ../camel/providers/smtp/camel-smtp-transport.c:875 + msgid "Help message" + msgstr "Messaggio di aiuto" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:819 ++#: ../camel/providers/smtp/camel-smtp-transport.c:877 + msgid "Service ready" + msgstr "Servizio pronto" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:821 ++#: ../camel/providers/smtp/camel-smtp-transport.c:879 + msgid "Service closing transmission channel" + msgstr "Il servizio sta chiudendo il canale di trasmissione" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:823 ++#: ../camel/providers/smtp/camel-smtp-transport.c:881 + msgid "Service not available, closing transmission channel" + msgstr "Servizio non disponibile, chiusura del canale di trasmissione" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:825 ++#: ../camel/providers/smtp/camel-smtp-transport.c:883 + msgid "Requested mail action okay, completed" + msgstr "L'azione di posta richiesta è corretta, completata" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:827 ++#: ../camel/providers/smtp/camel-smtp-transport.c:885 + msgid "User not local; will forward to " + msgstr "Utente non locale; verrà inoltrata a " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:829 ++#: ../camel/providers/smtp/camel-smtp-transport.c:887 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "Azione di posta richiesta non intrapresa: mailbox non disponibile" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:831 ++#: ../camel/providers/smtp/camel-smtp-transport.c:889 + msgid "Requested action not taken: mailbox unavailable" + msgstr "Azione richiesta non intrapresa: mailbox non disponibile" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:833 ++#: ../camel/providers/smtp/camel-smtp-transport.c:891 + msgid "Requested action aborted: error in processing" + msgstr "Azione richiesta interrotta: errore nell'elaborazione" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:835 ++#: ../camel/providers/smtp/camel-smtp-transport.c:893 + msgid "User not local; please try " + msgstr "Utente non locale; tentare " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:837 ++#: ../camel/providers/smtp/camel-smtp-transport.c:895 + msgid "Requested action not taken: insufficient system storage" + msgstr "Azione richiesta non intrapresa: storage di sistema non sufficiente" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:839 ++#: ../camel/providers/smtp/camel-smtp-transport.c:897 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "" + "Azione di posta richiesta interrotta: allocazione dello storage superato" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:841 ++#: ../camel/providers/smtp/camel-smtp-transport.c:899 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "Azione richiesta non intrapresa: nome della mailbox non consentito" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:843 ++#: ../camel/providers/smtp/camel-smtp-transport.c:901 + msgid "Start mail input; end with ." + msgstr "Iniziare a inserire la posta; terminare con ." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:845 ++#: ../camel/providers/smtp/camel-smtp-transport.c:903 + msgid "Transaction failed" + msgstr "Transazione non riuscita" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:849 ++#: ../camel/providers/smtp/camel-smtp-transport.c:907 + msgid "A password transition is needed" + msgstr "È necessario passare attraverso la verifica della password" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:851 ++#: ../camel/providers/smtp/camel-smtp-transport.c:909 + msgid "Authentication mechanism is too weak" + msgstr "Il meccanismo di autenticazione è troppo debole" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:853 ++#: ../camel/providers/smtp/camel-smtp-transport.c:911 + msgid "Encryption required for requested authentication mechanism" + msgstr "Il meccanismo di autenticazione richiesto richiede la cifratura" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:855 ++#: ../camel/providers/smtp/camel-smtp-transport.c:913 + msgid "Temporary authentication failure" + msgstr "Autenticazione temporaneamente non riuscita" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1112 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1170 + msgid "SMTP Greeting" + msgstr "Messaggio di benvenuto SMTP" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1139 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1157 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1165 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1197 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1219 + msgid "HELO command failed: " + msgstr "Comando HELO non riuscito: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1240 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1255 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1265 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1294 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1309 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1319 + msgid "MAIL FROM command failed: " + msgstr "Comando MAIL FROM non riuscito: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1292 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1346 + msgid "RCPT TO command failed: " + msgstr "Comando RSET non riuscito: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1309 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1319 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1363 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1373 + #, c-format + msgid "RCPT TO <%s> failed: " + msgstr "RCPT TO <%s> non riuscito: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1362 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1373 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1384 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1443 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1463 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1477 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1486 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1416 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1427 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1438 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1497 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1517 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1531 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1540 + msgid "DATA command failed: " + msgstr "Comando DATA non riuscito: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1511 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1526 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1535 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1565 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1580 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1589 + msgid "RSET command failed: " + msgstr "Comando RSET non riuscito: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1560 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1574 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1581 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1614 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1628 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1635 + msgid "QUIT command failed: " + msgstr "Comando QUIT non riuscito: " + +@@ -4974,7 +4866,8 @@ msgstr "Valore promemoria compleanni e a + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4 + msgid "Number of units for determining a birthday or anniversary reminder" + msgstr "" +-"Numero di unità per determinare il promemoria di un compleanno o anniversario" ++"Numero di unità per determinare il promemoria di un compleanno o " ++"anniversario" + + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5 + msgid "Birthday and anniversary reminder units" +@@ -4990,8 +4883,8 @@ msgstr "" + + #: ../libebackend/e-authentication-mediator.c:205 + #: ../libebackend/e-authentication-mediator.c:216 +-#: ../libebackend/e-authentication-mediator.c:849 +-#: ../libebackend/e-authentication-mediator.c:1179 ++#: ../libebackend/e-authentication-mediator.c:852 ++#: ../libebackend/e-authentication-mediator.c:1185 + msgid "Bus name vanished (client terminated?)" + msgstr "Nome del bus scomparso (client terminato?)" + +@@ -5001,8 +4894,8 @@ msgstr "Nessuna risposta dal client" + + #: ../libebackend/e-authentication-mediator.c:334 + #: ../libebackend/e-authentication-mediator.c:345 +-#: ../libebackend/e-authentication-mediator.c:843 +-#: ../libebackend/e-authentication-mediator.c:1173 ++#: ../libebackend/e-authentication-mediator.c:846 ++#: ../libebackend/e-authentication-mediator.c:1179 + msgid "Client cancelled the operation" + msgstr "Il client ha annullato l'operazione" + +@@ -5010,46 +4903,46 @@ msgstr "Il client ha annullato l'operazi + msgid "Client reports password was rejected" + msgstr "Il client riporta che la password è stata rifiutata" + +-#: ../libebackend/e-authentication-session.c:532 ++#: ../libebackend/e-authentication-session.c:543 + msgid "Add this password to your keyring" + msgstr "Aggiungere questa password al proprio portachiavi" + +-#: ../libebackend/e-authentication-session.c:595 ++#: ../libebackend/e-authentication-session.c:648 + msgid "Password was incorrect" + msgstr "La password non era corretta" + +-#: ../libebackend/e-authentication-session.c:1331 +-#: ../libebackend/e-authentication-session.c:1507 +-#: ../libebackend/e-authentication-session.c:1690 +-msgid "Keyring operation was cancelled" +-msgstr "L'operazione sul portachiavi è stata annullata" +- +-#: ../libebackend/e-backend.c:190 ++#: ../libebackend/e-backend.c:428 + #, c-format + msgid "%s does not support authentication" + msgstr "%s non supporta l'autenticazione" + +-#: ../libebackend/e-collection-backend.c:734 ++#: ../libebackend/e-collection-backend.c:800 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "%s non supporta la creazione di risorse remote" + +-#: ../libebackend/e-collection-backend.c:793 ++#: ../libebackend/e-collection-backend.c:859 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "%s non supporta l'eliminazione di risorse remote" + +-#: ../libebackend/e-server-side-source.c:126 ++#: ../libebackend/e-data-factory.c:320 ++#, c-format ++msgid "No backend factory for hash key '%s'" ++msgstr "Nessun backend di fabbrica per la chiave '%s'" ++ ++#: ../libebackend/e-server-side-source.c:134 + #, c-format + msgid "Data source is missing a [%s] group" + msgstr "Alla sorgente dati manca un gruppo [%s]" + +-#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1111 ++#: ../libebackend/e-server-side-source.c:1008 ++#: ../libedataserver/e-source.c:1138 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "La sorgenti dati «%s» non supporta la creazione di risorse remote" + +-#: ../libebackend/e-server-side-source.c:930 ++#: ../libebackend/e-server-side-source.c:1022 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" +@@ -5057,12 +4950,13 @@ msgstr "" + "La sorgenti dati «%s» non dispone di un backend per la creazione della " + "risorsa remota" + +-#: ../libebackend/e-server-side-source.c:958 ../libedataserver/e-source.c:1220 ++#: ../libebackend/e-server-side-source.c:1050 ++#: ../libedataserver/e-source.c:1251 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "La sorgenti dati «%s» non supporta l'eliminazione di risorse remote" + +-#: ../libebackend/e-server-side-source.c:972 ++#: ../libebackend/e-server-side-source.c:1064 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" +@@ -5070,21 +4964,33 @@ msgstr "" + "La sorgente dati «%s» non dispone di un backend per l'eliminazione della " + "risorse remota" + +-#: ../libebackend/e-server-side-source.c:1285 ++#: ../libebackend/e-server-side-source.c:1095 ++#: ../libedataserver/e-source.c:1347 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990 ++#, c-format ++msgid "Data source '%s' does not support OAuth 2.0 authentication" ++msgstr "Il sorgente dati '%s' non supporta l'autenticazione OAuth 2.0" ++ ++#: ../libebackend/e-server-side-source.c:1438 + #, c-format + msgid "File must have a '.source' extension" + msgstr "Il file deve avere una estensione \".source\"" + +-#: ../libebackend/e-source-registry-server.c:522 +-#: ../libedataserver/e-source-registry.c:1523 ++#: ../libebackend/e-source-registry-server.c:523 ++#: ../libedataserver/e-source-registry.c:1882 + msgid "The user declined to authenticate" + msgstr "L'utente ha rifiutato l'autenticazione" + +-#: ../libebackend/e-source-registry-server.c:770 ++#: ../libebackend/e-source-registry-server.c:792 + #, c-format + msgid "UID '%s' is already in use" + msgstr "L'UID «%s» è già in uso" + ++#: ../libebackend/e-user-prompter-server.c:303 ++#, c-format ++msgid "Extension dialog '%s' not found." ++msgstr "Dialogo estensione '%s' non trovato." ++ + #: ../libedataserver/e-categories.c:46 + msgctxt "CategoryName" + msgid "Anniversary" +@@ -5197,21 +5103,22 @@ msgctxt "CategoryName" + msgid "Waiting" + msgstr "In attesa" + +-#: ../libedataserver/e-client.c:124 ++#: ../libedataserver/e-client.c:135 + msgid "Source not loaded" + msgstr "Sorgente non caricata" + +-#: ../libedataserver/e-client.c:126 ++#: ../libedataserver/e-client.c:137 + msgid "Source already loaded" + msgstr "Sorgente già caricata" + +-#. Translators: This means that the EClient does not support offline mode, or +-#. * it's not set to by a user, thus it is unavailable while user is not connected. +-#: ../libedataserver/e-client.c:136 ++#. Translators: This means that the EClient does not ++#. * support offline mode, or it's not set to by a user, ++#. * thus it is unavailable while user is not connected. ++#: ../libedataserver/e-client.c:148 + msgid "Offline unavailable" + msgstr "Fuori rete non disponibile" + +-#: ../libedataserver/e-client.c:158 ++#: ../libedataserver/e-client.c:170 + msgid "D-Bus error" + msgstr "errore D-Bus" + +@@ -5268,35 +5175,72 @@ msgstr "Inserire la password per l'elenc + msgid "Please enter the password for account \"%s\"." + msgstr "Inserire la password per l'account «%s»." + +-#: ../libedataserver/e-source.c:621 ++#: ../libedataserver/e-source.c:627 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "Al file sorgente manca un gruppo [%s]" + +-#: ../libedataserver/e-source.c:938 ++#: ../libedataserver/e-source.c:949 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "La sorgente dati «%s» non è rimovibile" + +-#: ../libedataserver/e-source.c:1020 ++#: ../libedataserver/e-source.c:1041 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "La sorgente dati «%s» non è scrivibile" + +-#: ../libedataserver/e-source.c:1408 ++#: ../libedataserver/e-source.c:1559 + msgid "Unnamed" + msgstr "Senza nome" + +-#: ../libedataserver/e-source-mail-signature.c:485 ++#: ../libedataserver/e-source-mail-signature.c:487 + #, c-format + msgid "Signature script must be a local file" + msgstr "Lo script della firma deve essere un file locale" + ++#: ../libedataserver/e-source-webdav.c:1529 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by address book '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "" ++"Il certificato SSL per l'host '%s', usato dalla rubrica '%s', non è fidato. " ++"Desideri accettarlo?" ++ ++#: ../libedataserver/e-source-webdav.c:1538 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " ++"wish to accept it?" ++msgstr "" ++"Il certificato SSL per l'host '%s', usato dal calendario '%s', non è fidato. " ++"Desideri accettarlo?" ++ ++#: ../libedataserver/e-source-webdav.c:1547 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "" ++"Il certificato SSL per l'host '%s', usato dall'elenco di promemoria '%s', " ++"non è fidato. Desideri accettarlo?" ++ ++#: ../libedataserver/e-source-webdav.c:1556 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by task list '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "" ++"Il certificato SSL per l'host '%s', usato dall'elenco dei compiti '%s', non " ++"è fidato. Desideri accettarlo?" ++ + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1949 ++#: ../libedataserver/e-time-utils.c:1663 ++#: ../libedataserver/e-time-utils.c:1962 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%a %d/%m/%Y, %I.%M.%S %p" + +@@ -5304,7 +5248,8 @@ msgstr "%a %d/%m/%Y, %I.%M.%S %p" + #. * in 24-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1655 ../libedataserver/e-time-utils.c:1940 ++#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1953 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%a %d/%m/%Y, %k.%M.%S" + +@@ -5312,7 +5257,8 @@ msgstr "%a %d/%m/%Y, %k.%M.%S" + #. * in 12-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1660 ../libedataserver/e-time-utils.c:1945 ++#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1958 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%a %d/%m/%Y, %I.%M %p" + +@@ -5320,78 +5266,83 @@ msgstr "%a %d/%m/%Y, %I.%M %p" + #. * in 24-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1665 ../libedataserver/e-time-utils.c:1936 ++#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1949 + msgid "%a %m/%d/%Y %H:%M" + msgstr "%a %d/%m/%Y, %k.%M" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1670 ++#: ../libedataserver/e-time-utils.c:1683 + msgid "%a %m/%d/%Y %I %p" + msgstr "%a %d/%m/%Y, %I %p" + + #. strptime format of a weekday, a date and a time, + #. * in 24-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1675 ++#: ../libedataserver/e-time-utils.c:1688 + msgid "%a %m/%d/%Y %H" + msgstr "%a %d/%m/%Y, %k" + + #. strptime format of a weekday and a date. + #. strftime format of a weekday and a date. +-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1798 +-#: ../libedataserver/e-time-utils.c:1931 ++#: ../libedataserver/e-time-utils.c:1691 ++#: ../libedataserver/e-time-utils.c:1811 ++#: ../libedataserver/e-time-utils.c:1944 + msgid "%a %m/%d/%Y" + msgstr "%a %d/%m/%Y" + + #. strptime format of a date and a time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1685 ++#: ../libedataserver/e-time-utils.c:1698 + msgid "%m/%d/%Y %I:%M:%S %p" + msgstr "%d/%m/%Y, %I.%M.%S %p" + + #. strptime format of a date and a time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1689 ++#: ../libedataserver/e-time-utils.c:1702 + msgid "%m/%d/%Y %H:%M:%S" + msgstr "%d/%m/%Y, %k.%M.%S" + + #. strptime format of a date and a time, in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1694 ++#: ../libedataserver/e-time-utils.c:1707 + msgid "%m/%d/%Y %I:%M %p" + msgstr "%d/%m/%Y, %I.%M %p" + + #. strptime format of a date and a time, in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1699 ++#: ../libedataserver/e-time-utils.c:1712 + msgid "%m/%d/%Y %H:%M" + msgstr "%d/%m/%Y, %k.%M" + + #. strptime format of a date and a time, in 12-hour format, + #. * without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1704 ++#: ../libedataserver/e-time-utils.c:1717 + msgid "%m/%d/%Y %I %p" + msgstr "%d/%m/%Y, %I %p" + + #. strptime format of a date and a time, in 24-hour format, + #. * without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1709 ++#: ../libedataserver/e-time-utils.c:1722 + msgid "%m/%d/%Y %H" + msgstr "%d/%m/%Y, %k" + + #. strptime format of a weekday and a date. + #. This is the preferred date format for the locale. +-#: ../libedataserver/e-time-utils.c:1712 ../libedataserver/e-time-utils.c:1801 ++#: ../libedataserver/e-time-utils.c:1725 ++#: ../libedataserver/e-time-utils.c:1814 + msgid "%m/%d/%Y" + msgstr "%d/%m/%Y" + + #. strptime format for a time of day, in 12-hour format. + #. strftime format of a time in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1993 ++#: ../libedataserver/e-time-utils.c:1885 ++#: ../libedataserver/e-time-utils.c:2006 + msgid "%I:%M:%S %p" + msgstr "%I.%M.%S %p" + + #. strptime format for a time of day, in 24-hour format. + #. strftime format of a time in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1876 ../libedataserver/e-time-utils.c:1985 ++#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1998 + msgid "%H:%M:%S" + msgstr "%k.%M.%S" + +@@ -5399,25 +5350,27 @@ msgstr "%k.%M.%S" + #. * in 12-hour format. + #. strftime format of a time in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1990 ++#: ../libedataserver/e-time-utils.c:1894 ++#: ../libedataserver/e-time-utils.c:2003 + msgid "%I:%M %p" + msgstr "%I.%M %p" + + #. strptime format for time of day, without seconds 24-hour format. + #. strftime format of a time in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:1982 ++#: ../libedataserver/e-time-utils.c:1898 ++#: ../libedataserver/e-time-utils.c:1995 + msgid "%H:%M" + msgstr "%k.%M" + + #. strptime format for time of day, without seconds 24-hour format, + #. * and no colon. +-#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1902 + msgid "%H%M" + msgstr "%k%M" + + #. strptime format for hour and AM/PM, 12-hour format. +-#: ../libedataserver/e-time-utils.c:1893 ++#: ../libedataserver/e-time-utils.c:1906 + msgid "%I %p" + msgstr "%I %p" + +@@ -5530,224 +5483,520 @@ msgstr "URL configurazione automatica pr + msgid "Where to read automatic proxy configuration from." + msgstr "Indica da dove leggere la configurazione automatica del proxy." + +-#: ../libedataserverui/e-categories-editor.c:230 +-msgid "Currently _used categories:" +-msgstr "Categorie attualmente _usate:" +- +-#: ../libedataserverui/e-categories-editor.c:239 +-msgid "_Available Categories:" +-msgstr "C_ategorie disponibili:" ++#: ../modules/gnome-online-accounts/e-goa-password-based.c:132 ++#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365 ++#, c-format ++msgid "No such data source for UID '%s'" ++msgstr "Nessun sorgente dati per l'UID '%s'" + +-#: ../libedataserverui/e-categories-selector.c:325 +-msgid "Icon" +-msgstr "Icona" ++#: ../modules/gnome-online-accounts/e-goa-password-based.c:144 ++#, c-format ++msgid "" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain a password for '%s'" ++msgstr "" ++"Impossibile trovare un account corrispondente nel servizio org.gnome." ++"OnlineAccounts dal quale ottenere una password per '%s'" + +-#: ../libedataserverui/e-categories-selector.c:330 +-msgid "Category" +-msgstr "Categoria" ++#: ../modules/gnome-online-accounts/e-goa-password-based.c:216 ++#, c-format ++msgid "Invalid password for '%s'" ++msgstr "Password non valida per '%s'" + +-#: ../libedataserverui/e-category-completion.c:300 ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:223 + #, c-format +-msgid "Create category \"%s\"" +-msgstr "Crea la categoria «%s»" ++msgid "Code: %u - Unexpected response from server" ++msgstr "Codice: %u - Risposta inattesa dal server" + +-#: ../libedataserverui/e-category-editor.c:137 +-msgid "Category Icon" +-msgstr "Icona della categoria" ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:244 ++#, c-format ++msgid "Failed to parse autodiscover response XML" ++msgstr "Analisi XML risposta autodiscover non riuscita" + +-#: ../libedataserverui/e-category-editor.c:141 +-msgid "_No Image" +-msgstr "_Nessuna immagine" ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:253 ++#, c-format ++msgid "Failed to find Autodiscover element" ++msgstr "Ricerca elemento Autodiscover non riuscita" + +-#: ../libedataserverui/e-category-editor.c:178 +-msgid "Category _Name" +-msgstr "_Nome della categoria" ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:265 ++#, c-format ++msgid "Failed to find Response element" ++msgstr "Ricerca elemento Response non riuscita" + +-#: ../libedataserverui/e-category-editor.c:186 +-msgid "Category _Icon" +-msgstr "_Icona della categoria" ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:277 ++#, c-format ++msgid "Failed to find Account element" ++msgstr "Ricerca elemento Account non riuscita" + +-#: ../libedataserverui/e-category-editor.c:226 +-msgid "Category Properties" +-msgstr "Proprietà della categoria" ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:291 ++#, c-format ++msgid "Failed to find ASUrl and OABUrl in autodiscover response" ++msgstr "Ricerca di ASUrl e OABUrl nella risposta autodiscover non riuscita" + +-#: ../libedataserverui/e-category-editor.c:287 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1271 + #, c-format + msgid "" +-"There is already a category '%s' in the configuration. Please use another " +-"name" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain an access token for '%s'" + msgstr "" +-"Esiste già una categoria «%s» nella configurazione. Usare un altro nome" +- +-#: ../libedataserverui/e-name-selector-dialog.c:278 +-msgid "Show Contacts" +-msgstr "Mostra contatti" +- +-#: ../libedataserverui/e-name-selector-dialog.c:300 +-msgid "Address B_ook:" +-msgstr "Ru_brica:" +- +-#: ../libedataserverui/e-name-selector-dialog.c:310 +-msgid "Cat_egory:" +-msgstr "C_ategoria:" +- +-#: ../libedataserverui/e-name-selector-dialog.c:332 +-msgid "_Search:" +-msgstr "C_erca:" ++"Impossibile trovare un account corrispondente nel servizio org.gnome." ++"OnlineAccounts dal quale ottenere un token d'accesso per '%s'" + +-#: ../libedataserverui/e-name-selector-dialog.c:357 +-#: ../libedataserverui/e-name-selector-dialog.c:1182 +-msgid "Any Category" +-msgstr "Ogni categoria" +- +-#: ../libedataserverui/e-name-selector-dialog.c:359 +-msgid "Co_ntacts" +-msgstr "Co_ntatti" +- +-#: ../libedataserverui/e-name-selector-dialog.c:421 +-msgid "Search" +-msgstr "Cerca" ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1298 ++#, c-format ++msgid "Failed to obtain an access token for '%s': " ++msgstr "Impossibile ottenere un token d'accesso per '%s': " + +-#: ../libedataserverui/e-name-selector-dialog.c:424 +-msgid "Address Book" +-msgstr "Rubrica" ++#: ../modules/google-backend/module-google-backend.c:140 ++#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:200 ++msgid "Calendar" ++msgstr "Calendario" + +-#: ../libedataserverui/e-name-selector-dialog.c:427 +-#: ../modules/google-backend/module-google-backend.c:183 ++#: ../modules/google-backend/module-google-backend.c:217 ++#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 ++#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 + msgid "Contacts" + msgstr "Contatti" + +-#: ../libedataserverui/e-name-selector-dialog.c:545 +-msgid "Select Contacts from Address Book" +-msgstr "Seleziona contatti dalla rubrica" ++#: ../modules/trust-prompt/certificate-viewer.c:292 ++msgid "Not part of certificate" ++msgstr "Non è parte del certificato" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:600 ++msgid "This certificate has been verified for the following uses:" ++msgstr "Questo certificato è stato verificato per gli usi seguenti:" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:604 ++#: ../modules/trust-prompt/e-asn1-object.c:387 ++msgid "SSL Client Certificate" ++msgstr "Certificato del client SSL" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:609 ++#: ../modules/trust-prompt/e-asn1-object.c:391 ++msgid "SSL Server Certificate" ++msgstr "Certificato del server SSL" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:614 ++msgid "Email Signer Certificate" ++msgstr "Certificato del firmatario email" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:619 ++msgid "Email Recipient Certificate" ++msgstr "Certificato del destinatario email" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:634 ++msgid "Issued To" ++msgstr "Emesso per" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:635 ++#: ../modules/trust-prompt/certificate-viewer.c:641 ++msgid "Common Name (CN)" ++msgstr "Nome comune (CN)" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:636 ++#: ../modules/trust-prompt/certificate-viewer.c:642 ++msgid "Organization (O)" ++msgstr "Organizzazione (O)" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:637 ++#: ../modules/trust-prompt/certificate-viewer.c:643 ++msgid "Organizational Unit (OU)" ++msgstr "Unità organizzativa (OU)" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:638 ++#: ../modules/trust-prompt/e-asn1-object.c:134 ++msgid "Serial Number" ++msgstr "Numero di serie" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:640 ++msgid "Issued By" ++msgstr "Emesso da" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:645 ++msgid "Validity" ++msgstr "Validità" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:646 ++msgid "Issued On" ++msgstr "Emesso il" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:647 ++msgid "Expires On" ++msgstr "Scade il" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:649 ++msgid "Fingerprints" ++msgstr "Impronte digitali" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:650 ++msgid "SHA1 Fingerprint" ++msgstr "Impronta digitale SHA1" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:651 ++msgid "MD5 Fingerprint" ++msgstr "Impronta digitale MD5" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:653 ++msgid "General" ++msgstr "Generale" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:672 ++msgid "Certificate Hierarchy" ++msgstr "Gerarchia del certificato" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:676 ++msgid "Certificate Fields" ++msgstr "Campi del certificato" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:680 ++msgid "Field Value" ++msgstr "Valore del campo" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:682 ++msgid "Details" ++msgstr "Dettagli:" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:95 ++msgid "Version" ++msgstr "Versione" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:110 ++msgid "Version 1" ++msgstr "Versione 1" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:113 ++msgid "Version 2" ++msgstr "Versione 2" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:116 ++msgid "Version 3" ++msgstr "Versione 3" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:192 ++msgid "PKCS #1 MD2 With RSA Encryption" ++msgstr "PKCS #1 MD2 con crittografia RSA" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:195 ++msgid "PKCS #1 MD5 With RSA Encryption" ++msgstr "PKCS #1 MD5 con crittografia RSA" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:198 ++msgid "PKCS #1 SHA-1 With RSA Encryption" ++msgstr "PKCS #1 SHA-1 con crittografia RSA" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:201 ++msgid "PKCS #1 SHA-256 With RSA Encryption" ++msgstr "PKCS #1 SHA-256 con crittografia RSA" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:204 ++msgid "PKCS #1 SHA-384 With RSA Encryption" ++msgstr "PKCS #1 SHA-384 con crittografia RSA" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:207 ++msgid "PKCS #1 SHA-512 With RSA Encryption" ++msgstr "PKCS #1 SHA-512 con crittografia RSA" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:234 ++msgid "PKCS #1 RSA Encryption" ++msgstr "PKCS #1 crittografia RSA" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:237 ++msgid "Certificate Key Usage" ++msgstr "Uso della chiave del certificato" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:240 ++msgid "Netscape Certificate Type" ++msgstr "Tipo di certificato Netscape" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:243 ++msgid "Certificate Authority Key Identifier" ++msgstr "Identificatore dell'autorità di certificazione chiavi" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:255 ++#, c-format ++msgid "Object Identifier (%s)" ++msgstr "Identificatore dell'oggetto (%s)" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:306 ++msgid "Algorithm Identifier" ++msgstr "Identificatore dell'algoritmo" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:314 ++msgid "Algorithm Parameters" ++msgstr "Parametri dell'algoritmo" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:336 ++msgid "Subject Public Key Info" ++msgstr "Informazioni della chiave pubblica soggetto" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:341 ++msgid "Subject Public Key Algorithm" ++msgstr "Algoritmo della chiave pubblica soggetto" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:356 ++msgid "Subject's Public Key" ++msgstr "Chiave pubblica del soggetto" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:378 ++#: ../modules/trust-prompt/e-asn1-object.c:428 ++msgid "Error: Unable to process extension" ++msgstr "Errore: impossibile elaborare l'estensione" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:395 ++msgid "Email" ++msgstr "Email" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:399 ++#: ../modules/trust-prompt/e-asn1-object.c:411 ++msgid "Object Signer" ++msgstr "Firmatario oggetto" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:403 ++msgid "SSL Certificate Authority" ++msgstr "Autorità di Certificazione SSL" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:407 ++msgid "Email Certificate Authority" ++msgstr "Autorità di Certificazione email" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:436 ++msgid "Signing" ++msgstr "In firma" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:440 ++msgid "Non-repudiation" ++msgstr "Non-ripudio" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:444 ++msgid "Key Encipherment" ++msgstr "Cifratura della chiave" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:448 ++msgid "Data Encipherment" ++msgstr "Cifratura dei dati" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:452 ++msgid "Key Agreement" ++msgstr "Chiave concordata" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:456 ++msgid "Certificate Signer" ++msgstr "Firmatario del certificato" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:460 ++msgid "CRL Signer" ++msgstr "Firmatario del CRL" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:509 ++msgid "Critical" ++msgstr "Critico" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:511 ++#: ../modules/trust-prompt/e-asn1-object.c:514 ++msgid "Not Critical" ++msgstr "Non critico" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:535 ++msgid "Extensions" ++msgstr "Estensioni" ++ ++#. Translators: This string is used in Certificate ++#. * details for fields like Issuer or Subject, which ++#. * shows the field name on the left and its respective ++#. * value on the right, both as stored in the ++#. * certificate itself. You probably do not need to ++#. * change this string, unless changing the order of ++#. * name and value. As a result example: ++#. * "OU = VeriSign Trust Network" ++#: ../modules/trust-prompt/e-asn1-object.c:615 ++#, c-format ++msgid "%s = %s" ++msgstr "%s = %s" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:658 ++msgid "Certificate" ++msgstr "Certificato" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:674 ++#: ../modules/trust-prompt/e-asn1-object.c:812 ++msgid "Certificate Signature Algorithm" ++msgstr "Algoritmo di firma del certificato" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:683 ++msgid "Issuer" ++msgstr "Emittente" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:714 ++msgid "Subject" ++msgstr "Soggetto" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:738 ++msgid "Issuer Unique ID" ++msgstr "ID univoco dell'emittente" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:757 ++msgid "Subject Unique ID" ++msgstr "ID univoco del soggetto" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:818 ++msgid "Certificate Signature Value" ++msgstr "Valore della firma del certificato" ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:201 ++msgid "The signing certificate authority is not known." ++msgstr "La firma dell'autorità di certificazione è sconosciuta." ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:203 ++msgid "" ++"The certificate does not match the expected identity of the site that it was " ++"retrieved from." ++msgstr "" ++"Il certificato non corrisponde all'identità attesa del sito da cui è stato " ++"ricevuto." ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:205 ++msgid "The certificate's activation time is still in the future." ++msgstr "Il tempo di attivazione del certificato è impostato nel futuro." ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:207 ++msgid "The certificate has expired." ++msgstr "Il certificato è scaduto." ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:209 ++msgid "" ++"The certificate has been revoked according to the connection's certificate " ++"revocation list." ++msgstr "" ++"Il certificato è stato revocato in base all'elenco di revoca dei certificati " ++"del collegamento." ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:211 ++msgid "The certificate's algorithm is considered insecure." ++msgstr "L'algoritmo del certificato è considerato non sicuro." ++ ++#: ../modules/trust-prompt/trust-prompt-gtk.c:162 ++msgid "Certificate trust..." ++msgstr "Fiducia del certificazione..." ++ ++#: ../modules/trust-prompt/trust-prompt-gtk.c:163 ++msgid "_View Certificate" ++msgstr "_Visualizza certificato" + +-#: ../libedataserverui/e-name-selector-dialog.c:917 +-msgid "_Add" +-msgstr "A_ggiungi" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:164 ++msgid "_Reject" ++msgstr "_Rifiuta" + +-#: ../libedataserverui/e-name-selector-dialog.c:921 +-msgid "_Remove" +-msgstr "_Rimuovi" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:165 ++msgid "Accept _Temporarily" ++msgstr "Accetta _temporanaemente" + +-#: ../libedataserverui/e-name-selector-dialog.c:1097 +-#, c-format +-msgid "Error loading address book: %s" +-msgstr "Errore nel caricare la rubrica: %s" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:166 ++msgid "_Accept Permanently" ++msgstr "_Accetta permanentemente" + +-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:3043 ++#: ../modules/trust-prompt/trust-prompt-gtk.c:203 + #, c-format +-msgid "E_xpand %s Inline" +-msgstr "E_spandere %s in linea" ++msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?" ++msgstr "Il certificato SSL per '%s' non è fidato. Desideri accettarlo?" + +-#. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:3059 +-#, c-format +-msgid "Cop_y %s" +-msgstr "Co_pia %s" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:209 ++msgid "Detailed information about the certificate:" ++msgstr "Informazioni dettagliate sul certificato:" + +-#. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:3070 +-#, c-format +-msgid "C_ut %s" +-msgstr "T_aglia %s" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:223 ++msgid "Issuer:" ++msgstr "Emittente:" + +-#. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:3088 +-#, c-format +-msgid "_Edit %s" +-msgstr "M_odifica %s" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:224 ++msgid "Subject:" ++msgstr "Soggetto:" + +-#: ../libedataserverui/e-name-selector-list.c:532 +-#, c-format +-msgid "_Delete %s" +-msgstr "_Elimina %s" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:225 ++msgid "Fingerprint:" ++msgstr "Impronta digitale:" + +-#: ../libedataserverui/e-passwords.c:126 +-msgid "Keyring key is unusable: no user or host name" +-msgstr "" +-"La chiave nel portachiavi è inutilizzabile: nessun nome utente o hostname" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:226 ++msgid "Reason:" ++msgstr "Motivo:" + +-#: ../libedataserverui/e-passwords.c:701 +-#: ../libedataserverui/e-passwords-win32.c:614 +-msgid "You have the Caps Lock key on." +-msgstr "Il tasto BlocMaiusc è attivo." ++#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2 ++msgid "Integrate your calendars" ++msgstr "Integra i tuoi calendari" + +-#: ../libedataserverui/e-passwords.c:821 +-#: ../libedataserverui/e-passwords-win32.c:737 +-msgid "_Remember this passphrase" +-msgstr "_Ricorda questa passphrase" ++#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2 ++msgid "Integrate your contacts" ++msgstr "Integra i tuoi contatti" + +-#: ../libedataserverui/e-passwords.c:822 +-#: ../libedataserverui/e-passwords-win32.c:738 +-msgid "_Remember this passphrase for the remainder of this session" +-msgstr "_Ricorda questa passphrase per il resto della sessione in corso" ++#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257 ++msgid "Signon service did not return a secret" ++msgstr "Il servizio di inizio sessione non ha ritornato alcun segreto" + +-#: ../libedataserverui/e-passwords.c:827 +-#: ../libedataserverui/e-passwords-win32.c:743 +-msgid "_Remember this password" +-msgstr "_Ricorda questa password" ++#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1 ++msgid "Google Calendar" ++msgstr "Calendario di google" + +-#: ../libedataserverui/e-passwords.c:828 +-#: ../libedataserverui/e-passwords-win32.c:744 +-msgid "_Remember this password for the remainder of this session" +-msgstr "_Ricorda questa password per il resto della sessione in corso" ++#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1 ++msgid "Google Contacts" ++msgstr "Contatti google" + +-#: ../libedataserverui/e-source-selector-dialog.c:224 +-msgid "_Destination" +-msgstr "_Destinazione" ++#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1 ++msgid "GMail" ++msgstr "GMail" + +-#: ../libedataserverui/e-source-selector-dialog.c:326 +-msgid "Select destination" +-msgstr "Seleziona la destinazione" ++#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1 ++msgid "Mail" ++msgstr "Posta" + +-#: ../modules/google-backend/module-google-backend.c:118 +-#: ../modules/yahoo-backend/module-yahoo-backend.c:200 +-msgid "Calendar" +-msgstr "Calendario" ++#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2 ++msgid "Integrate your mailboxes" ++msgstr "Integra le tue caselle di posta" + +-#. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:184 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971 + #, c-format +-msgid "Code: %u - Unexpected response from server" +-msgstr "Codice: %u - Risposta inattesa dal server" ++msgid "" ++"Cannot find a corresponding account service in the accounts database from " ++"which to obtain an access token for '%s'" ++msgstr "" ++"Impossibile trovare un servizio per l'account corrispondente nel database " ++"degli account dai quali ottenere un token d'accesso per '%s'" + +-#. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:205 ++#: ../modules/ubuntu-online-accounts/uoa-utils.c:79 + #, c-format +-msgid "Failed to parse autodiscover response XML" +-msgstr "Analisi XML risposta autodiscover non riuscita" ++msgid "Expected status 200 when requesting guid, instead got status %d (%s)" ++msgstr "" ++"Atteso stato 200 durante la richiesta di guid, ottenuto invece lo stato %d " ++"(%s)" + +-#. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:214 +-#, c-format +-msgid "Failed to find Autodiscover element" +-msgstr "Ricerca elemento Autodiscover non riuscita" ++#: ../modules/ubuntu-online-accounts/uoa-utils.c:96 ++msgid "Error parsing response as JSON: " ++msgstr "Errore durante l'analisi della risposta come JSON:" + +-#. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:226 +-#, c-format +-msgid "Failed to find Response element" +-msgstr "Ricerca elemento Response non riuscita" ++#: ../modules/ubuntu-online-accounts/uoa-utils.c:112 ++msgid "Didn't find email member in JSON data" ++msgstr "Non è stata trovata l'email del membro nei dati JSON" + +-#. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:238 +-#, c-format +-msgid "Failed to find Account element" +-msgstr "Ricerca elemento Account non riuscita" ++#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1 ++msgid "Yahoo! Calendar" ++msgstr "Yahoo! Calendario" + +-#. TODO: more specific +-#: ../modules/online-accounts/goaewsclient.c:252 +-#, c-format +-msgid "Failed to find ASUrl and OABUrl in autodiscover response" +-msgstr "Ricerca di ASUrl e OABUrl nella risposta autodiscover non riuscita" ++#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1 ++msgid "Yahoo! Mail" ++msgstr "Yahoo! Posta" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:215 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:227 + msgid "Tasks" + msgstr "Attività" + + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51 ++#: ../services/evolution-user-prompter/evolution-user-prompter.c:31 + msgid "Keep running after the last client is closed" + msgstr "Resta in esecuzione dopo la chiusura dell'ultimo client" + +@@ -5756,19 +6005,43 @@ msgstr "Resta in esecuzione dopo la chiu + msgid "Wait running until at least one client is connected" + msgstr "Attendi in esecuzione finché è connesso almeno un client" + +-#: ../tests/libedataserverui/evolution-source-viewer.c:620 +-msgid "Evolution Source Viewer" +-msgstr "Visualizzatore sorgenti Evolution" +- +-#. Translators: The name that is displayed in the user interface +-#: ../tests/libedataserverui/evolution-source-viewer.c:650 +-msgid "Display Name" +-msgstr "Nome" +- +-#: ../tests/libedataserverui/evolution-source-viewer.c:659 +-msgid "Flags" +-msgstr "Flag" +- +-#: ../tests/libedataserverui/evolution-source-viewer.c:711 +-msgid "Identity" +-msgstr "Identità" ++#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1 ++msgid "Birthdays & Anniversaries" ++msgstr "Compleanni & anniversari" ++ ++#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1 ++msgid "CalDAV" ++msgstr "CalDAV" ++ ++#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1 ++msgid "Google" ++msgstr "Google" ++ ++#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1 ++msgid "On LDAP Servers" ++msgstr "Su server LDAP" ++ ++#: ../services/evolution-source-registry/builtin/local.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1 ++msgid "On This Computer" ++msgstr "Su questo computer" ++ ++#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1 ++msgid "Search Folders" ++msgstr "Cartelle di ricerca" ++ ++#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1 ++msgid "Weather" ++msgstr "Meteo" ++ ++#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1 ++msgid "On The Web" ++msgstr "Sul Web" ++ ++#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1 ++msgid "WebDAV" ++msgstr "WebDAV" ++ ++#: ../services/evolution-user-prompter/prompt-user-gtk.c:122 ++msgid "_Dismiss" ++msgstr "_Ignora" +diff -up evolution-data-server-3.8.5/po/ja.po.translations evolution-data-server-3.8.5/po/ja.po +--- evolution-data-server-3.8.5/po/ja.po.translations 2013-03-24 01:42:11.000000000 +0100 ++++ evolution-data-server-3.8.5/po/ja.po 2014-01-13 16:23:40.781630232 +0100 +@@ -10,20 +10,21 @@ + # Takayoshi OKANO , 2011. + # Jiro Matsuzawa , 2011, 2013. + # Noriko Mizumoto , 2012. +-# ++# noriko , 2013. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: evolution-data-server master\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2013-03-24 03:00+0900\n" +-"PO-Revision-Date: 2013-03-24 03:05+0000\n" +-"Last-Translator: Jiro Matsuzawa \n" ++"POT-Creation-Date: 2013-08-06 14:46+0530\n" ++"PO-Revision-Date: 2013-10-13 06:25-0400\n" ++"Last-Translator: noriko \n" + "Language-Team: Japanese \n" +-"Language: ja\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: ja\n" + "Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: Zanata 3.1.2\n" + + #: ../addressbook/backends/file/e-book-backend-file.c:114 + #, c-format +@@ -48,11 +49,11 @@ msgstr "この連絡先に UID はあり + #: ../addressbook/backends/file/e-book-backend-file.c:757 + #, c-format + msgid "Conflicting UIDs found in added contacts" +-msgstr "" ++msgstr "追加した連絡先に UID の衝突が見つかりました" + + #: ../addressbook/backends/file/e-book-backend-file.c:844 + #: ../addressbook/backends/file/e-book-backend-file.c:1038 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2615 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2656 + #, c-format + msgid "Contact '%s' not found" + msgstr "連絡先 '%s' が見つかりません" +@@ -60,40 +61,37 @@ msgstr "連絡先 '%s' が見つかり� + #: ../addressbook/backends/file/e-book-backend-file.c:940 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" +-msgstr "" ++msgstr "同期していない版の連絡先 '%s' を変更しようとしました" + + #: ../addressbook/backends/file/e-book-backend-file.c:1089 + #: ../addressbook/backends/file/e-book-backend-file.c:1139 +-#, fuzzy, c-format +-#| msgid "Protocol not supported" ++#, c-format + msgid "Query '%s' not supported" +-msgstr "プロトコルはサポートされていません" ++msgstr "問い合わせ '%s' はサポートされていません" + + #: ../addressbook/backends/file/e-book-backend-file.c:1098 + #: ../addressbook/backends/file/e-book-backend-file.c:1148 +-#, fuzzy, c-format +-#| msgid "Invalid query: " ++#, c-format + msgid "Invalid Query '%s'" +-msgstr "問い合わせ内容が無効です: " ++msgstr "問い合わせ内容 '%s' は無効です" + + #: ../addressbook/backends/file/e-book-backend-file.c:1248 + msgid "Loading..." + msgstr "読み込み中..." + + #: ../addressbook/backends/file/e-book-backend-file.c:1250 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4963 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4978 + msgid "Searching..." + msgstr "検索中..." + + #: ../addressbook/backends/file/e-book-backend-file.c:1568 +-#, fuzzy, c-format +-#| msgid "Could not rename folder %s to %s: %s" ++#, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" +-msgstr "フォルダーを %s から %s へ名前変更できませんでした: %s" ++msgstr "古いデータベースを '%s' から '%s' へ名前変更できませんでした: %s" + + #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1222 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4858 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4873 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:338 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 +@@ -101,58 +99,60 @@ msgstr "フォルダーを %s から %s + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:562 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:592 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 +-#: ../calendar/libecal/e-cal.c:2339 ../calendar/libecal/e-cal-client.c:275 +-#: ../camel/camel-imapx-command.c:596 ../libedataserver/e-client.c:179 ++#: ../calendar/libecal/e-cal.c:2339 ++#: ../calendar/libecal/e-cal-client.c:275 ++#: ../camel/camel-imapx-command.c:609 ++#: ../libedataserver/e-client.c:179 + msgid "Unknown error" + msgstr "エラーを特定できません" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:649 ++#: ../addressbook/backends/google/e-book-backend-google.c:679 + msgid "Querying for updated contacts…" + msgstr "更新された連絡先を問い合わせ中…" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:786 ++#: ../addressbook/backends/google/e-book-backend-google.c:816 + msgid "Querying for updated groups…" + msgstr "更新されたグループを問い合わせ中…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1235 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1653 ++#: ../addressbook/backends/google/e-book-backend-google.c:1265 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:389 + msgid "The backend does not support bulk additions" + msgstr "バックエンドが大量追加に対応していません" + + #. Insert the entry on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1267 ++#: ../addressbook/backends/google/e-book-backend-google.c:1297 + msgid "Creating new contact…" + msgstr "新しい連絡先の作成中…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1358 ++#: ../addressbook/backends/google/e-book-backend-google.c:1388 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:506 + msgid "The backend does not support bulk removals" + msgstr "バックエンドが大量削除に対応していません" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1386 ++#: ../addressbook/backends/google/e-book-backend-google.c:1416 + msgid "Deleting contact…" + msgstr "連絡先の削除中…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1640 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2319 ++#: ../addressbook/backends/google/e-book-backend-google.c:1670 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:567 + msgid "The backend does not support bulk modifications" + msgstr "バックエンドが大量修正に対応していません" + + #. Update the contact on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1678 ++#: ../addressbook/backends/google/e-book-backend-google.c:1708 + msgid "Modifying contact…" + msgstr "連絡先の更新中…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1849 ++#: ../addressbook/backends/google/e-book-backend-google.c:1879 + msgid "Loading…" + msgstr "読み込み中…" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1602 ++#: ../addressbook/backends/google/e-book-google-utils.c:1606 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -161,97 +161,96 @@ msgid "Personal" + msgstr "個人" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1604 ++#: ../addressbook/backends/google/e-book-google-utils.c:1608 + msgid "Friends" + msgstr "友人" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1606 ++#: ../addressbook/backends/google/e-book-google-utils.c:1610 + msgid "Family" + msgstr "家族" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1608 ++#: ../addressbook/backends/google/e-book-google-utils.c:1612 + msgid "Coworkers" + msgstr "同僚" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174 + msgid "Not connected" + msgstr "接続していません" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:950 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "v3 または v2 のバインドいずれかを使った結合に失敗しました" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1073 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088 + msgid "Reconnecting to LDAP server..." + msgstr "LDAP サーバーへ再接続中..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1203 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218 + msgid "Invalid DN syntax" + msgstr "無効な識別名 (DN)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1219 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4857 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4872 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP エラー 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1737 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Adding contact to LDAP server..." + msgstr "LDAP サーバーへ連絡先を追加中..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1875 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1890 + msgid "Removing contact from LDAP server..." + msgstr "LDAP サーバーから連絡先を削除中..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2019 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2431 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: ldap_first_entry から NULL が返されました" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2272 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2474 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2489 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: 未処理の結果タイプ %d が返されました" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2341 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2356 + msgid "Modifying contact from LDAP server..." + msgstr "LDAP サーバーにある連絡先を修正中..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2703 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2935 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2718 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2950 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: 未処理の検索結果タイプ %d が返されました" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4806 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4821 + msgid "Receiving LDAP search results..." + msgstr "LDAP サーバー検索結果を取得中..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4985 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5000 + msgid "Error performing search" + msgstr "検索中にエラーが発生しました" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5108 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "連絡先 (%d 個目) をダウンロード中... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5571 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5654 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "ユーザー '%s' の DN 取得に失敗しました" + + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:420 +-#, fuzzy, c-format +-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)" ++#, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" +-msgstr "リソース '%s' の作成に失敗しました。HTTP ステータス: %d (%s)" ++msgstr "リソース '%s' の作成に失敗しました。HTTP ステータス %d (%s)" + + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:522 + #, c-format +@@ -263,10 +262,9 @@ msgid "Contact on server changed -> not + msgstr "サーバー上の連絡先が変更されました -> 修正していません" + + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:597 +-#, fuzzy, c-format +-#| msgid "Modify contact failed with HTTP status: %d (%s)" ++#, c-format + msgid "Modify contact failed with HTTP status %d (%s)" +-msgstr "連絡先の変更に失敗しました。HTTP ステータス: %d (%s)" ++msgstr "連絡先の変更に失敗しました。HTTP ステータス %d (%s)" + + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1007 + msgid "Loading Addressbook summary..." +@@ -354,23 +352,23 @@ msgstr "あだ名" + #. Email fields + #: ../addressbook/libebook-contacts/e-contact.c:139 + msgid "Email 1" +-msgstr "E-メール 1" ++msgstr "メール 1" + + #: ../addressbook/libebook-contacts/e-contact.c:140 + msgid "Email 2" +-msgstr "E-メール 2" ++msgstr "メール 2" + + #: ../addressbook/libebook-contacts/e-contact.c:141 + msgid "Email 3" +-msgstr "E-メール 3" ++msgstr "メール 3" + + #: ../addressbook/libebook-contacts/e-contact.c:142 + msgid "Email 4" +-msgstr "E-メール 4" ++msgstr "メール 4" + + #: ../addressbook/libebook-contacts/e-contact.c:144 + msgid "Mailer" +-msgstr "メール・クライアント" ++msgstr "メールクライアント" + + #. Address Labels + #: ../addressbook/libebook-contacts/e-contact.c:147 +@@ -728,7 +726,7 @@ msgstr "名前" + + #: ../addressbook/libebook-contacts/e-contact.c:260 + msgid "Email List" +-msgstr "E-メール一覧" ++msgstr "メール一覧" + + #. Instant messaging fields + #: ../addressbook/libebook-contacts/e-contact.c:263 +@@ -859,31 +857,31 @@ msgstr "SIP アドレス" + + #: ../addressbook/libebook-contacts/e-contact.c:311 + msgid "Google Talk Home Name 1" +-msgstr "自宅の Google トーク名 1" ++msgstr "自宅の Google Talk 名 1" + + #: ../addressbook/libebook-contacts/e-contact.c:312 + msgid "Google Talk Home Name 2" +-msgstr "自宅の Google トーク名 2" ++msgstr "自宅の Google Talk 名 2" + + #: ../addressbook/libebook-contacts/e-contact.c:313 + msgid "Google Talk Home Name 3" +-msgstr "自宅の Google トーク名 3" ++msgstr "自宅の Google Talk 名 3" + + #: ../addressbook/libebook-contacts/e-contact.c:314 + msgid "Google Talk Work Name 1" +-msgstr "勤務先の Google トーク名 1" ++msgstr "勤務先の Google Talk 名 1" + + #: ../addressbook/libebook-contacts/e-contact.c:315 + msgid "Google Talk Work Name 2" +-msgstr "勤務先の Google トーク名 2" ++msgstr "勤務先の Google Talk 名 2" + + #: ../addressbook/libebook-contacts/e-contact.c:316 + msgid "Google Talk Work Name 3" +-msgstr "勤務先の Google トーク名 3" ++msgstr "勤務先の Google Talk 名 3" + + #: ../addressbook/libebook-contacts/e-contact.c:317 + msgid "Google Talk Name List" +-msgstr "Google トーク名の一覧" ++msgstr "Google Talk 名の一覧" + + #: ../addressbook/libebook-contacts/e-contact.c:319 + msgid "Twitter Name List" +@@ -896,128 +894,129 @@ msgstr "名前なしの一覧" + + #: ../addressbook/libebook-contacts/e-phone-number.c:43 + msgid "The library was built without phone number support." +-msgstr "" ++msgstr "このライブラリは電話番号サポートなしでビルドされています。" + + #: ../addressbook/libebook-contacts/e-phone-number.c:45 + msgid "The phone number parser reported an yet unkown error code." +-msgstr "" ++msgstr "電話番号パーサーが未知のエラーコードを返しました。" + + #: ../addressbook/libebook-contacts/e-phone-number.c:47 + msgid "Not a phone number" +-msgstr "" ++msgstr "電話番号ではありません" + + #: ../addressbook/libebook-contacts/e-phone-number.c:49 +-#, fuzzy +-#| msgid "Invalid range" + msgid "Invalid country calling code" +-msgstr "有効範囲が無効です" ++msgstr "国呼び出しコードが無効です" + + #: ../addressbook/libebook-contacts/e-phone-number.c:51 +-msgid "Remaining text after the country calling code is too short for a phone number" +-msgstr "" ++msgid "" ++"Remaining text after the country calling code is too short for a phone " ++"number" ++msgstr "国呼び出しコードの後の残り文字列が電話番号としては短すぎます" + + #: ../addressbook/libebook-contacts/e-phone-number.c:53 + msgid "Text is too short for a phone number" +-msgstr "" ++msgstr "文字列が電話番号としては短すぎます" + + #: ../addressbook/libebook-contacts/e-phone-number.c:55 + msgid "Text is too long for a phone number" +-msgstr "" ++msgstr "文字列が電話番号としては長すぎます" + +-#: ../addressbook/libebook/e-book-client.c:659 ++#: ../addressbook/libebook/e-book-client.c:643 + #: ../addressbook/libedata-book/e-book-backend.c:120 + #, c-format + msgid "Unknown book property '%s'" + msgstr "不明なアドレス帳プロパティ '%s'" + +-#: ../addressbook/libebook/e-book-client.c:674 ++#: ../addressbook/libebook/e-book-client.c:658 + #, c-format + msgid "Cannot change value of book property '%s'" + msgstr "アドレス帳プロパティ '%s' の値を変更できません" + +-#: ../addressbook/libebook/e-book-client.c:985 +-#: ../addressbook/libebook/e-book-client.c:1158 +-#: ../calendar/libecal/e-cal-client.c:1502 +-#: ../calendar/libecal/e-cal-client.c:1682 +-#, fuzzy, c-format +-#| msgid "Could not connect to %s: " ++#: ../addressbook/libebook/e-book-client.c:993 ++#: ../addressbook/libebook/e-book-client.c:1168 ++#: ../calendar/libecal/e-cal-client.c:1515 ++#: ../calendar/libecal/e-cal-client.c:1697 ++#, c-format + msgid "Unable to connect to '%s': " +-msgstr "%s へ接続できませんでした: " ++msgstr "'%s' へ接続できません: " + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:752 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793 + #, c-format + msgid "Error introspecting unknown summary field '%s'" +-msgstr "" ++msgstr "不明なサマリーフィールド '%s' の内部検査エラー" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1241 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289 + #: ../camel/camel-db.c:544 + #, c-format + msgid "Insufficient memory" + msgstr "メモリが足りません" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1374 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1422 + #, c-format + msgid "Invalid contact field '%d' specified in summary" +-msgstr "" ++msgstr "無効な連絡先 '%d' がサマリーで指定されています" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1408 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1456 + #, c-format +-msgid "Contact field '%s' of type '%s' specified in summary, but only boolean, string and string list field types are supported" +-msgstr "" ++msgid "" ++"Contact field '%s' of type '%s' specified in summary, but only boolean, " ++"string and string list field types are supported" ++msgstr "サマリーで連絡先 '%s' が型 '%s' に対して指定されていますが、サポートされている型は真偽値、文字列、文字列一覧だけです" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2603 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3686 + #, c-format +-msgid "Full search_contacts are not stored in cache. vcards cannot be returned." +-msgstr "" ++msgid "" ++"Full search_contacts are not stored in cache. vcards cannot be returned." ++msgstr "search_contacts は全体がキャッシュに保管されてはいません。vcard を返せません。" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3770 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3851 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3812 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3893 + #, c-format + msgid "Query contained unsupported elements" +-msgstr "" ++msgstr "問い合わせにサポート外のエレメントがありました" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3774 +-#, fuzzy, c-format +-#| msgid "Invalid query" ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 ++#, c-format + msgid "Invalid Query" + msgstr "問い合わせの内容が無効です" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3798 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3840 + #, c-format +-msgid "Full search_contacts are not stored in cache. Hence only summary query is supported." +-msgstr "" ++msgid "" ++"Full search_contacts are not stored in cache. Hence only summary query is " ++"supported." ++msgstr "search_contacts は全体がキャッシュに保管されてはいません。サマリーの問い合わせだけをサポートしています。" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3855 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 + #: ../addressbook/libedata-book/e-data-book.c:669 + #: ../addressbook/libedata-book/e-data-book.c:809 + #: ../calendar/libedata-cal/e-data-cal.c:612 +-#: ../calendar/libedata-cal/e-data-cal.c:771 ../libedataserver/e-client.c:166 ++#: ../calendar/libedata-cal/e-data-cal.c:771 ++#: ../libedataserver/e-client.c:166 + #, c-format + msgid "Invalid query" + msgstr "問い合わせの内容が無効です" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3940 + #, c-format +-msgid "Full vcards are not stored in cache. Hence only summary query is supported." +-msgstr "" ++msgid "" ++"Full vcards are not stored in cache. Hence only summary query is supported." ++msgstr "vcard は全体がキャッシュに保管されてはいません。サマリーの問い合わせだけをサポートしています。" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4598 +-#, fuzzy, c-format +-#| msgid "Failed to remove file '%s': %s" ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4643 ++#, c-format + msgid "Unable to remove the db file: errno %d" +-msgstr "ファイル '%s' の削除に失敗しました: %s" ++msgstr "データベースファイルの削除に失敗しました: エラー番号: %d" + + #: ../addressbook/libedata-book/e-book-backend-sync.c:179 + #: ../calendar/libedata-cal/e-cal-backend-sync.c:182 +-#, fuzzy +-#| msgid "Cannot set backend property: " + msgid "Clients cannot set backend properties" +-msgstr "バックエンドのプロパティを設定できません: " ++msgstr "クライアントによるバックエンドのプロパティ設定が行なえません" + + #. Translators: This is prefix to a detailed error message + #. Translators: This is a prefix to a detailed error message * +-#. + #: ../addressbook/libedata-book/e-data-book.c:691 + #: ../calendar/libedata-cal/e-data-cal.c:635 + msgid "Invalid query: " +@@ -1029,18 +1028,21 @@ msgid "Success" + msgstr "成功しました" + + #: ../addressbook/libedata-book/e-data-book.c:794 +-#: ../calendar/libecal/e-cal.c:2307 ../calendar/libedata-cal/e-data-cal.c:753 ++#: ../calendar/libecal/e-cal.c:2307 ++#: ../calendar/libedata-cal/e-data-cal.c:753 + #: ../libedataserver/e-client.c:133 + msgid "Backend is busy" + msgstr "バックエンドが処理中です" + + #: ../addressbook/libedata-book/e-data-book.c:795 +-#: ../calendar/libedata-cal/e-data-cal.c:754 ../libedataserver/e-client.c:143 ++#: ../calendar/libedata-cal/e-data-cal.c:754 ++#: ../libedataserver/e-client.c:143 + msgid "Repository offline" + msgstr "リポジトリはオフラインです" + + #: ../addressbook/libedata-book/e-data-book.c:796 +-#: ../calendar/libecal/e-cal.c:2321 ../calendar/libedata-cal/e-data-cal.c:755 ++#: ../calendar/libecal/e-cal.c:2321 ++#: ../calendar/libedata-cal/e-data-cal.c:755 + #: ../libedataserver/e-client.c:150 + msgid "Permission denied" + msgstr "権限がありません" +@@ -1061,12 +1063,14 @@ msgid "Unsupported field" + msgstr "サポートしていない項目です" + + #: ../addressbook/libedata-book/e-data-book.c:802 +-#: ../calendar/libedata-cal/e-data-cal.c:764 ../libedataserver/e-client.c:158 ++#: ../calendar/libedata-cal/e-data-cal.c:764 ++#: ../libedataserver/e-client.c:158 + msgid "Unsupported authentication method" + msgstr "サポートしていない認証方法です" + + #: ../addressbook/libedata-book/e-data-book.c:803 +-#: ../calendar/libedata-cal/e-data-cal.c:765 ../libedataserver/e-client.c:160 ++#: ../calendar/libedata-cal/e-data-cal.c:765 ++#: ../libedataserver/e-client.c:160 + msgid "TLS not available" + msgstr "TLS は利用できません" + +@@ -1084,22 +1088,26 @@ msgid "Not available in offline mode" + msgstr "オフラインモードでは利用できません" + + #: ../addressbook/libedata-book/e-data-book.c:807 +-#: ../calendar/libedata-cal/e-data-cal.c:769 ../libedataserver/e-client.c:162 ++#: ../calendar/libedata-cal/e-data-cal.c:769 ++#: ../libedataserver/e-client.c:162 + msgid "Search size limit exceeded" + msgstr "検索サイズが上限を超えました" + + #: ../addressbook/libedata-book/e-data-book.c:808 +-#: ../calendar/libedata-cal/e-data-cal.c:770 ../libedataserver/e-client.c:164 ++#: ../calendar/libedata-cal/e-data-cal.c:770 ++#: ../libedataserver/e-client.c:164 + msgid "Search time limit exceeded" + msgstr "検索時間の上限を超えました" + + #: ../addressbook/libedata-book/e-data-book.c:810 +-#: ../calendar/libedata-cal/e-data-cal.c:772 ../libedataserver/e-client.c:168 ++#: ../calendar/libedata-cal/e-data-cal.c:772 ++#: ../libedataserver/e-client.c:168 + msgid "Query refused" + msgstr "問い合わせを拒否しました" + + #: ../addressbook/libedata-book/e-data-book.c:811 +-#: ../calendar/libedata-cal/e-data-cal.c:773 ../libedataserver/e-client.c:154 ++#: ../calendar/libedata-cal/e-data-cal.c:773 ++#: ../libedataserver/e-client.c:154 + msgid "Could not cancel" + msgstr "キャンセルできませんでした" + +@@ -1108,37 +1116,41 @@ msgstr "キャンセルできません� + #: ../addressbook/libedata-book/e-data-book.c:813 + #: ../calendar/libedata-cal/e-data-cal.c:775 + msgid "Invalid server version" +-msgstr "サーバー・バージョンが無効です" ++msgstr "サーバーバージョンが無効です" + + #: ../addressbook/libedata-book/e-data-book.c:815 +-#: ../calendar/libecal/e-cal.c:2305 ../calendar/libedata-cal/e-data-cal.c:776 ++#: ../calendar/libecal/e-cal.c:2305 ++#: ../calendar/libedata-cal/e-data-cal.c:776 + #: ../libedataserver/e-client.c:131 + msgid "Invalid argument" + msgstr "無効な引数" + + #. Translators: The string for NOT_SUPPORTED error + #: ../addressbook/libedata-book/e-data-book.c:817 +-#: ../calendar/libecal/e-cal.c:1064 ../calendar/libecal/e-cal.c:1432 +-#: ../calendar/libecal/e-cal.c:1912 ../calendar/libecal/e-cal.c:2344 +-#: ../calendar/libedata-cal/e-data-cal.c:778 ../libedataserver/e-client.c:156 ++#: ../calendar/libecal/e-cal.c:1064 ++#: ../calendar/libecal/e-cal.c:1432 ++#: ../calendar/libecal/e-cal.c:1912 ++#: ../calendar/libecal/e-cal.c:2344 ++#: ../calendar/libedata-cal/e-data-cal.c:778 ++#: ../libedataserver/e-client.c:156 + #, c-format + msgid "Not supported" + msgstr "サポートされていません" + + #: ../addressbook/libedata-book/e-data-book.c:818 +-#: ../calendar/libedata-cal/e-data-cal.c:779 ../libedataserver/e-client.c:174 ++#: ../calendar/libedata-cal/e-data-cal.c:779 ++#: ../libedataserver/e-client.c:174 + msgid "Backend is not opened yet" + msgstr "まだバックエンドが開かれていません" + + #: ../addressbook/libedata-book/e-data-book.c:819 + #: ../libedataserver/e-client.c:176 +-#, fuzzy +-#| msgid "Object not found" + msgid "Object is out of sync" +-msgstr "オブジェクトが見つかりません" ++msgstr "オブジェクトが同期していません" + + #: ../addressbook/libedata-book/e-data-book.c:827 +-#: ../calendar/libedata-cal/e-data-cal.c:787 ../libedataserver/e-client.c:172 ++#: ../calendar/libedata-cal/e-data-cal.c:787 ++#: ../libedataserver/e-client.c:172 + msgid "Other error" + msgstr "その他のエラー" + +@@ -1229,8 +1241,7 @@ msgstr "無効な転送 URL です" + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" + "Error message: %s" +-msgstr "" +-"サーバーに接続できないんで、カレンダーを読み込み専用モードで開きます。\n" ++msgstr "サーバーに接続できないんで、カレンダーを読み込み専用モードで開きます。\n" + "エラーメッセージ: %s" + + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:2801 +@@ -1306,51 +1317,51 @@ msgid "Not a calendar." + msgstr "カレンダーではありません。" + + #: ../calendar/backends/http/e-cal-backend-http.c:926 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:514 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:520 + msgid "Could not create cache file" +-msgstr "キャッシュ・ファイルを生成できませんでした" ++msgstr "キャッシュファイルを生成できませんでした" + + #: ../calendar/backends/weather/e-cal-backend-weather.c:173 + msgid "Could not retrieve weather data" + msgstr "天気のデータを取得できませんでした" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:278 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:284 + msgid "Weather: Fog" + msgstr "天気: 霧" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:279 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:285 + msgid "Weather: Cloudy Night" + msgstr "天気: 曇のある夜空" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:280 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:286 + msgid "Weather: Cloudy" + msgstr "天気: 曇り" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:281 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:287 + msgid "Weather: Overcast" + msgstr "天気: 本曇り" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:282 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:288 + msgid "Weather: Showers" + msgstr "天気: 雨" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:283 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:289 + msgid "Weather: Snow" + msgstr "天気: 雪" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:284 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:290 + msgid "Weather: Clear Night" + msgstr "天気: 澄んだ夜空" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:285 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:291 + msgid "Weather: Sunny" + msgstr "天気: 暖かい快晴" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:286 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:292 + msgid "Weather: Thunderstorms" + msgstr "天気: 雷雨" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:410 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:416 + msgid "Forecast" + msgstr "天気予報" + +@@ -1358,16 +1369,19 @@ msgstr "天気予報" + msgid "Repository is offline" + msgstr "リポジトリはオフラインです" + +-#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:262 ++#: ../calendar/libecal/e-cal.c:2311 ++#: ../calendar/libecal/e-cal-client.c:262 + msgid "No such calendar" + msgstr "そのようなカレンダーはありません" + +-#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:264 ++#: ../calendar/libecal/e-cal.c:2313 ++#: ../calendar/libecal/e-cal-client.c:264 + #: ../calendar/libedata-cal/e-data-cal.c:757 + msgid "Object not found" + msgstr "オブジェクトが見つかりません" + +-#: ../calendar/libecal/e-cal.c:2315 ../calendar/libecal/e-cal-client.c:266 ++#: ../calendar/libecal/e-cal.c:2315 ++#: ../calendar/libecal/e-cal-client.c:266 + #: ../calendar/libedata-cal/e-data-cal.c:758 + msgid "Invalid object" + msgstr "無効なオブジェクトです" +@@ -1384,7 +1398,8 @@ msgstr "URL は既に読み込み済み� + msgid "Unknown User" + msgstr "ユーザーを特定できません" + +-#: ../calendar/libecal/e-cal.c:2325 ../calendar/libecal/e-cal-client.c:270 ++#: ../calendar/libecal/e-cal.c:2325 ++#: ../calendar/libecal/e-cal-client.c:270 + #: ../calendar/libedata-cal/e-data-cal.c:759 + msgid "Object ID already exists" + msgstr "既にオブジェクト ID が存在しています" +@@ -1401,12 +1416,13 @@ msgstr "操作をキャンセルしま� + msgid "Could not cancel operation" + msgstr "操作をキャンセルできませんでした" + +-#: ../calendar/libecal/e-cal.c:2333 ../libedataserver/e-client.c:139 ++#: ../calendar/libecal/e-cal.c:2333 ++#: ../libedataserver/e-client.c:139 + msgid "Authentication failed" + msgstr "認証に失敗しました" + + #: ../calendar/libecal/e-cal.c:2335 +-#: ../camel/providers/smtp/camel-smtp-transport.c:923 ++#: ../camel/providers/smtp/camel-smtp-transport.c:915 + #: ../libedataserver/e-client.c:141 + msgid "Authentication required" + msgstr "認証を必要としています" +@@ -1429,13 +1445,13 @@ msgstr "ユーザーを特定できま� + msgid "Invalid range" + msgstr "有効範囲が無効です" + +-#: ../calendar/libecal/e-cal-client.c:936 ++#: ../calendar/libecal/e-cal-client.c:920 + #: ../calendar/libedata-cal/e-cal-backend.c:204 + #, c-format + msgid "Unknown calendar property '%s'" + msgstr "不明なカレンダープロパティ '%s'" + +-#: ../calendar/libecal/e-cal-client.c:951 ++#: ../calendar/libecal/e-cal-client.c:935 + #, c-format + msgid "Cannot change value of calendar property '%s'" + msgstr "カレンダープロパティ '%s' の値を変更できません" +@@ -1568,17 +1584,20 @@ msgstr "30日" + msgid "31st" + msgstr "31日" + +-#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734 ++#: ../calendar/libecal/e-cal-util.c:707 ++#: ../calendar/libecal/e-cal-util.c:734 + msgctxt "Priority" + msgid "High" + msgstr "高い" + +-#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736 ++#: ../calendar/libecal/e-cal-util.c:709 ++#: ../calendar/libecal/e-cal-util.c:736 + msgctxt "Priority" + msgid "Normal" + msgstr "普通" + +-#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738 ++#: ../calendar/libecal/e-cal-util.c:711 ++#: ../calendar/libecal/e-cal-util.c:738 + msgctxt "Priority" + msgid "Low" + msgstr "低い" +@@ -1667,8 +1686,14 @@ msgstr "\"%s\" は二番目の引数と� + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:707 + #, c-format +-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\"" +-msgstr "\"%s\" は最初の引数として \"any\", \"summary\" または \"description\"、\"location\"、\"attendee\"、\"organizer\"、\"classification\" のいずれか一つが必要です" ++msgid "" ++"\"%s\" expects the first argument to be either \"any\", \"summary\", or " ++"\"description\", or \"location\", or \"attendee\", or \"organizer\", or " ++"\"classification\"" ++msgstr "" ++"\"%s\" は最初の引数として \"any\", \"summary\" または " ++"\"description\"、\"location\"、\"attendee\"、\"organizer\"、\"classification\" " ++"のいずれか一つが必要です" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 + #, c-format +@@ -1677,7 +1702,9 @@ msgstr "\"%s\" は少なくとも引数� + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:893 + #, c-format +-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)" ++msgid "" ++"\"%s\" expects all arguments to be strings or one and only one argument to " ++"be a boolean false (#f)" + msgstr "\"%s\" は、すべての引数が文字列であるか、または引数が一つだけで論理値 FALSE (#f) である必要があります" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389 +@@ -1832,7 +1859,7 @@ msgstr "キャッシュファイルを� + #: ../camel/camel-data-cache.c:509 + #, c-format + msgid "Could not remove cache entry: %s: %s" +-msgstr "キャッシュ・エントリを開けませんでした: %s: %s" ++msgstr "キャッシュエントリを開けませんでした: %s: %s" + + #: ../camel/camel-disco-diary.c:207 + #, c-format +@@ -1840,8 +1867,7 @@ msgid "" + "Could not write log entry: %s\n" + "Further operations on this server will not be replayed when you\n" + "reconnect to the network." +-msgstr "" +-"ログを書き込めませんでした: %s\n" ++msgstr "ログを書き込めませんでした: %s\n" + "ネットワークに再接続しても、このサーバーに対する\n" + "これ以降の操作は再現されません。" + +@@ -1851,8 +1877,7 @@ msgid "" + "Could not open '%s':\n" + "%s\n" + "Changes made to this folder will not be resynchronized." +-msgstr "" +-"'%s' が開けませんでした:\n" ++msgstr "'%s' が開けませんでした:\n" + "%s\n" + "このフォルダーに対する変更が再び同期されることはありません。" + +@@ -1860,32 +1885,43 @@ msgstr "" + msgid "Resynchronizing with server" + msgstr "サーバーの再同期中" + +-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93 ++#: ../camel/camel-disco-folder.c:76 ++#: ../camel/camel-offline-folder.c:93 + msgid "Downloading new messages for offline mode" +-msgstr "オフライン・モードでの新着メールのダウンロード中" ++msgstr "オフラインモードでの新着メールのダウンロード中" + + #: ../camel/camel-disco-folder.c:422 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "オフラインに切り替える準備中: %s" + +-#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336 ++#: ../camel/camel-disco-folder.c:489 ++#: ../camel/camel-offline-folder.c:336 + msgid "Copy folder content locally for _offline operation" + msgstr "オフラインでの作業用にフォルダーの内容をローカルへコピーする (_O)" + +-#: ../camel/camel-disco-store.c:475 ../camel/camel-imapx-folder.c:478 +-#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553 +-#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748 +-#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993 +-#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:368 +-#: ../camel/camel-imapx-store.c:1573 ../camel/camel-imapx-store.c:1662 +-#: ../camel/camel-imapx-store.c:1711 +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 +-#: ../camel/providers/pop3/camel-pop3-folder.c:677 +-#: ../camel/providers/pop3/camel-pop3-folder.c:906 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1106 +-#: ../camel/providers/pop3/camel-pop3-store.c:472 +-#: ../camel/providers/pop3/camel-pop3-store.c:896 ++#: ../camel/camel-disco-store.c:475 ++#: ../camel/camel-imapx-folder.c:478 ++#: ../camel/camel-imapx-folder.c:514 ++#: ../camel/camel-imapx-folder.c:553 ++#: ../camel/camel-imapx-folder.c:613 ++#: ../camel/camel-imapx-folder.c:748 ++#: ../camel/camel-imapx-folder.c:933 ++#: ../camel/camel-imapx-folder.c:993 ++#: ../camel/camel-imapx-folder.c:1032 ++#: ../camel/camel-imapx-store.c:368 ++#: ../camel/camel-imapx-store.c:1592 ++#: ../camel/camel-imapx-store.c:1681 ++#: ../camel/camel-imapx-store.c:1730 ++#: ../camel/providers/pop3/camel-pop3-folder.c:555 ++#: ../camel/providers/pop3/camel-pop3-folder.c:705 ++#: ../camel/providers/pop3/camel-pop3-folder.c:940 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1150 ++#: ../camel/providers/pop3/camel-pop3-store.c:291 ++#: ../camel/providers/pop3/camel-pop3-store.c:519 ++#: ../camel/providers/pop3/camel-pop3-store.c:567 ++#: ../camel/providers/pop3/camel-pop3-store.c:652 ++#: ../camel/providers/pop3/camel-pop3-store.c:1052 + #, c-format + msgid "You must be working online to complete this operation" + msgstr "この動作を完了するためにオンラインで作業してください" +@@ -1895,7 +1931,8 @@ msgstr "この動作を完了するた� + msgid "Canceled" + msgstr "キャンセル済み" + +-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797 ++#: ../camel/camel-filter-driver.c:916 ++#: ../camel/camel-filter-search.c:797 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "子プロセス '%s' の生成に失敗しました: %s" +@@ -1903,77 +1940,79 @@ msgstr "子プロセス '%s' の生成� + #: ../camel/camel-filter-driver.c:964 + #, c-format + msgid "Invalid message stream received from %s: %s" +-msgstr "%s から受信したメッセージ・ストリームが正しくありません: %s" ++msgstr "%s から受信したメッセージストリームが正しくありません: %s" + +-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1179 ++#: ../camel/camel-filter-driver.c:1171 ++#: ../camel/camel-filter-driver.c:1180 + msgid "Syncing folders" + msgstr "フォルダーの同期中" + +-#: ../camel/camel-filter-driver.c:1277 ++#: ../camel/camel-filter-driver.c:1278 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "フィルターの構文解析中にエラー: %s: %s" + +-#: ../camel/camel-filter-driver.c:1288 ++#: ../camel/camel-filter-driver.c:1289 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "フィルター実行中にエラー: %s: %s" + +-#: ../camel/camel-filter-driver.c:1384 ++#: ../camel/camel-filter-driver.c:1385 + #, c-format + msgid "Unable to open spool folder" +-msgstr "スプール・フォルダーを開けません" ++msgstr "スプールフォルダーを開けません" + +-#: ../camel/camel-filter-driver.c:1396 ++#: ../camel/camel-filter-driver.c:1397 + #, c-format + msgid "Unable to process spool folder" +-msgstr "スプール・フォルダーを処理できません" ++msgstr "スプールフォルダーを処理できません" + +-#: ../camel/camel-filter-driver.c:1419 ++#: ../camel/camel-filter-driver.c:1420 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "メッセージ %d の取得中 (%d%%)" + +-#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1450 ++#: ../camel/camel-filter-driver.c:1429 ++#: ../camel/camel-filter-driver.c:1451 + #, c-format + msgid "Failed on message %d" + msgstr "メッセージ %d で失敗しました" + +-#: ../camel/camel-filter-driver.c:1469 ../camel/camel-filter-driver.c:1583 ++#: ../camel/camel-filter-driver.c:1470 ++#: ../camel/camel-filter-driver.c:1584 + msgid "Syncing folder" + msgstr "フォルダーの同期中" + +-#: ../camel/camel-filter-driver.c:1474 ../camel/camel-filter-driver.c:1591 ++#: ../camel/camel-filter-driver.c:1475 ++#: ../camel/camel-filter-driver.c:1592 + msgid "Complete" + msgstr "完了しました" + +-#: ../camel/camel-filter-driver.c:1537 ++#: ../camel/camel-filter-driver.c:1538 + #, c-format + msgid "Getting message %d of %d" + msgstr "メッセージ %d / %d の取得中" + +-#: ../camel/camel-filter-driver.c:1555 ++#: ../camel/camel-filter-driver.c:1556 + #, c-format + msgid "Failed at message %d of %d" + msgstr "メッセージ %d / %d で失敗しました" + +-#: ../camel/camel-filter-driver.c:1751 ../camel/camel-filter-driver.c:1785 +-#, fuzzy, c-format +-#| msgid "Error executing filter: %s: %s" ++#: ../camel/camel-filter-driver.c:1752 ++#: ../camel/camel-filter-driver.c:1786 ++#, c-format + msgid "Execution of filter '%s' failed: " +-msgstr "フィルター実行中にエラー: %s: %s" ++msgstr "フィルター '%s' の実行に失敗しました: " + +-#: ../camel/camel-filter-driver.c:1775 +-#, fuzzy, c-format +-#| msgid "Error parsing filter: %s: %s" ++#: ../camel/camel-filter-driver.c:1776 ++#, c-format + msgid "Error parsing filter '%s': %s: %s" +-msgstr "フィルターの構文解析中にエラー: %s: %s" ++msgstr "フィルター '%s' の構文解析中にエラー: %s: %s" + +-#: ../camel/camel-filter-driver.c:1794 +-#, fuzzy, c-format +-#| msgid "Error executing filter: %s: %s" ++#: ../camel/camel-filter-driver.c:1795 ++#, c-format + msgid "Error executing filter '%s': %s: %s" +-msgstr "フィルター実行中にエラー: %s: %s" ++msgstr "フィルター '%s' の実行中にエラー: %s: %s" + + #: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" +@@ -1987,65 +2026,67 @@ msgstr "(system-flag) に対する無効 + msgid "Invalid arguments to (user-tag)" + msgstr "(user-tag) に対する無効な引数" + +-#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055 ++#: ../camel/camel-filter-search.c:1046 ++#: ../camel/camel-filter-search.c:1055 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "フィルター検索実行中にエラー: %s: %s" + +-#: ../camel/camel-folder.c:291 ++#: ../camel/camel-folder.c:310 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" +-msgstr[0] "'%s' にある新しいスパム・メッセージの学習中" ++msgstr[0] "'%s' にある新しいスパムメッセージの学習中" + +-#: ../camel/camel-folder.c:331 ++#: ../camel/camel-folder.c:350 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" +-msgstr[0] "'%s' にある新しいハム・メッセージの学習中" ++msgstr[0] "'%s' にある新しいハムメッセージの学習中" + +-#: ../camel/camel-folder.c:379 ++#: ../camel/camel-folder.c:398 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "'%s' にある新しいメッセージのフィルターリング中" + +-#: ../camel/camel-folder.c:953 ++#: ../camel/camel-folder.c:972 + #: ../camel/providers/local/camel-maildir-folder.c:321 + msgid "Moving messages" + msgstr "メッセージの移動中" + +-#: ../camel/camel-folder.c:956 ++#: ../camel/camel-folder.c:975 + msgid "Copying messages" + msgstr "メッセージのコピー中" + +-#: ../camel/camel-folder.c:1276 ++#: ../camel/camel-folder.c:1295 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "フォルダー'%s' に対してはクオータ情報はサポートされていません" + +-#: ../camel/camel-folder.c:3509 ++#: ../camel/camel-folder.c:3528 + #, c-format + msgid "Expunging folder '%s'" + msgstr "フォルダー '%s' の抹消中" + +-#: ../camel/camel-folder.c:3741 ++#: ../camel/camel-folder.c:3760 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "メッセージ '%s' (%s 内) の取得中" + +-#: ../camel/camel-folder.c:3892 ++#: ../camel/camel-folder.c:3911 + #, c-format + msgid "Retrieving quota information for '%s'" +-msgstr "'%s' のクォータ情報を取得中" ++msgstr "'%s' のクオータ情報を取得中" + +-#: ../camel/camel-folder.c:4124 ++#: ../camel/camel-folder.c:4143 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "フォルダー '%s' を更新中" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:838 ../camel/camel-folder-search.c:881 ++#: ../camel/camel-folder-search.c:838 ++#: ../camel/camel-folder-search.c:881 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) には論理結果が必要です" +@@ -2057,7 +2098,8 @@ msgid "(%s) not allowed inside %s" + msgstr "(%s) は %s の中に含めることはできません" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:923 ../camel/camel-folder-search.c:931 ++#: ../camel/camel-folder-search.c:923 ++#: ../camel/camel-folder-search.c:931 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) には検索の種類を表す文字列が必要です" +@@ -2074,176 +2116,179 @@ msgstr "(%s) は配列の結果を期待 + msgid "(%s) requires the folder set" + msgstr "(%s) にはフォルダーの組が必要です" + +-#: ../camel/camel-folder-search.c:1862 ../camel/camel-folder-search.c:2029 ++#: ../camel/camel-folder-search.c:1862 ++#: ../camel/camel-folder-search.c:2029 + #, c-format +-msgid "" +-"Cannot parse search expression: %s:\n" ++msgid "Cannot parse search expression: %s:\n" + "%s" +-msgstr "" +-"正規表現の構文を解析できません: %s:\n" ++msgstr "正規表現の構文を解析できません: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1874 ../camel/camel-folder-search.c:2041 ++#: ../camel/camel-folder-search.c:1874 ++#: ../camel/camel-folder-search.c:2041 + #, c-format +-msgid "" +-"Error executing search expression: %s:\n" ++msgid "Error executing search expression: %s:\n" + "%s" +-msgstr "" +-"正規表現での検索を実行中にエラー: %s:\n" ++msgstr "正規表現での検索を実行中にエラー: %s:\n" + "%s" + +-#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696 +-#: ../camel/camel-gpg-context.c:1359 ++#: ../camel/camel-gpg-context.c:730 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/camel-gpg-context.c:1398 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "GPG の実行に失敗しました: %s" + +-#: ../camel/camel-gpg-context.c:696 +-#: ../camel/providers/smtp/camel-smtp-transport.c:926 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/providers/smtp/camel-smtp-transport.c:918 + msgid "Unknown" + msgstr "不明" + +-#: ../camel/camel-gpg-context.c:761 ++#: ../camel/camel-gpg-context.c:800 + #, c-format +-msgid "" +-"Unexpected GnuPG status message encountered:\n" ++msgid "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" +-msgstr "" +-"Unexpected GnuPG status message encountered:\n" ++msgstr "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:797 ++#: ../camel/camel-gpg-context.c:836 + #, c-format + msgid "Failed to parse gpg userid hint." + msgstr "GnuPG のユーザー ID ヒントの解析に失敗しました。" + +-#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837 ++#: ../camel/camel-gpg-context.c:861 ++#: ../camel/camel-gpg-context.c:876 + #, c-format + msgid "Failed to parse gpg passphrase request." + msgstr "GnuPG のパスフレーズ要求の解析に失敗しました。" + +-#: ../camel/camel-gpg-context.c:858 ++#: ../camel/camel-gpg-context.c:897 + #, c-format +-msgid "" +-"You need a PIN to unlock the key for your\n" ++msgid "You need a PIN to unlock the key for your\n" + "SmartCard: \"%s\"" +-msgstr "" +-"お使いのスマートカードのキーを解除するには\n" ++msgstr "お使いのスマートカードの鍵を解除するには\n" + "PIN が必要です: \"%s\"" + +-#: ../camel/camel-gpg-context.c:862 ++#: ../camel/camel-gpg-context.c:901 + #, c-format +-msgid "" +-"You need a passphrase to unlock the key for\n" ++msgid "You need a passphrase to unlock the key for\n" + "user: \"%s\"" +-msgstr "" +-"次のユーザーのキーを解除するにはパスフレーズが必要です:\n" ++msgstr "次のユーザーの鍵を解除するにはパスフレーズが必要です:\n" + " \"%s\"" + +-#: ../camel/camel-gpg-context.c:868 ++#: ../camel/camel-gpg-context.c:907 + #, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "'%s' に対して GnuPG から想定外の要求がありました" + +-#: ../camel/camel-gpg-context.c:880 +-msgid "Note the encrypted content doesn't contain information about a recipient, thus there will be a password prompt for each of stored private key." +-msgstr "暗号化されたコンテンツには受信者に関する情報は含まれないため、格納されている各プライベートキーごとにパスワードの入力が求められることになります。" ++#: ../camel/camel-gpg-context.c:919 ++msgid "" ++"Note the encrypted content doesn't contain information about a recipient, " ++"thus there will be a password prompt for each of stored private key." ++msgstr "" ++"暗号化されたコンテンツには受信者に関する情報は含まれないため、格納されている各プライベート鍵ごとにパスワードの入力が求められることになります。" + +-#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523 ++#: ../camel/camel-gpg-context.c:950 ++#: ../camel/camel-net-utils.c:524 + #: ../camel/camel-tcp-stream-raw.c:268 +-#: ../camel/providers/nntp/camel-nntp-summary.c:388 ++#: ../camel/providers/nntp/camel-nntp-summary.c:402 + #: ../libedataserver/e-client.c:152 + #, c-format + msgid "Cancelled" + msgstr "キャンセル済み" + +-#: ../camel/camel-gpg-context.c:932 ++#: ../camel/camel-gpg-context.c:971 + #, c-format + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "秘密鍵の解除に失敗しました: 指定した三つのパスフレーズがおかしいです。" + +-#: ../camel/camel-gpg-context.c:945 ++#: ../camel/camel-gpg-context.c:984 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "GnuPG から想定外の応答がありました: %s" + +-#: ../camel/camel-gpg-context.c:1076 ++#: ../camel/camel-gpg-context.c:1115 + #, c-format + msgid "Failed to encrypt: No valid recipients specified." + msgstr "暗号化に失敗しました: 正しい宛先が指定されていません。" + +-#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846 ++#: ../camel/camel-gpg-context.c:1665 ++#: ../camel/camel-smime-context.c:846 + msgid "Could not generate signing data: " + msgstr "署名データを生成できませんでした: " + +-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879 +-#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136 +-#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284 ++#: ../camel/camel-gpg-context.c:1714 ++#: ../camel/camel-gpg-context.c:1918 ++#: ../camel/camel-gpg-context.c:2028 ++#: ../camel/camel-gpg-context.c:2179 ++#: ../camel/camel-gpg-context.c:2279 ++#: ../camel/camel-gpg-context.c:2327 + msgid "Failed to execute gpg." + msgstr "GPG の実行に失敗しました。" + +-#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762 +-#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790 +-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987 ++#: ../camel/camel-gpg-context.c:1793 ++#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1809 ++#: ../camel/camel-gpg-context.c:1829 ++#: ../camel/camel-smime-context.c:973 ++#: ../camel/camel-smime-context.c:987 + #: ../camel/camel-smime-context.c:996 + #, c-format + msgid "Cannot verify message signature: Incorrect message format" + msgstr "このメッセージ署名の整合性を確認できません: メッセージの書式が正しくありません" + +-#: ../camel/camel-gpg-context.c:1832 ++#: ../camel/camel-gpg-context.c:1871 + msgid "Cannot verify message signature: " + msgstr "このメッセージ署名の整合性を確認できません: " + +-#: ../camel/camel-gpg-context.c:1955 ++#: ../camel/camel-gpg-context.c:1994 + msgid "Could not generate encrypting data: " + msgstr "暗号化されたデータを生成できませんでした: " + +-#: ../camel/camel-gpg-context.c:2008 ++#: ../camel/camel-gpg-context.c:2047 + msgid "This is a digitally encrypted message part" + msgstr "これはデジタル署名された部分です" + +-#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075 +-#: ../camel/camel-gpg-context.c:2098 ++#: ../camel/camel-gpg-context.c:2105 ++#: ../camel/camel-gpg-context.c:2114 ++#: ../camel/camel-gpg-context.c:2137 + #, c-format + msgid "Cannot decrypt message: Incorrect message format" + msgstr "メッセージを解読できません: メッセージの書式が正しくありません" + +-#: ../camel/camel-gpg-context.c:2086 ++#: ../camel/camel-gpg-context.c:2125 + #, c-format + msgid "Failed to decrypt MIME part: protocol error" +-msgstr "MIME 型の暗号解読に失敗しました: プロトコル・エラー" ++msgstr "MIME 型の暗号解読に失敗しました: プロトコルエラー" + +-#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1287 ++#: ../camel/camel-gpg-context.c:2220 ++#: ../camel/camel-smime-context.c:1287 + msgid "Encrypted content" + msgstr "暗号化した内容" + + #: ../camel/camel-imapx-folder.c:710 +-#, fuzzy, c-format +-#| msgid "Quota information not supported for folder '%s'" ++#, c-format + msgid "No quota information available for folder '%s'" +-msgstr "フォルダー'%s' に対してはクオータ情報はサポートされていません" ++msgstr "フォルダー'%s' について利用できるクオータ情報はありません" + +-#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882 ++#: ../camel/camel-imapx-folder.c:809 ++#: ../camel/camel-imapx-folder.c:882 + #, c-format + msgid "No destination folder specified" +-msgstr "" ++msgstr "対象フォルダーが指定されていません" + + #: ../camel/camel-imapx-folder.c:828 +-#, fuzzy +-#| msgid "Unable to retrieve message: " + msgid "Unable to move junk messages" +-msgstr "メッセージを回復できません: " ++msgstr "ジャンクメッセージを移動できません" + + #: ../camel/camel-imapx-folder.c:901 +-#, fuzzy +-#| msgid "Unable to retrieve message: " + msgid "Unable to move deleted messages" +-msgstr "メッセージを回復できません: " ++msgstr "削除したメッセージを移動できません" + + #: ../camel/camel-imapx-folder.c:1119 +-#: ../camel/providers/nntp/camel-nntp-folder.c:738 ++#: ../camel/providers/nntp/camel-nntp-folder.c:794 + msgid "Apply message _filters to this folder" + msgstr "このフォルダーにメッセージフィルターを適用 (_F)" + +@@ -2257,184 +2302,189 @@ msgstr "%s のフォルダーサマリ� + msgid "Could not create cache for %s: " + msgstr "%s のキャッシュを生成できませんでした: " + +-#: ../camel/camel-imapx-server.c:1279 ++#: ../camel/camel-imapx-server.c:1283 + msgid "Server disconnected" + msgstr "サーバーが切断されました" + +-#: ../camel/camel-imapx-server.c:1787 +-#, fuzzy +-#| msgid "Error writing to cache stream: " ++#: ../camel/camel-imapx-server.c:1772 + msgid "Error writing to cache stream" +-msgstr "キャッシュストリームに書き込み中にエラー: " ++msgstr "キャッシュストリームに書き込み中にエラー" ++ ++#: ../camel/camel-imapx-server.c:2441 ++#, c-format ++msgid "Alert from IMAP server %s:\n" ++"%s" ++msgstr "IMAP サーバー %s からの警告:\n" ++"%s" + +-#: ../camel/camel-imapx-server.c:2994 ++#: ../camel/camel-imapx-server.c:3029 + #, c-format + msgid "Not authenticated" + msgstr "認証されていません" + +-#: ../camel/camel-imapx-server.c:3072 ++#: ../camel/camel-imapx-server.c:3107 + msgid "Error performing IDLE" + msgstr "IDLE を実行する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:4029 ++#: ../camel/camel-imapx-server.c:3994 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "セキュリティ保護されたモードで IMAP サーバー %s への接続に失敗しました: %s" + +-#: ../camel/camel-imapx-server.c:4030 +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/camel-imapx-server.c:3995 ++#: ../camel/providers/smtp/camel-smtp-transport.c:203 + msgid "STARTTLS not supported" + msgstr "STARTTLS 拡張はサポートしていません。" + +-#: ../camel/camel-imapx-server.c:4069 ++#: ../camel/camel-imapx-server.c:4034 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "セキュリティ保護されたモードによる IMAP サーバー %s への接続に失敗しました: " + +-#: ../camel/camel-imapx-server.c:4149 ++#: ../camel/camel-imapx-server.c:4114 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP サーバーの %s では %s という認証タイプをサポートしていません" + +-#: ../camel/camel-imapx-server.c:4160 ../camel/camel-session.c:495 +-#: ../camel/providers/pop3/camel-pop3-store.c:272 +-#: ../camel/providers/pop3/camel-pop3-store.c:654 +-#: ../camel/providers/smtp/camel-smtp-transport.c:517 ++#: ../camel/camel-imapx-server.c:4125 ++#: ../camel/camel-session.c:495 ++#: ../camel/providers/pop3/camel-pop3-store.c:303 ++#: ../camel/providers/pop3/camel-pop3-store.c:737 ++#: ../camel/providers/smtp/camel-smtp-transport.c:509 + #, c-format + msgid "No support for %s authentication" + msgstr "%s という認証タイプはサポートしていません" + +-#: ../camel/camel-imapx-server.c:4179 +-#: ../camel/providers/nntp/camel-nntp-store.c:362 +-#: ../camel/providers/nntp/camel-nntp-store.c:562 ++#: ../camel/camel-imapx-server.c:4144 ++#: ../camel/providers/nntp/camel-nntp-store.c:407 ++#: ../camel/providers/nntp/camel-nntp-store.c:595 + msgid "Cannot authenticate without a username" + msgstr "ユーザー名がないと認証を行えません" + +-#: ../camel/camel-imapx-server.c:4188 +-#: ../camel/providers/nntp/camel-nntp-store.c:571 +-#: ../camel/providers/pop3/camel-pop3-store.c:579 +-#: ../camel/providers/pop3/camel-pop3-store.c:599 ++#: ../camel/camel-imapx-server.c:4153 ++#: ../camel/providers/nntp/camel-nntp-store.c:604 ++#: ../camel/providers/pop3/camel-pop3-store.c:662 ++#: ../camel/providers/pop3/camel-pop3-store.c:682 + msgid "Authentication password not available" + msgstr "認証用のパスワードがありません" + +-#: ../camel/camel-imapx-server.c:4396 ++#: ../camel/camel-imapx-server.c:4360 + msgid "Error fetching message" + msgstr "メッセージを取得する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:4478 +-msgid "Failed to copy the tmp file" +-msgstr "tmp ファイルのコピーに失敗しました" +- +-#: ../camel/camel-imapx-server.c:4492 ++#: ../camel/camel-imapx-server.c:4410 ++#: ../camel/camel-imapx-server.c:4418 + msgid "Failed to close the tmp stream" + msgstr "tmp ストリームのクローズに失敗しました" + +-#: ../camel/camel-imapx-server.c:4613 ++#: ../camel/camel-imapx-server.c:4447 ++msgid "Failed to copy the tmp file" ++msgstr "tmp ファイルのコピーに失敗しました" ++ ++#: ../camel/camel-imapx-server.c:4571 + msgid "Error copying messages" + msgstr "メッセージをコピーする際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:4779 ++#: ../camel/camel-imapx-server.c:4740 + msgid "Error appending message" + msgstr "メッセージを追加する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:4978 ++#: ../camel/camel-imapx-server.c:4939 + msgid "Error fetching message headers" + msgstr "メッセージヘッダーを取得する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:5129 ++#: ../camel/camel-imapx-server.c:5090 + msgid "Error retrieving message" + msgstr "メッセージの取得中にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:5260 ../camel/camel-imapx-server.c:5488 ++#: ../camel/camel-imapx-server.c:5221 ++#: ../camel/camel-imapx-server.c:5449 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "'%s' にある新着メッセージのサマリ情報を取得中" + +-#: ../camel/camel-imapx-server.c:5324 ++#: ../camel/camel-imapx-server.c:5285 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "'%s' 内の変更されたメッセージをスキャン中" + +-#: ../camel/camel-imapx-server.c:5377 ++#: ../camel/camel-imapx-server.c:5338 + msgid "Error fetching new messages" + msgstr "新しいメッセージの取得中にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:5590 ++#: ../camel/camel-imapx-server.c:5551 + msgid "Error while fetching messages" + msgstr "メッセージの取得中にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:5598 ../camel/camel-imapx-server.c:5631 ++#: ../camel/camel-imapx-server.c:5559 ++#: ../camel/camel-imapx-server.c:5592 + #, c-format + msgid "Fetching summary information for %d message in '%s'" + msgid_plural "Fetching summary information for %d messages in '%s'" + msgstr[0] "%d メッセージ (%s 内) のサマリ情報を取得中" + +-#: ../camel/camel-imapx-server.c:5767 ../camel/camel-imapx-server.c:5797 ++#: ../camel/camel-imapx-server.c:5728 ++#: ../camel/camel-imapx-server.c:5758 + msgid "Error refreshing folder" + msgstr "フォルダーを更新する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:5921 ++#: ../camel/camel-imapx-server.c:5882 + msgid "Error expunging message" + msgstr "メッセージを抹消する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:6032 ++#: ../camel/camel-imapx-server.c:5993 + msgid "Error fetching folders" + msgstr "フォルダーを取得する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:6114 ++#: ../camel/camel-imapx-server.c:6075 + msgid "Error subscribing to folder" + msgstr "フォルダーをサブスクライブする際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:6179 ++#: ../camel/camel-imapx-server.c:6140 + msgid "Error creating folder" + msgstr "フォルダーを作成する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:6233 ++#: ../camel/camel-imapx-server.c:6194 + msgid "Error deleting folder" + msgstr "フォルダーを削除する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:6307 ++#: ../camel/camel-imapx-server.c:6268 + msgid "Error renaming folder" + msgstr "フォルダーの名前を変更する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:6382 +-#, fuzzy +-#| msgid "Retrieving quota information for '%s'" ++#: ../camel/camel-imapx-server.c:6343 + msgid "Error retrieving quota information" +-msgstr "'%s' のクォータ情報を取得中" ++msgstr "クオータ情報の取得エラー" + +-#: ../camel/camel-imapx-server.c:6447 +-#, fuzzy +-#| msgid "Decoder failed" ++#: ../camel/camel-imapx-server.c:6408 + msgid "Search failed" +-msgstr "デコーダーのエラーです" ++msgstr "検索失敗" + +-#: ../camel/camel-imapx-server.c:6510 ++#: ../camel/camel-imapx-server.c:6471 + msgid "Error performing NOOP" + msgstr "NOOP を実行する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:6619 ++#: ../camel/camel-imapx-server.c:6580 + msgid "Error syncing changes" + msgstr "変更を同期する際にエラーが発生しました" + +-#: ../camel/camel-imapx-server.c:7431 ++#: ../camel/camel-imapx-server.c:7385 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "%s という ID のメッセージを取得できません: %s" + +-#: ../camel/camel-imapx-server.c:7432 ++#: ../camel/camel-imapx-server.c:7386 + msgid "No such message available." + msgstr "そのようなメッセージは利用できません。" + +-#: ../camel/camel-imapx-server.c:7590 ../camel/camel-imapx-server.c:7605 ++#: ../camel/camel-imapx-server.c:7547 ++#: ../camel/camel-imapx-server.c:7562 + msgid "Cannot create spool file: " + msgstr "スプールファイルを作成できません: " + +-#: ../camel/camel-imapx-server.c:8347 +-#, fuzzy +-#| msgid "IMAP server %s does not support %s authentication" ++#: ../camel/camel-imapx-server.c:8304 + msgid "IMAP server does not support quotas" +-msgstr "IMAP サーバーの %s では %s という認証タイプをサポートしていません" ++msgstr "IMAP サーバーはクオータをサポートしていません" + + #: ../camel/camel-imapx-store.c:249 + #, c-format +@@ -2453,8 +2503,9 @@ msgid "Password" + msgstr "パスワード" + + #: ../camel/camel-imapx-store.c:345 +-msgid "This option will connect to the IMAP server using a plaintext password." +-msgstr "このオプションはプレイン・テキストのパスワードを使って IMAP サーバーに接続します。" ++msgid "" ++"This option will connect to the IMAP server using a plaintext password." ++msgstr "このオプションはプレインテキストのパスワードを使って IMAP サーバーに接続します。" + + #: ../camel/camel-imapx-store.c:453 + #, c-format +@@ -2462,7 +2513,8 @@ msgid "No such folder %s" + msgstr "そのようなフォルダー %s はありません" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/camel-imapx-store.c:478 ../camel/camel-imapx-store.c:968 ++#: ../camel/camel-imapx-store.c:478 ++#: ../camel/camel-imapx-store.c:968 + #: ../camel/providers/local/camel-maildir-folder.c:473 + #: ../camel/providers/local/camel-maildir-store.c:316 + #: ../camel/providers/local/camel-maildir-store.c:750 +@@ -2472,22 +2524,22 @@ msgstr "そのようなフォルダー % + msgid "Inbox" + msgstr "受信箱" + +-#: ../camel/camel-imapx-store.c:1212 ++#: ../camel/camel-imapx-store.c:1231 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "%s のフォルダーの一覧を取得中" + +-#: ../camel/camel-imapx-store.c:1595 ++#: ../camel/camel-imapx-store.c:1614 + #, c-format + msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "\"%s\" というフォルダー名に \"%c\" という文字を含めることはできません" + +-#: ../camel/camel-imapx-store.c:1606 ++#: ../camel/camel-imapx-store.c:1625 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "親フォルダーを特定できません: %s" + +-#: ../camel/camel-imapx-store.c:1616 ++#: ../camel/camel-imapx-store.c:1635 + #, c-format + msgid "The parent folder is not allowed to contain subfolders" + msgstr "親フォルダーには複数のサブフォルダーを含めることはできません" +@@ -2505,12 +2557,12 @@ msgstr "ソースストリームは利� + #: ../camel/camel-lock.c:102 + #, c-format + msgid "Could not create lock file for %s: %s" +-msgstr "%s のロック・ファイルを作成できませんでした: %s" ++msgstr "%s のロックファイルを作成できませんでした: %s" + + #: ../camel/camel-lock.c:145 + #, c-format + msgid "Timed out trying to get lock file on %s. Try again later." +-msgstr "%s のロック・ファイルの取得中にタイムアウトしました。後でやり直してください。" ++msgstr "%s のロックファイルの取得中にタイムアウトしました。後でやり直してください。" + + #: ../camel/camel-lock.c:205 + #, c-format +@@ -2525,17 +2577,18 @@ msgstr "flock(2) を使ったロック� + #: ../camel/camel-lock-client.c:106 + #, c-format + msgid "Cannot build locking helper pipe: %s" +-msgstr "ロッキング・ヘルパー・パイプが構築できません: %s" ++msgstr "ロッキングヘルパーパイプが構築できません: %s" + + #: ../camel/camel-lock-client.c:130 + #, c-format + msgid "Cannot fork locking helper: %s" +-msgstr "ロッキング・ヘルパーのプロセスを作成できません: %s" ++msgstr "ロッキングヘルパーのプロセスを作成できません: %s" + +-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239 ++#: ../camel/camel-lock-client.c:211 ++#: ../camel/camel-lock-client.c:239 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" +-msgstr "'%s' をロックできませんでした: lock-helper のプロトコル・エラーです" ++msgstr "'%s' をロックできませんでした: lock-helper のプロトコルエラーです" + + #: ../camel/camel-lock-client.c:227 + #, c-format +@@ -2545,17 +2598,17 @@ msgstr "'%s' をロックできません + #: ../camel/camel-movemail.c:105 + #, c-format + msgid "Could not check mail file %s: %s" +-msgstr "メール・ファイル %s をチェックできませんでした: %s" ++msgstr "メールファイル %s をチェックできませんでした: %s" + + #: ../camel/camel-movemail.c:119 + #, c-format + msgid "Could not open mail file %s: %s" +-msgstr "メール・ファイル %s を開けませんでした: %s" ++msgstr "メールファイル %s を開けませんでした: %s" + + #: ../camel/camel-movemail.c:129 + #, c-format + msgid "Could not open temporary mail file %s: %s" +-msgstr "メール・ファイル %s のテンポラリを開けませんでした: %s" ++msgstr "メールファイル %s のテンポラリを開けませんでした: %s" + + #: ../camel/camel-movemail.c:159 + #, c-format +@@ -2584,14 +2637,15 @@ msgstr "(特定できないエラー)" + #: ../camel/camel-movemail.c:273 + #, c-format + msgid "Error reading mail file: %s" +-msgstr "メール・ファイルの読み込み中にエラー: %s" ++msgstr "メールファイルの読み込み中にエラー: %s" + + #: ../camel/camel-movemail.c:286 + #, c-format + msgid "Error writing mail temp file: %s" + msgstr "メール作業ファイルの書き込み中にエラー: %s" + +-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562 ++#: ../camel/camel-movemail.c:493 ++#: ../camel/camel-movemail.c:562 + #, c-format + msgid "Error copying mail temp file: %s" + msgstr "メール作業ファイルのコピー中にエラー: %s" +@@ -2611,66 +2665,65 @@ msgstr "利用できる署名があり� + msgid "parse error" + msgstr "解析エラー" + +-#: ../camel/camel-net-utils.c:703 ++#: ../camel/camel-net-utils.c:704 + #, c-format + msgid "Resolving: %s" + msgstr "解決中: %s" + +-#: ../camel/camel-net-utils.c:726 ++#: ../camel/camel-net-utils.c:727 + msgid "Host lookup failed" + msgstr "ホストの検索に失敗しました" + +-#: ../camel/camel-net-utils.c:732 ++#: ../camel/camel-net-utils.c:733 + #, c-format + msgid "Host lookup '%s' failed. Check your host name for spelling errors." +-msgstr "" ++msgstr "ホストの検索 '%s' に失敗しました。ホスト名につづりの誤りがないか確認してください。" + +-#: ../camel/camel-net-utils.c:736 +-#, fuzzy, c-format +-#| msgid "Host lookup failed: %s: %s" ++#: ../camel/camel-net-utils.c:737 ++#, c-format + msgid "Host lookup '%s' failed: %s" +-msgstr "ホストの検索に失敗しました: %s: %s" ++msgstr "ホストの検索 '%s' に失敗しました: %s" + +-#: ../camel/camel-net-utils.c:857 ++#: ../camel/camel-net-utils.c:858 + msgid "Resolving address" + msgstr "アドレスの解決中" + +-#: ../camel/camel-net-utils.c:878 ++#: ../camel/camel-net-utils.c:879 + msgid "Name lookup failed" + msgstr "名前の検索に失敗しました" + +-#: ../camel/camel-net-utils.c:885 ++#: ../camel/camel-net-utils.c:886 + msgid "Name lookup failed. Check your host name for spelling errors." +-msgstr "" ++msgstr "名前の検索に失敗しました。ホスト名のつづりに誤りがないか確認してください。" + +-#: ../camel/camel-net-utils.c:889 ++#: ../camel/camel-net-utils.c:890 + #, c-format + msgid "Name lookup failed: %s" + msgstr "名前の検索に失敗しました: %s" + + #: ../camel/camel-network-service.c:350 +-#, fuzzy, c-format +-#| msgid "Could not connect to %s: %s" ++#, c-format + msgid "Could not connect to '%s:%s': " +-msgstr "%s へ接続できませんでした: %s" ++msgstr "'%s:%s' に接続できませんでした: " + + #: ../camel/camel-offline-folder.c:212 + #, c-format + msgid "Syncing messages in folder '%s' to disk" + msgstr "フォルダー '%s' にあるメッセージを同期して保存中" + +-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177 ++#: ../camel/camel-offline-journal.c:145 ++#: ../camel/camel-offline-journal.c:177 + #, c-format + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "フォルダー '%s' のオフライン・ジャーナルに書き込めません: %s" + + #: ../camel/camel-provider.c:58 + msgid "Virtual folder email provider" +-msgstr "仮想フォルダー・メール・プロバイダー" ++msgstr "仮想フォルダーメールプロバイダー" + + #: ../camel/camel-provider.c:60 + msgid "For reading mail as a query of another set of folders" +-msgstr "その他のフォルダー・セットのクエリとしてメールを読む" ++msgstr "その他のフォルダーセットのクエリとしてメールを読む" + + #: ../camel/camel-provider.c:263 + #, c-format +@@ -2687,7 +2740,8 @@ msgstr "%s を読み込めませんで� + msgid "Could not load %s: No initialization code in module." + msgstr "%s を読み込めませんでした: モジュールのコードが初期化されていません。" + +-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:407 ++#: ../camel/camel-provider.c:429 ++#: ../camel/camel-session.c:407 + #, c-format + msgid "No provider available for protocol '%s'" + msgstr "'%s' というプロトコルを利用できるプロバイダーはありません" +@@ -2708,29 +2762,23 @@ msgstr "認証に失敗しました。" + + #: ../camel/camel-sasl-anonymous.c:81 + #, c-format +-msgid "" +-"Invalid email address trace information:\n" ++msgid "Invalid email address trace information:\n" + "%s" +-msgstr "" +-"無効な E-メール・アドレスのトレース情報:\n" ++msgstr "無効な メールアドレスのトレース情報:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:95 + #, c-format +-msgid "" +-"Invalid opaque trace information:\n" ++msgid "Invalid opaque trace information:\n" + "%s" +-msgstr "" +-"無効で不可解なトレース情報:\n" ++msgstr "無効で不可解なトレース情報:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:109 + #, c-format +-msgid "" +-"Invalid trace information:\n" ++msgid "Invalid trace information:\n" + "%s" +-msgstr "" +-"無効なトレース情報:\n" ++msgstr "無効なトレース情報:\n" + "%s" + + #: ../camel/camel-sasl-cram-md5.c:46 +@@ -2738,7 +2786,9 @@ msgid "CRAM-MD5" + msgstr "CRAM-MD5" + + #: ../camel/camel-sasl-cram-md5.c:48 +-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it." ++msgid "" ++"This option will connect to the server using a secure CRAM-MD5 password, if " ++"the server supports it." + msgstr "サーバーがサポートしている場合、このオプションはセキュリティ保護された CRAM-MD5 認証を使ってサーバーへ接続します。" + + #: ../camel/camel-sasl-digest-md5.c:59 +@@ -2746,7 +2796,9 @@ msgid "DIGEST-MD5" + msgstr "DIGEST-MD5" + + #: ../camel/camel-sasl-digest-md5.c:61 +-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it." ++msgid "" ++"This option will connect to the server using a secure DIGEST-MD5 password, " ++"if the server supports it." + msgstr "サーバーがサポートしている場合、このオプションはセキュリティ保護された DIGEST-MD5 を使ってサーバーへ接続します。" + + #: ../camel/camel-sasl-digest-md5.c:855 +@@ -2784,11 +2836,14 @@ msgid "GSSAPI" + msgstr "GSSAPI" + + #: ../camel/camel-sasl-gssapi.c:93 +-msgid "This option will connect to the server using Kerberos 5 authentication." ++msgid "" ++"This option will connect to the server using Kerberos 5 authentication." + msgstr "このオプションは Kerberos 5 認証を使ってサーバーに接続します。" + + #: ../camel/camel-sasl-gssapi.c:134 +-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation." ++msgid "" ++"The specified mechanism is not supported by the provided credential, or is " ++"unrecognized by the implementation." + msgstr "指定したメカニズムが提供された証明書ではサポートされていないか、その実装で認識されていません。" + + #: ../camel/camel-sasl-gssapi.c:139 +@@ -2796,19 +2851,27 @@ msgid "The provided target_name paramete + msgstr "指定した引数 target_name の形式が間違っています。" + + #: ../camel/camel-sasl-gssapi.c:142 +-msgid "The provided target_name parameter contained an invalid or unsupported type of name." ++msgid "" ++"The provided target_name parameter contained an invalid or unsupported type " ++"of name." + msgstr "指定した引数の target_name に無効な、あるいはサポートしていない種類の名前があります。" + + #: ../camel/camel-sasl-gssapi.c:146 +-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter." ++msgid "" ++"The input_token contains different channel bindings to those specified via " ++"the input_chan_bindings parameter." + msgstr "input_token に引数 input_chan_bindings を介して指定された別のチャンネルのビンディングがあります。" + + #: ../camel/camel-sasl-gssapi.c:151 +-msgid "The input_token contains an invalid signature, or a signature that could not be verified." ++msgid "" ++"The input_token contains an invalid signature, or a signature that could not " ++"be verified." + msgstr "input_token の中に無効な署名があるか、またはその署名が正しくありません。" + + #: ../camel/camel-sasl-gssapi.c:155 +-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials." ++msgid "" ++"The supplied credentials were not valid for context initiation, or the " ++"credential handle did not reference any credentials." + msgstr "指定した証明書でコンテキストの初期化はできないか、または証明書のハンドルが任意の証明書を参照していませんでした。" + + #: ../camel/camel-sasl-gssapi.c:160 +@@ -2827,9 +2890,11 @@ msgstr "証明書で実施した整合� + msgid "The referenced credentials have expired." + msgstr "参照している証明書の期限が過ぎています。" + +-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340 +-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405 +-#: ../camel/providers/smtp/camel-smtp-transport.c:624 ++#: ../camel/camel-sasl-gssapi.c:175 ++#: ../camel/camel-sasl-gssapi.c:340 ++#: ../camel/camel-sasl-gssapi.c:388 ++#: ../camel/camel-sasl-gssapi.c:405 ++#: ../camel/providers/smtp/camel-smtp-transport.c:616 + #, c-format + msgid "Bad authentication response from server." + msgstr "サーバーから間違った認証応答がありました。" +@@ -2837,13 +2902,14 @@ msgstr "サーバーから間違った� + #: ../camel/camel-sasl-gssapi.c:417 + #, c-format + msgid "Unsupported security layer." +-msgstr "サポートしていないセキュリティ・レイヤーです。" ++msgstr "サポートしていないセキュリティレイヤーです。" + + #: ../camel/camel-sasl-login.c:40 + msgid "Login" + msgstr "ログイン" + +-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46 ++#: ../camel/camel-sasl-login.c:42 ++#: ../camel/camel-sasl-plain.c:46 + msgid "This option will connect to the server using a simple password." + msgstr "このオプションは簡単なパスワードを使ってサーバーへ接続します。" + +@@ -2852,12 +2918,14 @@ msgstr "このオプションは簡単� + msgid "Unknown authentication state." + msgstr "特定できない認証状態です。" + +-#: ../camel/camel-sasl-ntlm.c:47 ++#: ../camel/camel-sasl-ntlm.c:48 + msgid "NTLM / SPA" + msgstr "NTLM / SPA" + +-#: ../camel/camel-sasl-ntlm.c:49 +-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication." ++#: ../camel/camel-sasl-ntlm.c:50 ++msgid "" ++"This option will connect to a Windows-based server using NTLM / Secure " ++"Password Authentication." + msgstr "このオプションは NTLM/セキュリティ保護されたパスワード認証を使って Windows サーバーに接続します。" + + #: ../camel/camel-sasl-plain.c:44 +@@ -2881,7 +2949,8 @@ msgstr "POP ソース UID" + msgid "POP Before SMTP authentication using an unknown transport" + msgstr "不明な転送を利用した POP Before SMTP 認証です" + +-#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119 ++#: ../camel/camel-sasl-popb4smtp.c:110 ++#: ../camel/camel-sasl-popb4smtp.c:119 + #, c-format + msgid "POP Before SMTP authentication attempted with a %s service" + msgstr "%s サービスで試行される POP Before SMTP 認証です" +@@ -2913,7 +2982,8 @@ msgstr "メッセージの転送はサ� + msgid "Please enter the %s password for %s on host %s." + msgstr "%2$s@%3$s の %1$s パスワードを入力してください。" + +-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074 ++#: ../camel/camel-smime-context.c:351 ++#: ../camel/camel-smime-context.c:1074 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "'%s' の証明書が見つかりません" +@@ -2946,7 +3016,8 @@ msgstr "認証チェインが見つか� + msgid "Cannot add CMS Signing time" + msgstr "CMS 署名時刻を追加できません" + +-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454 ++#: ../camel/camel-smime-context.c:439 ++#: ../camel/camel-smime-context.c:454 + #, c-format + msgid "Encryption certificate for '%s' does not exist" + msgstr "'%s' の暗号化証明書がありません" +@@ -3016,15 +3087,18 @@ msgstr "署名の中に署名したデ� + msgid "Digests missing from enveloped data" + msgstr "EnvelopedData からのダイジェストがありません" + +-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602 ++#: ../camel/camel-smime-context.c:591 ++#: ../camel/camel-smime-context.c:602 + msgid "Cannot calculate digests" + msgstr "ダイジェストを計算できません" + +-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613 ++#: ../camel/camel-smime-context.c:609 ++#: ../camel/camel-smime-context.c:613 + msgid "Cannot set message digests" +-msgstr "メッセージ・ダイジェストをセットできません" ++msgstr "メッセージダイジェストをセットできません" + +-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628 ++#: ../camel/camel-smime-context.c:623 ++#: ../camel/camel-smime-context.c:628 + msgid "Certificate import failed" + msgstr "証明書のインポートに失敗しました" + +@@ -3047,7 +3121,8 @@ msgstr "証明書のダイジェスト� + msgid "Signer: %s <%s>: %s\n" + msgstr "署名者: %s <%s>: %s\n" + +-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148 ++#: ../camel/camel-smime-context.c:858 ++#: ../camel/camel-smime-context.c:1148 + msgid "Cannot create encoder context" + msgstr "エンコーダーのコンテキストを作成できません" + +@@ -3055,11 +3130,13 @@ msgstr "エンコーダーのコンテ� + msgid "Failed to add data to CMS encoder" + msgstr "CMS エンコーダーへのデータの追加が失敗しました" + +-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165 ++#: ../camel/camel-smime-context.c:869 ++#: ../camel/camel-smime-context.c:1165 + msgid "Failed to encode data" + msgstr "データのエンコードに失敗しました" + +-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262 ++#: ../camel/camel-smime-context.c:1013 ++#: ../camel/camel-smime-context.c:1262 + msgid "Decoder failed" + msgstr "デコーダーのエラーです" + +@@ -3085,7 +3162,7 @@ msgstr "CMS Enveloped データを添付 + + #: ../camel/camel-smime-context.c:1119 + msgid "Cannot attach CMS data object" +-msgstr "CMS データ・オブジェクトを添付できません" ++msgstr "CMS データオブジェクトを添付できません" + + #: ../camel/camel-smime-context.c:1128 + msgid "Cannot create CMS Recipient information" +@@ -3118,12 +3195,14 @@ msgstr "フォルダー '%s' を開い� + msgid "Scanning folders in '%s'" + msgstr "'%s' にあるフォルダーをスキャン中" + +-#: ../camel/camel-store.c:2115 ../camel/camel-store.c:2146 ++#: ../camel/camel-store.c:2115 ++#: ../camel/camel-store.c:2146 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Trash" + msgstr "ゴミ箱" + +-#: ../camel/camel-store.c:2127 ../camel/camel-store.c:2162 ++#: ../camel/camel-store.c:2127 ++#: ../camel/camel-store.c:2162 + #: ../camel/camel-vtrash-folder.c:50 + msgid "Junk" + msgstr "ジャンク" +@@ -3138,13 +3217,15 @@ msgstr "フォルダーを作成でき� + msgid "Creating folder '%s'" + msgstr "フォルダー '%s' の作成中" + +-#: ../camel/camel-store.c:2747 ../camel/camel-vee-store.c:416 ++#: ../camel/camel-store.c:2747 ++#: ../camel/camel-vee-store.c:416 + #: ../camel/providers/local/camel-maildir-store.c:315 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "フォルダーを削除できません: %s: 無効な操作です" + +-#: ../camel/camel-store.c:2890 ../camel/camel-vee-store.c:466 ++#: ../camel/camel-store.c:2890 ++#: ../camel/camel-vee-store.c:466 + #: ../camel/providers/local/camel-maildir-store.c:839 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" +@@ -3183,7 +3264,8 @@ msgstr "'%s' というフォルダーの + msgid "NSPR error code %d" + msgstr "NSPR エラーコード %d" + +-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662 ++#: ../camel/camel-tcp-stream-raw.c:649 ++#: ../camel/camel-tcp-stream-raw.c:662 + #, c-format + msgid "The proxy host does not support SOCKS4" + msgstr "プロキシホストは SOCKS 4 をサポートしていません" +@@ -3193,7 +3275,8 @@ msgstr "プロキシホストは SOCKS 4 + msgid "The proxy host denied our request: code %d" + msgstr "プロキシホストはリクエストを拒否しました: コード %d" + +-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781 ++#: ../camel/camel-tcp-stream-raw.c:773 ++#: ../camel/camel-tcp-stream-raw.c:781 + #, c-format + msgid "The proxy host does not support SOCKS5" + msgstr "プロキシホストは SOCKS 5 をサポートしません" +@@ -3256,7 +3339,8 @@ msgstr "ホスト名が長すぎます ( + + #. SOCKS5 + #. reserved - must be 0 +-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922 ++#: ../camel/camel-tcp-stream-raw.c:912 ++#: ../camel/camel-tcp-stream-raw.c:922 + #, c-format + msgid "Invalid reply from proxy server" + msgstr "プロキシサーバーからの応答が無効です" +@@ -3271,7 +3355,8 @@ msgstr "'%s' という URL を解析で� + msgid "Updating folder '%s'" + msgstr "フォルダー '%s' の更新中" + +-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965 ++#: ../camel/camel-vee-folder.c:855 ++#: ../camel/camel-vee-folder.c:965 + #, c-format + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "メッセージの仮想フォルダーへのコピーまたは移動ができません。" +@@ -3316,7 +3401,7 @@ msgstr "ゴミ箱フォルダーへメ� + + #: ../camel/camel-vtrash-folder.c:51 + msgid "Cannot copy messages to the Junk folder" +-msgstr "ジャンク・フォルダーへメッセージをコピーできません" ++msgstr "ジャンクフォルダーへメッセージをコピーできません" + + #: ../camel/providers/imapx/camel-imapx-provider.c:38 + msgid "Checking for New Mail" +@@ -3422,32 +3507,32 @@ msgstr "メール本文のインデッ� + + #: ../camel/providers/local/camel-local-folder.c:727 + #, c-format +-msgid "" +-"Cannot get message %s from folder %s\n" ++msgid "Cannot get message %s from folder %s\n" + "%s" +-msgstr "" +-"メッセージ %s をフォルダー %s から取得できません\n" ++msgstr "メッセージ %s をフォルダー %s から取得できません\n" + " %s" + + #: ../camel/providers/local/camel-local-provider.c:43 + msgid "_Use the '.folders' folder summary file (exmh)" +-msgstr "'.folders' をサマリ・ファイルとして使用する (exmh)(_U)" ++msgstr "'.folders' をサマリファイルとして使用する (exmh)(_U)" + + #: ../camel/providers/local/camel-local-provider.c:50 + msgid "MH-format mail directories" +-msgstr "MH 形式のメール・フォルダー" ++msgstr "MH 形式のメールフォルダー" + + #: ../camel/providers/local/camel-local-provider.c:51 + msgid "For storing local mail in MH-like mail directories." +-msgstr "ローカル・メールを MH 形式のメール・フォルダーの中に保存します。" ++msgstr "ローカルメールを MH 形式のメールフォルダーの中に保存します。" + + #: ../camel/providers/local/camel-local-provider.c:68 + msgid "Local delivery" + msgstr "ローカルの配信" + + #: ../camel/providers/local/camel-local-provider.c:69 +-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution." +-msgstr "ローカル・メールを収集して標準 mbox 形式のスプールから Evolution が管理するフォルダーに移動します。" ++msgid "" ++"For retrieving (moving) local mail from standard mbox-formatted spools into " ++"folders managed by Evolution." ++msgstr "ローカルメールを収集して標準 mbox 形式のスプールから Evolution が管理するフォルダーに移動します。" + + #: ../camel/providers/local/camel-local-provider.c:83 + #: ../camel/providers/local/camel-local-provider.c:103 +@@ -3456,19 +3541,19 @@ msgstr "受信箱にある新着メー� + + #: ../camel/providers/local/camel-local-provider.c:90 + msgid "Maildir-format mail directories" +-msgstr "Maildir 形式のメール・フォルダー" ++msgstr "Maildir 形式のメールフォルダー" + + #: ../camel/providers/local/camel-local-provider.c:91 + msgid "For storing local mail in maildir directories." +-msgstr "ローカル・メールを Maildir 形式のフォルダーに保存します。" ++msgstr "ローカルメールを Maildir 形式のフォルダーに保存します。" + + #: ../camel/providers/local/camel-local-provider.c:104 + msgid "_Store status headers in Elm/Pine/Mutt format" +-msgstr "ステータス・ヘッダーを Elm/Pine/Mutt 形式で格納する(_S)" ++msgstr "ステータスヘッダーを Elm/Pine/Mutt 形式で格納する(_S)" + + #: ../camel/providers/local/camel-local-provider.c:111 + msgid "Standard Unix mbox spool file" +-msgstr "標準的な UNIX の mbox 形式のスプール・ファイル" ++msgstr "標準的な UNIX の mbox 形式のスプールファイル" + + #: ../camel/providers/local/camel-local-provider.c:112 + #: ../camel/providers/local/camel-local-provider.c:126 +@@ -3476,12 +3561,12 @@ msgid "" + "For reading and storing local mail in external standard mbox spool files.\n" + "May also be used to read a tree of Elm, Pine, or Mutt style folders." + msgstr "" +-"外部の標準 mbox 形式のスプール・ファイルにあるローカル・メールを読み込んだり格納します\n" ++"外部の標準 mbox 形式のスプールファイルにあるローカルメールを読み込んだり格納します\n" + "(Elm、Pine、Mutt 形式のフォルダーの読み込みにも対応)。" + + #: ../camel/providers/local/camel-local-provider.c:125 + msgid "Standard Unix mbox spool directory" +-msgstr "標準的な UNIX の mbox 形式のスプール・フォルダー" ++msgstr "標準的な UNIX の mbox 形式のスプールフォルダー" + + #: ../camel/providers/local/camel-local-store.c:98 + #, c-format +@@ -3491,7 +3576,7 @@ msgstr "フォルダーを %s から %s + #: ../camel/providers/local/camel-local-store.c:180 + #, c-format + msgid "Local mail file %s" +-msgstr "ローカル・メールのファイル %s" ++msgstr "ローカルメールのファイル %s" + + #: ../camel/providers/local/camel-local-store.c:223 + #: ../camel/providers/local/camel-local-store.c:383 +@@ -3524,13 +3609,13 @@ msgstr "ローカルへの保存では� + #: ../camel/providers/local/camel-mbox-store.c:748 + #, c-format + msgid "Could not delete folder index file '%s': %s" +-msgstr "'%s' というインデックス・ファイルを削除できませんでした: %s" ++msgstr "'%s' というインデックスファイルを削除できませんでした: %s" + + #: ../camel/providers/local/camel-local-store.c:484 + #: ../camel/providers/local/camel-mbox-store.c:778 + #, c-format + msgid "Could not delete folder meta file '%s': %s" +-msgstr "'%s' というメタ・ファイルを削除できませんでした: %s" ++msgstr "'%s' というメタファイルを削除できませんでした: %s" + + #: ../camel/providers/local/camel-local-store.c:596 + #, c-format +@@ -3585,14 +3670,14 @@ msgstr "'%s' というフォルダーを + + #: ../camel/providers/local/camel-maildir-store.c:245 + #: ../camel/providers/local/camel-mbox-store.c:369 +-#: ../camel/providers/local/camel-mh-store.c:522 ++#: ../camel/providers/local/camel-mh-store.c:514 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "'%s' というフォルダーを取得できません: %s" + + #: ../camel/providers/local/camel-maildir-store.c:251 + #: ../camel/providers/local/camel-mbox-store.c:379 +-#: ../camel/providers/local/camel-mh-store.c:531 ++#: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "'%s' というフォルダーを取得できません: フォルダーが存在しません。" +@@ -3604,14 +3689,14 @@ msgstr "'%s' というフォルダーを + + #: ../camel/providers/local/camel-maildir-store.c:283 + #: ../camel/providers/local/camel-mbox-store.c:442 +-#: ../camel/providers/local/camel-mh-store.c:564 ++#: ../camel/providers/local/camel-mh-store.c:556 + #, c-format + msgid "Cannot create folder '%s': folder exists." + msgstr "'%s' というフォルダーを作成できません: 既に存在しています。" + + #: ../camel/providers/local/camel-maildir-store.c:347 + #: ../camel/providers/local/camel-maildir-store.c:387 +-#: ../camel/providers/local/camel-mh-store.c:682 ++#: ../camel/providers/local/camel-mh-store.c:674 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "'%s' というフォルダーを削除できませんでした: %s" +@@ -3668,7 +3753,7 @@ msgstr "フォルダーで回復でき� + #: ../camel/providers/local/camel-spool-folder.c:69 + #, c-format + msgid "Cannot create folder lock on %s: %s" +-msgstr "%s のフォルダー・ロックを生成できません: %s" ++msgstr "%s のフォルダーロックを生成できません: %s" + + #: ../camel/providers/local/camel-mbox-store.c:391 + #: ../camel/providers/local/camel-mbox-store.c:589 +@@ -3699,11 +3784,9 @@ msgstr "既にフォルダーがあり� + #: ../camel/providers/local/camel-mbox-store.c:672 + #: ../camel/providers/local/camel-mbox-store.c:701 + #, c-format +-msgid "" +-"Could not delete folder '%s':\n" ++msgid "Could not delete folder '%s':\n" + "%s" +-msgstr "" +-"'%s' というフォルダーを削除できませんでした:\n" ++msgstr "'%s' というフォルダーを削除できませんでした:\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:682 +@@ -3720,7 +3803,7 @@ msgstr "'%s' というフォルダーは + #: ../camel/providers/local/camel-mbox-store.c:733 + #, c-format + msgid "Could not delete folder summary file '%s': %s" +-msgstr "'%s' というサマリ・ファイルを削除できませんでした: %s" ++msgstr "'%s' というサマリファイルを削除できませんでした: %s" + + #: ../camel/providers/local/camel-mbox-store.c:815 + #, c-format +@@ -3790,7 +3873,9 @@ msgstr "フォルダーを保存でき� + #: ../camel/providers/local/camel-mbox-summary.c:892 + #: ../camel/providers/local/camel-mbox-summary.c:1162 + #, c-format +-msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)" ++msgid "" ++"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " ++"it.)" + msgstr "MBOX ファイルが壊れています (差出人の行を得るはずですが、できませんでした)。修正してください。" + + #: ../camel/providers/local/camel-mbox-summary.c:902 +@@ -3821,12 +3906,12 @@ msgstr "作業用の mailbox に書き� + msgid "Cannot append message to mh folder: %s: " + msgstr "MH 形式フォルダーへメッセージを追加できません: %s: " + +-#: ../camel/providers/local/camel-mh-store.c:541 ++#: ../camel/providers/local/camel-mh-store.c:533 + #, c-format + msgid "Could not create folder '%s': %s" + msgstr "'%s' というフォルダーを作成できませんでした: %s" + +-#: ../camel/providers/local/camel-mh-store.c:557 ++#: ../camel/providers/local/camel-mh-store.c:549 + #, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "'%s' というフォルダーを取得できません: フォルダーではありません。" +@@ -3849,12 +3934,12 @@ msgstr "'%s' というスプールは通 + #: ../camel/providers/local/camel-spool-store.c:425 + #, c-format + msgid "Spool mail file %s" +-msgstr "スプール・メール・ファイル %s" ++msgstr "スプールメールファイル %s" + + #: ../camel/providers/local/camel-spool-store.c:429 + #, c-format + msgid "Spool folder tree %s" +-msgstr "スプール・フォルダー・ツリー %s" ++msgstr "スプールフォルダーツリー %s" + + #: ../camel/providers/local/camel-spool-store.c:432 + msgid "Invalid spool" +@@ -3867,11 +3952,9 @@ msgstr "'%s/%s' というフォルダー + + #: ../camel/providers/local/camel-spool-store.c:505 + #, c-format +-msgid "" +-"Could not open folder '%s':\n" ++msgid "Could not open folder '%s':\n" + "%s" +-msgstr "" +-"'%s' というフォルダーを開けませんでした:\n" ++msgstr "'%s' というフォルダーを開けませんでした:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:511 +@@ -3881,17 +3964,15 @@ msgstr "'%s' というフォルダーが + + #: ../camel/providers/local/camel-spool-store.c:519 + #, c-format +-msgid "" +-"Could not create folder '%s':\n" ++msgid "Could not create folder '%s':\n" + "%s" +-msgstr "" +-"'%s' というフォルダーを作成できませんでした:\n" ++msgstr "'%s' というフォルダーを作成できませんでした:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:532 + #, c-format + msgid "'%s' is not a mailbox file." +-msgstr "'%s' はメールボックス・ファイルではありません。" ++msgstr "'%s' はメールボックスファイルではありません。" + + #: ../camel/providers/local/camel-spool-store.c:596 + #, c-format +@@ -3901,12 +3982,12 @@ msgstr "受信箱への格納をサポ� + #: ../camel/providers/local/camel-spool-store.c:615 + #, c-format + msgid "Spool folders cannot be deleted" +-msgstr "スプール・フォルダーは削除できません" ++msgstr "スプールフォルダーは削除できません" + + #: ../camel/providers/local/camel-spool-store.c:630 + #, c-format + msgid "Spool folders cannot be renamed" +-msgstr "スプール・フォルダーの名前は変更できません" ++msgstr "スプールフォルダーの名前は変更できません" + + #: ../camel/providers/local/camel-spool-summary.c:179 + #: ../camel/providers/local/camel-spool-summary.c:191 +@@ -3918,7 +3999,7 @@ msgstr "作業用フォルダー %s を� + #: ../camel/providers/local/camel-spool-summary.c:221 + #, c-format + msgid "Could not synchronize spool folder %s: %s" +-msgstr "スプール・フォルダー %s を同期できませんでした: %s" ++msgstr "スプールフォルダー %s を同期できませんでした: %s" + + #: ../camel/providers/local/camel-spool-summary.c:253 + #: ../camel/providers/local/camel-spool-summary.c:272 +@@ -3928,61 +4009,61 @@ msgid "" + "Could not synchronize spool folder %s: %s\n" + "Folder may be corrupt, copy saved in '%s'" + msgstr "" +-"%s というスプール・フォルダーと同期できませんでした: %s\n" ++"%s というスプールフォルダーと同期できませんでした: %s\n" + "フォルダーが壊れている可能性があります。そのコピーを '%s' に保存しました。" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:278 +-#: ../camel/providers/nntp/camel-nntp-folder.c:360 +-#: ../camel/providers/nntp/camel-nntp-folder.c:481 ++#: ../camel/providers/nntp/camel-nntp-folder.c:285 ++#: ../camel/providers/nntp/camel-nntp-folder.c:388 ++#: ../camel/providers/nntp/camel-nntp-folder.c:510 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "内部エラー: UID の書式が無効です: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:332 +-#: ../camel/providers/pop3/camel-pop3-folder.c:633 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1065 ++#: ../camel/providers/nntp/camel-nntp-folder.c:349 ++#: ../camel/providers/nntp/camel-nntp-folder.c:354 ++#: ../camel/providers/pop3/camel-pop3-folder.c:657 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1107 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "メッセージ %s を取得できません: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:339 +-#: ../camel/providers/nntp/camel-nntp-folder.c:504 +-#: ../camel/providers/pop3/camel-pop3-folder.c:558 +-#: ../camel/providers/pop3/camel-pop3-folder.c:623 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/nntp/camel-nntp-folder.c:361 ++#: ../camel/providers/nntp/camel-nntp-folder.c:536 ++#: ../camel/providers/pop3/camel-pop3-folder.c:582 ++#: ../camel/providers/pop3/camel-pop3-folder.c:647 ++#: ../camel/providers/pop3/camel-pop3-folder.c:666 + #, c-format + msgid "Cannot get message %s: " + msgstr "メッセージ %s を取得できません: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:493 ++#: ../camel/providers/nntp/camel-nntp-folder.c:525 + #, c-format + msgid "This message is not currently available" + msgstr "このメッセージは現在利用できません" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:559 +-#: ../camel/providers/nntp/camel-nntp-folder.c:565 +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:593 ++#: ../camel/providers/nntp/camel-nntp-folder.c:599 + #, c-format + msgid "Posting failed: %s" + msgstr "投稿に失敗しました: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:606 ++#: ../camel/providers/nntp/camel-nntp-folder.c:664 + msgid "Posting failed: " + msgstr "投稿に失敗しました: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:633 ++#: ../camel/providers/nntp/camel-nntp-folder.c:689 + #, c-format + msgid "You cannot post NNTP messages while working offline!" + msgstr "オフライン状態の間は NNTP メッセージを投稿できません!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:653 ++#: ../camel/providers/nntp/camel-nntp-folder.c:709 + #, c-format + msgid "You cannot copy messages from a NNTP folder!" + msgstr "NNTP フォルダーからメッセージのコピーはできません!" + + #: ../camel/providers/nntp/camel-nntp-provider.c:48 +-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" ++msgid "" ++"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" + msgstr "フォルダー名を短く表記する (例: \"comp.os.linux\" => \"c.o.linux\")(_S)" + + #: ../camel/providers/nntp/camel-nntp-provider.c:51 +@@ -4006,145 +4087,142 @@ msgid "This is a provider for reading fr + msgstr "USENET のニュースグループを購読したり投稿します。" + + #: ../camel/providers/nntp/camel-nntp-provider.c:87 +-#, fuzzy +-#| msgid "This option will connect to the server using Kerberos 5 authentication." +-msgid "This option will connect to the NNTP server anonymously, without authentication." +-msgstr "このオプションは Kerberos 5 認証を使ってサーバーに接続します。" ++msgid "" ++"This option will connect to the NNTP server anonymously, without " ++"authentication." ++msgstr "このオプションは NNTP サーバーに匿名で、認証せずに接続します。" + + #: ../camel/providers/nntp/camel-nntp-provider.c:97 +-msgid "This option will authenticate with the NNTP server using a plaintext password." +-msgstr "このオプションはプレイン・テキストのパスワードを使って NNTP サーバーで認証します。" ++msgid "" ++"This option will authenticate with the NNTP server using a plaintext " ++"password." ++msgstr "このオプションはプレインテキストのパスワードを使って NNTP サーバーで認証します。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:333 ++#: ../camel/providers/nntp/camel-nntp-store.c:386 + #, c-format + msgid "Could not read greeting from %s: " + msgstr "%s からの挨拶を読むことができませんでした: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:345 ++#: ../camel/providers/nntp/camel-nntp-store.c:394 + #, c-format + msgid "NNTP server %s returned error code %d: %s" + msgstr "NNTP サーバー %s がエラーコード %d を返しました: %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:522 ++#: ../camel/providers/nntp/camel-nntp-store.c:555 + #, c-format + msgid "USENET News via %s" + msgstr "%s 経由の USENET ニュース" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1123 ++#: ../camel/providers/nntp/camel-nntp-store.c:1218 + #, c-format +-msgid "" +-"Error retrieving newsgroups:\n" ++msgid "Error retrieving newsgroups:\n" + "\n" + "%s" +-msgstr "" +-"ニュースグループの取得でエラー:\n" ++msgstr "ニュースグループの取得でエラー:\n" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1217 ++#: ../camel/providers/nntp/camel-nntp-store.c:1319 + #, c-format + msgid "You cannot create a folder in a News store: subscribe instead." +-msgstr "ニュース・ストアにフォルダーを生成できません: 代わりに購読を申請してください。" ++msgstr "ニュースストアにフォルダーを生成できません: 代わりに購読を申請してください。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1233 ++#: ../camel/providers/nntp/camel-nntp-store.c:1335 + #, c-format + msgid "You cannot rename a folder in a News store." + msgstr "ニュース格納場所のフォルダー名を変更できません。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1256 ++#: ../camel/providers/nntp/camel-nntp-store.c:1358 + #, c-format + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "ニュース格納場所のフォルダーを削除できません: 代わりに購読を停止してください。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1455 ++#: ../camel/providers/nntp/camel-nntp-store.c:1577 + #, c-format + msgid "" + "You cannot subscribe to this newsgroup:\n" + "\n" + "No such newsgroup. The selected item is a probably a parent folder." +-msgstr "" +-"このニュースグループは購読できません:\n" ++msgstr "このニュースグループは購読できません:\n" + "\n" + "そのようなニュースグループはありません。選択したアイテムは親フォルダーのものかもしれません。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1503 ++#: ../camel/providers/nntp/camel-nntp-store.c:1644 + #, c-format +-msgid "" +-"You cannot unsubscribe to this newsgroup:\n" ++msgid "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" +-msgstr "" +-"このニュースグループの購読を停止できません:\n" ++msgstr "このニュースグループの購読を停止できません:\n" + "\n" + "ニュースグループがありません!" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1707 ++#: ../camel/providers/nntp/camel-nntp-store.c:2081 + msgid "NNTP Command failed: " + msgstr "NNTP コマンドが失敗しました: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:1794 ++#: ../camel/providers/nntp/camel-nntp-store.c:2178 + #, c-format + msgid "Not connected." + msgstr "接続していません。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1856 ++#: ../camel/providers/nntp/camel-nntp-store.c:2272 + #, c-format + msgid "No such folder: %s" + msgstr "そのようなフォルダーはありません: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:198 +-#: ../camel/providers/nntp/camel-nntp-summary.c:328 ++#: ../camel/providers/nntp/camel-nntp-summary.c:200 ++#: ../camel/providers/nntp/camel-nntp-summary.c:339 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: 新しいメッセージの解析中" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:216 ++#: ../camel/providers/nntp/camel-nntp-summary.c:222 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "xover から想定外の応答がありました: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:346 ++#: ../camel/providers/nntp/camel-nntp-summary.c:360 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "head から想定外の応答がありました: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:393 ++#: ../camel/providers/nntp/camel-nntp-summary.c:407 + #, c-format + msgid "Operation failed: %s" + msgstr "操作が失敗しました: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:453 +-#: ../camel/providers/pop3/camel-pop3-folder.c:526 ++#: ../camel/providers/pop3/camel-pop3-folder.c:468 ++#: ../camel/providers/pop3/camel-pop3-folder.c:547 + #, c-format + msgid "No message with UID %s" + msgstr "UID %s のメッセージはありません" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:542 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 + #, c-format + msgid "Retrieving POP message %d" + msgstr "メッセージ %d を POP で取得中" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:634 ++#: ../camel/providers/pop3/camel-pop3-folder.c:658 + msgid "Unknown reason" + msgstr "原因不明" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:682 ++#: ../camel/providers/pop3/camel-pop3-folder.c:710 + msgid "Retrieving POP summary" + msgstr "POP サマリの取得中" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:741 +-#: ../camel/providers/pop3/camel-pop3-folder.c:744 +-#: ../camel/providers/pop3/camel-pop3-folder.c:757 +-#: ../camel/providers/pop3/camel-pop3-folder.c:770 +-#: ../camel/providers/pop3/camel-pop3-folder.c:784 ++#: ../camel/providers/pop3/camel-pop3-folder.c:771 ++#: ../camel/providers/pop3/camel-pop3-folder.c:774 ++#: ../camel/providers/pop3/camel-pop3-folder.c:787 ++#: ../camel/providers/pop3/camel-pop3-folder.c:800 ++#: ../camel/providers/pop3/camel-pop3-folder.c:814 + msgid "Cannot get POP summary: " + msgstr "POP サマリを取得できません: " + +-#: ../camel/providers/pop3/camel-pop3-folder.c:891 ++#: ../camel/providers/pop3/camel-pop3-folder.c:925 + msgid "Expunging old messages" + msgstr "古いメッセージの抹消中" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:911 ++#: ../camel/providers/pop3/camel-pop3-folder.c:945 + msgid "Expunging deleted messages" + msgstr "ローカルで削除済みのメッセージの抹消中" + +@@ -4188,95 +4266,102 @@ msgid "For connecting to and downloading + msgstr "POP サーバーに接続したりメールを読んだりします。" + + #: ../camel/providers/pop3/camel-pop3-provider.c:85 +-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers." +-msgstr "このオプションはプレイン・テキストのパスワードを使って POP サーバーへ接続します。これは多くの POP サーバーでサポートされるオプションです。" ++msgid "" ++"This option will connect to the POP server using a plaintext password. This " ++"is the only option supported by many POP servers." ++msgstr "" ++"このオプションはプレインテキストのパスワードを使って POP サーバーへ接続します。これは多くの POP サーバーでサポートされるオプションです。" + + #: ../camel/providers/pop3/camel-pop3-provider.c:95 +-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it." +-msgstr "このオプションは APOP プロトコル経由で暗号化されたパスワードを使って POP サーバーへ接続します。これは、たとえ APOP 対応を謳っているサーバーであっても、すべてのユーザーが正常に動作するわけではありません。" ++msgid "" ++"This option will connect to the POP server using an encrypted password via " ++"the APOP protocol. This may not work for all users even on servers that " ++"claim to support it." ++msgstr "" ++"このオプションは APOP プロトコル経由で暗号化されたパスワードを使って POP サーバーへ接続します。これは、たとえ APOP " ++"対応を謳っているサーバーであっても、すべてのユーザーが正常に動作するわけではありません。" + + #. Translators: This is the separator between an error and an explanation +-#: ../camel/providers/pop3/camel-pop3-store.c:89 ++#: ../camel/providers/pop3/camel-pop3-store.c:99 + msgid ": " + msgstr ": " + +-#: ../camel/providers/pop3/camel-pop3-store.c:150 ++#: ../camel/providers/pop3/camel-pop3-store.c:161 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "POP サーバー %s から妥当な挨拶の読み込みが失敗しました" + +-#: ../camel/providers/pop3/camel-pop3-store.c:165 ++#: ../camel/providers/pop3/camel-pop3-store.c:176 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "セキュリティ保護されたモードで POP サーバー %s への接続に失敗しました: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:166 ++#: ../camel/providers/pop3/camel-pop3-store.c:177 + msgid "STLS not supported by server" + msgstr "サーバーは STLS 拡張をサポートしていません" + + #. Translators: Last %s is an optional + #. * explanation beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:187 ++#: ../camel/providers/pop3/camel-pop3-store.c:198 + #, c-format + msgid "Failed to connect to POP server %s in secure mode%s" + msgstr "セキュリティ保護モードでの POP サーバー %s への接続に失敗しました%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:200 ++#: ../camel/providers/pop3/camel-pop3-store.c:211 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: " + msgstr "セキュリティ保護されたモードで POP サーバー %s への接続に失敗しました: " + +-#: ../camel/providers/pop3/camel-pop3-store.c:311 ++#: ../camel/providers/pop3/camel-pop3-store.c:351 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" +-msgstr "POP サーバー %s へログインできません: SASL プロトコル・エラーです" ++msgstr "POP サーバー %s へログインできません: SASL プロトコルエラーです" + +-#: ../camel/providers/pop3/camel-pop3-store.c:333 ++#: ../camel/providers/pop3/camel-pop3-store.c:373 + #, c-format + msgid "Failed to authenticate on POP server %s: " + msgstr "POP サーバー %s で認証に失敗しました: " + +-#: ../camel/providers/pop3/camel-pop3-store.c:435 ++#: ../camel/providers/pop3/camel-pop3-store.c:481 + #, c-format + msgid "POP3 server %s" + msgstr "POP3 サーバー %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:438 ++#: ../camel/providers/pop3/camel-pop3-store.c:484 + #, c-format + msgid "POP3 server for %s on %s" + msgstr "%s の %s にある POP3 サーバー" + +-#: ../camel/providers/pop3/camel-pop3-store.c:613 ++#: ../camel/providers/pop3/camel-pop3-store.c:696 + #, c-format +-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin." +-msgstr "POP サーバー %s へ接続できません:\t無効な APOP ID を受け取りました; 詐称攻撃の可能性があるので管理者に連絡してください。" ++msgid "" ++"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " ++"attack suspected. Please contact your admin." ++msgstr "" ++"POP サーバー %s へ接続できません:\t無効な APOP ID を受け取りました; 詐称攻撃の可能性があるので管理者に連絡してください。" + +-#: ../camel/providers/pop3/camel-pop3-store.c:665 ++#: ../camel/providers/pop3/camel-pop3-store.c:748 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending password: " +-msgstr "" +-"POP サーバー %s に接続できません。\n" ++msgstr "POP サーバー %s に接続できません。\n" + "パスワードの送信中にエラー: " + + #. Translators: Last %s is an optional explanation + #. * beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:680 ++#: ../camel/providers/pop3/camel-pop3-store.c:763 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending username%s" +-msgstr "" +-"POP サーバー %s に接続できません。\n" ++msgstr "POP サーバー %s に接続できません。\n" + "ユーザー名の送信中にエラー%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:751 ++#: ../camel/providers/pop3/camel-pop3-store.c:845 + #, c-format + msgid "No such folder '%s'." + msgstr "'%s' というフォルダーは存在しません。" + +-#: ../camel/providers/pop3/camel-pop3-store.c:768 ++#: ../camel/providers/pop3/camel-pop3-store.c:862 + #, c-format + msgid "POP3 stores have no folder hierarchy" + msgstr "POP3 ストアはフォルダーの階層構造を持ちません" +@@ -4287,7 +4372,9 @@ msgid "Sendmail" + msgstr "Sendmail" + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:38 +-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system." ++msgid "" ++"For delivering mail by passing it to the \"sendmail\" program on the local " ++"system." + msgstr "メールを配送するためにローカルシステムの \"sendmail\" プログラムへ渡します。" + + #: ../camel/providers/sendmail/camel-sendmail-transport.c:50 +@@ -4304,10 +4391,9 @@ msgid "Could not parse recipient list" + msgstr "返信リストを解析できませんでした" + + #: ../camel/providers/sendmail/camel-sendmail-transport.c:182 +-#, fuzzy, c-format +-#| msgid "Could not parse recipient list" ++#, c-format + msgid "Could not parse arguments" +-msgstr "返信リストを解析できませんでした" ++msgstr "引数を解析できませんでした" + + #: ../camel/providers/sendmail/camel-sendmail-transport.c:213 + #, c-format +@@ -4358,218 +4444,218 @@ msgstr "SMTP" + msgid "For delivering mail by connecting to a remote mailhub using SMTP." + msgstr "SMTP を使ってリモートのメールハブに接続することでメールを配信します。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:160 +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:158 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 + msgid "Welcome response error: " + msgstr "Welcome 応答エラー: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:207 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "セキュリティ保護されたモードで SMTP サーバー %s への接続に失敗しました: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 +-#: ../camel/providers/smtp/camel-smtp-transport.c:229 +-#: ../camel/providers/smtp/camel-smtp-transport.c:236 ++#: ../camel/providers/smtp/camel-smtp-transport.c:211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:224 ++#: ../camel/providers/smtp/camel-smtp-transport.c:231 + msgid "STARTTLS command failed: " + msgstr "STARTTLS コマンドが失敗しました: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:247 ++#: ../camel/providers/smtp/camel-smtp-transport.c:242 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: " + msgstr "セキュリティ保護されたモードで SMTP サーバー %s への接続に失敗しました: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:349 ++#: ../camel/providers/smtp/camel-smtp-transport.c:342 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP サーバー %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:352 ++#: ../camel/providers/smtp/camel-smtp-transport.c:345 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "%s 経由で SMTP メールを配信します" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:426 ++#: ../camel/providers/smtp/camel-smtp-transport.c:419 + #, c-format + msgid "SMTP server %s does not support %s authentication" + msgstr "SMTP サーバー %s は認証方式 %s をサポートしていません" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:508 ++#: ../camel/providers/smtp/camel-smtp-transport.c:500 + #, c-format + msgid "No SASL mechanism was specified" + msgstr "SASL メカニズムが指定されていませんでした" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:538 +-#: ../camel/providers/smtp/camel-smtp-transport.c:549 +-#: ../camel/providers/smtp/camel-smtp-transport.c:562 ++#: ../camel/providers/smtp/camel-smtp-transport.c:530 ++#: ../camel/providers/smtp/camel-smtp-transport.c:541 ++#: ../camel/providers/smtp/camel-smtp-transport.c:554 + msgid "AUTH command failed: " + msgstr "AUTH コマンドが失敗しました: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:695 + #, c-format + msgid "Cannot send message: service not connected." + msgstr "メッセージを送信できません: サービスが接続されていません。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:710 ++#: ../camel/providers/smtp/camel-smtp-transport.c:702 + #, c-format + msgid "Cannot send message: sender address not valid." + msgstr "メッセージを送信できません: 差出人のアドレスが正しくありません。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:714 ++#: ../camel/providers/smtp/camel-smtp-transport.c:706 + msgid "Sending message" + msgstr "メッセージの送信中" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:731 + #, c-format + msgid "Cannot send message: no recipients defined." + msgstr "メッセージを送信できません: 宛先が定義されていません。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:752 ++#: ../camel/providers/smtp/camel-smtp-transport.c:744 + #, c-format + msgid "Cannot send message: one or more invalid recipients" + msgstr "メッセージを送信できません: 無効な応答が一つ以上あります" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:873 ++#: ../camel/providers/smtp/camel-smtp-transport.c:865 + msgid "Syntax error, command unrecognized" + msgstr "構文解析エラー: コマンドではありません" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:875 ++#: ../camel/providers/smtp/camel-smtp-transport.c:867 + msgid "Syntax error in parameters or arguments" + msgstr "パラメーターあるいは引数に構文解析エラー" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:877 ++#: ../camel/providers/smtp/camel-smtp-transport.c:869 + msgid "Command not implemented" + msgstr "コマンドは実装されていません" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:879 ++#: ../camel/providers/smtp/camel-smtp-transport.c:871 + msgid "Command parameter not implemented" + msgstr "コマンドパラメーターは実装されていません" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:881 ++#: ../camel/providers/smtp/camel-smtp-transport.c:873 + msgid "System status, or system help reply" +-msgstr "システム・ステータスまたはシステム・ヘルプの応答" ++msgstr "システムステータスまたはシステムヘルプの応答" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:883 ++#: ../camel/providers/smtp/camel-smtp-transport.c:875 + msgid "Help message" +-msgstr "ヘルプ・メッセージ" ++msgstr "ヘルプメッセージ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:885 ++#: ../camel/providers/smtp/camel-smtp-transport.c:877 + msgid "Service ready" + msgstr "サービスは利用できます" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:887 ++#: ../camel/providers/smtp/camel-smtp-transport.c:879 + msgid "Service closing transmission channel" + msgstr "サービスは送信チャンネルを閉じています" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:889 ++#: ../camel/providers/smtp/camel-smtp-transport.c:881 + msgid "Service not available, closing transmission channel" + msgstr "サービスは利用できません, 送信チャンネルを閉じています" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:891 ++#: ../camel/providers/smtp/camel-smtp-transport.c:883 + msgid "Requested mail action okay, completed" + msgstr "要求されたメールの動作はOK, 完了しました" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:893 ++#: ../camel/providers/smtp/camel-smtp-transport.c:885 + msgid "User not local; will forward to " + msgstr "ユーザーはローカルではありません; へ転送します" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:895 ++#: ../camel/providers/smtp/camel-smtp-transport.c:887 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "要求されたメールの動作は完了しません: メールボックスは利用できません" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:897 ++#: ../camel/providers/smtp/camel-smtp-transport.c:889 + msgid "Requested action not taken: mailbox unavailable" + msgstr "要求された動作は完了しません: メールボックスは利用できません" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:899 ++#: ../camel/providers/smtp/camel-smtp-transport.c:891 + msgid "Requested action aborted: error in processing" + msgstr "要求された動作を中断しました: 処理中にエラー" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:901 ++#: ../camel/providers/smtp/camel-smtp-transport.c:893 + msgid "User not local; please try " + msgstr "ユーザーはローカルではありません; を試してください。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:903 ++#: ../camel/providers/smtp/camel-smtp-transport.c:895 + msgid "Requested action not taken: insufficient system storage" + msgstr "要求された動作は完了しません: システムの保存領域が足りません" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:905 ++#: ../camel/providers/smtp/camel-smtp-transport.c:897 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "要求されたメールの動作を中断しました: 領域割り当てを越えました" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:907 ++#: ../camel/providers/smtp/camel-smtp-transport.c:899 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "要求された動作は完了しません: メールボックス名は認められません" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:909 ++#: ../camel/providers/smtp/camel-smtp-transport.c:901 + msgid "Start mail input; end with ." + msgstr "メールの入力を開始します; . で終了します" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:911 ++#: ../camel/providers/smtp/camel-smtp-transport.c:903 + msgid "Transaction failed" + msgstr "処理は失敗しました" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:915 ++#: ../camel/providers/smtp/camel-smtp-transport.c:907 + msgid "A password transition is needed" + msgstr "パスワードの変更が必要です" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:917 ++#: ../camel/providers/smtp/camel-smtp-transport.c:909 + msgid "Authentication mechanism is too weak" + msgstr "認証メカニズムは不十分過ぎます" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:919 ++#: ../camel/providers/smtp/camel-smtp-transport.c:911 + msgid "Encryption required for requested authentication mechanism" + msgstr "要求した認証メカニズムのために暗号化が必要です" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:921 ++#: ../camel/providers/smtp/camel-smtp-transport.c:913 + msgid "Temporary authentication failure" + msgstr "一時的な認証に失敗しました" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1170 + msgid "SMTP Greeting" + msgstr "SMTP で接続中" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1205 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1223 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1231 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1197 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1219 + msgid "HELO command failed: " + msgstr "HELO コマンドが失敗しました: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1306 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1321 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1331 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1294 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1309 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1319 + msgid "MAIL FROM command failed: " + msgstr "MAIL FROM コマンドが失敗しました: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1358 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1346 + msgid "RCPT TO command failed: " + msgstr "RCPT TO コマンドが失敗しました: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1375 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1385 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1363 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1373 + #, c-format + msgid "RCPT TO <%s> failed: " + msgstr "RCPT TO <%s> コマンドが失敗しました: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1428 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1439 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1450 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1509 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1529 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1543 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1552 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1416 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1427 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1438 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1497 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1517 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1531 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1540 + msgid "DATA command failed: " + msgstr "DATA コマンドが失敗しました: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1577 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1592 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1601 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1565 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1580 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1589 + msgid "RSET command failed: " + msgstr "RSET コマンドが失敗しました: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1626 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1640 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1647 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1614 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1628 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1635 + msgid "QUIT command failed: " + msgstr "QUIT コマンドが失敗しました: " + +@@ -4598,7 +4684,9 @@ msgid "Birthday and anniversary reminder + msgstr "誕生日や記念日のリマインダーユニット" + + #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6 +-msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\"" ++msgid "" ++"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or " ++"\"days\"" + msgstr "\"minutes\"、\"hours\"、\"days\" など誕生日または記念日の単位です" + + #: ../libebackend/e-authentication-mediator.c:205 +@@ -4623,11 +4711,11 @@ msgstr "クライアントにより操� + msgid "Client reports password was rejected" + msgstr "クライアントはパスワードが拒否されたと報告しています" + +-#: ../libebackend/e-authentication-session.c:532 ++#: ../libebackend/e-authentication-session.c:543 + msgid "Add this password to your keyring" +-msgstr "キーリングにこのパスワードを追加する" ++msgstr "鍵リングにこのパスワードを追加する" + +-#: ../libebackend/e-authentication-session.c:622 ++#: ../libebackend/e-authentication-session.c:648 + msgid "Password was incorrect" + msgstr "パスワードが間違っています" + +@@ -4647,10 +4735,9 @@ msgid "%s does not support deleting remo + msgstr "%s ではリモートリソースの削除をサポートしていません" + + #: ../libebackend/e-data-factory.c:320 +-#, fuzzy, c-format +-#| msgid "No backend name in source '%s'" ++#, c-format + msgid "No backend factory for hash key '%s'" +-msgstr "ソース '%s' にはバックエンド名がありません" ++msgstr "ハッシュ鍵 '%s' にはバックエンドファクトリーがありません" + + #: ../libebackend/e-server-side-source.c:134 + #, c-format +@@ -4658,34 +4745,35 @@ msgid "Data source is missing a [%s] gro + msgstr "データソースには [%s] グループがありません" + + #: ../libebackend/e-server-side-source.c:1008 +-#: ../libedataserver/e-source.c:1120 ++#: ../libedataserver/e-source.c:1138 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "データソース '%s' ではリモートリソースの作成をサポートしていません" + + #: ../libebackend/e-server-side-source.c:1022 + #, c-format +-msgid "Data source '%s' has no collection backend to create the remote resource" ++msgid "" ++"Data source '%s' has no collection backend to create the remote resource" + msgstr "データソース '%s' には、リモートリソースを作成するために収集されるバックエンドがありません。" + + #: ../libebackend/e-server-side-source.c:1050 +-#: ../libedataserver/e-source.c:1227 ++#: ../libedataserver/e-source.c:1251 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "データソース '%s' はリモートリソースの削除をサポートしていません" + + #: ../libebackend/e-server-side-source.c:1064 + #, c-format +-msgid "Data source '%s' has no collection backend to delete the remote resource" ++msgid "" ++"Data source '%s' has no collection backend to delete the remote resource" + msgstr "データソース '%s' には、リモートリソースを削除するために収集されるバックエンドがありません。" + + #: ../libebackend/e-server-side-source.c:1095 +-#: ../libedataserver/e-source.c:1317 ++#: ../libedataserver/e-source.c:1347 + #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990 +-#, fuzzy, c-format +-#| msgid "IMAP server %s does not support %s authentication" ++#, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" +-msgstr "IMAP サーバーの %s では %s という認証タイプをサポートしていません" ++msgstr "データソース %s は OAuth 2.0 という認証タイプをサポートしていません" + + #: ../libebackend/e-server-side-source.c:1438 + #, c-format +@@ -4693,7 +4781,7 @@ msgid "File must have a '.source' extens + msgstr "ファイルには '.source' 拡張子が必要です" + + #: ../libebackend/e-source-registry-server.c:523 +-#: ../libedataserver/e-source-registry.c:1625 ++#: ../libedataserver/e-source-registry.c:1882 + msgid "The user declined to authenticate" + msgstr "ユーザー認証に失敗しました" + +@@ -4703,10 +4791,9 @@ msgid "UID '%s' is already in use" + msgstr "UID '%s' は既に使用されています" + + #: ../libebackend/e-user-prompter-server.c:303 +-#, fuzzy, c-format +-#| msgid "Contact '%s' not found" ++#, c-format + msgid "Extension dialog '%s' not found." +-msgstr "連絡先 '%s' が見つかりません" ++msgstr "拡張ダイアログ '%s' が見つかりません" + + #: ../libedataserver/e-categories.c:46 + msgctxt "CategoryName" +@@ -4751,7 +4838,7 @@ msgstr "休日" + #: ../libedataserver/e-categories.c:54 + msgctxt "CategoryName" + msgid "Holiday Cards" +-msgstr "ホリデー・カード" ++msgstr "ホリデーカード" + + #. important people (e.g. new business partners) + #: ../libedataserver/e-categories.c:56 +@@ -4833,7 +4920,7 @@ msgstr "ソースは既に読み込み� + #. * thus it is unavailable while user is not connected. + #: ../libedataserver/e-client.c:148 + msgid "Offline unavailable" +-msgstr "オフライン・モードに切り替えられません" ++msgstr "オフラインモードに切り替えられません" + + #: ../libedataserver/e-client.c:170 + msgid "D-Bus error" +@@ -4891,22 +4978,22 @@ msgstr "タスクリスト \"%s\" のパ + msgid "Please enter the password for account \"%s\"." + msgstr "アカウント \"%s\" のパスワードを入力してください。" + +-#: ../libedataserver/e-source.c:622 ++#: ../libedataserver/e-source.c:627 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "ソースファイルには [%s] グループがありません" + +-#: ../libedataserver/e-source.c:943 ++#: ../libedataserver/e-source.c:949 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "データソース '%s' を削除することはできません" + +-#: ../libedataserver/e-source.c:1029 ++#: ../libedataserver/e-source.c:1041 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "データソース '%s' には書き込みできません" + +-#: ../libedataserver/e-source.c:1523 ++#: ../libedataserver/e-source.c:1559 + msgid "Unnamed" + msgstr "名前なしの一覧" + +@@ -4916,66 +5003,39 @@ msgid "Signature script must be a local + msgstr "署名スクリプトはローカルファイルにしてください" + + #: ../libedataserver/e-source-webdav.c:1529 +-#, fuzzy, c-format +-#| msgid "" +-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n" +-#| "\n" +-#| "Detailed information about the certificate:\n" +-#| "%s" +-msgid "SSL certificate for host '%s', used by address book '%s', is not trusted. Do you wish to accept it?" +-msgstr "" +-"'%s' の SSL 証明書は信頼できません。許可しますか?\n" +-"\n" +-"この証明書の詳細情報は以下の通りです。\n" +-"%s" ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by address book '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "ホスト '%s' の SSL 証明書がアドレス帳 '%s' で利用されていますが信頼できません。許可しますか?" + + #: ../libedataserver/e-source-webdav.c:1538 +-#, fuzzy, c-format +-#| msgid "" +-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n" +-#| "\n" +-#| "Detailed information about the certificate:\n" +-#| "%s" +-msgid "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you wish to accept it?" +-msgstr "" +-"'%s' の SSL 証明書は信頼できません。許可しますか?\n" +-"\n" +-"この証明書の詳細情報は以下の通りです。\n" +-"%s" ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " ++"wish to accept it?" ++msgstr "ホスト '%s' の SSL 証明書がカレンダー '%s' で利用されていますが信頼できません。許可しますか?" + + #: ../libedataserver/e-source-webdav.c:1547 +-#, fuzzy, c-format +-#| msgid "" +-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n" +-#| "\n" +-#| "Detailed information about the certificate:\n" +-#| "%s" +-msgid "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do you wish to accept it?" +-msgstr "" +-"'%s' の SSL 証明書は信頼できません。許可しますか?\n" +-"\n" +-"この証明書の詳細情報は以下の通りです。\n" +-"%s" ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "ホスト '%s' の SSL 証明書がメモ一覧 '%s' で利用されていますが信頼できません。許可しますか?" + + #: ../libedataserver/e-source-webdav.c:1556 +-#, fuzzy, c-format +-#| msgid "" +-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n" +-#| "\n" +-#| "Detailed information about the certificate:\n" +-#| "%s" +-msgid "SSL certificate for host '%s', used by task list '%s', is not trusted. Do you wish to accept it?" +-msgstr "" +-"'%s' の SSL 証明書は信頼できません。許可しますか?\n" +-"\n" +-"この証明書の詳細情報は以下の通りです。\n" +-"%s" ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by task list '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "ホスト '%s' の SSL 証明書がタスク一覧 '%s' で利用されていますが信頼できません。許可しますか?" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962 ++#: ../libedataserver/e-time-utils.c:1663 ++#: ../libedataserver/e-time-utils.c:1962 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%Y/%m/%d (%a) %p%l:%M:%S" + +@@ -4983,7 +5043,8 @@ msgstr "%Y/%m/%d (%a) %p%l:%M:%S" + #. * in 24-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953 ++#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1953 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%Y/%m/%d (%a) %k:%M:%S" + +@@ -4991,7 +5052,8 @@ msgstr "%Y/%m/%d (%a) %k:%M:%S" + #. * in 12-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958 ++#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1958 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%Y/%m/%d (%a) %p%l:%M" + +@@ -4999,7 +5061,8 @@ msgstr "%Y/%m/%d (%a) %p%l:%M" + #. * in 24-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949 ++#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1949 + msgid "%a %m/%d/%Y %H:%M" + msgstr "%Y/%m/%d (%a) %k:%M" + +@@ -5017,7 +5080,8 @@ msgstr "%Y/%m/%d (%a) %k時" + + #. strptime format of a weekday and a date. + #. strftime format of a weekday and a date. +-#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811 ++#: ../libedataserver/e-time-utils.c:1691 ++#: ../libedataserver/e-time-utils.c:1811 + #: ../libedataserver/e-time-utils.c:1944 + msgid "%a %m/%d/%Y" + msgstr "%Y/%m/%d (%a)" +@@ -5058,19 +5122,22 @@ msgstr "%Y/%m/%d %k時" + + #. strptime format of a weekday and a date. + #. This is the preferred date format for the locale. +-#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814 ++#: ../libedataserver/e-time-utils.c:1725 ++#: ../libedataserver/e-time-utils.c:1814 + msgid "%m/%d/%Y" + msgstr "%Y/%m/%d" + + #. strptime format for a time of day, in 12-hour format. + #. strftime format of a time in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006 ++#: ../libedataserver/e-time-utils.c:1885 ++#: ../libedataserver/e-time-utils.c:2006 + msgid "%I:%M:%S %p" + msgstr "%p%l:%M:%S" + + #. strptime format for a time of day, in 24-hour format. + #. strftime format of a time in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998 ++#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1998 + msgid "%H:%M:%S" + msgstr "%k:%M:%S" + +@@ -5078,14 +5145,16 @@ msgstr "%k:%M:%S" + #. * in 12-hour format. + #. strftime format of a time in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003 ++#: ../libedataserver/e-time-utils.c:1894 ++#: ../libedataserver/e-time-utils.c:2003 + msgid "%I:%M %p" + msgstr "%p%l:%M" + + #. strptime format for time of day, without seconds 24-hour format. + #. strftime format of a time in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995 ++#: ../libedataserver/e-time-utils.c:1898 ++#: ../libedataserver/e-time-utils.c:1995 + msgid "%H:%M" + msgstr "%k:%M" + +@@ -5105,7 +5174,9 @@ msgid "Proxy type to use" + msgstr "使用するプロキシタイプ" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2 +-msgid "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" means manual proxy." ++msgid "" ++"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" " ++"means manual proxy." + msgstr "使用するプロキシタイプです。\"0\" はシステム、\"1\" はプロシキなし、\"2\" は手作業によるプロキシになります。" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 +@@ -5206,21 +5277,21 @@ msgstr "自動プロキシの設定を� + + #: ../modules/gnome-online-accounts/e-goa-password-based.c:132 + #: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365 +-#, fuzzy, c-format +-#| msgid "No such source for UID '%s'" ++#, c-format + msgid "No such data source for UID '%s'" +-msgstr "UID '%s' にそのようなソースはありません" ++msgstr "UID '%s' にそのようなデータソースはありません" + + #: ../modules/gnome-online-accounts/e-goa-password-based.c:144 + #, c-format +-msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain a password for '%s'" +-msgstr "" ++msgid "" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain a password for '%s'" ++msgstr "'%s' のパスワード取得先の org.gnome.OnlineAccounts サービスから対応するアカウントを見つけることができません" + + #: ../modules/gnome-online-accounts/e-goa-password-based.c:216 +-#, fuzzy, c-format +-#| msgid "Enter password for %s" ++#, c-format + msgid "Invalid password for '%s'" +-msgstr "%s のパスワードを入力してください" ++msgstr "%s のパスワードが無効です" + + #. TODO: more specific + #: ../modules/gnome-online-accounts/goaewsclient.c:223 +@@ -5258,16 +5329,18 @@ msgstr "account エレメントの検出 + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "autodiscover 応答内で ASUrl と OABUrl の検出に失敗しました" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1237 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1271 + #, c-format +-msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain an access token for '%s'" ++msgid "" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain an access token for '%s'" + msgstr "" ++"'%s' のアクセス用トークン取得先の org.gnome.OnlineAccounts サービスから対応するアカウントを見つけることができません" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1264 +-#, fuzzy, c-format +-#| msgid "Failed to open addressbook at '%s': %s" ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1298 ++#, c-format + msgid "Failed to obtain an access token for '%s': " +-msgstr "'%s' でアドレス帳を開くのに失敗しました: %s" ++msgstr "'%s' のアクセス用トークン取得に失敗しました: " + + #: ../modules/google-backend/module-google-backend.c:140 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 +@@ -5282,280 +5355,246 @@ msgid "Contacts" + msgstr "連絡先" + + #: ../modules/trust-prompt/certificate-viewer.c:292 +-#, fuzzy +-#| msgid "Cannot add encryption certificate" + msgid "Not part of certificate" +-msgstr "暗号化証明書を追加できません" ++msgstr "証明書の一部ではありません" + + #: ../modules/trust-prompt/certificate-viewer.c:600 + msgid "This certificate has been verified for the following uses:" +-msgstr "" ++msgstr "この証明書は次の用途に対して検証済です:" + + #: ../modules/trust-prompt/certificate-viewer.c:604 + #: ../modules/trust-prompt/e-asn1-object.c:387 +-#, fuzzy +-#| msgid "X.509 Certificate" + msgid "SSL Client Certificate" +-msgstr "X.509 認証" ++msgstr "SSL クライアント証明書" + + #: ../modules/trust-prompt/certificate-viewer.c:609 + #: ../modules/trust-prompt/e-asn1-object.c:391 +-#, fuzzy +-#| msgid "X.509 Certificate" + msgid "SSL Server Certificate" +-msgstr "X.509 認証" ++msgstr "SSL サーバー証明書" + + #: ../modules/trust-prompt/certificate-viewer.c:614 + msgid "Email Signer Certificate" +-msgstr "" ++msgstr "メールに署名した人の証明書" + + #: ../modules/trust-prompt/certificate-viewer.c:619 +-#, fuzzy +-#| msgid "Cannot add encryption certificate" + msgid "Email Recipient Certificate" +-msgstr "暗号化証明書を追加できません" ++msgstr "メールを受信した人の証明書" + + #: ../modules/trust-prompt/certificate-viewer.c:634 + msgid "Issued To" +-msgstr "" ++msgstr "発行対象" + + #: ../modules/trust-prompt/certificate-viewer.c:635 + #: ../modules/trust-prompt/certificate-viewer.c:641 + msgid "Common Name (CN)" +-msgstr "" ++msgstr "コモンネーム (CN)" + + #: ../modules/trust-prompt/certificate-viewer.c:636 + #: ../modules/trust-prompt/certificate-viewer.c:642 +-#, fuzzy +-#| msgid "Organization" + msgid "Organization (O)" +-msgstr "組織" ++msgstr "組織 (O)" + + #: ../modules/trust-prompt/certificate-viewer.c:637 + #: ../modules/trust-prompt/certificate-viewer.c:643 +-#, fuzzy +-#| msgid "Organizational Unit" + msgid "Organizational Unit (OU)" +-msgstr "組織" ++msgstr "組織の単位 (OU)" + + #: ../modules/trust-prompt/certificate-viewer.c:638 + #: ../modules/trust-prompt/e-asn1-object.c:134 + msgid "Serial Number" +-msgstr "" ++msgstr "シリアル番号" + + #: ../modules/trust-prompt/certificate-viewer.c:640 + msgid "Issued By" +-msgstr "" ++msgstr "発行元" + + #: ../modules/trust-prompt/certificate-viewer.c:645 + msgid "Validity" +-msgstr "" ++msgstr "妥当性" + + #: ../modules/trust-prompt/certificate-viewer.c:646 + msgid "Issued On" +-msgstr "" ++msgstr "発行日" + + #: ../modules/trust-prompt/certificate-viewer.c:647 + msgid "Expires On" +-msgstr "" ++msgstr "有効期限" + + #: ../modules/trust-prompt/certificate-viewer.c:649 + msgid "Fingerprints" +-msgstr "" ++msgstr "フィンガープリント" + + #: ../modules/trust-prompt/certificate-viewer.c:650 + msgid "SHA1 Fingerprint" +-msgstr "" ++msgstr "SHA1 フィンガープリント" + + #: ../modules/trust-prompt/certificate-viewer.c:651 + msgid "MD5 Fingerprint" +-msgstr "" ++msgstr "MD5 フィンガープリント" + + #: ../modules/trust-prompt/certificate-viewer.c:653 + msgid "General" +-msgstr "" ++msgstr "全般" + + #: ../modules/trust-prompt/certificate-viewer.c:672 +-#, fuzzy +-#| msgid "Certificate rejected" + msgid "Certificate Hierarchy" +-msgstr "拒否された証明書です" ++msgstr "証明書の階層" + + #: ../modules/trust-prompt/certificate-viewer.c:676 +-#, fuzzy +-#| msgid "Certificate Revoked" + msgid "Certificate Fields" +-msgstr "無効になった証明書です" ++msgstr "証明書のフィールド" + + #: ../modules/trust-prompt/certificate-viewer.c:680 + msgid "Field Value" +-msgstr "" ++msgstr "項目の値" + + #: ../modules/trust-prompt/certificate-viewer.c:682 + msgid "Details" +-msgstr "" ++msgstr "詳細" + + #: ../modules/trust-prompt/e-asn1-object.c:95 + msgid "Version" +-msgstr "" ++msgstr "バージョン" + + #: ../modules/trust-prompt/e-asn1-object.c:110 + msgid "Version 1" +-msgstr "" ++msgstr "バージョン 1" + + #: ../modules/trust-prompt/e-asn1-object.c:113 + msgid "Version 2" +-msgstr "" ++msgstr "バージョン 2" + + #: ../modules/trust-prompt/e-asn1-object.c:116 + msgid "Version 3" +-msgstr "" ++msgstr "バージョン 3" + + #: ../modules/trust-prompt/e-asn1-object.c:192 + msgid "PKCS #1 MD2 With RSA Encryption" +-msgstr "" ++msgstr "RSA で暗号化された PKCS #1 MD2" + + #: ../modules/trust-prompt/e-asn1-object.c:195 + msgid "PKCS #1 MD5 With RSA Encryption" +-msgstr "" ++msgstr "RSA で暗号化された PKCS #1 MD5" + + #: ../modules/trust-prompt/e-asn1-object.c:198 + msgid "PKCS #1 SHA-1 With RSA Encryption" +-msgstr "" ++msgstr "RSA で暗号化された PKCS #1 SHA-1" + + #: ../modules/trust-prompt/e-asn1-object.c:201 + msgid "PKCS #1 SHA-256 With RSA Encryption" +-msgstr "" ++msgstr "RSA で暗号化された PKCS #1 SHA-256" + + #: ../modules/trust-prompt/e-asn1-object.c:204 + msgid "PKCS #1 SHA-384 With RSA Encryption" +-msgstr "" ++msgstr "RSA で暗号化された PKCS #1 SHA-384" + + #: ../modules/trust-prompt/e-asn1-object.c:207 + msgid "PKCS #1 SHA-512 With RSA Encryption" +-msgstr "" ++msgstr "RSA で暗号化された PKCS #1 SHA-512" + + #: ../modules/trust-prompt/e-asn1-object.c:234 + msgid "PKCS #1 RSA Encryption" +-msgstr "" ++msgstr "PKCS #1 RSA 暗号化" + + #: ../modules/trust-prompt/e-asn1-object.c:237 +-#, fuzzy +-#| msgid "Certificate Revoked" + msgid "Certificate Key Usage" +-msgstr "無効になった証明書です" ++msgstr "証明書鍵の使い方" + + #: ../modules/trust-prompt/e-asn1-object.c:240 + msgid "Netscape Certificate Type" +-msgstr "" ++msgstr "Netscape 証明書の種類" + + #: ../modules/trust-prompt/e-asn1-object.c:243 +-#, fuzzy +-#| msgid "Certificate untrusted" + msgid "Certificate Authority Key Identifier" +-msgstr "信頼されていない証明書です" ++msgstr "認証局の鍵識別子" + + #: ../modules/trust-prompt/e-asn1-object.c:255 + #, c-format + msgid "Object Identifier (%s)" +-msgstr "" ++msgstr "オブジェクトの識別子 (%s)" + + #: ../modules/trust-prompt/e-asn1-object.c:306 + msgid "Algorithm Identifier" +-msgstr "" ++msgstr "アルゴリズムの識別子" + + #: ../modules/trust-prompt/e-asn1-object.c:314 + msgid "Algorithm Parameters" +-msgstr "" ++msgstr "アルゴリズムのパラメータ" + + #: ../modules/trust-prompt/e-asn1-object.c:336 + msgid "Subject Public Key Info" +-msgstr "" ++msgstr "主体者公開鍵情報" + + #: ../modules/trust-prompt/e-asn1-object.c:341 + msgid "Subject Public Key Algorithm" +-msgstr "" ++msgstr "主体者公開鍵のアルゴリズム" + + #: ../modules/trust-prompt/e-asn1-object.c:356 + msgid "Subject's Public Key" +-msgstr "" ++msgstr "主体者公開鍵" + + #: ../modules/trust-prompt/e-asn1-object.c:378 + #: ../modules/trust-prompt/e-asn1-object.c:428 +-#, fuzzy +-#| msgid "Unable to process spool folder" + msgid "Error: Unable to process extension" +-msgstr "スプール・フォルダーを処理できません" ++msgstr "エラー: 拡張処理できません" + + #: ../modules/trust-prompt/e-asn1-object.c:395 +-#, fuzzy +-#| msgid "Email 1" + msgid "Email" +-msgstr "E-メール 1" ++msgstr "Email" + + #: ../modules/trust-prompt/e-asn1-object.c:399 + #: ../modules/trust-prompt/e-asn1-object.c:411 + msgid "Object Signer" +-msgstr "" ++msgstr "オブジェクトの署名者" + + #: ../modules/trust-prompt/e-asn1-object.c:403 +-#, fuzzy +-#| msgid "Invalid Certificate Authority (CA)" + msgid "SSL Certificate Authority" +-msgstr "認証局 (CA) が無効です" ++msgstr "SSL 認証局" + + #: ../modules/trust-prompt/e-asn1-object.c:407 +-#, fuzzy +-#| msgid "Invalid Certificate Authority (CA)" + msgid "Email Certificate Authority" +-msgstr "認証局 (CA) が無効です" ++msgstr "メール認証局" + + #: ../modules/trust-prompt/e-asn1-object.c:436 +-#, fuzzy +-#| msgid "Signing message" + msgid "Signing" +-msgstr "メッセージの署名中" ++msgstr "署名中" + + #: ../modules/trust-prompt/e-asn1-object.c:440 +-#, fuzzy +-#| msgid "Non-editing Author" + msgid "Non-repudiation" +-msgstr "Non-editing Author" ++msgstr "容認" + + #: ../modules/trust-prompt/e-asn1-object.c:444 + msgid "Key Encipherment" +-msgstr "" ++msgstr "鍵の暗号化" + + #: ../modules/trust-prompt/e-asn1-object.c:448 + msgid "Data Encipherment" +-msgstr "" ++msgstr "データの暗号化" + + #: ../modules/trust-prompt/e-asn1-object.c:452 + msgid "Key Agreement" +-msgstr "" ++msgstr "鍵の約款" + + #: ../modules/trust-prompt/e-asn1-object.c:456 +-#, fuzzy +-#| msgid "Certificate signature failure" + msgid "Certificate Signer" +-msgstr "証明書の署名に失敗しました" ++msgstr "証明書の署名者" + + #: ../modules/trust-prompt/e-asn1-object.c:460 + msgid "CRL Signer" +-msgstr "" ++msgstr "CRL の署名者" + + #: ../modules/trust-prompt/e-asn1-object.c:509 + msgid "Critical" +-msgstr "" ++msgstr "重大" + + #: ../modules/trust-prompt/e-asn1-object.c:511 + #: ../modules/trust-prompt/e-asn1-object.c:514 + msgid "Not Critical" +-msgstr "" ++msgstr "危険ではない" + + #: ../modules/trust-prompt/e-asn1-object.c:535 + msgid "Extensions" +-msgstr "" ++msgstr "拡張" + + #. Translators: This string is used in Certificate + #. * details for fields like Issuer or Subject, which +@@ -5568,88 +5607,72 @@ msgstr "" + #: ../modules/trust-prompt/e-asn1-object.c:615 + #, c-format + msgid "%s = %s" +-msgstr "" ++msgstr "%s = %s" + + #: ../modules/trust-prompt/e-asn1-object.c:658 +-#, fuzzy +-#| msgid "X.509 Certificate" + msgid "Certificate" +-msgstr "X.509 認証" ++msgstr "証明書" + + #: ../modules/trust-prompt/e-asn1-object.c:674 + #: ../modules/trust-prompt/e-asn1-object.c:812 +-#, fuzzy +-#| msgid "Certificate signature failure" + msgid "Certificate Signature Algorithm" +-msgstr "証明書の署名に失敗しました" ++msgstr "証明書の署名アルゴリズム" + + #: ../modules/trust-prompt/e-asn1-object.c:683 + msgid "Issuer" +-msgstr "" ++msgstr "発行者" + + #: ../modules/trust-prompt/e-asn1-object.c:714 + msgid "Subject" +-msgstr "" ++msgstr "件名" + + #: ../modules/trust-prompt/e-asn1-object.c:738 +-#, fuzzy +-#| msgid "Unique ID" + msgid "Issuer Unique ID" +-msgstr "重複しない ID" ++msgstr "重複しない発行者の ID" + + #: ../modules/trust-prompt/e-asn1-object.c:757 +-#, fuzzy +-#| msgid "Unique ID" + msgid "Subject Unique ID" +-msgstr "重複しない ID" ++msgstr "重複しない件名の ID" + + #: ../modules/trust-prompt/e-asn1-object.c:818 +-#, fuzzy +-#| msgid "Certificate signature failure" + msgid "Certificate Signature Value" +-msgstr "証明書の署名に失敗しました" ++msgstr "証明書の署名の値" + + #: ../modules/trust-prompt/module-trust-prompt.c:201 +-#, fuzzy +-#| msgid "Signing certificate not found" + msgid "The signing certificate authority is not known." +-msgstr "署名付き証明書がみつかりません" ++msgstr "署名している認証局が未知です" + + #: ../modules/trust-prompt/module-trust-prompt.c:203 +-msgid "The certificate does not match the expected identity of the site that it was retrieved from." +-msgstr "" ++msgid "" ++"The certificate does not match the expected identity of the site that it was " ++"retrieved from." ++msgstr "証明書が予期した取得サイトの識別情報と一致しません。" + + #: ../modules/trust-prompt/module-trust-prompt.c:205 +-#, fuzzy +-#| msgid "Certificate Revocation List signature failure" + msgid "The certificate's activation time is still in the future." +-msgstr "認証取り消し一覧の署名に失敗しました" ++msgstr "証明書の発効時刻が未来になっています。" + + #: ../modules/trust-prompt/module-trust-prompt.c:207 +-#, fuzzy +-#| msgid "Certificate has expired" + msgid "The certificate has expired." +-msgstr "証明書の有効期間が延びました" ++msgstr "証明書の有効期限が切れています。" + + #: ../modules/trust-prompt/module-trust-prompt.c:209 +-msgid "The certificate has been revoked according to the connection's certificate revocation list." +-msgstr "" ++msgid "" ++"The certificate has been revoked according to the connection's certificate " ++"revocation list." ++msgstr "この接続の証明書失効リストによれば、この証明書は失効されています。" + + #: ../modules/trust-prompt/module-trust-prompt.c:211 + msgid "The certificate's algorithm is considered insecure." +-msgstr "" ++msgstr "証明書のアルゴリズムは安全ではないものと見なされています。" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:162 +-#, fuzzy +-#| msgid "Certificate untrusted" + msgid "Certificate trust..." +-msgstr "信頼されていない証明書です" ++msgstr "証明書の信頼..." + + #: ../modules/trust-prompt/trust-prompt-gtk.c:163 +-#, fuzzy +-#| msgid "X.509 Certificate" + msgid "_View Certificate" +-msgstr "X.509 認証" ++msgstr "証明書の表示(_V)" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:164 + msgid "_Reject" +@@ -5664,109 +5687,89 @@ msgid "_Accept Permanently" + msgstr "永久に許可(_A)" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:203 +-#, fuzzy, c-format +-#| msgid "" +-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n" +-#| "\n" +-#| "Detailed information about the certificate:\n" +-#| "%s" ++#, c-format + msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?" +-msgstr "" +-"'%s' の SSL 証明書は信頼できません。許可しますか?\n" +-"\n" +-"この証明書の詳細情報は以下の通りです。\n" +-"%s" ++msgstr "'%s' の SSL 証明書は信頼できません。許可しますか?" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:209 + msgid "Detailed information about the certificate:" +-msgstr "" ++msgstr "証明書に関する詳細情報:" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:223 + msgid "Issuer:" +-msgstr "" ++msgstr "発行者:" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:224 + msgid "Subject:" +-msgstr "" ++msgstr "件名:" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:225 + msgid "Fingerprint:" +-msgstr "" ++msgstr "フィンガープリント:" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:226 + msgid "Reason:" +-msgstr "" ++msgstr "理由:" + + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2 + msgid "Integrate your calendars" +-msgstr "" ++msgstr "カレンダーと統合" + + #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2 + msgid "Integrate your contacts" +-msgstr "" ++msgstr "連絡先と統合" + + #: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257 + msgid "Signon service did not return a secret" +-msgstr "" ++msgstr "サインオンのサービスがシークレットを返しませんでした" + + #: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1 +-#, fuzzy +-#| msgid "Calendar" + msgid "Google Calendar" +-msgstr "カレンダー" ++msgstr "Google カレンダー" + + #: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1 +-#, fuzzy +-#| msgctxt "CategoryName" +-#| msgid "Hot Contacts" + msgid "Google Contacts" +-msgstr "最新の連絡先" ++msgstr "Google 連絡先" + + #: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1 +-#, fuzzy +-#| msgid "Mailer" + msgid "GMail" +-msgstr "メール・クライアント" ++msgstr "Gmail" + + #: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1 +-#, fuzzy +-#| msgid "Mailer" + msgid "Mail" +-msgstr "メール・クライアント" ++msgstr "メール" + + #: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2 + msgid "Integrate your mailboxes" +-msgstr "" ++msgstr "メールボックスを統合" + + #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971 + #, c-format +-msgid "Cannot find a corresponding account service in the accounts database from which to obtain an access token for '%s'" +-msgstr "" ++msgid "" ++"Cannot find a corresponding account service in the accounts database from " ++"which to obtain an access token for '%s'" ++msgstr "'%s' のアクセス用トークン取得先のアカウントデータベースから対応するアカウントを見つけることができません" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:79 + #, c-format + msgid "Expected status 200 when requesting guid, instead got status %d (%s)" +-msgstr "" ++msgstr "guid を要求した時に返されるステータスは 200 を期待していましたが、代わりに受け取ったステータスは %d (%s) でした" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:96 +-#, fuzzy +-#| msgid "Error parsing filter: %s: %s" + msgid "Error parsing response as JSON: " +-msgstr "フィルターの構文解析中にエラー: %s: %s" ++msgstr "応答を JSON として解析中にエラー: " + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:112 + msgid "Didn't find email member in JSON data" +-msgstr "" ++msgstr "JSON データ中にメールアドレスを見つけられませんでした" + + #: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1 +-#, fuzzy +-#| msgid "Calendar" + msgid "Yahoo! Calendar" +-msgstr "カレンダー" ++msgstr "Yahoo!カレンダー" + + #: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1 + msgid "Yahoo! Mail" +-msgstr "" ++msgstr "Yahoo!メール" + + #: ../modules/yahoo-backend/module-yahoo-backend.c:227 + msgid "Tasks" +@@ -5784,10 +5787,8 @@ msgid "Wait running until at least one c + msgstr "少なくとも 1 クライアントが接続するまで実行を待機する" + + #: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1 +-#, fuzzy +-#| msgid "Birthday and anniversary reminder" + msgid "Birthdays & Anniversaries" +-msgstr "誕生日や記念日のリマインダー" ++msgstr "誕生日や記念日" + + #: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1 + msgid "CalDAV" +@@ -5798,10 +5799,8 @@ msgid "Google" + msgstr "Google" + + #: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1 +-#, fuzzy +-#| msgid "IMAP server %s" + msgid "On LDAP Servers" +-msgstr "IMAP サーバー %s" ++msgstr "LDAP サーバー" + + #: ../services/evolution-source-registry/builtin/local.source.in.h:1 + #: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1 +@@ -5809,1304 +5808,21 @@ msgid "On This Computer" + msgstr "このコンピューター" + + #: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1 +-#, fuzzy +-#| msgid "Personal Folders" + msgid "Search Folders" +-msgstr "個人フォルダー" ++msgstr "仮想フォルダー" + + #: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1 +-#, fuzzy +-#| msgid "Weather: Fog" + msgid "Weather" +-msgstr "天気: 霧" ++msgstr "天気" + + #: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1 + msgid "On The Web" +-msgstr "" ++msgstr "ウェブ" + + #: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1 + msgid "WebDAV" +-msgstr "" ++msgstr "WebDAV" + + #: ../services/evolution-user-prompter/prompt-user-gtk.c:122 + msgid "_Dismiss" +-msgstr "" +- +-#~ msgid "Failed to build summary for an address book %s" +-#~ msgstr "アドレス帳 %s の要約のビルドに失敗しました" +- +-#~ msgid "Using Distinguished Name (DN)" +-#~ msgstr "識別名 (DN) を使用する" +- +-#~ msgid "Using Email Address" +-#~ msgstr "E-メール・アドレスを使用する" +- +-#~ msgid "Failed to run book factory" +-#~ msgstr "ブックファクトリーの実行に失敗しました" +- +-#~ msgid "Cannot get connection to view" +-#~ msgstr "ビューへの接続を取得できません" +- +-#~ msgid "Cannot process, book backend is opening" +-#~ msgstr "処理できません、アドレス帳のバックエンドを開いています" +- +-#~ msgid "Empty query: " +-#~ msgstr "問い合わせ内容が空です: " +- +-#~ msgid "Cannot remove book: " +-#~ msgstr "データブックを削除できません: " +- +-#~ msgid "Cannot get backend property: " +-#~ msgstr "バックエンドのプロパティを取得できません: " +- +-#~ msgid "Invalid backend name '%s' in source '%s'" +-#~ msgstr "バックエンド名 '%s' は無効な名前です (ソース '%s')" +- +-#~ msgid "Failed to connect to a server using SSL. One possible reason is an invalid certificate being used by the server. If this is expected, like self-signed certificate being used on the server, then disable certificate validity tests by selecting 'Ignore invalid SSL certificate' option in Properties" +-#~ msgstr "SSL によるサーバーへの接続に失敗しました。考えられる原因のひとつとして、無効な証明書が使用された可能性があります。サーバーで自己署名の証明書を使用したなど、無効な証明書が原因と考えられる場合には、プロパティで「無効な SSL 証明書を無視」のオプションを選択して証明書の有効性確認テストを無効にします。" +- +-#~ msgid "Cannot create local store" +-#~ msgstr "ローカルのストアを作成できません" +- +-#~ msgid "Could not create synch slave thread" +-#~ msgstr "同期のスレーブスレッドを作成できませんでした" +- +-#~ msgid "Failed to run calendar factory" +-#~ msgstr "カレンダーファクトリーの実行に失敗しました" +- +-#~ msgid "Cannot process, calendar backend is opening" +-#~ msgstr "処理できません、カレンダーバックエンドを開いています" +- +-#~ msgid "Cannot remove calendar: " +-#~ msgstr "カレンダーを削除できません: " +- +-#~ msgid "Invalid call" +-#~ msgstr "無効なコールです" +- +-#~ msgid "" +-#~ " Issuer: %s\n" +-#~ " Subject: %s\n" +-#~ " Fingerprint: %s\n" +-#~ " Signature: %s" +-#~ msgstr "" +-#~ " 発行者: %s\n" +-#~ " タイトル: %s\n" +-#~ " 指紋: %s\n" +-#~ " 署名: %s" +- +-#~ msgid "GOOD" +-#~ msgstr "GOOD" +- +-#~ msgid "BAD" +-#~ msgstr "BAD" +- +-#~ msgid "" +-#~ "Certificate problem: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "認証問題: %s\n" +-#~ "発行者: %s" +- +-#~ msgid "" +-#~ "Bad certificate domain: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "おかしな認証ドメイン: %s\n" +-#~ "発行者: %s" +- +-#~ msgid "" +-#~ "Certificate expired: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "証明書の有効期限切れ: %s\n" +-#~ "発行者: %s" +- +-#~ msgid "" +-#~ "Certificate revocation list expired: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "証明書取り消し一覧の期限切れ: %s\n" +-#~ "発行者: %s" +- +-#~ msgid "No output stream" +-#~ msgstr "出力ストリームはありません" +- +-#~ msgid "No input stream" +-#~ msgstr "入力ストリームはありません" +- +-#~ msgid "Server unexpectedly disconnected: %s" +-#~ msgstr "突然サーバーが接続を切りました: %s" +- +-#~ msgid "" +-#~ "Alert from IMAP server %s@%s in folder %s:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "IMAP サーバー %s@%s からの警告 (フォルダー %s):\n" +-#~ "%s" +- +-#~ msgid "" +-#~ "Alert from IMAP server %s@%s:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "IMAP サーバー %s@%s からの警告:\n" +-#~ "%s" +- +-#~ msgid "Unexpected response from IMAP server: %s" +-#~ msgstr "IMAP サーバーから想定外の応答がありました: %s" +- +-#~ msgid "IMAP command failed: %s" +-#~ msgstr "IMAP コマンドが失敗しました: %s" +- +-#~ msgid "Server response ended too soon." +-#~ msgstr "サーバーレスポンスはあっけなく終わりました。" +- +-#~ msgid "IMAP server response did not contain %s information" +-#~ msgstr "IMAP サーバーの応答は %s 情報を含んでいません" +- +-#~ msgid "Unexpected OK response from IMAP server: %s" +-#~ msgstr "IMAP サーバーから想定外の OK 応答がありました: %s" +- +-#~ msgid "Always check for _new mail in this folder" +-#~ msgstr "常にこのフォルダーにある新着メールをチェックする(_N)" +- +-#~ msgid "Could not create directory %s: %s" +-#~ msgstr "フォルダー %s を作成できませんでした: %s" +- +-#~ msgid "Could not load summary for %s" +-#~ msgstr "%s のサマリをロードできませんでした" +- +-#~ msgid "Scanning for changed messages in %s" +-#~ msgstr "%s にあるメッセージの解析中" +- +-#~ msgid "Fetching summary information for new messages in %s" +-#~ msgstr "%s にある新着メッセージのサマリ情報の同期中" +- +-#~ msgid "Incomplete server response: no information provided for message %d" +-#~ msgstr "不完全なサーバーの応答: メッセージ %d の情報が提供されませんでした" +- +-#~ msgid "Incomplete server response: no UID provided for message %d" +-#~ msgstr "不完全なサーバーの応答: メッセージ %d の UID が提供されませんでした" +- +-#~ msgid "Could not find message body in FETCH response." +-#~ msgstr "FETCH 応答にメッセージ本体がありませんでした。" +- +-#~ msgid "Could not open cache directory: " +-#~ msgstr "キャッシュ・フォルダーを開けませんでした: " +- +-#~ msgid "Failed to cache message %s: %s" +-#~ msgstr "%s というメッセージをキャッシュできませんでした: %s" +- +-#~ msgid "Failed to cache message %s: " +-#~ msgstr "メッセージ %s のキャッシュに失敗しました: " +- +-#~ msgid "Failed to cache %s: " +-#~ msgstr "%s のキャッシュに失敗しました: " +- +-#~ msgid "Names_pace:" +-#~ msgstr "ネームスペース(_P):" +- +-#~ msgid "IMAP default port" +-#~ msgstr "IMAP のデフォルトポート" +- +-#~ msgid "IMAP" +-#~ msgstr "IMAP" +- +-#~ msgid "Retrieving list of folders at '%s'" +-#~ msgstr "'%s' にあるフォルダーの一覧を取得中" +- +-#~ msgid "Server unexpectedly disconnected" +-#~ msgstr "突然サーバーが接続を切りました" +- +-#~ msgid "Server unexpectedly disconnected: " +-#~ msgstr "突然サーバーから切断されました: " +- +-#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot" +-#~ msgstr "フォルダーを作成できません: %s: フォルダー名にドットを含むことはできません" +- +-#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot" +-#~ msgstr "フォルダーの名前を変更できません: %s: フォルダー名にドットを含むことはできません" +- +-#~ msgid "Could not connect to POP server %s" +-#~ msgstr "POP サーバー %s へ接続できませんでした" +- +-#~ msgid "Keyring operation was cancelled" +-#~ msgstr "キーリングの操作が取り消されました" +- +-#~ msgid "Currently _used categories:" +-#~ msgstr "最近使用したカテゴリ(_U):" +- +-#~ msgid "_Available Categories:" +-#~ msgstr "利用可能なカテゴリ(_A):" +- +-#~ msgid "Icon" +-#~ msgstr "アイコン" +- +-#~ msgid "Category" +-#~ msgstr "カテゴリ" +- +-#~ msgid "Create category \"%s\"" +-#~ msgstr "\"%s\" というカテゴリの生成" +- +-#~ msgid "Category Icon" +-#~ msgstr "カテゴリのアイコン" +- +-#~ msgid "_No Image" +-#~ msgstr "画像なし(_N)" +- +-#~ msgid "Category _Name" +-#~ msgstr "カテゴリの名前(_N)" +- +-#~ msgid "Category _Icon" +-#~ msgstr "カテゴリのアイコン(_I)" +- +-#~ msgid "Category Properties" +-#~ msgstr "カテゴリのプロパティ" +- +-#~ msgid "There is already a category '%s' in the configuration. Please use another name" +-#~ msgstr "設定の中にカテゴリ '%s' が存在します。別の名前を指定してください。" +- +-#~ msgid "Show Contacts" +-#~ msgstr "連絡先を表示" +- +-#~ msgid "Address B_ook:" +-#~ msgstr "アドレス帳(_O):" +- +-#~ msgid "Cat_egory:" +-#~ msgstr "カテゴリー(_E):" +- +-#~ msgid "_Search:" +-#~ msgstr "検索(_S):" +- +-#~ msgid "Any Category" +-#~ msgstr "任意のカテゴリ" +- +-#~ msgid "Co_ntacts" +-#~ msgstr "連絡先(_N)" +- +-#~ msgid "Search" +-#~ msgstr "検索" +- +-#~ msgid "Address Book" +-#~ msgstr "アドレス帳" +- +-#~ msgid "Select Contacts from Address Book" +-#~ msgstr "アドレス帳から連絡先の選択" +- +-#~ msgid "_Add" +-#~ msgstr "追加(_A)" +- +-#~ msgid "_Remove" +-#~ msgstr "削除(_R)" +- +-#~ msgid "Error loading address book: %s" +-#~ msgstr "アドレス帳の読み込み中にエラー: %s" +- +-#~ msgid "E_xpand %s Inline" +-#~ msgstr "%s をインラインで展開する(_X)" +- +-#~ msgid "Cop_y %s" +-#~ msgstr "%s のコピー(_Y)" +- +-#~ msgid "C_ut %s" +-#~ msgstr "%s の切り取り(_U)" +- +-#~ msgid "_Edit %s" +-#~ msgstr "%s の編集(_E)" +- +-#~ msgid "_Delete %s" +-#~ msgstr "%s の削除(_D)" +- +-#~ msgid "Keyring key is unusable: no user or host name" +-#~ msgstr "キーリングのキーを使用できません: ユーザーまたはホスト名が存在しません" +- +-#~ msgid "You have the Caps Lock key on." +-#~ msgstr "[Caps Lock] キーが ON 状態です。" +- +-#~ msgid "_Remember this passphrase" +-#~ msgstr "このパスフレーズを記憶する(_R)" +- +-#~ msgid "_Remember this passphrase for the remainder of this session" +-#~ msgstr "このパスフレーズをこのセッション用に保存する(_R)" +- +-#~ msgid "_Remember this password" +-#~ msgstr "このパスワードを記憶する(_R)" +- +-#~ msgid "_Remember this password for the remainder of this session" +-#~ msgstr "このパスワードをこのセッション用に保存する(_R)" +- +-#~ msgid "_Destination" +-#~ msgstr "転送先(_D)" +- +-#~ msgid "Select destination" +-#~ msgstr "転送先の選択" +- +-#~ msgid "Evolution Source Viewer" +-#~ msgstr "Evolution ソースビューワー" +- +-#~ msgid "Display Name" +-#~ msgstr "名前の表示" +- +-#~ msgid "Flags" +-#~ msgstr "フラグ" +- +-#~ msgid "Identity" +-#~ msgstr "アイデンティティ" +- +-#~ msgid "Authenticating with the server…" +-#~ msgstr "サーバーで認証中…" +- +-#~ msgid "%s: there was no source for UID '%s' stored in GConf." +-#~ msgstr "%s: GConf に UID '%s' のソースがありません。" +- +-#~ msgid "Invalid source" +-#~ msgstr "ソースが無効です" +- +-#, fuzzy +-#~| msgid "Failed on message %d" +-#~ msgid "Failed to find system book" +-#~ msgstr "メッセージ %d で失敗しました" +- +-#, fuzzy +-#~| msgid "%s: there was no source for UID '%s' stored in GConf." +-#~ msgid "There was no source for UID '%s' stored in a source list." +-#~ msgstr "%s: GConf に UID '%s' のソースがありません。" +- +-#, fuzzy +-#~| msgid "Cannot authenticate user: %s" +-#~ msgid "Cannot authenticate user: " +-#~ msgstr "ユーザー認証できません: %s" +- +-#~ msgid "Empty URI" +-#~ msgstr "空の URI" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "" +-#~ "Enter password for address book %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "Enter password for address book %s (user %s)" +-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください" +- +-#~ msgid "Enter password for %s (user %s)" +-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください" +- +-#~ msgid "Enter password for %s to enable proxy for user %s" +-#~ msgstr "%s のパスワードを入力して、ユーザー %s のプロキシを有効にしてください" +- +-#, fuzzy +-#~| msgid "Invalid source" +-#~ msgid "Invalid source type" +-#~ msgstr "ソースが無効です" +- +-#~ msgid "Connection to Server" +-#~ msgstr "サーバーへ接続" +- +-#~ msgid "_Use custom command to connect to server" +-#~ msgstr "サーバーへ接続する際にカスタム・コマンドを使用する(_U)" +- +-#~ msgid "Co_mmand:" +-#~ msgstr "コマンド(_M):" +- +-#~ msgid "Check new messages for Jun_k contents" +-#~ msgstr "新着メールがスパムかどうかチェックする(_K)" +- +-#~ msgid "Command:" +-#~ msgstr "コマンド:" +- +-#~ msgid "Numbe_r of cached connections to use" +-#~ msgstr "キャッシュ接続の数(_R)" +- +-#~ msgid "Closing tmp stream failed: " +-#~ msgstr "作業用ストリームのクローズに失敗しました: " +- +-#~ msgid "SMTP Authentication" +-#~ msgstr "SMTP 認証" +- +-#~ msgid "Accessing LDAP Server anonymously" +-#~ msgstr "匿名で LDAP サーバーへアクセス中" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "" +-#~ "Enter password for calendar %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "Enter password for calendar %s (user %s)" +-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "" +-#~ "Enter password for task list %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "Enter password for task list %s (user %s)" +-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "" +-#~ "Enter password for memo list %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください" +- +-#, fuzzy +-#~| msgid "Enter password for %s (user %s)" +-#~ msgid "Enter password for memo list %s (user %s)" +-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください" +- +-#, fuzzy +-#~| msgid "Enter password" +-#~ msgid "Enter Passphrase" +-#~ msgstr "パスワードの入力" +- +-#, fuzzy +-#~| msgid "Enter password" +-#~ msgid "Enter Password" +-#~ msgstr "パスワードの入力" +- +-#~ msgid "" +-#~ "SSL Certificate check for %s:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "Do you wish to accept?" +-#~ msgstr "" +-#~ "%s の SSL 証明書のチェック:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "受諾してみますか?" +- +-#~ msgid "Use I_dle if the server supports it" +-#~ msgstr "サーバーがサポートするときは Idle を使用する(_D)" +- +-#, fuzzy +-#~| msgid "URL '%s' needs a username component" +-#~ msgid "URL '%s' needs a user component" +-#~ msgstr "URL '%s' はユーザー名コンポーネントが必要です" +- +-#~ msgid "URL '%s' needs a host component" +-#~ msgstr "URL '%s' はホスト・コンポーネントが必要です" +- +-#~ msgid "URL '%s' needs a path component" +-#~ msgstr "URL '%s' はパス・コンポーネントが必要です" +- +-#~ msgid "Invalid URI" +-#~ msgstr "無効な URI です" +- +-#~ msgid "Could not instantiate backend" +-#~ msgstr "バックエンドのインスタンスを生成できませんでした" +- +-#~ msgid "SSL unavailable" +-#~ msgstr "SSL は無効です" +- +-#~ msgid "SSL is not available in this build" +-#~ msgstr "このパッケージでは SSL を利用できません" +- +-#~ msgid "Error creating SASL authentication object." +-#~ msgstr "SASL 認証オブジェクトの生成中にエラーが発生しました。" +- +-#~ msgid "You did not enter a password." +-#~ msgstr "パスワードを入力しませんでした。" +- +-#~ msgid "Authentication requested but no username provided" +-#~ msgstr "認証を必要としていますが、ユーザー名が指定されていません" +- +-#~ msgid "TLS is not available in this build" +-#~ msgstr "このパッケージでは TLS を利用できません" +- +-#~ msgid "Unable to connect to POP server %s: No support for requested authentication mechanism." +-#~ msgstr "POP サーバー %s へ接続できません: 要求された認証方式をサポートしていません。" +- +-#~ msgid "SASL '%s' Login failed for POP server %s%s" +-#~ msgstr "POP サーバー %2$s への SASL '%1$s' 認証ログインに失敗しました: %3$s" +- +-#~ msgid "" +-#~ "Unable to connect to POP server %s.\n" +-#~ "Error sending password%s" +-#~ msgstr "" +-#~ "POP サーバー %s に接続できません。\n" +-#~ "パスワードの送信中にエラー%s" +- +-#~ msgid "" +-#~ "Unable to authenticate to SMTP server.\n" +-#~ "%s\n" +-#~ "\n" +-#~ msgstr "" +-#~ "SMTP サーバーに認証できません。\n" +-#~ "%s\n" +-#~ "\n" +- +-#~ msgid "Updating contacts cache (%d)... " +-#~ msgstr "連絡先のキャッシュ情報 (%d 個目) を更新中... " +- +-#~ msgid "Cannot get supported fields: %s" +-#~ msgstr "対応する項目を取得できません: %s" +- +-#~ msgid "Cannot get required fields: %s" +-#~ msgstr "要求される項目を取得できません: %s" +- +-#~ msgid "Cannot get supported authentication methods: %s" +-#~ msgstr "対応する認証方法を取得できません: %s" +- +-#~ msgid "Cannot get changes: %s" +-#~ msgstr "変更を取得できません: %s" +- +-#~ msgid "Cancel operation failed: %s" +-#~ msgstr "操作のキャンセルに失敗しました: %s" +- +-#~ msgid "Reply Requested: by " +-#~ msgstr "返信要求: by " +- +-#~ msgid "Reply Requested: When convenient" +-#~ msgstr "返信要求: When convenient" +- +-#~ msgid "Loading Appointment items" +-#~ msgstr "予定アイテムの読み込み中" +- +-#~ msgid "Loading Task items" +-#~ msgstr "タスクアイテムの読み込み中" +- +-#~ msgid "Loading Note items" +-#~ msgstr "ノートアイテムの読み込み中" +- +-#~ msgid "Loading items" +-#~ msgstr "アイテムの読み込み中" +- +-#~ msgid "Could not create thread for populating cache" +-#~ msgstr "キャッシュを生成するためのスレッドを生成できませんでした" +- +-#~ msgid "Cannot retrieve calendar alarm e-mail address: %s" +-#~ msgstr "カレンダーのアラームを送信する E-メールアドレスを回復できません: %s" +- +-#~ msgid "Cannot retrieve calendar's LDAP attribute: %s" +-#~ msgstr "カレンダーの LDAP 属性を回復できません: %s" +- +-#~ msgid "Cannot retrieve calendar scheduling information: %s" +-#~ msgstr "カレンダーの予定情報を回復できません: %s" +- +-#~ msgid "Cannot discard calendar alarm: %s" +-#~ msgstr "カレンダーのアラームを破棄できません: %s" +- +-#~ msgid "Cannot retrieve default calendar object path: %s" +-#~ msgstr "カレンダーオブジェクトへの既定のパスを回復できません: %s" +- +-#~ msgid "Could not complete calendar query: %s" +-#~ msgstr "カレンダーの検索を完了できませんでした: %s" +- +-#~ msgid "Could not set default calendar time zone: %s" +-#~ msgstr "カレンダーの既定のタイムゾーンを設定できませんでした: %s" +- +-#~ msgid "Cannot retrieve calendar changes: %s" +-#~ msgstr "カレンダーの変更を回復できませんでした: %s" +- +-#~ msgid "No stream available" +-#~ msgstr "利用できるストリームがありません" +- +-#~ msgid "" +-#~ "Could not create directory %s:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "フォルダー %s を作成できませんでした:\n" +-#~ "%s" +- +-#~ msgid "Checking for deleted messages %s" +-#~ msgstr "削除されたメッセージ %s のチェック中" +- +-#~ msgid "Could not get message" +-#~ msgstr "メッセージを取得できませんでした" +- +-#~ msgid "Cannot append message to folder '%s': %s" +-#~ msgstr "'%s' というフォルダーにメッセージを追加できません: %s" +- +-#~ msgid "Cannot create message: %s" +-#~ msgstr "メッセージを作成できません: %s" +- +-#~ msgid "" +-#~ "Cannot get message: %s\n" +-#~ " %s" +-#~ msgstr "" +-#~ "メッセージを取得できません: %s\n" +-#~ " %s" +- +-#~ msgid "This message is not available in offline mode." +-#~ msgstr "このメッセージはオフライン・モードでは利用できません。" +- +-#~ msgid "Cannot get folder container %s" +-#~ msgstr "フォルダーのコンテナー %s を取得できません" +- +-#~ msgid "Cannot append message in offline mode: cache unavailable" +-#~ msgstr "オフライン・モードではメッセージを追加できません: キャッシュを利用できません" +- +-#~ msgid "Cannot append message in offline mode: " +-#~ msgstr "オフライン・モードでメッセージを追加できません: " +- +-#~ msgid "Checking for new mail" +-#~ msgstr "新着メールのチェック" +- +-#~ msgid "Check new messages for J_unk contents" +-#~ msgstr "新着メールがスパムかどうかチェックする(_U)" +- +-#~ msgid "Automatically synchroni_ze account locally" +-#~ msgstr "ローカルのアカウントを自動的に同期する(_Z)" +- +-#~ msgid "SOAP Settings" +-#~ msgstr "SOAP の設定" +- +-#~ msgid "Post Office Agent SOAP _Port:" +-#~ msgstr "ポスト・オフィス・エージェントの SOAP ポート(_P):" +- +-#~ msgid "Novell GroupWise" +-#~ msgstr "Novell GroupWise" +- +-#~ msgid "For accessing Novell GroupWise servers" +-#~ msgstr "Novell GroupWise サーバーへのアクセス用です" +- +-#~ msgid "This option will connect to the GroupWise server using a plaintext password." +-#~ msgstr "このオプションはプレイン・テキストのパスワードを使って GroupWise サーバーに接続します。" +- +-#~ msgid "Host or user not available in url" +-#~ msgstr "ホスト名またはユーザー名は URI で指定できません" +- +-#~ msgid "Some features may not work correctly with your current server version" +-#~ msgstr "お使いのサーバーのバージョンでは、いくつかの機能が正しく動作しないかもしれません" +- +-#~ msgid "Cannot create GroupWise folders in offline mode." +-#~ msgstr "オフライン・モードでは GroupWise フォルダーを生成できません。" +- +-#~ msgid "Cannot create a special system folder" +-#~ msgstr "特別なシステムフォルダーを作成することはできません" +- +-#~ msgid "Cannot rename GroupWise folder '%s' to '%s'" +-#~ msgstr "GroupWise フォルダーの '%s' を '%s' という名前に変更できません" +- +-#~ msgid "GroupWise server %s" +-#~ msgstr "GroupWise のサーバー %s" +- +-#~ msgid "GroupWise service for %s on %s" +-#~ msgstr "%s の %s にある GroupWise のサービス" +- +-#~ msgid "GroupWise mail delivery via %s" +-#~ msgstr "%s 経由で GroupWise のメールを配信します" +- +-#~ msgid "Sending Message" +-#~ msgstr "メッセージの送信" +- +-#~ msgid "Cannot get folder: Invalid operation on this store" +-#~ msgstr "フォルダーを取得できません: ここでは無効な操作です" +- +-#~ msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n" +-#~ msgstr "このアカウントで利用できるディスク容量を超えました。送信したメッセージは送信箱に保存されます。まずはメールを削除したりアーカイブにまとめる等してから、[送受信] ボタンを押してメッセージを送信してください。\n" +- +-#~ msgid "Could not send message: %s" +-#~ msgstr "メッセージを送信できませんでした: %s" +- +-#~ msgid "SSL negotiations failed" +-#~ msgstr "SSL 接続に失敗しました" +- +-#~ msgid "Could not connect to %s (port %s): " +-#~ msgstr "%s (ポート %s) へ接続できませんでした: " +- +-#~ msgid "TLS negotiations failed" +-#~ msgstr "TLS 接続に失敗しました" +- +-#~ msgid "_Edit" +-#~ msgstr "編集(_E)" +- +-#~ msgid "Invalid connection" +-#~ msgstr "無効な接続です" +- +-#~ msgid "Invalid response from server" +-#~ msgstr "サーバーからの応答が無効です" +- +-#~ msgid "Bad parameter" +-#~ msgstr "パラメーターが無効です" +- +-#~ msgid "_Apply filters to new messages in INBOX on this server" +-#~ msgstr "このサーバーの受信箱にある新着メールにフィルターを適用する(_A)" +- +-#~ msgid "Cannot create spool file: %s" +-#~ msgstr "スプールファイルを作成できません: %s" +- +-#~ msgid "categories" +-#~ msgstr "カテゴリ" +- +-#~ msgid "*" +-#~ msgstr "*" +- +-#~ msgid "Co_ntacts" +-#~ msgstr "連絡先(_N)" +- +-#~ msgid "Show Contacts" +-#~ msgstr "連絡先の表示" +- +-#~ msgid "\"%s\" on book before \"%s\"" +-#~ msgstr "\"%2$s\" の前にあるブックの \"%1$s\"" +- +-#~ msgid "book busy" +-#~ msgstr "ブックは処理中です" +- +-#~ msgid "CORBA exception making \"%s\" call" +-#~ msgstr "\"%s\" 呼び出しを行う際に CORBA 例外が発生しました" +- +-#~ msgid "%s: there is no current operation" +-#~ msgstr "%s: 現在実行中の操作はありません" +- +-#~ msgid "\"%s\" on book after \"%s\"" +-#~ msgstr "\"%2$s\" の次にあるブックの \"%1$s\"" +- +-#~ msgid "%s: canceled" +-#~ msgstr "%s: キャンセルしました" +- +-#~ msgid "%s: no factories available for URI `%s'" +-#~ msgstr "%s: URI '%s' に対するファクトリを利用できません" +- +-#~ msgid "%s: Could not create EBookListener" +-#~ msgstr "%s: EBookListener を生成できませんでした" +- +-#~ msgid "%s: there was no self contact UID stored in gconf" +-#~ msgstr "%s: GConf にセルフ連絡先 UID がありませんでした" +- +-#~ msgid "Could not create thread for getting deltas" +-#~ msgstr "差分を取得するためのスレッドを生成できませんでした" +- +-#~ msgid "Cannot open message" +-#~ msgstr "メッセージを開けません" +- +-#~ msgid "Unsupported operation: append message: for %s" +-#~ msgstr "サポートしていない操作: %s に対するメッセージの追加" +- +-#~ msgid "Unsupported operation: search by expression: for %s" +-#~ msgstr "サポートしていない操作: %s に対して式を使った検索" +- +-#~ msgid "Unsupported operation: count by expression: for %s" +-#~ msgstr "サポートしていない操作: %s に対して式を使ったカウント" +- +-#~ msgid "Unsupported operation: search by UIDs: for %s" +-#~ msgstr "サポートしていない操作: %s に対して UID を使った検索" +- +-#~ msgid "Learning junk" +-#~ msgstr "ジャンク・メールの学習中" +- +-#~ msgid "Learning non-junk" +-#~ msgstr "ジャンクではないメールの学習中" +- +-#~ msgid "Canceled." +-#~ msgstr "キャンセルしました" +- +-#~ msgid "This is a digitally signed message part" +-#~ msgstr "このメッセージにはデジタル署名された部分があります" +- +-#~ msgid "Cannot verify message signature: could not create temp file: %s" +-#~ msgstr "このメッセージの整合性を確認できません: 作業用ファイルを作成できませんでした: %s" +- +-#~ msgid "Unable to parse message content" +-#~ msgstr "メッセージの内容を解析できません" +- +-#~ msgid "cannot create thread" +-#~ msgstr "スレッドを生成できません" +- +-#~ msgid "Kerberos 4" +-#~ msgstr "Kerberos 4" +- +-#~ msgid "This option will connect to the server using Kerberos 4 authentication." +-#~ msgstr "このオプションは Kerberos 4 認証を使ってサーバーに接続します" +- +-#~ msgid "" +-#~ "Could not get Kerberos ticket:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "Kerberos チケットを取得できませんでした:\n" +-#~ "%s" +- +-#~ msgid "Camel session doesn't support forwarding of a message." +-#~ msgstr "Camel のセッションではメッセージの転送はサポートしていません" +- +-#~ msgid "import keys: unimplemented" +-#~ msgstr "鍵のインポート: 未だ実装されていません" +- +-#~ msgid "export keys: unimplemented" +-#~ msgstr "鍵のエクスポート: 未だ実装されていません" +- +-#~ msgid "Cannot create folder: Invalid operation on this store" +-#~ msgstr "フォルダーを作成できません: ここでは無効な操作です" +- +-#~ msgid "Unable to get issuer's certificate" +-#~ msgstr "発行者の証明書を取得できません" +- +-#~ msgid "Unable to get Certificate Revocation List" +-#~ msgstr "認証取り消し一覧を取得できません" +- +-#~ msgid "Unable to decrypt certificate signature" +-#~ msgstr "証明書の署名を解読できません" +- +-#~ msgid "Unable to decrypt Certificate Revocation List signature" +-#~ msgstr "認証取り消し一覧の署名の解読ができません" +- +-#~ msgid "Unable to decode issuer's public key" +-#~ msgstr "発行者のパブリック・キーを解読できません" +- +-#~ msgid "Certificate not yet valid" +-#~ msgstr "認証がまだ正しくありません" +- +-#~ msgid "Certificate Revocation List (CRL) not yet valid" +-#~ msgstr "証明書失効リスト (CRL) はまだ無効です" +- +-#~ msgid "Certificate Revocation List (CRL) has expired" +-#~ msgstr "証明書失効リスト (CRL) が期限切れです" +- +-#~ msgid "Error in Certificate Revocation List (CRL)" +-#~ msgstr "証明書失効リスト (CRL) にエラー" +- +-#~ msgid "Out of memory" +-#~ msgstr "メモリが足りません" +- +-#~ msgid "Zero-depth self-signed certificate" +-#~ msgstr "Zero-depth self-signed 認証" +- +-#~ msgid "Self-signed certificate in chain" +-#~ msgstr "チェーンの中にある Self-signed 認証" +- +-#~ msgid "Unable to get issuer's certificate locally" +-#~ msgstr "発行者の認証をローカルで取得できません" +- +-#~ msgid "Unable to verify leaf signature" +-#~ msgstr "Leaf 署名を検証できません" +- +-#~ msgid "Certificate chain too long" +-#~ msgstr "認証チェーンが長すぎます" +- +-#~ msgid "Path length exceeded" +-#~ msgstr "パスワードが長すぎます" +- +-#~ msgid "Invalid purpose" +-#~ msgstr "目的が間違っています" +- +-#~ msgid "Subject/Issuer mismatch" +-#~ msgstr "タイトル/発行者が一致しません" +- +-#~ msgid "AKID/SKID mismatch" +-#~ msgstr "AKID/SKID が一致しません" +- +-#~ msgid "AKID/Issuer serial mismatch" +-#~ msgstr "AKID/発行者のシリアル番号が一致しません" +- +-#~ msgid "Error in application verification" +-#~ msgstr "アプリケーションの検証でエラーが発生しました" +- +-#~ msgid "" +-#~ "Bad certificate from %s:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "Do you wish to accept anyway?" +-#~ msgstr "" +-#~ "%s からおかしな証明書です:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "受諾してみますか?" +- +-#~ msgid "User canceled" +-#~ msgstr "ユーザーがキャンセルしました" +- +-#~ msgid "Trash Folder Full. Please Empty." +-#~ msgstr "ゴミ箱フォルダーが満杯です。空にしてください。" +- +-#~ msgid "Hula" +-#~ msgstr "Hula" +- +-#~ msgid "For accessing Hula servers" +-#~ msgstr "Hula サーバーへのアクセス用です" +- +-#~ msgid "This option will connect to the Hula server using a plaintext password." +-#~ msgstr "このオプションはプレイン・テキストのパスワードを使って Hula サーバーに接続します" +- +-#~ msgid "Unexpected response status '%s' after APPEND command" +-#~ msgstr "APPEND コマンドの後に想定外の応答ステータスがあります: '%s'" +- +-#~ msgid "No response on continuation after APPEND command" +-#~ msgstr "APPEND コマンドに続く応答がありません" +- +-#~ msgid "Unknown error occurred during APPEND command!" +-#~ msgstr "APPEND コマンドの発行中に原因不明のエラーが発生しました!" +- +-#~ msgid "Failed sending command to IMAP server %s: %s" +-#~ msgstr "%s という IMAP サーバーへのコマンド送信に失敗しました: %s" +- +-#~ msgid "Unexpected response from IMAP4 server %s: %s" +-#~ msgstr "IMAP サーバーの %s から想定外の応答がありました: %s" +- +-#~ msgid "Unexpected greeting from IMAP server %s." +-#~ msgstr "IMAP サーバーの %s から想定外の応答がありました" +- +-#~ msgid "Cannot select folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' というフォルダーを選択できません: mailbox の名前が無効です" +- +-#~ msgid "Cannot select folder '%s': Bad command" +-#~ msgstr "'%s' というフォルダー を選択できません: コマンドが間違っています" +- +-#~ msgid "Failed to send command to IMAP server %s: %s" +-#~ msgstr "%s という IMAP サーバーへのコマンド送信に失敗しました: %s" +- +-#~ msgid "IMAP4 server %s unexpectedly disconnected: %s" +-#~ msgstr "突然 IMAP4 サーバーの %s が接続を切りました: %s" +- +-#~ msgid "Enable extended Mailing-List detection required for some filter and vFolder rules" +-#~ msgstr "フィルターのルールや仮想フォルダーのルールに必要なメーリング・リストの検出を有効にする" +- +-#~ msgid "Expire cached messages that haven't been read in X seconds" +-#~ msgstr "X秒間読まれなかったキャッシュ済のメッセージを無効にします" +- +-#~ msgid "Expire cached messages older than X seconds" +-#~ msgstr "X秒より古いキャッシュ済のメッセージを無効にします" +- +-#~ msgid "Cannot access folder '%s': %s" +-#~ msgstr "'%s' というフォルダーにアクセスできません: %s" +- +-#~ msgid "Cannot sync flags to folder '%s': Unknown error" +-#~ msgstr "'%s' というフォルダーとフラグを同期できません: 原因不明のエラー" +- +-#~ msgid "Cannot sync flags to folder '%s': Bad command" +-#~ msgstr "'%s' というフォルダーとフラグを同期できません: コマンドが間違っています" +- +-#~ msgid "Cannot expunge folder '%s': Unknown error" +-#~ msgstr "'%s' というフォルダーを抹消できません: 原因不明のエラー" +- +-#~ msgid "Cannot expunge folder '%s': Bad command" +-#~ msgstr "'%s' というフォルダーを抹消できません: コマンドが間違っています" +- +-#~ msgid "Cannot get message %s from folder '%s': No such message" +-#~ msgstr "%s を '%s' というフォルダーから取得できません: そのようなメッセージはありません" +- +-#~ msgid "Cannot get message %s from folder '%s': Bad command" +-#~ msgstr "%s を '%s' というフォルダーから取得できません: コマンドが間違っています" +- +-#~ msgid "Cannot append message to folder '%s': Folder is read-only" +-#~ msgstr "'%s' というフォルダーにメッセージを追加できません: フォルダーは読み込み専用です" +- +-#~ msgid "Cannot append message to folder '%s': Unknown error" +-#~ msgstr "'%s' というフォルダーにメッセージを追加できません: 原因不明のエラー" +- +-#~ msgid "Cannot append message to folder '%s': Bad command" +-#~ msgstr "'%s' というフォルダーにメッセージを追加できません: コマンドが間違っています" +- +-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" +-#~ msgstr "'%s' から '%s' へメッセージを移動できません: 原因不明のエラー" +- +-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" +-#~ msgstr "'%s' から '%s' へメッセージをコピーできません: 原因不明のエラー" +- +-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command" +-#~ msgstr "'%s' から '%s' へメッセージを移動できません: コマンドが間違っています" +- +-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command" +-#~ msgstr "'%s' から '%s' へメッセージをコピーできません: コマンドが間違っています" +- +-#~ msgid "Only check for Junk messa_ges in the INBOX folder" +-#~ msgstr "受信箱にあるメールだけスパムかどうかチェックする(_G)" +- +-#~ msgid "IMAP4rev1" +-#~ msgstr "IMAP4rev1" +- +-#~ msgid "For reading and storing mail on IMAPv4rev1 servers." +-#~ msgstr "IMAP サーバーにあるメールを読んだり保存します" +- +-#~ msgid "This option will connect to the IMAPv4rev1 server using a plaintext password." +-#~ msgstr "このオプションはプレイン・テキストのパスワードを使って IMAPv4rev1 サーバーに接続します" +- +-#~ msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS" +-#~ msgstr "セキュリティ保護されたモードで IMAP サーバー %s への接続に失敗しました: サーバー側で STARTTLS をサポートしていないのが原因です" +- +-#~ msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism" +-#~ msgstr "IMAP サーバー %s に対して認証方式 %s を使って認証できませんでした" +- +-#~ msgid "Cannot authenticate to IMAP server %s using %s" +-#~ msgstr "IMAP サーバー %s で %s を使った認証を行えません" +- +-#~ msgid "Cannot create IMAP folders in offline mode." +-#~ msgstr "オフライン・モードでは IMAP フォルダーを作成できません。" +- +-#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error" +-#~ msgstr "'%s' を IMAP サーバーの %s から取得できません: 原因不明のエラー" +- +-#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s" +-#~ msgstr "'%s' の LIST 情報を IMAP サーバーの %s から取得できません: %s" +- +-#~ msgid "Bad command" +-#~ msgstr "コマンドが間違っています" +- +-#~ msgid "Cannot create folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' というフォルダーを作成できません: mailbox の名前が無効です" +- +-#~ msgid "Cannot create folder '%s': Bad command" +-#~ msgstr "'%s' というフォルダーを作成できません: コマンドが間違っています" +- +-#~ msgid "Cannot delete IMAP folders in offline mode." +-#~ msgstr "オフライン・モードでは IMAP フォルダーを削除できません。" +- +-#~ msgid "Cannot delete folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' というフォルダーを削除できません: mailbox の名前が無効です" +- +-#~ msgid "Cannot delete folder '%s': Bad command" +-#~ msgstr "'%s' というフォルダーを削除できません: コマンドが間違っています" +- +-#~ msgid "Cannot rename folder '%s' to '%s': Special folder" +-#~ msgstr "'%s' から '%s' に名前を変更できません: 特別なフォルダーです" +- +-#~ msgid "Cannot rename IMAP folders in offline mode." +-#~ msgstr "オフライン・モードでは IMAP のフォルダー名を変更できません。" +- +-#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name" +-#~ msgstr "'%s' から '%s' に名前を変更できません: mailbox の名前が無効です" +- +-#~ msgid "Cannot rename folder '%s' to '%s': Bad command" +-#~ msgstr "'%s' から '%s' に名前を変更できません: コマンドが間違っています" +- +-#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" +-#~ msgstr "%s を '%s' というパターンで IMAP サーバーの %s から取得できません: %s" +- +-#~ msgid "Cannot subscribe to IMAP folders in offline mode." +-#~ msgstr "オフライン・モードでは IMAP フォルダーを購読できません。" +- +-#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' というフォルダーを購読できません: mailbox の名前が無効です" +- +-#~ msgid "Cannot subscribe to folder '%s': Bad command" +-#~ msgstr "'%s' というフォルダーを購読できません: コマンドが間違っています" +- +-#~ msgid "Cannot unsubscribe from IMAP folders in offline mode." +-#~ msgstr "オフライン・モードでは IMAP フォルダーの購読を停止できません。" +- +-#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" +-#~ msgstr "'%s' というフォルダーの購読を停止できません: mailbox の名前が無効です" +- +-#~ msgid "Scanning for changed messages" +-#~ msgstr "変更メッセージの解析中" +- +-#~ msgid "IMAP server %s is in an inconsistent state." +-#~ msgstr "IMAP サーバー %s の状態が矛盾しています" +- +-#~ msgid "Fetching envelopes of new messages" +-#~ msgstr "新しいメッセージのエンベロープの取得中" +- +-#~ msgid "Unexpected token in response from IMAP server %s: " +-#~ msgstr "IMAP サーバー %s から想定外の応答がありました: " +- +-#~ msgid "No data" +-#~ msgstr "データなし" +- +-#~ msgid "IMAP server %s unexpectedly disconnected: %s" +-#~ msgstr "突然 IMAP サーバー %s が接続を切りました: %s" +- +-#~ msgid "" +-#~ "Experimental IMAP 4(.1) client\n" +-#~ "This is untested and unsupported code, you want to use plain imap instead.\n" +-#~ "\n" +-#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n" +-#~ msgstr "" +-#~ "IMAP 4(.1) クライアント (開発版)\n" +-#~ "これは未テスト/未サポートのコードなので、代わりに標準 IMAP を使用してください。\n" +-#~ "\n" +-#~ " !!! 重要なメールには利用しないでください !!!\n" +- +-#~ msgid "Could not connect to POP server on %s" +-#~ msgstr "%s の POP サーバーへ接続できませんでした" +- +-#~ msgid "Maildir append message canceled" +-#~ msgstr "Maildir 形式のメッセージ追加が取り消されました" +- +-#~ msgid "Invalid message contents" +-#~ msgstr "メッセージの内容は無効です" +- +-#~ msgid "Mail append canceled" +-#~ msgstr "メールの追加がキャンセルされました" +- +-#~ msgid "Message construction failed." +-#~ msgstr "メッセージの構築に失敗しました。" +- +-#~ msgid "MH append message canceled" +-#~ msgstr "MH 形式のメッセージ追加がキャンセルされました" +- +-#~ msgid "Use cancel" +-#~ msgstr "キャンセルを利用する" +- +-#~ msgid "STARTTLS command failed" +-#~ msgstr "STARTTLS コマンドが失敗しました" +- +-#~ msgid "HELO command failed" +-#~ msgstr "HELO コマンドが失敗しました" +- +-#~ msgid "AUTH command failed" +-#~ msgstr "AUTH コマンドが失敗しました" +- +-#~ msgid "Bad authentication response from server.\n" +-#~ msgstr "サーバーから間違った認証応答がありました\n" +- +-#~ msgid "MAIL FROM command failed: %s: mail not sent" +-#~ msgstr "MAIL FROM コマンドが失敗しました: %s: メールを送信しません" +- +-#~ msgid "RCPT TO command failed: %s: mail not sent" +-#~ msgstr "RCPT TO コマンドが失敗しました: %s: メールを送信しません" +- +-#~ msgid "DATA command failed: %s: mail not sent" +-#~ msgstr "DATA コマンドが失敗しました: %s: メールを送信しません" +- +-#~ msgid "RSET command failed" +-#~ msgstr "RSET コマンドが失敗しました" +- +-#~ msgid "QUIT command failed" +-#~ msgstr "QUIT コマンドが失敗しました" +- +-#~ msgid "Item(s) belong to these _categories:" +-#~ msgstr "カテゴリに属しているアイテム(_C):" +- +-#~ msgid "Color Info" +-#~ msgstr "色の情報" +- +-#~ msgid "The color to render" +-#~ msgstr "描画する色の情報です" +- +-#~ msgid "Owner" +-#~ msgstr "所有者" +- +-#~ msgid "Publishing Editor" +-#~ msgstr "Publishing Editor" +- +-#~ msgid "Editor" +-#~ msgstr "編集者" +- +-#~ msgid "Publishing Author" +-#~ msgstr "Publishing Author" +- +-#~ msgid "Author" +-#~ msgstr "作者" +- +-#~ msgid "Reviewer" +-#~ msgstr "レビューアー" +- +-#~ msgid "Contributor" +-#~ msgstr "貢献者" +- +-#~ msgid "None" +-#~ msgstr "なし" +- +-#~ msgid "Custom" +-#~ msgstr "カスタム" +- +-#~ msgid "Generic error" +-#~ msgstr "一般的なエラー" +- +-#~ msgid "A folder with the same name already exists" +-#~ msgstr "既に同名のフォルダーが存在します" +- +-#~ msgid "The specified folder type is not valid" +-#~ msgstr "指定したフォルダーの種類が間違っています" +- +-#~ msgid "Not enough space to create the folder" +-#~ msgstr "フォルダーを生成するための容量が足りません" +- +-#~ msgid "The folder is not empty" +-#~ msgstr "そのフォルダーは空ではありません" +- +-#~ msgid "The specified folder was not found" +-#~ msgstr "指定したフォルダーが見つかりませんでした" +- +-#~ msgid "Function not implemented in this storage" +-#~ msgstr "このストレージでは実装されていない機能です" +- +-#~ msgid "The specified type is not supported in this storage" +-#~ msgstr "このストレージでは指定した種類をサポートしていません" +- +-#~ msgid "The specified folder cannot be modified or removed" +-#~ msgstr "指定したフォルダーを変更/削除できません" +- +-#~ msgid "Cannot make a folder a child of one of its descendants" +-#~ msgstr "そのフォルダーの子を生成できません" +- +-#~ msgid "Cannot create a folder with that name" +-#~ msgstr "そのような名前でフォルダーを作成できません" +- +-#~ msgid "This operation cannot be performed in off-line mode" +-#~ msgstr "この操作はオフライン・モードでは利用できません。" +- +-#~ msgid "%s's Folders" +-#~ msgstr "%s のフォルダー" +- +-#~ msgid "Favorite Public Folders" +-#~ msgstr "お気に入りのパブリックなフォルダー" +- +-#~ msgid "All Public Folders" +-#~ msgstr "すべてのパブリックなフォルダー" +- +-#~ msgid "Global Address List" +-#~ msgstr "グローバルな住所の一覧" +- +-#~ msgid "Deleted Items" +-#~ msgstr "アイテムを削除しました" +- +-#~ msgid "Drafts" +-#~ msgstr "草案" +- +-#~ msgid "Journal" +-#~ msgstr "ジャーナル" +- +-#~ msgid "Notes" +-#~ msgstr "メモ" +- +-#~ msgid "Outbox" +-#~ msgstr "送信箱" +- +-#~ msgid "Sent Items" +-#~ msgstr "アイテムを送信しました" +- +-#~ msgid "Evolution Addressbook file backend" +-#~ msgstr "Evolution アドレス帳ファイルのバックエンド" +- +-#~ msgid "Evolution Calendar file and webcal backend" +-#~ msgstr "Evolution カレンダー・ファイルと webcal のバックエンド" +- +-#~ msgid "Evolution Data Server interface check service" +-#~ msgstr "Evolution データ・サーバーのインターフェース確認サービス" +- +-#~ msgid "Evolution Data Server logging service" +-#~ msgstr "Evolution データ・サーバーのログ記録サービス" +- +-#~ msgid "Decoder failed, error %d" +-#~ msgstr "デコーダーのエラー (%d)" +- +-#~ msgid "CRL not yet valid" +-#~ msgstr "CRL はまだ正しくありません" +- +-#~ msgid "CRL has expired" +-#~ msgstr "CRL が期限切れです" +- +-#~ msgid "Error in CRL" +-#~ msgstr "CRL の中でエラーが発生しました" +- +-#~ msgid "Sent" +-#~ msgstr "送信済" +- +-#~ msgid "Templates" +-#~ msgstr "テンプレート" +- +-#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n" +-#~ msgstr "セグメンテーション・フォルトが複数回発生しました: エラー・ダイアログを表示できません\n" +- +-#~ msgid "Failed to create create child process '%s': %s" +-#~ msgstr "子プロセス '%s' の生成に失敗しました: %s" ++msgstr "解散(_D)" +diff -up evolution-data-server-3.8.5/po/ko.po.translations evolution-data-server-3.8.5/po/ko.po +--- evolution-data-server-3.8.5/po/ko.po.translations 2013-03-17 13:46:02.000000000 +0100 ++++ evolution-data-server-3.8.5/po/ko.po 2014-01-13 16:23:40.783630232 +0100 +@@ -5,30 +5,32 @@ + # Young-Ho Cha , 2000, 2002. + # Seong-ho Cho , 2012. + # Changwoo Ryu , 2004-2013. +-# ++# + # 주의: + # - 기술적인 용어가 많습니다. 무슨 의미인지 확실히 파악하고 번역하시기 바랍니다. +-# ++# + # 용어: + # - "Evolution"은 "에볼루션"으로 음역. + # - "Google Talk"는 "구글 토크"로 번역. + # - "spool"은 "메일 모음"으로 번역. + # - "authentication"을 여러가지 인증 방식을 구별하는 용도로 사용할 때는 "인증 + # 방법"이라고 번역. +-# ++# eukim , 2013. #zanata + msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=" ++"evolution-data-server&keywords=I18N+L10N&component=Misc.\n" + "POT-Creation-Date: 2013-03-01 18:36+0000\n" +-"PO-Revision-Date: 2013-03-13 01:35+0900\n" +-"Last-Translator: Changwoo Ryu \n" ++"PO-Revision-Date: 2013-09-26 09:28-0400\n" ++"Last-Translator: eukim \n" + "Language-Team: GNOME Korea \n" +-"Language: Korean\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: ko\n" + "Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: Zanata 3.1.2\n" + + #: ../addressbook/backends/file/e-book-backend-file.c:114 + #, c-format +@@ -46,7 +48,7 @@ msgid "Failed to create hardlink for res + msgstr "'%s' 리소스의 하드링크를 만드는데 실패했습니다: %s" + + #: ../addressbook/backends/file/e-book-backend-file.c:487 +-#: ../addressbook/backends/file/e-book-backend-file.c:910 ++#: ../addressbook/backends/file/e-book-backend-file.c:911 + msgid "No UID in the contact" + msgstr "연락처에 UID가 없습니다" + +@@ -55,106 +57,108 @@ msgstr "연락처에 UID가 없습니다 + msgid "Conflicting UIDs found in added contacts" + msgstr "추가한 연락처에서 UID 충돌이 생겼습니다" + +-#: ../addressbook/backends/file/e-book-backend-file.c:843 +-#: ../addressbook/backends/file/e-book-backend-file.c:1035 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2592 ++#: ../addressbook/backends/file/e-book-backend-file.c:844 ++#: ../addressbook/backends/file/e-book-backend-file.c:1038 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2656 + #, c-format + msgid "Contact '%s' not found" + msgstr "'%s' 연락처를 찾을 수 없습니다" + +-#: ../addressbook/backends/file/e-book-backend-file.c:938 ++#: ../addressbook/backends/file/e-book-backend-file.c:940 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" + msgstr "동기화되지 않은 버전으로 '%s' 연락처 수정을 시도했습니다" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1085 +-#: ../addressbook/backends/file/e-book-backend-file.c:1133 ++#: ../addressbook/backends/file/e-book-backend-file.c:1089 ++#: ../addressbook/backends/file/e-book-backend-file.c:1139 + #, c-format + msgid "Query '%s' not supported" + msgstr "'%s' 질의를 지원하지 않습니다" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1093 +-#: ../addressbook/backends/file/e-book-backend-file.c:1141 ++#: ../addressbook/backends/file/e-book-backend-file.c:1098 ++#: ../addressbook/backends/file/e-book-backend-file.c:1148 + #, c-format + msgid "Invalid Query '%s'" + msgstr "잘못된 질의: '%s'" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1241 ++#: ../addressbook/backends/file/e-book-backend-file.c:1248 + msgid "Loading..." + msgstr "읽어들이는 중입니다..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1243 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4918 ++#: ../addressbook/backends/file/e-book-backend-file.c:1250 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4978 + msgid "Searching..." + msgstr "찾는 중입니다..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1561 ++#: ../addressbook/backends/file/e-book-backend-file.c:1568 + #, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" + msgstr "과거 데이터베이스의 이름을 '%s'에서 '%s'(으)로 바꿀 수 없습니다: %s" + +-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:142 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1194 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4813 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:333 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1022 +-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:34 ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4873 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:338 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 + #: ../addressbook/libebook-contacts/e-phone-number.c:58 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:562 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:592 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 +-#: ../calendar/libecal/e-cal.c:2330 ../calendar/libecal/e-cal-client.c:268 +-#: ../camel/camel-imapx-command.c:596 ../libedataserver/e-client.c:178 ++#: ../calendar/libecal/e-cal.c:2339 ++#: ../calendar/libecal/e-cal-client.c:275 ++#: ../camel/camel-imapx-command.c:609 ++#: ../libedataserver/e-client.c:179 + msgid "Unknown error" + msgstr "알 수 없는 오류가 발생했습니다" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:649 ++#: ../addressbook/backends/google/e-book-backend-google.c:679 + msgid "Querying for updated contacts…" + msgstr "업데이트된 연락처를 받는 중입니다…" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:786 ++#: ../addressbook/backends/google/e-book-backend-google.c:816 + msgid "Querying for updated groups…" + msgstr "업데이트된 그룹을 받는 중입니다…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1235 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1625 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:382 ++#: ../addressbook/backends/google/e-book-backend-google.c:1265 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:389 + msgid "The backend does not support bulk additions" + msgstr "백엔드가 대량 추가를 지원하지 않습니다" + + #. Insert the entry on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1267 ++#: ../addressbook/backends/google/e-book-backend-google.c:1297 + msgid "Creating new contact…" + msgstr "새 연락처를 만드는 중입니다…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1358 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:499 ++#: ../addressbook/backends/google/e-book-backend-google.c:1388 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:506 + msgid "The backend does not support bulk removals" + msgstr "백엔드가 대량 제거를 지원하지 않습니다" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1386 ++#: ../addressbook/backends/google/e-book-backend-google.c:1416 + msgid "Deleting contact…" + msgstr "연락처를 삭제하는 중입니다…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1640 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2288 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:560 ++#: ../addressbook/backends/google/e-book-backend-google.c:1670 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:567 + msgid "The backend does not support bulk modifications" + msgstr "백엔드가 대량 수정을 지원하지 않습니다" + + #. Update the contact on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1678 ++#: ../addressbook/backends/google/e-book-backend-google.c:1708 + msgid "Modifying contact…" + msgstr "연락처를 수정하는 중입니다…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1849 ++#: ../addressbook/backends/google/e-book-backend-google.c:1879 + msgid "Loading…" + msgstr "읽어들이는 중입니다…" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1602 ++#: ../addressbook/backends/google/e-book-google-utils.c:1606 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -163,151 +167,152 @@ msgid "Personal" + msgstr "개인" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1604 ++#: ../addressbook/backends/google/e-book-google-utils.c:1608 + msgid "Friends" + msgstr "친구" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1606 ++#: ../addressbook/backends/google/e-book-google-utils.c:1610 + msgid "Family" + msgstr "가족" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1608 ++#: ../addressbook/backends/google/e-book-google-utils.c:1612 + msgid "Coworkers" + msgstr "직장 동료" + +-#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165 ++#. Translators: An error message shown to a user when trying to do an ++#. * operation on the LDAP address book which is not connected to the server ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174 + msgid "Not connected" + msgstr "연결되지 않았습니다" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:922 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "v3 또는 v2 bind를 사용한 바인딩에 실패했습니다" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1045 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088 + msgid "Reconnecting to LDAP server..." + msgstr "LDAP 서버에 다시 연결하는 중입니다..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1175 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218 + msgid "Invalid DN syntax" + msgstr "DN 문법이 잘못되었습니다" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1191 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4812 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4872 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP 오류 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1709 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Adding contact to LDAP server..." + msgstr "연락처를 LDAP 서버에 추가하는 중입니다..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1847 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1890 + msgid "Removing contact from LDAP server..." + msgstr "연락처를 LDAP 서버에서 제거하는 중입니다..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1989 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2384 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2431 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: ldap_first_entry에서 NULL을 리턴했습니다" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2241 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2441 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2489 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: 처리하지 못한 결과 형식 %d을(를) 반환했습니다" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2310 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2356 + msgid "Modifying contact from LDAP server..." + msgstr "연락처를 LDAP 서버에서 수정하는 중입니다..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2670 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2890 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2718 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2950 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: 처리하지 못한 검색 결과 형식 %d을(를) 반환했습니다" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4761 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4821 + msgid "Receiving LDAP search results..." + msgstr "LDAP 검색 결과를 받는 중입니다..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4940 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5000 + msgid "Error performing search" + msgstr "검색을 수행하는 중 오류가 발생했습니다" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5063 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "연락처(%d)를 다운로드하는 중입니다..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5526 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5654 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "'%s' 사용자의 DN을 가져오는데 실패했습니다" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:413 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:420 + #, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" + msgstr "'%s' 리소스 만들기 실패, HTTP 상태 %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:522 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "DELETE를 HTTP 상태 %d(으)로 실패했습니다" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:581 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588 + msgid "Contact on server changed -> not modifying" + msgstr "서버의 연락처 바뀜 -> 수정하지 않음" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:590 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:597 + #, c-format + msgid "Modify contact failed with HTTP status %d (%s)" + msgstr "연락처 수정을 HTTP 상태 %d번(%s)으로 실패했습니다" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1000 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1007 + msgid "Loading Addressbook summary..." + msgstr "주소록 개요를 불러오는 중..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1019 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "WebDAV의 PROPFIND에서 HTTP 상태 %d (%s)(으)로 실패했습니다" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1044 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1051 + msgid "No response body in webdav PROPFIND result" + msgstr "WebDAV PROPFIND 결과에서 본문 응답이 없습니다" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1076 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1083 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "연락처 불러오는 중 (%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1409 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1416 + msgid "Cannot transform SoupURI to string" + msgstr "SoupURI를 문자열로 변환할 수 없습니다" + +-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:23 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24 + msgid "No such book" + msgstr "그런 주소록이 없음" + +-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:25 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26 + #: ../addressbook/libedata-book/e-data-book.c:797 + msgid "Contact not found" + msgstr "연락처를 찾을 수 없습니다" + +-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:27 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28 + #: ../addressbook/libedata-book/e-data-book.c:798 + msgid "Contact ID already exists" + msgstr "오브젝트 ID가 이미 있습니다" + +-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:29 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30 + msgid "No such source" + msgstr "그런 원본이 없음" + +-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:31 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32 + #: ../addressbook/libedata-book/e-data-book.c:814 + msgid "No space" + msgstr "공간이 없습니다" +@@ -778,7 +783,7 @@ msgid "Birth Date" + msgstr "생일" + + #: ../addressbook/libebook-contacts/e-contact.c:283 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:875 + msgid "Anniversary" + msgstr "기념일" + +@@ -888,7 +893,7 @@ msgstr "구글 토크 대화명 목록" + msgid "Twitter Name List" + msgstr "트위터 이름 목록" + +-#: ../addressbook/libebook-contacts/e-contact.c:1683 ++#: ../addressbook/libebook-contacts/e-contact.c:1624 + #: ../addressbook/libebook/e-destination.c:884 + msgid "Unnamed List" + msgstr "이름 없는 목록" +@@ -911,7 +916,8 @@ msgstr "국가 번호가 잘못되었습 + + #: ../addressbook/libebook-contacts/e-phone-number.c:51 + msgid "" +-"Remaining text after the country calling code is too short for a phone number" ++"Remaining text after the country calling code is too short for a phone " ++"number" + msgstr "국가 번호 다음의 텍스트가 전화 번호로 너무 짧습니다" + + #: ../addressbook/libebook-contacts/e-phone-number.c:53 +@@ -922,89 +928,90 @@ msgstr "텍스트가 전화 번호로 � + msgid "Text is too long for a phone number" + msgstr "텍스트가 전화 번호로 너무 깁니다" + +-#: ../addressbook/libebook/e-book-client.c:683 +-#: ../addressbook/libedata-book/e-book-backend.c:93 ++#: ../addressbook/libebook/e-book-client.c:643 ++#: ../addressbook/libedata-book/e-book-backend.c:120 + #, c-format + msgid "Unknown book property '%s'" + msgstr "알 수 없는 주소록 속성 '%s'" + +-#: ../addressbook/libebook/e-book-client.c:698 ++#: ../addressbook/libebook/e-book-client.c:658 + #, c-format + msgid "Cannot change value of book property '%s'" + msgstr "주소록 속성 '%s'의 값을 바꿀 수 없습니다" + +-#: ../addressbook/libebook/e-book-client.c:1004 +-#: ../addressbook/libebook/e-book-client.c:1177 +-#: ../calendar/libecal/e-cal-client.c:1448 +-#: ../calendar/libecal/e-cal-client.c:1628 ++#: ../addressbook/libebook/e-book-client.c:993 ++#: ../addressbook/libebook/e-book-client.c:1168 ++#: ../calendar/libecal/e-cal-client.c:1515 ++#: ../calendar/libecal/e-cal-client.c:1697 + #, c-format + msgid "Unable to connect to '%s': " + msgstr "'%s'에 연결할 수 없습니다: " + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:754 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793 + #, c-format + msgid "Error introspecting unknown summary field '%s'" + msgstr "요약 필드 '%s' 점검에 오류가 발생했습니다" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1228 +-#: ../camel/camel-db.c:510 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289 ++#: ../camel/camel-db.c:544 + #, c-format + msgid "Insufficient memory" + msgstr "메모리 부족" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1361 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1422 + #, c-format + msgid "Invalid contact field '%d' specified in summary" + msgstr "잘못된 연락처 필드 '%d'번을 요약에서 지정했습니다" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1395 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1456 + #, c-format + msgid "" + "Contact field '%s' of type '%s' specified in summary, but only boolean, " + "string and string list field types are supported" + msgstr "연락처 필드 '%s'(형식 '%s')을(를) 지정했지만 불리언, 문자열, 문자열 목록 필드 형식만 지원합니다." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2580 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3605 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3686 + #, c-format + msgid "" + "Full search_contacts are not stored in cache. vcards cannot be returned." + msgstr "전체 search_contacts는 캐시에 저장하지 않습니다. vcards를 리턴할 수 없습니다." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3730 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3810 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3812 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3893 + #, c-format + msgid "Query contained unsupported elements" + msgstr "질의에 지원하지 않는 요소가 들어 있습니다" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3734 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 + #, c-format + msgid "Invalid Query" + msgstr "질의가 잘못되었습니다" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3758 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3840 + #, c-format + msgid "" + "Full search_contacts are not stored in cache. Hence only summary query is " + "supported." + msgstr "전체 search_contacts는 캐시에 저장하지 않습니다. 즉 요약 질의만 지원합니다." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3814 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 + #: ../addressbook/libedata-book/e-data-book.c:669 + #: ../addressbook/libedata-book/e-data-book.c:809 + #: ../calendar/libedata-cal/e-data-cal.c:612 +-#: ../calendar/libedata-cal/e-data-cal.c:771 ../libedataserver/e-client.c:165 ++#: ../calendar/libedata-cal/e-data-cal.c:771 ++#: ../libedataserver/e-client.c:166 + #, c-format + msgid "Invalid query" + msgstr "질의가 잘못되었습니다" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3856 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3940 + #, c-format + msgid "" + "Full vcards are not stored in cache. Hence only summary query is supported." + msgstr "전체 vcards는 캐시에 저장하지 않습니다. 즉 요약 질의만 지원합니다." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4557 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4643 + #, c-format + msgid "Unable to remove the db file: errno %d" + msgstr "DB 파일을 제거하는데 실패했습니다: 오류 번호 %d번" +@@ -1016,7 +1023,6 @@ msgstr "클라이언트에서 백엔드 + + #. Translators: This is prefix to a detailed error message + #. Translators: This is a prefix to a detailed error message * +-#. + #: ../addressbook/libedata-book/e-data-book.c:691 + #: ../calendar/libedata-cal/e-data-cal.c:635 + msgid "Invalid query: " +@@ -1028,19 +1034,22 @@ msgid "Success" + msgstr "성공" + + #: ../addressbook/libedata-book/e-data-book.c:794 +-#: ../calendar/libecal/e-cal.c:2298 ../calendar/libedata-cal/e-data-cal.c:753 ++#: ../calendar/libecal/e-cal.c:2307 ++#: ../calendar/libedata-cal/e-data-cal.c:753 + #: ../libedataserver/e-client.c:133 + msgid "Backend is busy" + msgstr "백엔드가 사용중입니다" + + #: ../addressbook/libedata-book/e-data-book.c:795 +-#: ../calendar/libedata-cal/e-data-cal.c:754 ../libedataserver/e-client.c:143 ++#: ../calendar/libedata-cal/e-data-cal.c:754 ++#: ../libedataserver/e-client.c:143 + msgid "Repository offline" + msgstr "저장고가 연결 중지 상태입니다" + + #: ../addressbook/libedata-book/e-data-book.c:796 +-#: ../calendar/libecal/e-cal.c:2312 ../calendar/libedata-cal/e-data-cal.c:755 +-#: ../libedataserver/e-client.c:149 ++#: ../calendar/libecal/e-cal.c:2321 ++#: ../calendar/libedata-cal/e-data-cal.c:755 ++#: ../libedataserver/e-client.c:150 + msgid "Permission denied" + msgstr "권한이 거부되었습니다" + +@@ -1060,12 +1069,14 @@ msgid "Unsupported field" + msgstr "지원하지 않는 필드" + + #: ../addressbook/libedata-book/e-data-book.c:802 +-#: ../calendar/libedata-cal/e-data-cal.c:764 ../libedataserver/e-client.c:157 ++#: ../calendar/libedata-cal/e-data-cal.c:764 ++#: ../libedataserver/e-client.c:158 + msgid "Unsupported authentication method" + msgstr "인증 방법을 지원하지 않습니다" + + #: ../addressbook/libedata-book/e-data-book.c:803 +-#: ../calendar/libedata-cal/e-data-cal.c:765 ../libedataserver/e-client.c:159 ++#: ../calendar/libedata-cal/e-data-cal.c:765 ++#: ../libedataserver/e-client.c:160 + msgid "TLS not available" + msgstr "TLS를 사용할 수 없습니다" + +@@ -1083,22 +1094,26 @@ msgid "Not available in offline mode" + msgstr "연결 중지 모드에서는 사용할 수 없습니다" + + #: ../addressbook/libedata-book/e-data-book.c:807 +-#: ../calendar/libedata-cal/e-data-cal.c:769 ../libedataserver/e-client.c:161 ++#: ../calendar/libedata-cal/e-data-cal.c:769 ++#: ../libedataserver/e-client.c:162 + msgid "Search size limit exceeded" + msgstr "검색 크기 제한을 넘어갔습니다" + + #: ../addressbook/libedata-book/e-data-book.c:808 +-#: ../calendar/libedata-cal/e-data-cal.c:770 ../libedataserver/e-client.c:163 ++#: ../calendar/libedata-cal/e-data-cal.c:770 ++#: ../libedataserver/e-client.c:164 + msgid "Search time limit exceeded" + msgstr "검색 제한 시간을 넘어갔습니다" + + #: ../addressbook/libedata-book/e-data-book.c:810 +-#: ../calendar/libedata-cal/e-data-cal.c:772 ../libedataserver/e-client.c:167 ++#: ../calendar/libedata-cal/e-data-cal.c:772 ++#: ../libedataserver/e-client.c:168 + msgid "Query refused" + msgstr "질의가 거부되었습니다" + + #: ../addressbook/libedata-book/e-data-book.c:811 +-#: ../calendar/libedata-cal/e-data-cal.c:773 ../libedataserver/e-client.c:153 ++#: ../calendar/libedata-cal/e-data-cal.c:773 ++#: ../libedataserver/e-client.c:154 + msgid "Could not cancel" + msgstr "취소할 수 없습니다" + +@@ -1110,32 +1125,38 @@ msgid "Invalid server version" + msgstr "서버 버전이 잘못되었습니다" + + #: ../addressbook/libedata-book/e-data-book.c:815 +-#: ../calendar/libecal/e-cal.c:2296 ../calendar/libedata-cal/e-data-cal.c:776 ++#: ../calendar/libecal/e-cal.c:2305 ++#: ../calendar/libedata-cal/e-data-cal.c:776 + #: ../libedataserver/e-client.c:131 + msgid "Invalid argument" + msgstr "인자가 잘못되었습니다" + + #. Translators: The string for NOT_SUPPORTED error + #: ../addressbook/libedata-book/e-data-book.c:817 +-#: ../calendar/libecal/e-cal.c:1058 ../calendar/libecal/e-cal.c:1426 +-#: ../calendar/libecal/e-cal.c:1906 ../calendar/libecal/e-cal.c:2335 +-#: ../calendar/libedata-cal/e-data-cal.c:778 ../libedataserver/e-client.c:155 ++#: ../calendar/libecal/e-cal.c:1064 ++#: ../calendar/libecal/e-cal.c:1432 ++#: ../calendar/libecal/e-cal.c:1912 ++#: ../calendar/libecal/e-cal.c:2344 ++#: ../calendar/libedata-cal/e-data-cal.c:778 ++#: ../libedataserver/e-client.c:156 + #, c-format + msgid "Not supported" + msgstr "지원하지 않습니다" + + #: ../addressbook/libedata-book/e-data-book.c:818 +-#: ../calendar/libedata-cal/e-data-cal.c:779 ../libedataserver/e-client.c:173 ++#: ../calendar/libedata-cal/e-data-cal.c:779 ++#: ../libedataserver/e-client.c:174 + msgid "Backend is not opened yet" + msgstr "백엔드를 아직 열지 않았습니다" + + #: ../addressbook/libedata-book/e-data-book.c:819 +-#: ../libedataserver/e-client.c:175 ++#: ../libedataserver/e-client.c:176 + msgid "Object is out of sync" + msgstr "오브젝트가 동기화되지 않았습니다" + + #: ../addressbook/libedata-book/e-data-book.c:827 +-#: ../calendar/libedata-cal/e-data-cal.c:787 ../libedataserver/e-client.c:171 ++#: ../calendar/libedata-cal/e-data-cal.c:787 ++#: ../libedataserver/e-client.c:172 + msgid "Other error" + msgstr "기타 오류" + +@@ -1145,37 +1166,37 @@ msgid "Cannot open book: " + msgstr "주소록을 열 수 없습니다: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1215 ++#: ../addressbook/libedata-book/e-data-book.c:1217 + msgid "Cannot refresh address book: " + msgstr "주소록을 새로 고칠 수 없습니다: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1296 ++#: ../addressbook/libedata-book/e-data-book.c:1298 + msgid "Cannot get contact: " + msgstr "연락처를 얻을 수 없습니다: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1360 ++#: ../addressbook/libedata-book/e-data-book.c:1364 + msgid "Cannot get contact list: " + msgstr "연락처 목록을 얻을 수 없습니다: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1449 ++#: ../addressbook/libedata-book/e-data-book.c:1456 + msgid "Cannot get contact list uids: " + msgstr "연락처를 목록 UID를 가져올 수 없습니다: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1526 ++#: ../addressbook/libedata-book/e-data-book.c:1536 + msgid "Cannot add contact: " + msgstr "연락처를 추가할 수 없습니다: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1589 ++#: ../addressbook/libedata-book/e-data-book.c:1599 + msgid "Cannot modify contacts: " + msgstr "연락처를 수정할 수 없습니다: " + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1630 ++#: ../addressbook/libedata-book/e-data-book.c:1640 + msgid "Cannot remove contacts: " + msgstr "연락처를 제거할 수 없습니다: " + +@@ -1226,8 +1247,7 @@ msgstr "잘못된 경로 재지정 URL � + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" + "Error message: %s" +-msgstr "" +-"서버에 접근할 수 없습니다. 달력을 읽기 전용 모드로 엽니다.\n" ++msgstr "서버에 접근할 수 없습니다. 달력을 읽기 전용 모드로 엽니다.\n" + "오류 메시지: %s" + + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:2801 +@@ -1259,16 +1279,16 @@ msgstr "스케듈 outbox URL을 찾을 � + msgid "Unexpected result in schedule-response" + msgstr "schedule-response에 예상치 못한 결과가 있습니다" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:877 + msgid "Birthday" + msgstr "생일" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:913 + #, c-format + msgid "Birthday: %s" + msgstr "생일: %s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:944 + #, c-format + msgid "Anniversary: %s" + msgstr "기념일: %s" +@@ -1282,157 +1302,162 @@ msgstr "달력 데이터를 저장할 � + msgid "Cannot save calendar data" + msgstr "달력 데이터를 저장할 수 없습니다" + +-#: ../calendar/backends/http/e-cal-backend-http.c:473 ++#: ../calendar/backends/http/e-cal-backend-http.c:477 + #, c-format + msgid "Malformed URI: %s" + msgstr "잘못 구성된 URI: %s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:564 ++#: ../calendar/backends/http/e-cal-backend-http.c:568 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "잘못된 URI로 리다이렉트했습니다" + +-#: ../calendar/backends/http/e-cal-backend-http.c:601 ++#: ../calendar/backends/http/e-cal-backend-http.c:605 + #, c-format + msgid "Bad file format." + msgstr "파일 형식이 틀렸습니다." + +-#: ../calendar/backends/http/e-cal-backend-http.c:611 ++#: ../calendar/backends/http/e-cal-backend-http.c:615 + #, c-format + msgid "Not a calendar." + msgstr "달력이 아닙니다." + +-#: ../calendar/backends/http/e-cal-backend-http.c:922 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:506 ++#: ../calendar/backends/http/e-cal-backend-http.c:926 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:520 + msgid "Could not create cache file" + msgstr "캐시 파일을 만들 수 없습니다" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:165 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:173 + msgid "Could not retrieve weather data" + msgstr "달력 데이터를 가져올 수 없습니다" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:270 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:284 + msgid "Weather: Fog" + msgstr "날씨: 안개" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:271 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:285 + msgid "Weather: Cloudy Night" + msgstr "날씨: 밤하늘 구름" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:272 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:286 + msgid "Weather: Cloudy" + msgstr "날씨: 구름" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:273 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:287 + msgid "Weather: Overcast" + msgstr "날씨: 흐림" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:274 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:288 + msgid "Weather: Showers" + msgstr "날씨: 소나기" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:275 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:289 + msgid "Weather: Snow" + msgstr "날씨: 눈" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:276 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:290 + msgid "Weather: Clear Night" + msgstr "날씨: 밤하늘 맑음" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:277 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:291 + msgid "Weather: Sunny" + msgstr "날씨: 해" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:278 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:292 + msgid "Weather: Thunderstorms" + msgstr "날씨: 뇌우" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:402 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:416 + msgid "Forecast" + msgstr "예보" + +-#: ../calendar/libecal/e-cal.c:2300 ++#: ../calendar/libecal/e-cal.c:2309 + msgid "Repository is offline" + msgstr "저장고가 연결 중지 상태입니다" + +-#: ../calendar/libecal/e-cal.c:2302 ../calendar/libecal/e-cal-client.c:255 ++#: ../calendar/libecal/e-cal.c:2311 ++#: ../calendar/libecal/e-cal-client.c:262 + msgid "No such calendar" + msgstr "그런 달력이 없습니다" + +-#: ../calendar/libecal/e-cal.c:2304 ../calendar/libecal/e-cal-client.c:257 ++#: ../calendar/libecal/e-cal.c:2313 ++#: ../calendar/libecal/e-cal-client.c:264 + #: ../calendar/libedata-cal/e-data-cal.c:757 + msgid "Object not found" + msgstr "오브젝트를 찾을 수 없습니다" + +-#: ../calendar/libecal/e-cal.c:2306 ../calendar/libecal/e-cal-client.c:259 ++#: ../calendar/libecal/e-cal.c:2315 ++#: ../calendar/libecal/e-cal-client.c:266 + #: ../calendar/libedata-cal/e-data-cal.c:758 + msgid "Invalid object" + msgstr "오브젝트가 잘못되었습니다" + +-#: ../calendar/libecal/e-cal.c:2308 ++#: ../calendar/libecal/e-cal.c:2317 + msgid "URI not loaded" + msgstr "URI를 읽어들이지 못했습니다" + +-#: ../calendar/libecal/e-cal.c:2310 ++#: ../calendar/libecal/e-cal.c:2319 + msgid "URI already loaded" + msgstr "URI를 이미 읽어들였습니다" + +-#: ../calendar/libecal/e-cal.c:2314 ++#: ../calendar/libecal/e-cal.c:2323 + msgid "Unknown User" + msgstr "알 수 없는 사용자" + +-#: ../calendar/libecal/e-cal.c:2316 ../calendar/libecal/e-cal-client.c:263 ++#: ../calendar/libecal/e-cal.c:2325 ++#: ../calendar/libecal/e-cal-client.c:270 + #: ../calendar/libedata-cal/e-data-cal.c:759 + msgid "Object ID already exists" + msgstr "오브젝트 ID가 이미 있습니다" + +-#: ../calendar/libecal/e-cal.c:2318 ++#: ../calendar/libecal/e-cal.c:2327 + msgid "Protocol not supported" + msgstr "프로토콜을 지원하지 않습니다" + +-#: ../calendar/libecal/e-cal.c:2320 ++#: ../calendar/libecal/e-cal.c:2329 + msgid "Operation has been canceled" + msgstr "작업을 취소했습니다" + +-#: ../calendar/libecal/e-cal.c:2322 ++#: ../calendar/libecal/e-cal.c:2331 + msgid "Could not cancel operation" + msgstr "작업을 취소할 수 없습니다" + +-#: ../calendar/libecal/e-cal.c:2324 ../libedataserver/e-client.c:139 ++#: ../calendar/libecal/e-cal.c:2333 ++#: ../libedataserver/e-client.c:139 + msgid "Authentication failed" + msgstr "인증이 실패했습니다" + +-#: ../calendar/libecal/e-cal.c:2326 +-#: ../camel/providers/smtp/camel-smtp-transport.c:923 ++#: ../calendar/libecal/e-cal.c:2335 ++#: ../camel/providers/smtp/camel-smtp-transport.c:915 + #: ../libedataserver/e-client.c:141 + msgid "Authentication required" + msgstr "인증이 필요합니다" + +-#: ../calendar/libecal/e-cal.c:2328 ++#: ../calendar/libecal/e-cal.c:2337 + msgid "A D-Bus exception has occurred" + msgstr "D-BUS 예외가 발생했습니다" + +-#: ../calendar/libecal/e-cal.c:2332 ++#: ../calendar/libecal/e-cal.c:2341 + msgid "No error" + msgstr "오류 없음" + +-#: ../calendar/libecal/e-cal-client.c:261 ++#: ../calendar/libecal/e-cal-client.c:268 + #: ../calendar/libedata-cal/e-data-cal.c:767 + msgid "Unknown user" + msgstr "알 수 없는 사용자" + +-#: ../calendar/libecal/e-cal-client.c:265 ++#: ../calendar/libecal/e-cal-client.c:272 + #: ../calendar/libedata-cal/e-data-cal.c:756 + msgid "Invalid range" + msgstr "범위가 잘못되었습니다" + +-#: ../calendar/libecal/e-cal-client.c:887 +-#: ../calendar/libedata-cal/e-cal-backend.c:176 ++#: ../calendar/libecal/e-cal-client.c:920 ++#: ../calendar/libedata-cal/e-cal-backend.c:204 + #, c-format + msgid "Unknown calendar property '%s'" + msgstr "알 수 없는 달력 속성 '%s'" + +-#: ../calendar/libecal/e-cal-client.c:902 ++#: ../calendar/libecal/e-cal-client.c:935 + #, c-format + msgid "Cannot change value of calendar property '%s'" + msgstr "'%s' 달력 속성의 값을 바꿀 수 없습니다" +@@ -1565,114 +1590,107 @@ msgstr "30일" + msgid "31st" + msgstr "31일" + +-#: ../calendar/libecal/e-cal-util.c:697 ../calendar/libecal/e-cal-util.c:724 ++#: ../calendar/libecal/e-cal-util.c:707 ++#: ../calendar/libecal/e-cal-util.c:734 + msgctxt "Priority" + msgid "High" + msgstr "높음" + +-#: ../calendar/libecal/e-cal-util.c:699 ../calendar/libecal/e-cal-util.c:726 ++#: ../calendar/libecal/e-cal-util.c:709 ++#: ../calendar/libecal/e-cal-util.c:736 + msgctxt "Priority" + msgid "Normal" + msgstr "보통" + +-#: ../calendar/libecal/e-cal-util.c:701 ../calendar/libecal/e-cal-util.c:728 ++#: ../calendar/libecal/e-cal-util.c:711 ++#: ../calendar/libecal/e-cal-util.c:738 + msgctxt "Priority" + msgid "Low" + msgstr "낮음" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:722 ++#: ../calendar/libecal/e-cal-util.c:732 + msgctxt "Priority" + msgid "Undefined" + msgstr "정의안됨" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:78 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:844 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:867 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1019 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1226 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1257 +-#, c-format +-msgid "\"%s\" expects no arguments" +-msgstr "\"%s\"에는 인자가 필요 없습니다" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:238 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:285 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:326 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1299 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541 + #, c-format + msgid "\"%s\" expects one argument" + msgstr "\"%s\"에는 한 개의 인자가 필요합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:122 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:130 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:333 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:914 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380 + #, c-format + msgid "\"%s\" expects the first argument to be a string" + msgstr "\"%s\"의 첫번째 인자가 문자열이어야 합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:139 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160 + #, c-format +-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" +-msgstr "\"%s\"의 첫번째 인자가 ISO 8601 날짜/시각 문자열이어야 합니다" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:559 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:907 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1055 +-#, c-format +-msgid "\"%s\" expects two arguments" +-msgstr "\"%s\"에는 두 개의 인자가 필요합니다" ++msgid "\"%s\" expects two or three arguments" ++msgstr "\"%s\"에는 두 개 또는 세 개 인자가 필요합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:189 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:245 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:504 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:566 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1062 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1306 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548 + #, c-format + msgid "\"%s\" expects the first argument to be a time_t" + msgstr "\"%s\"의 첫번째 인자가 time_t 값이어야 합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:198 +-#, c-format +-msgid "\"%s\" expects the second argument to be an integer" +-msgstr "\"%s\"의 두번째 인자가 정수 값이어야 합니다" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:408 +-#, c-format +-msgid "\"%s\" expects two or three arguments" +-msgstr "\"%s\"에는 두 개 또는 세 개 인자가 필요합니다" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:424 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:512 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:576 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1071 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826 + #, c-format + msgid "\"%s\" expects the second argument to be a time_t" + msgstr "\"%s\"의 두번째 인자가 time_t여야 합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:434 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186 + #, c-format + msgid "\"%s\" expects the third argument to be a string" + msgstr "\"%s\"의 세번째 인자가 문자열이어야 합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:496 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248 + #, c-format + msgid "\"%s\" expects none or two arguments" + msgstr "\"%s\"에는 인자가 없거나 두 개의 인자가 필요합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434 ++#, c-format ++msgid "\"%s\" expects two arguments" ++msgstr "\"%s\"에는 두 개의 인자가 필요합니다" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326 ++#, c-format ++msgid "\"%s\" expects no arguments" ++msgstr "\"%s\"에는 인자가 필요 없습니다" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676 + #, c-format + msgid "\"%s\" expects the second argument to be a string" + msgstr "\"%s\"의 두번째 인자가 문자열이어야 합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707 + #, c-format + msgid "" + "\"%s\" expects the first argument to be either \"any\", \"summary\", or " +@@ -1682,19 +1700,27 @@ msgstr "" + "\"%s\"의 첫번째 인자가 \"any\", \"summary\", \"description\", \"location\", " + "\"attendee\", \"organizer\", \"classification\" 중의 하나여야 합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1123 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 + #, c-format + msgid "\"%s\" expects at least one argument" + msgstr "\"%s\"에는 최소한 한 개의 인자가 필요합니다" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1138 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893 + #, c-format + msgid "" + "\"%s\" expects all arguments to be strings or one and only one argument to " + "be a boolean false (#f)" +-msgstr "" +-"\"%s\"의 모든 인자가 문자열이거나, 아니면 인자가 한 개이고 불리언 거짓 (#f) " +-"값이어야 합니다" ++msgstr "\"%s\"의 모든 인자가 문자열이거나, 아니면 인자가 한 개이고 불리언 거짓 (#f) 값이어야 합니다" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389 ++#, c-format ++msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" ++msgstr "\"%s\"의 첫번째 인자가 ISO 8601 날짜/시각 문자열이어야 합니다" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450 ++#, c-format ++msgid "\"%s\" expects the second argument to be an integer" ++msgstr "\"%s\"의 두번째 인자가 정수 값이어야 합니다" + + #: ../calendar/libedata-cal/e-data-cal.c:763 + msgid "Unsupported method" +@@ -1846,8 +1872,7 @@ msgid "" + "Could not write log entry: %s\n" + "Further operations on this server will not be replayed when you\n" + "reconnect to the network." +-msgstr "" +-"로그 항목을 쓸 수 없습니다: %s\n" ++msgstr "로그 항목을 쓸 수 없습니다: %s\n" + "이 서버에 대해 향후 작업은 네트워크에 다시 연결했을 때\n" + "다시 수행됩니다." + +@@ -1857,8 +1882,7 @@ msgid "" + "Could not open '%s':\n" + "%s\n" + "Changes made to this folder will not be resynchronized." +-msgstr "" +-"'%s'을(를) 열 수 없습니다:\n" ++msgstr "'%s'을(를) 열 수 없습니다:\n" + "%s\n" + "이 폴더에 바뀐 사항을 동기화하지 않습니다." + +@@ -1866,7 +1890,8 @@ msgstr "" + msgid "Resynchronizing with server" + msgstr "서버와 다시 동기화하는 중입니다" + +-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93 ++#: ../camel/camel-disco-folder.c:76 ++#: ../camel/camel-offline-folder.c:93 + msgid "Downloading new messages for offline mode" + msgstr "연결 중지 모드를 위한 새 메시지를 다운로드하는 중입니다" + +@@ -1875,23 +1900,33 @@ msgstr "연결 중지 모드를 위한 � + msgid "Preparing folder '%s' for offline" + msgstr "연결 중지 모드를 위한 '%s' 폴더를 준비하는 중입니다" + +-#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336 ++#: ../camel/camel-disco-folder.c:489 ++#: ../camel/camel-offline-folder.c:336 + msgid "Copy folder content locally for _offline operation" + msgstr "오프라인 작업을 위해 폴더 내용을 로컬에 복사(_O)" + +-#: ../camel/camel-disco-store.c:475 ../camel/camel-imapx-folder.c:478 +-#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553 +-#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748 +-#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993 +-#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:368 +-#: ../camel/camel-imapx-store.c:1573 ../camel/camel-imapx-store.c:1662 +-#: ../camel/camel-imapx-store.c:1711 +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 +-#: ../camel/providers/pop3/camel-pop3-folder.c:677 +-#: ../camel/providers/pop3/camel-pop3-folder.c:906 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1106 +-#: ../camel/providers/pop3/camel-pop3-store.c:472 +-#: ../camel/providers/pop3/camel-pop3-store.c:896 ++#: ../camel/camel-disco-store.c:475 ++#: ../camel/camel-imapx-folder.c:478 ++#: ../camel/camel-imapx-folder.c:514 ++#: ../camel/camel-imapx-folder.c:553 ++#: ../camel/camel-imapx-folder.c:613 ++#: ../camel/camel-imapx-folder.c:748 ++#: ../camel/camel-imapx-folder.c:933 ++#: ../camel/camel-imapx-folder.c:993 ++#: ../camel/camel-imapx-folder.c:1032 ++#: ../camel/camel-imapx-store.c:368 ++#: ../camel/camel-imapx-store.c:1592 ++#: ../camel/camel-imapx-store.c:1681 ++#: ../camel/camel-imapx-store.c:1730 ++#: ../camel/providers/pop3/camel-pop3-folder.c:555 ++#: ../camel/providers/pop3/camel-pop3-folder.c:705 ++#: ../camel/providers/pop3/camel-pop3-folder.c:940 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1150 ++#: ../camel/providers/pop3/camel-pop3-store.c:291 ++#: ../camel/providers/pop3/camel-pop3-store.c:519 ++#: ../camel/providers/pop3/camel-pop3-store.c:567 ++#: ../camel/providers/pop3/camel-pop3-store.c:652 ++#: ../camel/providers/pop3/camel-pop3-store.c:1052 + #, c-format + msgid "You must be working online to complete this operation" + msgstr "이 작업을 마치려면 온라인으로 실행해야 합니다" +@@ -1901,7 +1936,8 @@ msgstr "이 작업을 마치려면 온� + msgid "Canceled" + msgstr "취소함" + +-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797 ++#: ../camel/camel-filter-driver.c:916 ++#: ../camel/camel-filter-search.c:797 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "하위 프로세스 '%s' 프로세스를 만드는데 실패했습니다: %s" +@@ -1911,69 +1947,74 @@ msgstr "하위 프로세스 '%s' 프로� + msgid "Invalid message stream received from %s: %s" + msgstr "%s에서 잘못된 메시지 스트림을 받았습니다: %s" + +-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178 ++#: ../camel/camel-filter-driver.c:1171 ++#: ../camel/camel-filter-driver.c:1180 + msgid "Syncing folders" + msgstr "폴더 동기중" + +-#: ../camel/camel-filter-driver.c:1276 ++#: ../camel/camel-filter-driver.c:1278 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "필터 분석 중 오류: %s: %s" + +-#: ../camel/camel-filter-driver.c:1287 ++#: ../camel/camel-filter-driver.c:1289 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "필터 실행 중 오류: %s: %s" + +-#: ../camel/camel-filter-driver.c:1383 ++#: ../camel/camel-filter-driver.c:1385 + #, c-format + msgid "Unable to open spool folder" + msgstr "메일 모음 폴더를 열 수 없습니다" + +-#: ../camel/camel-filter-driver.c:1395 ++#: ../camel/camel-filter-driver.c:1397 + #, c-format + msgid "Unable to process spool folder" + msgstr "메일 모음 폴더를 진행할 수 없습니다" + +-#: ../camel/camel-filter-driver.c:1415 ++#: ../camel/camel-filter-driver.c:1420 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "메시지 %d개(%d%%)를 가져오는 중" + +-#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446 ++#: ../camel/camel-filter-driver.c:1429 ++#: ../camel/camel-filter-driver.c:1451 + #, c-format + msgid "Failed on message %d" + msgstr "메시지 %d개에서 실패" + +-#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573 ++#: ../camel/camel-filter-driver.c:1470 ++#: ../camel/camel-filter-driver.c:1584 + msgid "Syncing folder" + msgstr "폴더 동기화" + +-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581 ++#: ../camel/camel-filter-driver.c:1475 ++#: ../camel/camel-filter-driver.c:1592 + msgid "Complete" + msgstr "완료" + +-#: ../camel/camel-filter-driver.c:1529 ++#: ../camel/camel-filter-driver.c:1538 + #, c-format + msgid "Getting message %d of %d" + msgstr "%2$d개 중에서 메시지 %1$d 가져오는 중" + +-#: ../camel/camel-filter-driver.c:1547 ++#: ../camel/camel-filter-driver.c:1556 + #, c-format + msgid "Failed at message %d of %d" + msgstr "%2$d개 중에서 메시지 %1$d에서 실패" + +-#: ../camel/camel-filter-driver.c:1741 ../camel/camel-filter-driver.c:1775 ++#: ../camel/camel-filter-driver.c:1752 ++#: ../camel/camel-filter-driver.c:1786 + #, c-format + msgid "Execution of filter '%s' failed: " + msgstr "'%s' 필터 실행 실패: " + +-#: ../camel/camel-filter-driver.c:1765 ++#: ../camel/camel-filter-driver.c:1776 + #, c-format + msgid "Error parsing filter '%s': %s: %s" + msgstr "'%s' 필터 파싱 오류: %s: %s" + +-#: ../camel/camel-filter-driver.c:1784 ++#: ../camel/camel-filter-driver.c:1795 + #, c-format + msgid "Error executing filter '%s': %s: %s" + msgstr "'%s' 필터 실행 오류: %s: %s" +@@ -1990,239 +2031,244 @@ msgstr "(system-flag)에 잘못된 인� + msgid "Invalid arguments to (user-tag)" + msgstr "(user-flag)에 잘못된 인자" + +-#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055 ++#: ../camel/camel-filter-search.c:1046 ++#: ../camel/camel-filter-search.c:1055 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "필터 검색 실행 중 오류: %s: %s" + +-#: ../camel/camel-folder.c:272 ++#: ../camel/camel-folder.c:310 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" + msgstr[0] "'%s'에 있는 정크 메시지를 검사하는 중입니다" + +-#: ../camel/camel-folder.c:312 ++#: ../camel/camel-folder.c:350 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" + msgstr[0] "'%s'에 있는 정상 메시지를 검사하는 중입니다" + +-#: ../camel/camel-folder.c:360 ++#: ../camel/camel-folder.c:398 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "'%s'에 있는 새 메시지를 필터링하는 중입니다" + +-#: ../camel/camel-folder.c:934 ++#: ../camel/camel-folder.c:972 + #: ../camel/providers/local/camel-maildir-folder.c:321 + msgid "Moving messages" + msgstr "메시지 옮기는 중입니다" + +-#: ../camel/camel-folder.c:937 ++#: ../camel/camel-folder.c:975 + msgid "Copying messages" + msgstr "메시지 복사하는 중입니다" + +-#: ../camel/camel-folder.c:1257 ++#: ../camel/camel-folder.c:1295 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "'%s' 폴더에 대해 용량 제한 정보를 지원하지 않습니다" + +-#: ../camel/camel-folder.c:3487 ++#: ../camel/camel-folder.c:3528 + #, c-format + msgid "Expunging folder '%s'" + msgstr "'%s' 폴더를 삭제하는 중" + +-#: ../camel/camel-folder.c:3719 ++#: ../camel/camel-folder.c:3760 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "%2$s 안에 '%1$s' 메시지를 가져오는 중입니다" + +-#: ../camel/camel-folder.c:3870 ++#: ../camel/camel-folder.c:3911 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "'%s'에 대한 용량 제한 정보를 가져오는 중입니다" + +-#: ../camel/camel-folder.c:4102 ++#: ../camel/camel-folder.c:4143 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "'%s' 폴더를 새로 고치는 중" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:824 ../camel/camel-folder-search.c:867 ++#: ../camel/camel-folder-search.c:838 ++#: ../camel/camel-folder-search.c:881 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s)은(는) 한 개의 불리언 결과가 필요합니다" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:902 ++#: ../camel/camel-folder-search.c:916 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s)은(는) %s 안에서 쓸 수 없습니다" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:909 ../camel/camel-folder-search.c:917 ++#: ../camel/camel-folder-search.c:923 ++#: ../camel/camel-folder-search.c:931 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s)은(는) match 타입의 문자열이 필요합니다." + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:945 ++#: ../camel/camel-folder-search.c:959 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s)은(는) 한 개의 배열 결과가 필요합니다" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:955 ++#: ../camel/camel-folder-search.c:969 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s)은(는) 폴더 집합이 필요합니다" + +-#: ../camel/camel-folder-search.c:1816 ../camel/camel-folder-search.c:1983 ++#: ../camel/camel-folder-search.c:1862 ++#: ../camel/camel-folder-search.c:2029 + #, c-format +-msgid "" +-"Cannot parse search expression: %s:\n" ++msgid "Cannot parse search expression: %s:\n" + "%s" +-msgstr "" +-"검색 표현식을 해석할 수 없음: %s:\n" ++msgstr "검색 표현식을 해석할 수 없음: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1828 ../camel/camel-folder-search.c:1995 ++#: ../camel/camel-folder-search.c:1874 ++#: ../camel/camel-folder-search.c:2041 + #, c-format +-msgid "" +-"Error executing search expression: %s:\n" ++msgid "Error executing search expression: %s:\n" + "%s" +-msgstr "" +-"검색을 수행하는 중 오류: %s:\n" ++msgstr "검색을 수행하는 중 오류: %s:\n" + "%s" + +-#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696 +-#: ../camel/camel-gpg-context.c:1359 ++#: ../camel/camel-gpg-context.c:730 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/camel-gpg-context.c:1398 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "gpg 실행에 실패했습니다: %s" + +-#: ../camel/camel-gpg-context.c:696 +-#: ../camel/providers/smtp/camel-smtp-transport.c:926 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/providers/smtp/camel-smtp-transport.c:918 + msgid "Unknown" + msgstr "알 수 없음" + +-#: ../camel/camel-gpg-context.c:761 ++#: ../camel/camel-gpg-context.c:800 + #, c-format +-msgid "" +-"Unexpected GnuPG status message encountered:\n" ++msgid "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" +-msgstr "" +-"예기치 않은 GnuPG 상태 메시지가 나왔습니다:\n" ++msgstr "예기치 않은 GnuPG 상태 메시지가 나왔습니다:\n" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:797 ++#: ../camel/camel-gpg-context.c:836 + #, c-format + msgid "Failed to parse gpg userid hint." + msgstr "gpg userid 힌트를 파싱하는데 실패했습니다." + +-#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837 ++#: ../camel/camel-gpg-context.c:861 ++#: ../camel/camel-gpg-context.c:876 + #, c-format + msgid "Failed to parse gpg passphrase request." + msgstr "gpg 암호 요청을 파싱하는데 실패했습니다." + +-#: ../camel/camel-gpg-context.c:858 ++#: ../camel/camel-gpg-context.c:897 + #, c-format +-msgid "" +-"You need a PIN to unlock the key for your\n" ++msgid "You need a PIN to unlock the key for your\n" + "SmartCard: \"%s\"" +-msgstr "" +-"스마트카드에서 키를 열려면 PIN이 필요합니다:\n" ++msgstr "스마트카드에서 키를 열려면 PIN이 필요합니다:\n" + "\"%s\"" + +-#: ../camel/camel-gpg-context.c:862 ++#: ../camel/camel-gpg-context.c:901 + #, c-format +-msgid "" +-"You need a passphrase to unlock the key for\n" ++msgid "You need a passphrase to unlock the key for\n" + "user: \"%s\"" +-msgstr "" +-"다음 사용자에 대한 키를 열려면 암호가 필요합니다:\n" ++msgstr "다음 사용자에 대한 키를 열려면 암호가 필요합니다:\n" + "\"%s\"" + +-#: ../camel/camel-gpg-context.c:868 ++#: ../camel/camel-gpg-context.c:907 + #, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "'%s'에 대해 GnuPG로부터 예상치 못한 요청" + +-#: ../camel/camel-gpg-context.c:880 ++#: ../camel/camel-gpg-context.c:919 + msgid "" + "Note the encrypted content doesn't contain information about a recipient, " + "thus there will be a password prompt for each of stored private key." +-msgstr "" +-"암호화된 내용 안에는 수신자에 대한 정보가 들어 있지 않습니다. 그러므로 저장" +-"된 개인 키 하나하나에 대해 암호를 묻습니다." ++msgstr "암호화된 내용 안에는 수신자에 대한 정보가 들어 있지 않습니다. 그러므로 저장된 개인 키 하나하나에 대해 암호를 묻습니다." + +-#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523 ++#: ../camel/camel-gpg-context.c:950 ++#: ../camel/camel-net-utils.c:524 + #: ../camel/camel-tcp-stream-raw.c:268 +-#: ../camel/providers/nntp/camel-nntp-summary.c:388 +-#: ../libedataserver/e-client.c:151 ++#: ../camel/providers/nntp/camel-nntp-summary.c:402 ++#: ../libedataserver/e-client.c:152 + #, c-format + msgid "Cancelled" + msgstr "취소함" + +-#: ../camel/camel-gpg-context.c:932 ++#: ../camel/camel-gpg-context.c:971 + #, c-format + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "비밀 키를 여는데 실패했습니다: 암호가 3번 틀렸습니다." + +-#: ../camel/camel-gpg-context.c:945 ++#: ../camel/camel-gpg-context.c:984 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "GnuPG로부터 예상치못한 답변: %s" + +-#: ../camel/camel-gpg-context.c:1076 ++#: ../camel/camel-gpg-context.c:1115 + #, c-format + msgid "Failed to encrypt: No valid recipients specified." + msgstr "암호화하는데 실패했습니다: 받는 사람이 올바르게 지정되지 않았습니다." + +-#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846 ++#: ../camel/camel-gpg-context.c:1665 ++#: ../camel/camel-smime-context.c:846 + msgid "Could not generate signing data: " + msgstr "서명 데이터를 만들 수 없습니다: " + +-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879 +-#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136 +-#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284 ++#: ../camel/camel-gpg-context.c:1714 ++#: ../camel/camel-gpg-context.c:1918 ++#: ../camel/camel-gpg-context.c:2028 ++#: ../camel/camel-gpg-context.c:2179 ++#: ../camel/camel-gpg-context.c:2279 ++#: ../camel/camel-gpg-context.c:2327 + msgid "Failed to execute gpg." + msgstr "GPG 실행에 실패했습니다." + +-#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762 +-#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790 +-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987 ++#: ../camel/camel-gpg-context.c:1793 ++#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1809 ++#: ../camel/camel-gpg-context.c:1829 ++#: ../camel/camel-smime-context.c:973 ++#: ../camel/camel-smime-context.c:987 + #: ../camel/camel-smime-context.c:996 + #, c-format + msgid "Cannot verify message signature: Incorrect message format" + msgstr "메시지 서명을 확인할 수 없습니다: 메시지 형식이 틀렸습니다" + +-#: ../camel/camel-gpg-context.c:1832 ++#: ../camel/camel-gpg-context.c:1871 + msgid "Cannot verify message signature: " + msgstr "메시지 서명을 확인할 수 없습니다: " + +-#: ../camel/camel-gpg-context.c:1955 ++#: ../camel/camel-gpg-context.c:1994 + msgid "Could not generate encrypting data: " + msgstr "암호화 데이터를 만들 수 없습니다: " + +-#: ../camel/camel-gpg-context.c:2008 ++#: ../camel/camel-gpg-context.c:2047 + msgid "This is a digitally encrypted message part" + msgstr "디지탈 암호화된 메시지 부분입니다" + +-#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075 +-#: ../camel/camel-gpg-context.c:2098 ++#: ../camel/camel-gpg-context.c:2105 ++#: ../camel/camel-gpg-context.c:2114 ++#: ../camel/camel-gpg-context.c:2137 + #, c-format + msgid "Cannot decrypt message: Incorrect message format" + msgstr "메시지의 암호화를 풀 수 없습니다: 메시지 형식이 틀렸습니다" + +-#: ../camel/camel-gpg-context.c:2086 ++#: ../camel/camel-gpg-context.c:2125 + #, c-format + msgid "Failed to decrypt MIME part: protocol error" + msgstr "MIME 부분을 암호화 해독하는데 실패했습니다: 프로토콜 오류" + +-#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1287 ++#: ../camel/camel-gpg-context.c:2220 ++#: ../camel/camel-smime-context.c:1287 + msgid "Encrypted content" + msgstr "암호화된 내용" + +@@ -2231,7 +2277,8 @@ msgstr "암호화된 내용" + msgid "No quota information available for folder '%s'" + msgstr "'%s' 폴더에 대해 용량 제한 정보가 없습니다" + +-#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882 ++#: ../camel/camel-imapx-folder.c:809 ++#: ../camel/camel-imapx-folder.c:882 + #, c-format + msgid "No destination folder specified" + msgstr "대상 폴더를 지정하지 않았습니다" +@@ -2244,191 +2291,204 @@ msgstr "정크 메시지를 옮길 수 � + msgid "Unable to move deleted messages" + msgstr "삭제한 메시지를 옮길 수 없습니다" + +-#: ../camel/camel-imapx-folder.c:1115 +-#: ../camel/providers/nntp/camel-nntp-folder.c:738 ++#: ../camel/camel-imapx-folder.c:1119 ++#: ../camel/providers/nntp/camel-nntp-folder.c:794 + msgid "Apply message _filters to this folder" + msgstr "이 폴더에 메시지 필터 적용(_F)" + +-#: ../camel/camel-imapx-folder.c:1224 ++#: ../camel/camel-imapx-folder.c:1228 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "%s에 대한 폴더 요약을 만들 수 없습니다" + +-#: ../camel/camel-imapx-folder.c:1232 ++#: ../camel/camel-imapx-folder.c:1236 + #, c-format + msgid "Could not create cache for %s: " + msgstr "%s에 대한 캐시를 만들 수 없습니다: " + +-#: ../camel/camel-imapx-server.c:1267 ++#: ../camel/camel-imapx-server.c:1283 + msgid "Server disconnected" + msgstr "서버 연결이 끊겼습니다" + +-#: ../camel/camel-imapx-server.c:1775 ++#: ../camel/camel-imapx-server.c:1772 + msgid "Error writing to cache stream" + msgstr "캐시 스트림에 쓰는 중 오류 발생" + +-#: ../camel/camel-imapx-server.c:2980 ++#: ../camel/camel-imapx-server.c:2441 ++#, c-format ++msgid "Alert from IMAP server %s:\n" ++"%s" ++msgstr "IMAP 서버 %s에서 경고:\n" ++"%s" ++ ++#: ../camel/camel-imapx-server.c:3029 + #, c-format + msgid "Not authenticated" + msgstr "인증하지 않았습니다" + + # IMAP 동작 +-#: ../camel/camel-imapx-server.c:3058 ++#: ../camel/camel-imapx-server.c:3107 + msgid "Error performing IDLE" + msgstr "IDLE 수행하는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:4015 ++#: ../camel/camel-imapx-server.c:3994 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "보안 모드로 IMAP 서버 %s에 연결하는데 실패했습니다: %s" + +-#: ../camel/camel-imapx-server.c:4016 +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/camel-imapx-server.c:3995 ++#: ../camel/providers/smtp/camel-smtp-transport.c:203 + msgid "STARTTLS not supported" + msgstr "STARTLS를 지원하지 않습니다" + +-#: ../camel/camel-imapx-server.c:4055 ++#: ../camel/camel-imapx-server.c:4034 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "보안 모드로 IMAP 서버 %s에 연결하는데 실패했습니다: " + +-#: ../camel/camel-imapx-server.c:4135 ++#: ../camel/camel-imapx-server.c:4114 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "%s IMAP 서버는 %s 인증 방법을 지원하지 않습니다" + +-#: ../camel/camel-imapx-server.c:4146 ../camel/camel-session.c:495 +-#: ../camel/providers/pop3/camel-pop3-store.c:272 +-#: ../camel/providers/pop3/camel-pop3-store.c:654 +-#: ../camel/providers/smtp/camel-smtp-transport.c:517 ++#: ../camel/camel-imapx-server.c:4125 ++#: ../camel/camel-session.c:495 ++#: ../camel/providers/pop3/camel-pop3-store.c:303 ++#: ../camel/providers/pop3/camel-pop3-store.c:737 ++#: ../camel/providers/smtp/camel-smtp-transport.c:509 + #, c-format + msgid "No support for %s authentication" + msgstr "%s 인증을 지원하지 않습니다" + +-#: ../camel/camel-imapx-server.c:4165 +-#: ../camel/providers/nntp/camel-nntp-store.c:362 +-#: ../camel/providers/nntp/camel-nntp-store.c:562 ++#: ../camel/camel-imapx-server.c:4144 ++#: ../camel/providers/nntp/camel-nntp-store.c:407 ++#: ../camel/providers/nntp/camel-nntp-store.c:595 + msgid "Cannot authenticate without a username" + msgstr "사용자 이름 없이 인증할 수 없습니다" + +-#: ../camel/camel-imapx-server.c:4174 +-#: ../camel/providers/nntp/camel-nntp-store.c:571 +-#: ../camel/providers/pop3/camel-pop3-store.c:579 +-#: ../camel/providers/pop3/camel-pop3-store.c:599 ++#: ../camel/camel-imapx-server.c:4153 ++#: ../camel/providers/nntp/camel-nntp-store.c:604 ++#: ../camel/providers/pop3/camel-pop3-store.c:662 ++#: ../camel/providers/pop3/camel-pop3-store.c:682 + msgid "Authentication password not available" + msgstr "인증 암호가 없습니다" + +-#: ../camel/camel-imapx-server.c:4382 ++#: ../camel/camel-imapx-server.c:4360 + msgid "Error fetching message" + msgstr "메시지 가져오는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:4464 +-msgid "Failed to copy the tmp file" +-msgstr "임시 파일을 복사하는데 실패했습니다" +- +-#: ../camel/camel-imapx-server.c:4478 ++#: ../camel/camel-imapx-server.c:4410 ++#: ../camel/camel-imapx-server.c:4418 + msgid "Failed to close the tmp stream" + msgstr "임시 스트림을 닫는데 실패했습니다" + +-#: ../camel/camel-imapx-server.c:4599 ++#: ../camel/camel-imapx-server.c:4447 ++msgid "Failed to copy the tmp file" ++msgstr "임시 파일을 복사하는데 실패했습니다" ++ ++#: ../camel/camel-imapx-server.c:4571 + msgid "Error copying messages" + msgstr "메시지 복사하는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:4765 ++#: ../camel/camel-imapx-server.c:4740 + msgid "Error appending message" + msgstr "메시지 덧붙이는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:4964 ++#: ../camel/camel-imapx-server.c:4939 + msgid "Error fetching message headers" + msgstr "메시지 헤더를 가져오는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:5111 ++#: ../camel/camel-imapx-server.c:5090 + msgid "Error retrieving message" + msgstr "메시지를 가져오는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:5235 ../camel/camel-imapx-server.c:5463 ++#: ../camel/camel-imapx-server.c:5221 ++#: ../camel/camel-imapx-server.c:5449 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "'%s'에서 새 메시지 요약 정보를 가져오는 중" + +-#: ../camel/camel-imapx-server.c:5299 ++#: ../camel/camel-imapx-server.c:5285 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "'%s'에서 바뀐 메시지 검색 중" + +-#: ../camel/camel-imapx-server.c:5352 ++#: ../camel/camel-imapx-server.c:5338 + msgid "Error fetching new messages" + msgstr "새 메시지를 가져오는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:5565 ++#: ../camel/camel-imapx-server.c:5551 + msgid "Error while fetching messages" + msgstr "메시지를 가져오는 중에 오류 발생" + +-#: ../camel/camel-imapx-server.c:5573 ../camel/camel-imapx-server.c:5606 ++#: ../camel/camel-imapx-server.c:5559 ++#: ../camel/camel-imapx-server.c:5592 + #, c-format + msgid "Fetching summary information for %d message in '%s'" + msgid_plural "Fetching summary information for %d messages in '%s'" + msgstr[0] "'%2$s'에서 메시지 %1$d개에 대한 요약 정보 가져오는 중" + +-#: ../camel/camel-imapx-server.c:5742 ../camel/camel-imapx-server.c:5772 ++#: ../camel/camel-imapx-server.c:5728 ++#: ../camel/camel-imapx-server.c:5758 + msgid "Error refreshing folder" + msgstr "폴더를 새로 고치는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:5876 ++#: ../camel/camel-imapx-server.c:5882 + msgid "Error expunging message" + msgstr "메시지를 완전히 삭제하는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:5987 ++#: ../camel/camel-imapx-server.c:5993 + msgid "Error fetching folders" + msgstr "폴더를 가져오는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:6069 ++#: ../camel/camel-imapx-server.c:6075 + msgid "Error subscribing to folder" + msgstr "폴더에 구독하는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:6134 ++#: ../camel/camel-imapx-server.c:6140 + msgid "Error creating folder" + msgstr "폴더를 만드는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:6188 ++#: ../camel/camel-imapx-server.c:6194 + msgid "Error deleting folder" + msgstr "폴더를 삭제하는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:6262 ++#: ../camel/camel-imapx-server.c:6268 + msgid "Error renaming folder" + msgstr "폴더의 이름을 바꾸는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:6337 ++#: ../camel/camel-imapx-server.c:6343 + msgid "Error retrieving quota information" + msgstr "용량 제한 정보를 가져오는 중 오류" + +-#: ../camel/camel-imapx-server.c:6402 ++#: ../camel/camel-imapx-server.c:6408 + msgid "Search failed" + msgstr "검색이 실패했습니다" + + # IMAP 동작 +-#: ../camel/camel-imapx-server.c:6465 ++#: ../camel/camel-imapx-server.c:6471 + msgid "Error performing NOOP" + msgstr "NOOP 수행하는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:6574 ++#: ../camel/camel-imapx-server.c:6580 + msgid "Error syncing changes" + msgstr "바뀐 내용을 동기화하는데 오류 발생" + +-#: ../camel/camel-imapx-server.c:7383 ++#: ../camel/camel-imapx-server.c:7385 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "메시지 ID가 %s인 메시지를 얻을 수 없습니다: %s" + +-#: ../camel/camel-imapx-server.c:7384 ++#: ../camel/camel-imapx-server.c:7386 + msgid "No such message available." + msgstr "그런 메시지가 없습니다." + +-#: ../camel/camel-imapx-server.c:7542 ../camel/camel-imapx-server.c:7557 ++#: ../camel/camel-imapx-server.c:7547 ++#: ../camel/camel-imapx-server.c:7562 + msgid "Cannot create spool file: " + msgstr "메일 모음 파일을 만들 수 없습니다: " + +-#: ../camel/camel-imapx-server.c:8299 ++#: ../camel/camel-imapx-server.c:8304 + msgid "IMAP server does not support quotas" + msgstr "IMAP 서버가 용량 제한을 지원하지 않습니다" + +@@ -2449,7 +2509,8 @@ msgid "Password" + msgstr "암호" + + #: ../camel/camel-imapx-store.c:345 +-msgid "This option will connect to the IMAP server using a plaintext password." ++msgid "" ++"This option will connect to the IMAP server using a plaintext password." + msgstr "이 옵션을 켜면 일반 텍스트 암호를 이용해 IMAP 서버에 연결합니다." + + #: ../camel/camel-imapx-store.c:453 +@@ -2458,34 +2519,33 @@ msgid "No such folder %s" + msgstr "%s 폴더가 없습니다" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/camel-imapx-store.c:478 ../camel/camel-imapx-store.c:968 ++#: ../camel/camel-imapx-store.c:478 ++#: ../camel/camel-imapx-store.c:968 + #: ../camel/providers/local/camel-maildir-folder.c:473 +-#: ../camel/providers/local/camel-maildir-store.c:312 +-#: ../camel/providers/local/camel-maildir-store.c:746 +-#: ../camel/providers/local/camel-maildir-store.c:752 +-#: ../camel/providers/local/camel-maildir-store.c:836 ++#: ../camel/providers/local/camel-maildir-store.c:316 ++#: ../camel/providers/local/camel-maildir-store.c:750 ++#: ../camel/providers/local/camel-maildir-store.c:756 ++#: ../camel/providers/local/camel-maildir-store.c:840 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "받은 편지함" + +-#: ../camel/camel-imapx-store.c:1212 ++#: ../camel/camel-imapx-store.c:1231 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "'%s'에 대한 폴더 목록을 가져오는 중" + +-#: ../camel/camel-imapx-store.c:1595 ++#: ../camel/camel-imapx-store.c:1614 + #, c-format +-msgid "" +-"The folder name \"%s\" is invalid because it contains the character \"%c\"" +-msgstr "" +-"폴더 이름 \"%s\"이(가) 올바르지 않습니다. \"%c\" 문자가 들어 있어 있습니다" ++msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" ++msgstr "폴더 이름 \"%s\"이(가) 올바르지 않습니다. \"%c\" 문자가 들어 있어 있습니다" + +-#: ../camel/camel-imapx-store.c:1606 ++#: ../camel/camel-imapx-store.c:1625 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "상위 폴더를 알 수 없습니다: %s" + +-#: ../camel/camel-imapx-store.c:1616 ++#: ../camel/camel-imapx-store.c:1635 + #, c-format + msgid "The parent folder is not allowed to contain subfolders" + msgstr "해당 상위 폴더에는 하위 폴더를 포함할 수 없습니다" +@@ -2508,8 +2568,7 @@ msgstr "%s용 잠금파일을 만들 수 + #: ../camel/camel-lock.c:145 + #, c-format + msgid "Timed out trying to get lock file on %s. Try again later." +-msgstr "" +-"%s의 잠금 파일을 가져오는데 제한 시간이 넘었습니다. 나중에 다시 시도합니다." ++msgstr "%s의 잠금 파일을 가져오는데 제한 시간이 넘었습니다. 나중에 다시 시도합니다." + + #: ../camel/camel-lock.c:205 + #, c-format +@@ -2531,11 +2590,11 @@ msgstr "잠금 도우미 프로그램의 + msgid "Cannot fork locking helper: %s" + msgstr "잠금 도우미 프로그램을 실행할 수 없습니다: %s" + +-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239 ++#: ../camel/camel-lock-client.c:211 ++#: ../camel/camel-lock-client.c:239 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" +-msgstr "" +-"'%s'을(를) 잠글 수 없습니다: lock-helper에 프로토콜 오류가 발생했습니다" ++msgstr "'%s'을(를) 잠글 수 없습니다: lock-helper에 프로토콜 오류가 발생했습니다" + + #: ../camel/camel-lock-client.c:227 + #, c-format +@@ -2591,7 +2650,8 @@ msgstr "메일 파일을 읽는 중 오� + msgid "Error writing mail temp file: %s" + msgstr "메일 임시파일을 쓰는 중 오류발생: %s" + +-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562 ++#: ../camel/camel-movemail.c:493 ++#: ../camel/camel-movemail.c:562 + #, c-format + msgid "Error copying mail temp file: %s" + msgstr "메일 임시파일을 복사하는 중 오류발생: %s" +@@ -2611,38 +2671,38 @@ msgstr "서명이 없습니다" + msgid "parse error" + msgstr "파싱 오류" + +-#: ../camel/camel-net-utils.c:703 ++#: ../camel/camel-net-utils.c:704 + #, c-format + msgid "Resolving: %s" + msgstr "호스트 찾는 중입니다: %s" + +-#: ../camel/camel-net-utils.c:726 ++#: ../camel/camel-net-utils.c:727 + msgid "Host lookup failed" + msgstr "호스트 이름 찾기가 실패했습니다" + +-#: ../camel/camel-net-utils.c:732 ++#: ../camel/camel-net-utils.c:733 + #, c-format + msgid "Host lookup '%s' failed. Check your host name for spelling errors." + msgstr "'%s' 호스트 찾기가 실패했습니다. 호스트 이름이 틀리지 않았는지 확인하십시오." + +-#: ../camel/camel-net-utils.c:736 ++#: ../camel/camel-net-utils.c:737 + #, c-format + msgid "Host lookup '%s' failed: %s" + msgstr "호스트 '%s' 이름 찾기가 실패했습니다: %s" + +-#: ../camel/camel-net-utils.c:857 ++#: ../camel/camel-net-utils.c:858 + msgid "Resolving address" + msgstr "주소 찾는 중" + +-#: ../camel/camel-net-utils.c:878 ++#: ../camel/camel-net-utils.c:879 + msgid "Name lookup failed" + msgstr "이름 찾기 실패" + +-#: ../camel/camel-net-utils.c:885 ++#: ../camel/camel-net-utils.c:886 + msgid "Name lookup failed. Check your host name for spelling errors." + msgstr "이름 찾기가 실패했습니다. 호스트 이름이 틀리지 않았는지 확인하십시오." + +-#: ../camel/camel-net-utils.c:889 ++#: ../camel/camel-net-utils.c:890 + #, c-format + msgid "Name lookup failed: %s" + msgstr "이름 찾기 실패: %s" +@@ -2657,7 +2717,8 @@ msgstr "'%s:%s'에 연결할 수 없습� + msgid "Syncing messages in folder '%s' to disk" + msgstr "'%s' 폴더의 메시지를 디스크와 동기화하는 중입니다" + +-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177 ++#: ../camel/camel-offline-journal.c:145 ++#: ../camel/camel-offline-journal.c:177 + #, c-format + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "'%s' 폴더에 대한 연결 중지 모드 일지를 쓸 수 없습니다: %s" +@@ -2685,7 +2746,8 @@ msgstr "%s을(를) 읽어들일 수 없� + msgid "Could not load %s: No initialization code in module." + msgstr "%s을(를) 읽어들일 수 없습니다: 모듈에 초기화 코드가 없습니다." + +-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:407 ++#: ../camel/camel-provider.c:429 ++#: ../camel/camel-session.c:407 + #, c-format + msgid "No provider available for protocol '%s'" + msgstr "'%s' 프로토콜의 제공 프로그램이 없습니다" +@@ -2706,30 +2768,24 @@ msgstr "인증 실패." + + #: ../camel/camel-sasl-anonymous.c:81 + #, c-format +-msgid "" +-"Invalid email address trace information:\n" ++msgid "Invalid email address trace information:\n" + "%s" +-msgstr "" +-"전자메일 주소 추적 정보가 잘못되었습니다:\n" ++msgstr "전자메일 주소 추적 정보가 잘못되었습니다:\n" + "%s" + + # opaque? + #: ../camel/camel-sasl-anonymous.c:95 + #, c-format +-msgid "" +-"Invalid opaque trace information:\n" ++msgid "Invalid opaque trace information:\n" + "%s" +-msgstr "" +-"불투명 추적 정보가 잘못되었습니다:\n" ++msgstr "불투명 추적 정보가 잘못되었습니다:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:109 + #, c-format +-msgid "" +-"Invalid trace information:\n" ++msgid "Invalid trace information:\n" + "%s" +-msgstr "" +-"추적 정보가 잘못되었습니다:\n" ++msgstr "추적 정보가 잘못되었습니다:\n" + "%s" + + #: ../camel/camel-sasl-cram-md5.c:46 +@@ -2740,9 +2796,7 @@ msgstr "CRAM-MD5" + msgid "" + "This option will connect to the server using a secure CRAM-MD5 password, if " + "the server supports it." +-msgstr "" +-"이 옵션을 켜면 서버에서 지원하는 경우 보안용 CRAM-MD5 암호를 사용해 서버에 연" +-"결합니다." ++msgstr "이 옵션을 켜면 서버에서 지원하는 경우 보안용 CRAM-MD5 암호를 사용해 서버에 연결합니다." + + #: ../camel/camel-sasl-digest-md5.c:59 + msgid "DIGEST-MD5" +@@ -2752,9 +2806,7 @@ msgstr "DIGEST-MD5" + msgid "" + "This option will connect to the server using a secure DIGEST-MD5 password, " + "if the server supports it." +-msgstr "" +-"이 옵션을 켜면 서버에서 지원하는 경우 보안용 DIGEST-MD5 암호를 사용해 서버에 " +-"연결합니다." ++msgstr "이 옵션을 켜면 서버에서 지원하는 경우 보안용 DIGEST-MD5 암호를 사용해 서버에 연결합니다." + + #: ../camel/camel-sasl-digest-md5.c:855 + #, c-format +@@ -2791,16 +2843,15 @@ msgid "GSSAPI" + msgstr "GSSAPI" + + #: ../camel/camel-sasl-gssapi.c:93 +-msgid "This option will connect to the server using Kerberos 5 authentication." ++msgid "" ++"This option will connect to the server using Kerberos 5 authentication." + msgstr "이 옵션을 켜면 Kerberos 5 인증을 사용해 서버에 연결합니다." + + #: ../camel/camel-sasl-gssapi.c:134 + msgid "" + "The specified mechanism is not supported by the provided credential, or is " + "unrecognized by the implementation." +-msgstr "" +-"지정한 방식은 제공한 증명서가 지원하지 않습니다. 혹은 현재 구현해 놓은 것에" +-"서 인식할 수 없습니다." ++msgstr "지정한 방식은 제공한 증명서가 지원하지 않습니다. 혹은 현재 구현해 놓은 것에서 인식할 수 없습니다." + + #: ../camel/camel-sasl-gssapi.c:139 + msgid "The provided target_name parameter was ill-formed." +@@ -2810,17 +2861,13 @@ msgstr "제공된 target_name 매개변� + msgid "" + "The provided target_name parameter contained an invalid or unsupported type " + "of name." +-msgstr "" +-"제공된 target_name 매개변수에 잘못되었거나 지원하지 않은 종류의 이름이 들어 " +-"있습니다." ++msgstr "제공된 target_name 매개변수에 잘못되었거나 지원하지 않은 종류의 이름이 들어 있습니다." + + #: ../camel/camel-sasl-gssapi.c:146 + msgid "" + "The input_token contains different channel bindings to those specified via " + "the input_chan_bindings parameter." +-msgstr "" +-"input_chan_bindings 인수를 통해 지정된 것과 다른 채널 바인딩이 input_token에 " +-"들어 있습니다." ++msgstr "input_chan_bindings 인수를 통해 지정된 것과 다른 채널 바인딩이 input_token에 들어 있습니다." + + #: ../camel/camel-sasl-gssapi.c:151 + msgid "" +@@ -2832,9 +2879,7 @@ msgstr "input_token에 잘못된 서명 + msgid "" + "The supplied credentials were not valid for context initiation, or the " + "credential handle did not reference any credentials." +-msgstr "" +-"제공된 증명서가 컨텍스트 초기화에 올바르지 않거나, 증명서 핸들이 어떤 증명서" +-"도 참조하지 않습니다." ++msgstr "제공된 증명서가 컨텍스트 초기화에 올바르지 않거나, 증명서 핸들이 어떤 증명서도 참조하지 않습니다." + + #: ../camel/camel-sasl-gssapi.c:160 + msgid "The supplied context handle did not refer to a valid context." +@@ -2852,9 +2897,11 @@ msgstr "credential에 수행한 일관� + msgid "The referenced credentials have expired." + msgstr "참조한 증명서가 만료된 증명서입니다." + +-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340 +-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405 +-#: ../camel/providers/smtp/camel-smtp-transport.c:624 ++#: ../camel/camel-sasl-gssapi.c:175 ++#: ../camel/camel-sasl-gssapi.c:340 ++#: ../camel/camel-sasl-gssapi.c:388 ++#: ../camel/camel-sasl-gssapi.c:405 ++#: ../camel/providers/smtp/camel-smtp-transport.c:616 + #, c-format + msgid "Bad authentication response from server." + msgstr "서버에서 보낸 인증 응답이 틀렸습니다." +@@ -2868,7 +2915,8 @@ msgstr "보안 레이어를 지원하지 + msgid "Login" + msgstr "로그인" + +-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46 ++#: ../camel/camel-sasl-login.c:42 ++#: ../camel/camel-sasl-plain.c:46 + msgid "This option will connect to the server using a simple password." + msgstr "이 옵션을 켜면 단순히 일반 암호를 사용해 서버에 연결합니다." + +@@ -2877,16 +2925,15 @@ msgstr "이 옵션을 켜면 단순히 � + msgid "Unknown authentication state." + msgstr "알 수 없는 인증 상태." + +-#: ../camel/camel-sasl-ntlm.c:47 ++#: ../camel/camel-sasl-ntlm.c:48 + msgid "NTLM / SPA" + msgstr "NTLM / SPA" + +-#: ../camel/camel-sasl-ntlm.c:49 ++#: ../camel/camel-sasl-ntlm.c:50 + msgid "" + "This option will connect to a Windows-based server using NTLM / Secure " + "Password Authentication." +-msgstr "" +-"이 옵션을 켜면 NTLM / 보안 암호 인증을 Windows 기반의 서버에 연결합니다." ++msgstr "이 옵션을 켜면 NTLM / 보안 암호 인증을 Windows 기반의 서버에 연결합니다." + + #: ../camel/camel-sasl-plain.c:44 + msgid "PLAIN" +@@ -2909,7 +2956,8 @@ msgstr "POP 원본 UID" + msgid "POP Before SMTP authentication using an unknown transport" + msgstr "알 수 없는 전송 경로를 사용해 SMTP 인증 전에 POP" + +-#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119 ++#: ../camel/camel-sasl-popb4smtp.c:110 ++#: ../camel/camel-sasl-popb4smtp.c:119 + #, c-format + msgid "POP Before SMTP authentication attempted with a %s service" + msgstr "SMTP 인증 전에 %s 서비스로 POP 시도" +@@ -2941,7 +2989,8 @@ msgstr "메시지 전달을 지원하지 + msgid "Please enter the %s password for %s on host %s." + msgstr "사용자이름 %2$s, 호스트 %3$s에 대한 %1$s 암호를 입력하십시오." + +-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074 ++#: ../camel/camel-smime-context.c:351 ++#: ../camel/camel-smime-context.c:1074 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "'%s'에 대한 인증서를 찾을 수 없습니다" +@@ -2974,7 +3023,8 @@ msgstr "인증서 체인을 찾을 수 � + msgid "Cannot add CMS Signing time" + msgstr "CMS 서명 시각을 추가할 수 없습니다" + +-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454 ++#: ../camel/camel-smime-context.c:439 ++#: ../camel/camel-smime-context.c:454 + #, c-format + msgid "Encryption certificate for '%s' does not exist" + msgstr "'%s'에 대한 암호화 인증서가 없습니다" +@@ -3044,15 +3094,18 @@ msgstr "서명에 서명한 데이터가 + msgid "Digests missing from enveloped data" + msgstr "싸여진 데이터에 요약문이 없습니다" + +-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602 ++#: ../camel/camel-smime-context.c:591 ++#: ../camel/camel-smime-context.c:602 + msgid "Cannot calculate digests" + msgstr "요약문을 계산할 수 없습니다" + +-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613 ++#: ../camel/camel-smime-context.c:609 ++#: ../camel/camel-smime-context.c:613 + msgid "Cannot set message digests" + msgstr "메시지 요약문을 설정할 수 없습니다" + +-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628 ++#: ../camel/camel-smime-context.c:623 ++#: ../camel/camel-smime-context.c:628 + msgid "Certificate import failed" + msgstr "인증서 가져오기가 실패했습니다" + +@@ -3075,7 +3128,8 @@ msgstr "서명 다이제스트를 찾을 + msgid "Signer: %s <%s>: %s\n" + msgstr "서명자: %s <%s>: %s\n" + +-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148 ++#: ../camel/camel-smime-context.c:858 ++#: ../camel/camel-smime-context.c:1148 + msgid "Cannot create encoder context" + msgstr "인코더 컨텍스트를 만들 수 없습니다" + +@@ -3083,11 +3137,13 @@ msgstr "인코더 컨텍스트를 만들 + msgid "Failed to add data to CMS encoder" + msgstr "CMS 인코더에 데이터를 추가하는데 실패했습니다" + +-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165 ++#: ../camel/camel-smime-context.c:869 ++#: ../camel/camel-smime-context.c:1165 + msgid "Failed to encode data" + msgstr "데이터를 인코딩하는데 실패했습니다" + +-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262 ++#: ../camel/camel-smime-context.c:1013 ++#: ../camel/camel-smime-context.c:1262 + msgid "Decoder failed" + msgstr "디코더가 실패했습니다" + +@@ -3131,51 +3187,53 @@ msgstr "데이터를 인코더에 추가 + msgid "S/MIME Decrypt: No encrypted content found" + msgstr "S/MIME 암호화 해제: 암호화한 내용이 없습니다" + +-#: ../camel/camel-store.c:1844 ++#: ../camel/camel-store.c:1871 + #, c-format + msgid "Cannot create folder '%s': folder exists" + msgstr "'%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다" + +-#: ../camel/camel-store.c:1887 ++#: ../camel/camel-store.c:1914 + #, c-format + msgid "Opening folder '%s'" + msgstr "폴더 '%s' 여는 중" + +-#: ../camel/camel-store.c:2072 ++#: ../camel/camel-store.c:2099 + #, c-format + msgid "Scanning folders in '%s'" + msgstr "'%s'의 폴더 검사하는 중" + +-#. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:2084 ../camel/camel-store.c:2094 ++#: ../camel/camel-store.c:2115 ++#: ../camel/camel-store.c:2146 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Trash" + msgstr "지운 메시지" + +-#. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:2087 ../camel/camel-store.c:2098 ++#: ../camel/camel-store.c:2127 ++#: ../camel/camel-store.c:2162 + #: ../camel/camel-vtrash-folder.c:50 + msgid "Junk" + msgstr "정크메일" + +-#: ../camel/camel-store.c:2546 ++#: ../camel/camel-store.c:2615 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "폴더를 만들 수 없습니다: %s: 폴더가 이미 있습니다" + +-#: ../camel/camel-store.c:2560 ++#: ../camel/camel-store.c:2629 + #, c-format + msgid "Creating folder '%s'" + msgstr "'%s' 폴더를 만드는 중" + +-#: ../camel/camel-store.c:2678 ../camel/camel-vee-store.c:410 +-#: ../camel/providers/local/camel-maildir-store.c:311 ++#: ../camel/camel-store.c:2747 ++#: ../camel/camel-vee-store.c:416 ++#: ../camel/providers/local/camel-maildir-store.c:315 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "폴더를 삭제할 수 없습니다: %s: 잘못된 동작" + +-#: ../camel/camel-store.c:2821 ../camel/camel-vee-store.c:460 +-#: ../camel/providers/local/camel-maildir-store.c:835 ++#: ../camel/camel-store.c:2890 ++#: ../camel/camel-vee-store.c:466 ++#: ../camel/providers/local/camel-maildir-store.c:839 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작" +@@ -3198,12 +3256,12 @@ msgstr "연결이 취소됨" + msgid "Could not connect with command \"%s\": %s" + msgstr "\"%s\" 명령으로 연결할 수 없습니다: %s" + +-#: ../camel/camel-subscribable.c:386 ++#: ../camel/camel-subscribable.c:397 + #, c-format + msgid "Subscribing to folder '%s'" + msgstr "'%s' 폴더 구독 신청중" + +-#: ../camel/camel-subscribable.c:518 ++#: ../camel/camel-subscribable.c:529 + #, c-format + msgid "Unsubscribing from folder '%s'" + msgstr "'%s' 폴더로부터 구독 해지중" +@@ -3213,7 +3271,8 @@ msgstr "'%s' 폴더로부터 구독 해� + msgid "NSPR error code %d" + msgstr "NSPR 오류 코드 %d" + +-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662 ++#: ../camel/camel-tcp-stream-raw.c:649 ++#: ../camel/camel-tcp-stream-raw.c:662 + #, c-format + msgid "The proxy host does not support SOCKS4" + msgstr "프록시가 SOCKS4를 지원하지 않습니다" +@@ -3223,7 +3282,8 @@ msgstr "프록시가 SOCKS4를 지원하 + msgid "The proxy host denied our request: code %d" + msgstr "프록시가 요청을 거부했습니다: 코드 %d번" + +-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781 ++#: ../camel/camel-tcp-stream-raw.c:773 ++#: ../camel/camel-tcp-stream-raw.c:781 + #, c-format + msgid "The proxy host does not support SOCKS5" + msgstr "프록시가 SOCKS5를 지원하지 않습니다" +@@ -3286,7 +3346,8 @@ msgstr "호스트 이름이 너무 깁� + + #. SOCKS5 + #. reserved - must be 0 +-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922 ++#: ../camel/camel-tcp-stream-raw.c:912 ++#: ../camel/camel-tcp-stream-raw.c:922 + #, c-format + msgid "Invalid reply from proxy server" + msgstr "프로시 서버에서 응답이 올바르지 않습니다" +@@ -3301,7 +3362,8 @@ msgstr "'%s' URL을 파싱할 수 없습 + msgid "Updating folder '%s'" + msgstr "'%s' 폴더 업데이트중" + +-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965 ++#: ../camel/camel-vee-folder.c:855 ++#: ../camel/camel-vee-folder.c:965 + #, c-format + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "메시지를 가상 폴더에 복사할/옮길 수 없습니다" +@@ -3322,21 +3384,21 @@ msgstr "원본 폴더 내용 바뀔 때 + + #. Translators: 'Unmatched' is a folder name under Search folders where are shown + #. * all messages not belonging into any other configured search folder +-#: ../camel/camel-vee-store.c:38 ++#: ../camel/camel-vee-store.c:42 + msgid "Unmatched" + msgstr "맞지 않음" + +-#: ../camel/camel-vee-store.c:436 ++#: ../camel/camel-vee-store.c:442 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "폴더를 삭제할 수 없습니다: %s: 그런 폴더가 없습니다" + +-#: ../camel/camel-vee-store.c:470 ++#: ../camel/camel-vee-store.c:476 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "폴더 이름을 바꿀 수 없습니다: %s: 그런 폴더가 없습니다" + +-#: ../camel/camel-vee-store.c:532 ++#: ../camel/camel-vee-store.c:538 + msgid "Enable _Unmatched folder" + msgstr "일치하지 않는 폴더 활성화(_U)" + +@@ -3454,11 +3516,9 @@ msgstr "메시지 본문의 데이터를 + + #: ../camel/providers/local/camel-local-folder.c:727 + #, c-format +-msgid "" +-"Cannot get message %s from folder %s\n" ++msgid "Cannot get message %s from folder %s\n" + "%s" +-msgstr "" +-"메시지를 얻을 수 없음: %2$s 폴더에서 %1$s\n" ++msgstr "메시지를 얻을 수 없음: %2$s 폴더에서 %1$s\n" + "%3$s" + + #: ../camel/providers/local/camel-local-provider.c:43 +@@ -3481,9 +3541,7 @@ msgstr "로컬 배달" + msgid "" + "For retrieving (moving) local mail from standard mbox-formatted spools into " + "folders managed by Evolution." +-msgstr "" +-"표준 mbox 형식의 메일 모음에 들어 있는 로컬 메일을 에볼루션이 관리하는 폴더" +-"로 가져올 때(옮길 때) 쓰입니다." ++msgstr "표준 mbox 형식의 메일 모음에 들어 있는 로컬 메일을 에볼루션이 관리하는 폴더로 가져올 때(옮길 때) 쓰입니다." + + #: ../camel/providers/local/camel-local-provider.c:83 + #: ../camel/providers/local/camel-local-provider.c:103 +@@ -3507,15 +3565,15 @@ msgid "Standard Unix mbox spool file" + msgstr "표준 유닉스 MBOX 메일 모음 파일" + + #: ../camel/providers/local/camel-local-provider.c:112 +-#: ../camel/providers/local/camel-local-provider.c:124 ++#: ../camel/providers/local/camel-local-provider.c:126 + msgid "" + "For reading and storing local mail in external standard mbox spool files.\n" + "May also be used to read a tree of Elm, Pine, or Mutt style folders." + msgstr "" +-"외부 표준 mbox 메일 모음 파일에서 로컬 메일로 읽거나 저장할 때 사용합니다. 또" +-"한 Elm, Pine 또는 Mutt방식의 폴더를 읽을 때도 쓰입니다." ++"외부 표준 mbox 메일 모음 파일에서 로컬 메일로 읽거나 저장할 때 사용합니다. 또한 Elm, Pine 또는 Mutt방식의 폴더를 읽을 " ++"때도 쓰입니다." + +-#: ../camel/providers/local/camel-local-provider.c:123 ++#: ../camel/providers/local/camel-local-provider.c:125 + msgid "Standard Unix mbox spool directory" + msgstr "표준 유닉스 MBOX 메일 모음 디렉터리" + +@@ -3531,7 +3589,7 @@ msgstr "로컬 메일 파일 %s" + + #: ../camel/providers/local/camel-local-store.c:223 + #: ../camel/providers/local/camel-local-store.c:383 +-#: ../camel/providers/local/camel-maildir-store.c:113 ++#: ../camel/providers/local/camel-maildir-store.c:117 + #: ../camel/providers/local/camel-mbox-store.c:581 + #: ../camel/providers/local/camel-spool-store.c:89 + #, c-format +@@ -3546,7 +3604,7 @@ msgstr "저장고 최상위 폴더 %s � + #: ../camel/providers/local/camel-local-store.c:244 + #: ../camel/providers/local/camel-local-store.c:254 + #: ../camel/providers/local/camel-local-store.c:396 +-#: ../camel/providers/local/camel-maildir-store.c:141 ++#: ../camel/providers/local/camel-maildir-store.c:145 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "폴더를 얻을 수 없습니다: %s: %s" +@@ -3573,7 +3631,7 @@ msgstr "폴더 메타 파일 '%s'을(를 + msgid "Could not rename '%s': %s" + msgstr "'%s'의 이름을 바꿀 수 없습니다: %s" + +-#: ../camel/providers/local/camel-local-summary.c:543 ++#: ../camel/providers/local/camel-local-summary.c:567 + #, c-format + msgid "Unable to add message to summary: unknown reason" + msgstr "메시지를 요약에 추가할 수 없습니다: 알 수 없는 이유" +@@ -3605,84 +3663,84 @@ msgstr "메시지를 얻을 수 없음: + msgid "Cannot transfer message to destination folder: %s" + msgstr "메시지를 대상 폴더로 옮길 수 없습니다: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:121 +-#: ../camel/providers/local/camel-maildir-store.c:844 ++#: ../camel/providers/local/camel-maildir-store.c:125 ++#: ../camel/providers/local/camel-maildir-store.c:848 + #, c-format + msgid "Folder %s already exists" + msgstr "'%s' 폴더가 이미 있습니다" + +-#: ../camel/providers/local/camel-maildir-store.c:226 +-#: ../camel/providers/local/camel-maildir-store.c:257 ++#: ../camel/providers/local/camel-maildir-store.c:230 ++#: ../camel/providers/local/camel-maildir-store.c:261 + #: ../camel/providers/local/camel-mbox-store.c:403 + #: ../camel/providers/local/camel-mbox-store.c:424 + #, c-format + msgid "Cannot create folder '%s': %s" + msgstr "'%s' 폴더를 만들 수 없습니다: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:241 ++#: ../camel/providers/local/camel-maildir-store.c:245 + #: ../camel/providers/local/camel-mbox-store.c:369 +-#: ../camel/providers/local/camel-mh-store.c:522 ++#: ../camel/providers/local/camel-mh-store.c:514 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "'%s' 폴더를 얻을 수 없습니다: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:247 ++#: ../camel/providers/local/camel-maildir-store.c:251 + #: ../camel/providers/local/camel-mbox-store.c:379 +-#: ../camel/providers/local/camel-mh-store.c:531 ++#: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "'%s' 폴더를 얻을 수 없습니다: 폴더가 없습니다." + +-#: ../camel/providers/local/camel-maildir-store.c:274 ++#: ../camel/providers/local/camel-maildir-store.c:278 + #, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "'%s' 폴더를 얻을 수 없습니다: maildir 디렉터리가 아닙니다." + +-#: ../camel/providers/local/camel-maildir-store.c:279 ++#: ../camel/providers/local/camel-maildir-store.c:283 + #: ../camel/providers/local/camel-mbox-store.c:442 +-#: ../camel/providers/local/camel-mh-store.c:564 ++#: ../camel/providers/local/camel-mh-store.c:556 + #, c-format + msgid "Cannot create folder '%s': folder exists." + msgstr "'%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다." + +-#: ../camel/providers/local/camel-maildir-store.c:343 +-#: ../camel/providers/local/camel-maildir-store.c:383 +-#: ../camel/providers/local/camel-mh-store.c:682 ++#: ../camel/providers/local/camel-maildir-store.c:347 ++#: ../camel/providers/local/camel-maildir-store.c:387 ++#: ../camel/providers/local/camel-mh-store.c:674 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "'%s' 폴더를 삭제할 수 없습니다: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:345 ++#: ../camel/providers/local/camel-maildir-store.c:349 + msgid "not a maildir directory" + msgstr "메일폴더 디렉터리가 아닙니다" + +-#: ../camel/providers/local/camel-maildir-store.c:624 +-#: ../camel/providers/local/camel-maildir-store.c:1051 ++#: ../camel/providers/local/camel-maildir-store.c:628 ++#: ../camel/providers/local/camel-maildir-store.c:1063 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format + msgid "Could not scan folder '%s': %s" + msgstr "'%s' 폴더를 검사할 수 없습니다: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:434 +-#: ../camel/providers/local/camel-maildir-summary.c:567 ++#: ../camel/providers/local/camel-maildir-summary.c:458 ++#: ../camel/providers/local/camel-maildir-summary.c:591 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "메일 디렉터리 경로를 열 수 없습니다: %s: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:558 ++#: ../camel/providers/local/camel-maildir-summary.c:582 + msgid "Checking folder consistency" + msgstr "폴더의 일관성을 확인 중입니다" + +-#: ../camel/providers/local/camel-maildir-summary.c:651 ++#: ../camel/providers/local/camel-maildir-summary.c:675 + msgid "Checking for new messages" + msgstr "새 메시지를 확인하는 중입니다" + +-#: ../camel/providers/local/camel-maildir-summary.c:746 +-#: ../camel/providers/local/camel-mbox-summary.c:418 +-#: ../camel/providers/local/camel-mbox-summary.c:650 +-#: ../camel/providers/local/camel-mbox-summary.c:798 +-#: ../camel/providers/local/camel-spool-summary.c:132 ++#: ../camel/providers/local/camel-maildir-summary.c:770 ++#: ../camel/providers/local/camel-mbox-summary.c:450 ++#: ../camel/providers/local/camel-mbox-summary.c:682 ++#: ../camel/providers/local/camel-mbox-summary.c:830 ++#: ../camel/providers/local/camel-spool-summary.c:141 + msgid "Storing folder" + msgstr "폴더를 저장하는 중입니다" + +@@ -3735,11 +3793,9 @@ msgstr "폴더가 이미 있습니다" + #: ../camel/providers/local/camel-mbox-store.c:672 + #: ../camel/providers/local/camel-mbox-store.c:701 + #, c-format +-msgid "" +-"Could not delete folder '%s':\n" ++msgid "Could not delete folder '%s':\n" + "%s" +-msgstr "" +-"'%s' 폴더를 삭제할 수 없습니다:\n" ++msgstr "'%s' 폴더를 삭제할 수 없습니다:\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:682 +@@ -3773,84 +3829,83 @@ msgstr "'%s'의 이름을 바꿀 수 없 + msgid "Could not rename '%s' to %s: %s" + msgstr "'%s'을(를) %s(으)로 이름을 바꿀 수 없습니다: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:428 ++#: ../camel/providers/local/camel-mbox-summary.c:460 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "폴더를 열 수 없습니다: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:490 ++#: ../camel/providers/local/camel-mbox-summary.c:522 + #, c-format + msgid "Fatal mail parser error near position %s in folder %s" + msgstr "폴더 %2$s에서 %1$s 위치에 치명적인 메일 파싱 오류 발생" + +-#: ../camel/providers/local/camel-mbox-summary.c:575 ++#: ../camel/providers/local/camel-mbox-summary.c:607 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "폴더를 확인할 수 없습니다: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:663 +-#: ../camel/providers/local/camel-mbox-summary.c:807 +-#: ../camel/providers/local/camel-spool-summary.c:139 ++#: ../camel/providers/local/camel-mbox-summary.c:695 ++#: ../camel/providers/local/camel-mbox-summary.c:839 ++#: ../camel/providers/local/camel-spool-summary.c:148 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "파일을 열 수 없습니다: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:677 +-#: ../camel/providers/local/camel-spool-summary.c:154 ++#: ../camel/providers/local/camel-mbox-summary.c:709 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "임시 메일함을 열 수 없습니다: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:694 +-#: ../camel/providers/local/camel-mbox-summary.c:924 ++#: ../camel/providers/local/camel-mbox-summary.c:726 ++#: ../camel/providers/local/camel-mbox-summary.c:956 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "원본 폴더 %s을(를) 닫을 수 없습니다: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:707 ++#: ../camel/providers/local/camel-mbox-summary.c:739 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "임시 폴더를 닫을 수 없습니다: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:726 ++#: ../camel/providers/local/camel-mbox-summary.c:758 + #, c-format + msgid "Could not rename folder: %s" + msgstr "폴더 이름을 바꿀 수 없습니다: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:821 +-#: ../camel/providers/local/camel-mbox-summary.c:1090 ++#: ../camel/providers/local/camel-mbox-summary.c:853 ++#: ../camel/providers/local/camel-mbox-summary.c:1122 + #, c-format + msgid "Could not store folder: %s" + msgstr "폴더를 저장할 수 없습니다: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:860 +-#: ../camel/providers/local/camel-mbox-summary.c:1130 ++#: ../camel/providers/local/camel-mbox-summary.c:892 ++#: ../camel/providers/local/camel-mbox-summary.c:1162 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " + "it.)" +-msgstr "" +-"MBOX 파일이 망가졌습니다. 바로잡으십시오. (From 줄이 와야 하지만 없습니다.)" ++msgstr "MBOX 파일이 망가졌습니다. 바로잡으십시오. (From 줄이 와야 하지만 없습니다.)" + +-#: ../camel/providers/local/camel-mbox-summary.c:870 +-#: ../camel/providers/local/camel-mbox-summary.c:1142 ++#: ../camel/providers/local/camel-mbox-summary.c:902 ++#: ../camel/providers/local/camel-mbox-summary.c:1174 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "요약과 폴더가 동기화 후에도 일치하지 않습니다." + +-#: ../camel/providers/local/camel-mbox-summary.c:1035 +-#: ../camel/providers/local/camel-spool-summary.c:347 ++#: ../camel/providers/local/camel-mbox-summary.c:1067 ++#: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "알 수 없는 오류: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1200 +-#: ../camel/providers/local/camel-mbox-summary.c:1230 ++#: ../camel/providers/local/camel-mbox-summary.c:1232 ++#: ../camel/providers/local/camel-mbox-summary.c:1262 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "임시 메일함에 쓰는데 실패했습니다: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1219 ++#: ../camel/providers/local/camel-mbox-summary.c:1251 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "임시 메일함에 쓰는데 실패했습니다: %s: %s" +@@ -3860,12 +3915,12 @@ msgstr "임시 메일함에 쓰는데 � + msgid "Cannot append message to mh folder: %s: " + msgstr "MH 폴더에 메시지를 추가할 수 없습니다: %s: " + +-#: ../camel/providers/local/camel-mh-store.c:541 ++#: ../camel/providers/local/camel-mh-store.c:533 + #, c-format + msgid "Could not create folder '%s': %s" + msgstr "'%s' 폴더를 만들 수 없습니다: %s" + +-#: ../camel/providers/local/camel-mh-store.c:557 ++#: ../camel/providers/local/camel-mh-store.c:549 + #, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "'%s' 폴더를 얻을 수 없습니다: 디렉터리가 아닙니다." +@@ -3906,11 +3961,9 @@ msgstr "'%s/%s' 폴더가 없습니다." + + #: ../camel/providers/local/camel-spool-store.c:505 + #, c-format +-msgid "" +-"Could not open folder '%s':\n" ++msgid "Could not open folder '%s':\n" + "%s" +-msgstr "" +-"'%s' 폴더를 열 수 없습니다:\n" ++msgstr "'%s' 폴더를 열 수 없습니다:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:511 +@@ -3920,11 +3973,9 @@ msgstr "'%s' 폴더가 없습니다." + + #: ../camel/providers/local/camel-spool-store.c:519 + #, c-format +-msgid "" +-"Could not create folder '%s':\n" ++msgid "Could not create folder '%s':\n" + "%s" +-msgstr "" +-"'%s' 폴더를 만들 수 없습니다:\n" ++msgstr "'%s' 폴더를 만들 수 없습니다:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:532 +@@ -3947,75 +3998,73 @@ msgstr "메일 모음 폴더를 삭제� + msgid "Spool folders cannot be renamed" + msgstr "메일 모음 폴더의 이름을 바꿀 수 없습니다" + +-#: ../camel/providers/local/camel-spool-summary.c:170 +-#: ../camel/providers/local/camel-spool-summary.c:182 +-#: ../camel/providers/local/camel-spool-summary.c:194 ++#: ../camel/providers/local/camel-spool-summary.c:179 ++#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:203 + #, c-format + msgid "Could not synchronize temporary folder %s: %s" + msgstr "임시 폴더 %s과(와) 동기화 할 수 없습니다: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:212 ++#: ../camel/providers/local/camel-spool-summary.c:221 + #, c-format + msgid "Could not synchronize spool folder %s: %s" + msgstr "메일 모음 폴더 %s과(와) 동기화 할 수 없습니다: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:244 +-#: ../camel/providers/local/camel-spool-summary.c:263 +-#: ../camel/providers/local/camel-spool-summary.c:276 ++#: ../camel/providers/local/camel-spool-summary.c:253 ++#: ../camel/providers/local/camel-spool-summary.c:272 ++#: ../camel/providers/local/camel-spool-summary.c:285 + #, c-format + msgid "" + "Could not synchronize spool folder %s: %s\n" + "Folder may be corrupt, copy saved in '%s'" +-msgstr "" +-"메일 모음 폴더 %s과(와) 동기화 할 수 없습니다: %s\n" ++msgstr "메일 모음 폴더 %s과(와) 동기화 할 수 없습니다: %s\n" + "폴더가 망가졌을 수 있습니다. '%s'에 사본을 저장합니다" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:278 +-#: ../camel/providers/nntp/camel-nntp-folder.c:360 +-#: ../camel/providers/nntp/camel-nntp-folder.c:481 ++#: ../camel/providers/nntp/camel-nntp-folder.c:285 ++#: ../camel/providers/nntp/camel-nntp-folder.c:388 ++#: ../camel/providers/nntp/camel-nntp-folder.c:510 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "내부 오류: UID 형식이 잘못되었습니다: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:332 +-#: ../camel/providers/pop3/camel-pop3-folder.c:633 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1065 ++#: ../camel/providers/nntp/camel-nntp-folder.c:349 ++#: ../camel/providers/nntp/camel-nntp-folder.c:354 ++#: ../camel/providers/pop3/camel-pop3-folder.c:657 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1107 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "%s 메시지를 얻을 수 없습니다: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:339 +-#: ../camel/providers/nntp/camel-nntp-folder.c:504 +-#: ../camel/providers/pop3/camel-pop3-folder.c:558 +-#: ../camel/providers/pop3/camel-pop3-folder.c:623 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/nntp/camel-nntp-folder.c:361 ++#: ../camel/providers/nntp/camel-nntp-folder.c:536 ++#: ../camel/providers/pop3/camel-pop3-folder.c:582 ++#: ../camel/providers/pop3/camel-pop3-folder.c:647 ++#: ../camel/providers/pop3/camel-pop3-folder.c:666 + #, c-format + msgid "Cannot get message %s: " + msgstr "%s 메시지를 얻을 수 없습니다: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:493 ++#: ../camel/providers/nntp/camel-nntp-folder.c:525 + #, c-format + msgid "This message is not currently available" + msgstr "이 메시지는 현재 보여줄 수가 없습니다" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:559 +-#: ../camel/providers/nntp/camel-nntp-folder.c:565 +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:593 ++#: ../camel/providers/nntp/camel-nntp-folder.c:599 + #, c-format + msgid "Posting failed: %s" + msgstr "게시가 실패했습니다: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:606 ++#: ../camel/providers/nntp/camel-nntp-folder.c:664 + msgid "Posting failed: " + msgstr "게시가 실패했습니다: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:633 ++#: ../camel/providers/nntp/camel-nntp-folder.c:689 + #, c-format + msgid "You cannot post NNTP messages while working offline!" + msgstr "연결 중지 모드로 작업하는 중에는 NNTP 메시지를 올릴 수 없습니다!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:653 ++#: ../camel/providers/nntp/camel-nntp-folder.c:709 + #, c-format + msgid "You cannot copy messages from a NNTP folder!" + msgstr "NNTP 폴더에서 메시지를 복사할 수 없습니다!" +@@ -4023,8 +4072,7 @@ msgstr "NNTP 폴더에서 메시지를 � + #: ../camel/providers/nntp/camel-nntp-provider.c:48 + msgid "" + "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" +-msgstr "" +-"폴더 이름을 줄인 이름으로 표시(_S) (예를 들어 comp.os.linux를 c.o.linux로)" ++msgstr "폴더 이름을 줄인 이름으로 표시(_S) (예를 들어 comp.os.linux를 c.o.linux로)" + + #: ../camel/providers/nntp/camel-nntp-provider.c:51 + msgid "In the subscription _dialog, show relative folder names" +@@ -4058,136 +4106,131 @@ msgid "" + "password." + msgstr "이 옵션을 켜면 일반 텍스트 암호를 이용해 NNTP 서버에 인증합니다." + +-#: ../camel/providers/nntp/camel-nntp-store.c:333 ++#: ../camel/providers/nntp/camel-nntp-store.c:386 + #, c-format + msgid "Could not read greeting from %s: " + msgstr "%s에서 초기 메시지를 읽을 수 없습니다: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:345 ++#: ../camel/providers/nntp/camel-nntp-store.c:394 + #, c-format + msgid "NNTP server %s returned error code %d: %s" + msgstr "NNTP 서버 %s에서 오류 코드 %d을(를) 리턴했습니다: %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:522 ++#: ../camel/providers/nntp/camel-nntp-store.c:555 + #, c-format + msgid "USENET News via %s" + msgstr "%s 서버를 통한 USENET 뉴스" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1123 ++#: ../camel/providers/nntp/camel-nntp-store.c:1218 + #, c-format +-msgid "" +-"Error retrieving newsgroups:\n" ++msgid "Error retrieving newsgroups:\n" + "\n" + "%s" +-msgstr "" +-"뉴스그룹을 가져오는데 오류가 밝생했습니다:\n" ++msgstr "뉴스그룹을 가져오는데 오류가 밝생했습니다:\n" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1217 ++#: ../camel/providers/nntp/camel-nntp-store.c:1319 + #, c-format + msgid "You cannot create a folder in a News store: subscribe instead." + msgstr "뉴스 저장고에 폴더를 만들 수 없습니다: 대신에 구독하십시오." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1233 ++#: ../camel/providers/nntp/camel-nntp-store.c:1335 + #, c-format + msgid "You cannot rename a folder in a News store." + msgstr "뉴스 저장고의 폴더의 이름을 바꿀 수 없습니다." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1256 ++#: ../camel/providers/nntp/camel-nntp-store.c:1358 + #, c-format + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "뉴스 저장고의 폴더를 제거할 수 없습니다: 대신에 구독 해제하십시오." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1455 ++#: ../camel/providers/nntp/camel-nntp-store.c:1577 + #, c-format + msgid "" + "You cannot subscribe to this newsgroup:\n" + "\n" + "No such newsgroup. The selected item is a probably a parent folder." +-msgstr "" +-"이 뉴스그룹에 구독할 수 없습니다:\n" ++msgstr "이 뉴스그룹에 구독할 수 없습니다:\n" + "\n" + "그런 뉴스그룹이 없습니다. 선택한 항목이 상위 폴더일 수 있습니다." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1503 ++#: ../camel/providers/nntp/camel-nntp-store.c:1644 + #, c-format +-msgid "" +-"You cannot unsubscribe to this newsgroup:\n" ++msgid "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" +-msgstr "" +-"이 뉴스그룹서 구독을 해제할 수 없습니다:\n" ++msgstr "이 뉴스그룹서 구독을 해제할 수 없습니다:\n" + "\n" + "뉴스그룹이 없습니다!" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1707 ++#: ../camel/providers/nntp/camel-nntp-store.c:2081 + msgid "NNTP Command failed: " + msgstr "NNTP 명령이 실패했습니다: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:1794 ++#: ../camel/providers/nntp/camel-nntp-store.c:2178 + #, c-format + msgid "Not connected." + msgstr "연결되지 않았습니다." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1856 ++#: ../camel/providers/nntp/camel-nntp-store.c:2272 + #, c-format + msgid "No such folder: %s" + msgstr "그런 폴더가 없습니다: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:198 +-#: ../camel/providers/nntp/camel-nntp-summary.c:328 ++#: ../camel/providers/nntp/camel-nntp-summary.c:200 ++#: ../camel/providers/nntp/camel-nntp-summary.c:339 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: 새 메시지를 검사하는 중입니다" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:216 ++#: ../camel/providers/nntp/camel-nntp-summary.c:222 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "xover에서 예상치 못한 서버 응답: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:346 ++#: ../camel/providers/nntp/camel-nntp-summary.c:360 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "head에서 예상치 못한 서버 응답: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:393 ++#: ../camel/providers/nntp/camel-nntp-summary.c:407 + #, c-format + msgid "Operation failed: %s" + msgstr "작업이 실패했습니다: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:453 +-#: ../camel/providers/pop3/camel-pop3-folder.c:526 ++#: ../camel/providers/pop3/camel-pop3-folder.c:468 ++#: ../camel/providers/pop3/camel-pop3-folder.c:547 + #, c-format + msgid "No message with UID %s" + msgstr "UID %s의 메시지가 없습니다" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:542 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 + #, c-format + msgid "Retrieving POP message %d" + msgstr "POP 메시지 %d개를 가져오는 중입니다" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:634 ++#: ../camel/providers/pop3/camel-pop3-folder.c:658 + msgid "Unknown reason" + msgstr "알 수 없는 이유" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:682 ++#: ../camel/providers/pop3/camel-pop3-folder.c:710 + msgid "Retrieving POP summary" + msgstr "POP 요약을 가져오는 중입니다" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:741 +-#: ../camel/providers/pop3/camel-pop3-folder.c:744 +-#: ../camel/providers/pop3/camel-pop3-folder.c:757 +-#: ../camel/providers/pop3/camel-pop3-folder.c:770 +-#: ../camel/providers/pop3/camel-pop3-folder.c:784 ++#: ../camel/providers/pop3/camel-pop3-folder.c:771 ++#: ../camel/providers/pop3/camel-pop3-folder.c:774 ++#: ../camel/providers/pop3/camel-pop3-folder.c:787 ++#: ../camel/providers/pop3/camel-pop3-folder.c:800 ++#: ../camel/providers/pop3/camel-pop3-folder.c:814 + msgid "Cannot get POP summary: " + msgstr "POP 요약을 가져올 수 없습니다: " + +-#: ../camel/providers/pop3/camel-pop3-folder.c:891 ++#: ../camel/providers/pop3/camel-pop3-folder.c:925 + msgid "Expunging old messages" + msgstr "오래 된 메시지를 완전히 삭제합니다" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:911 ++#: ../camel/providers/pop3/camel-pop3-folder.c:945 + msgid "Expunging deleted messages" + msgstr "삭제한 메시지를 완전히 삭제합니다" + +@@ -4234,9 +4277,7 @@ msgstr "POP 서버에 연결해서 메� + msgid "" + "This option will connect to the POP server using a plaintext password. This " + "is the only option supported by many POP servers." +-msgstr "" +-"이 옵션을 켜면 일반 텍스트 암호를 이용해 POP 서버에 연결합니다. 많은 POP 서버" +-"에서 이 옵션만을 지원합니다." ++msgstr "이 옵션을 켜면 일반 텍스트 암호를 이용해 POP 서버에 연결합니다. 많은 POP 서버에서 이 옵션만을 지원합니다." + + #: ../camel/providers/pop3/camel-pop3-provider.c:95 + msgid "" +@@ -4244,96 +4285,90 @@ msgid "" + "the APOP protocol. This may not work for all users even on servers that " + "claim to support it." + msgstr "" +-"이 옵션을 켜면 APOP 프로토콜을 통해 암호화된 암호를 이용해 POP 서버에 연결합" +-"니다. 이 옵션을 지원한다고 말하고 있는 서버에서 조차 사용자에 따라 동작하지 " +-"않을 수도 있습니다." ++"이 옵션을 켜면 APOP 프로토콜을 통해 암호화된 암호를 이용해 POP 서버에 연결합니다. 이 옵션을 지원한다고 말하고 있는 서버에서 " ++"조차 사용자에 따라 동작하지 않을 수도 있습니다." + + #. Translators: This is the separator between an error and an explanation +-#: ../camel/providers/pop3/camel-pop3-store.c:89 ++#: ../camel/providers/pop3/camel-pop3-store.c:99 + msgid ": " + msgstr ": " + +-#: ../camel/providers/pop3/camel-pop3-store.c:150 ++#: ../camel/providers/pop3/camel-pop3-store.c:161 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "POP 서버 %s에서 올바른 초기 메시지를 읽는데 실패했습니다" + +-#: ../camel/providers/pop3/camel-pop3-store.c:165 ++#: ../camel/providers/pop3/camel-pop3-store.c:176 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "POP 서버 %s에 보안 모드로 연결하는데 실패했습니다: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:166 ++#: ../camel/providers/pop3/camel-pop3-store.c:177 + msgid "STLS not supported by server" + msgstr "서버가 STLS를 지원하지 않습니다." + + #. Translators: Last %s is an optional + #. * explanation beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:187 ++#: ../camel/providers/pop3/camel-pop3-store.c:198 + #, c-format + msgid "Failed to connect to POP server %s in secure mode%s" + msgstr "POP 서버 %s에 보안 모드로 연결하는데 실패했습니다%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:200 ++#: ../camel/providers/pop3/camel-pop3-store.c:211 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: " + msgstr "POP 서버 %s에 보안 모드로 연결하는데 실패했습니다: " + +-#: ../camel/providers/pop3/camel-pop3-store.c:311 ++#: ../camel/providers/pop3/camel-pop3-store.c:351 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "POP 서버 %s에 로그인할 수 없습니다: SASL 프로토콜 오류" + +-#: ../camel/providers/pop3/camel-pop3-store.c:333 ++#: ../camel/providers/pop3/camel-pop3-store.c:373 + #, c-format + msgid "Failed to authenticate on POP server %s: " + msgstr "POP 서버 %s에 인증하는데 실패했습니다: " + +-#: ../camel/providers/pop3/camel-pop3-store.c:435 ++#: ../camel/providers/pop3/camel-pop3-store.c:481 + #, c-format + msgid "POP3 server %s" + msgstr "POP3 서버 %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:438 ++#: ../camel/providers/pop3/camel-pop3-store.c:484 + #, c-format + msgid "POP3 server for %s on %s" + msgstr "POP3 서버(사용자: %s, 위치: %s)" + +-#: ../camel/providers/pop3/camel-pop3-store.c:613 ++#: ../camel/providers/pop3/camel-pop3-store.c:696 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " + "attack suspected. Please contact your admin." + msgstr "" +-"POP 서버 %s에 연결할 수 없습니다: 잘못된 APOP ID를 받았습니다. 개인정보 공격" +-"이 의심됩니다. 관리자에게 문의하십시오." ++"POP 서버 %s에 연결할 수 없습니다: 잘못된 APOP ID를 받았습니다. 개인정보 공격이 의심됩니다. 관리자에게 문의하십시오." + +-#: ../camel/providers/pop3/camel-pop3-store.c:665 ++#: ../camel/providers/pop3/camel-pop3-store.c:748 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending password: " +-msgstr "" +-"POP 서버 %s에 연결하는데 실패했습니다.\n" ++msgstr "POP 서버 %s에 연결하는데 실패했습니다.\n" + "암호를 보내는데 오류가 발생했습니다: " + + #. Translators: Last %s is an optional explanation + #. * beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:680 ++#: ../camel/providers/pop3/camel-pop3-store.c:763 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending username%s" +-msgstr "" +-"POP 서버 %s에 연결할 수 없습니다.\n" ++msgstr "POP 서버 %s에 연결할 수 없습니다.\n" + "사용자 이름을 보내는데 오류가 발생했습니다%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:751 ++#: ../camel/providers/pop3/camel-pop3-store.c:845 + #, c-format + msgid "No such folder '%s'." + msgstr "'%s'(이)라는 폴더가 없습니다." + +-#: ../camel/providers/pop3/camel-pop3-store.c:768 ++#: ../camel/providers/pop3/camel-pop3-store.c:862 + #, c-format + msgid "POP3 stores have no folder hierarchy" + msgstr "POP3는 폴더 구조를 저장하지 않습니다" +@@ -4416,218 +4451,218 @@ msgstr "SMTP" + msgid "For delivering mail by connecting to a remote mailhub using SMTP." + msgstr "SMTP를 사용해서 원격 메일허브로 연결해 메일을 보냅니다." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:160 +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:158 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 + msgid "Welcome response error: " + msgstr "Welcome 응답에 오류가 있습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:207 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "SMTP 서버 %s에 보안 모드로 연결하는데 실패했습니다: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 +-#: ../camel/providers/smtp/camel-smtp-transport.c:229 +-#: ../camel/providers/smtp/camel-smtp-transport.c:236 ++#: ../camel/providers/smtp/camel-smtp-transport.c:211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:224 ++#: ../camel/providers/smtp/camel-smtp-transport.c:231 + msgid "STARTTLS command failed: " + msgstr "STARTTLS 명령이 실패했습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:247 ++#: ../camel/providers/smtp/camel-smtp-transport.c:242 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: " + msgstr "SMTP 서버 %s에 보안 모드로 연결하는데 실패했습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:349 ++#: ../camel/providers/smtp/camel-smtp-transport.c:342 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP 서버 %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:352 ++#: ../camel/providers/smtp/camel-smtp-transport.c:345 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "%s 서버를 통한 SMTP 메일" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:426 ++#: ../camel/providers/smtp/camel-smtp-transport.c:419 + #, c-format + msgid "SMTP server %s does not support %s authentication" + msgstr "SMTP 서버 %s에서 요청한 %s 인증 방식을 지원하지 않습니다." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:508 ++#: ../camel/providers/smtp/camel-smtp-transport.c:500 + #, c-format + msgid "No SASL mechanism was specified" + msgstr "SASL 방식을 하나도 지정하지 않았습니다." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:538 +-#: ../camel/providers/smtp/camel-smtp-transport.c:549 +-#: ../camel/providers/smtp/camel-smtp-transport.c:562 ++#: ../camel/providers/smtp/camel-smtp-transport.c:530 ++#: ../camel/providers/smtp/camel-smtp-transport.c:541 ++#: ../camel/providers/smtp/camel-smtp-transport.c:554 + msgid "AUTH command failed: " + msgstr "AUTH 명령이 실패했습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:695 + #, c-format + msgid "Cannot send message: service not connected." + msgstr "메시지를 보낼 수 없습니다: 서비스에 연결되지 않았습니다." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:710 ++#: ../camel/providers/smtp/camel-smtp-transport.c:702 + #, c-format + msgid "Cannot send message: sender address not valid." + msgstr "메시지를 보낼 수 없습니다. 보내는 사람 주소가 올바르지 않습니다." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:714 ++#: ../camel/providers/smtp/camel-smtp-transport.c:706 + msgid "Sending message" + msgstr "메시지를 보냄" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:731 + #, c-format + msgid "Cannot send message: no recipients defined." + msgstr "메시지를 보낼 수 없습니다: 받는 사람이 정의되지 않았습니다." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:752 ++#: ../camel/providers/smtp/camel-smtp-transport.c:744 + #, c-format + msgid "Cannot send message: one or more invalid recipients" + msgstr "메시지를 보낼 수 없습니다: 받는 사람 중에 한 명 이상이 잘못되었습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:873 ++#: ../camel/providers/smtp/camel-smtp-transport.c:865 + msgid "Syntax error, command unrecognized" + msgstr "문법 오류로, 무슨 명령인지 파악할 수 없습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:875 ++#: ../camel/providers/smtp/camel-smtp-transport.c:867 + msgid "Syntax error in parameters or arguments" + msgstr "인자 혹은 인수에서 문법 오류입니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:877 ++#: ../camel/providers/smtp/camel-smtp-transport.c:869 + msgid "Command not implemented" + msgstr "명령이 구현되지 않았습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:879 ++#: ../camel/providers/smtp/camel-smtp-transport.c:871 + msgid "Command parameter not implemented" + msgstr "명령어 인자가 구현되지 않았습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:881 ++#: ../camel/providers/smtp/camel-smtp-transport.c:873 + msgid "System status, or system help reply" + msgstr "시스템 상태, 혹은 시스템 도움말 응답" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:883 ++#: ../camel/providers/smtp/camel-smtp-transport.c:875 + msgid "Help message" + msgstr "도움말" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:885 ++#: ../camel/providers/smtp/camel-smtp-transport.c:877 + msgid "Service ready" + msgstr "서비스 준비되었습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:887 ++#: ../camel/providers/smtp/camel-smtp-transport.c:879 + msgid "Service closing transmission channel" + msgstr "서비스가 전송 채널을 닫았습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:889 ++#: ../camel/providers/smtp/camel-smtp-transport.c:881 + msgid "Service not available, closing transmission channel" + msgstr "서비스를 사용할 수 없습니다. 전송 채널을 닫습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:891 ++#: ../camel/providers/smtp/camel-smtp-transport.c:883 + msgid "Requested mail action okay, completed" + msgstr "요청한 메일 동작을 정상적으로 수행했습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:893 ++#: ../camel/providers/smtp/camel-smtp-transport.c:885 + msgid "User not local; will forward to " + msgstr "로컬 사용자가 아닙니다. 에 전달합니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:895 ++#: ../camel/providers/smtp/camel-smtp-transport.c:887 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "요청한 메일 동작을 하지 않습니다: 메일함을 사용할 수 없습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:897 ++#: ../camel/providers/smtp/camel-smtp-transport.c:889 + msgid "Requested action not taken: mailbox unavailable" + msgstr "요청한 작업을 하지 않습니다: 메일함을 사용할 수 없습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:899 ++#: ../camel/providers/smtp/camel-smtp-transport.c:891 + msgid "Requested action aborted: error in processing" + msgstr "요청한 작업을 취소했습니다: 처리하는데 오류 발생" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:901 ++#: ../camel/providers/smtp/camel-smtp-transport.c:893 + msgid "User not local; please try " + msgstr "로컬 사용자가 아닙니다. 를 시도해 보십시오" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:903 ++#: ../camel/providers/smtp/camel-smtp-transport.c:895 + msgid "Requested action not taken: insufficient system storage" + msgstr "요청한 메일 작업을 하지 않습니다: 시스템 저장 공간이 부족합니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:905 ++#: ../camel/providers/smtp/camel-smtp-transport.c:897 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "요청한 메일 작업을 취소했습니다: 저장 공간이 할당량을 넘었습니다." + msgstr "메일 입력 시작. .로 끝납니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:911 ++#: ../camel/providers/smtp/camel-smtp-transport.c:903 + msgid "Transaction failed" + msgstr "전송이 실패했습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:915 ++#: ../camel/providers/smtp/camel-smtp-transport.c:907 + msgid "A password transition is needed" + msgstr "암호를 넘겨야 합니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:917 ++#: ../camel/providers/smtp/camel-smtp-transport.c:909 + msgid "Authentication mechanism is too weak" + msgstr "인증 방식이 너무 취약합니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:919 ++#: ../camel/providers/smtp/camel-smtp-transport.c:911 + msgid "Encryption required for requested authentication mechanism" + msgstr "요청한 인증 방식에서는 암호화가 필요합니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:921 ++#: ../camel/providers/smtp/camel-smtp-transport.c:913 + msgid "Temporary authentication failure" + msgstr "인증이 임시로 실패했습니다" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1170 + msgid "SMTP Greeting" + msgstr "SMTP 초기 메시지" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1205 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1223 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1231 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1197 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1219 + msgid "HELO command failed: " + msgstr "HELO 명령이 실패했습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1306 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1321 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1331 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1294 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1309 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1319 + msgid "MAIL FROM command failed: " + msgstr "MAIL FROM 명령이 실패했습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1358 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1346 + msgid "RCPT TO command failed: " + msgstr "RCPT TO 명령이 실패했습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1375 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1385 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1363 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1373 + #, c-format + msgid "RCPT TO <%s> failed: " + msgstr "RCPT TO <%s> 실패했습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1428 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1439 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1450 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1509 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1529 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1543 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1552 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1416 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1427 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1438 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1497 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1517 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1531 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1540 + msgid "DATA command failed: " + msgstr "DATA 명령이 실패했습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1577 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1592 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1601 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1565 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1580 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1589 + msgid "RSET command failed: " + msgstr "RSET 명령이 실패했습니다: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1626 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1640 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1647 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1614 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1628 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1635 + msgid "QUIT command failed: " + msgstr "QUIT 명령이 실패했습니다: " + +@@ -4664,7 +4699,7 @@ msgstr "생일 또는 기념일 알리� + #: ../libebackend/e-authentication-mediator.c:205 + #: ../libebackend/e-authentication-mediator.c:216 + #: ../libebackend/e-authentication-mediator.c:852 +-#: ../libebackend/e-authentication-mediator.c:1182 ++#: ../libebackend/e-authentication-mediator.c:1185 + msgid "Bus name vanished (client terminated?)" + msgstr "버스 이름이 사라졌습니다(클라이언트를 중단했습니까?)" + +@@ -4675,7 +4710,7 @@ msgstr "클라이언트로부터 응답� + #: ../libebackend/e-authentication-mediator.c:334 + #: ../libebackend/e-authentication-mediator.c:345 + #: ../libebackend/e-authentication-mediator.c:846 +-#: ../libebackend/e-authentication-mediator.c:1176 ++#: ../libebackend/e-authentication-mediator.c:1179 + msgid "Client cancelled the operation" + msgstr "클라이언트가 " + +@@ -4683,11 +4718,11 @@ msgstr "클라이언트가 " + msgid "Client reports password was rejected" + msgstr "클라이언트가 암호가 거절되었음을 보고합니다" + +-#: ../libebackend/e-authentication-session.c:532 ++#: ../libebackend/e-authentication-session.c:543 + msgid "Add this password to your keyring" + msgstr "이 암호를 키 모음에 추가" + +-#: ../libebackend/e-authentication-session.c:622 ++#: ../libebackend/e-authentication-session.c:648 + msgid "Password was incorrect" + msgstr "암호가 맞지 않습니다" + +@@ -4717,7 +4752,7 @@ msgid "Data source is missing a [%s] gro + msgstr "데이터 소스에서 [%s] 그룹이 빠졌습니다" + + #: ../libebackend/e-server-side-source.c:1008 +-#: ../libedataserver/e-source.c:1120 ++#: ../libedataserver/e-source.c:1138 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "'%s' 데이터 소스에서 원격 자원 만들기를 지원하지 않습니다" +@@ -4729,7 +4764,7 @@ msgid "" + msgstr "'%s' 데이터 소스에 원격 자원을 만들기 위한 콜렉션 백엔드가 없습니다" + + #: ../libebackend/e-server-side-source.c:1050 +-#: ../libedataserver/e-source.c:1227 ++#: ../libedataserver/e-source.c:1251 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "'%s' 데이터 소스에서 원격 자원 삭제를 지원하지 않습니다" +@@ -4741,19 +4776,19 @@ msgid "" + msgstr "'%s' 데이터 소스에 원격 자원을 삭제하기 위한 콜렉션 백엔드가 없습니다" + + #: ../libebackend/e-server-side-source.c:1095 +-#: ../libedataserver/e-source.c:1317 ++#: ../libedataserver/e-source.c:1347 + #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" + msgstr "'%s' 데이터 원본은 OAuth 2.0 인증 방법을 지원하지 않습니다" + +-#: ../libebackend/e-server-side-source.c:1435 ++#: ../libebackend/e-server-side-source.c:1438 + #, c-format + msgid "File must have a '.source' extension" + msgstr "파일 확장자는 반드시 '.source' 이어야 합니다" + + #: ../libebackend/e-source-registry-server.c:523 +-#: ../libedataserver/e-source-registry.c:1594 ++#: ../libedataserver/e-source-registry.c:1882 + msgid "The user declined to authenticate" + msgstr "인증을 거절한 사용자" + +@@ -4762,7 +4797,7 @@ msgstr "인증을 거절한 사용자" + msgid "UID '%s' is already in use" + msgstr "'%s' UID는 이미 사용중입니다" + +-#: ../libebackend/e-user-prompter-server.c:279 ++#: ../libebackend/e-user-prompter-server.c:303 + #, c-format + msgid "Extension dialog '%s' not found." + msgstr "'%s' 확장 대화창을 찾을 수 없습니다." +@@ -4887,13 +4922,14 @@ msgstr "원본을 읽어들이지 못했 + msgid "Source already loaded" + msgstr "원본을 이미 읽어들였습니다" + +-#. Translators: This means that the EClient does not support offline mode, or +-#. * it's not set to by a user, thus it is unavailable while user is not connected. +-#: ../libedataserver/e-client.c:147 ++#. Translators: This means that the EClient does not ++#. * support offline mode, or it's not set to by a user, ++#. * thus it is unavailable while user is not connected. ++#: ../libedataserver/e-client.c:148 + msgid "Offline unavailable" + msgstr "오프라인을 사용할 수 없습니다" + +-#: ../libedataserver/e-client.c:169 ++#: ../libedataserver/e-client.c:170 + msgid "D-Bus error" + msgstr "D-버스 오류" + +@@ -4949,22 +4985,22 @@ msgstr "\"%s\" 작업 목록에 대한 � + msgid "Please enter the password for account \"%s\"." + msgstr "\"%s\" 계정에 대한 암호를 입력하여 주십시오." + +-#: ../libedataserver/e-source.c:622 ++#: ../libedataserver/e-source.c:627 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "소스 파일에서 [%s] 그룹이 빠졌습니다" + +-#: ../libedataserver/e-source.c:943 ++#: ../libedataserver/e-source.c:949 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "'%s' 데이터 소스를 제거할 수 없습니다" + +-#: ../libedataserver/e-source.c:1029 ++#: ../libedataserver/e-source.c:1041 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "'%s' 데이터 소스를 기록할 수 없습니다" + +-#: ../libedataserver/e-source.c:1523 ++#: ../libedataserver/e-source.c:1559 + msgid "Unnamed" + msgstr "이름 없음" + +@@ -4973,28 +5009,28 @@ msgstr "이름 없음" + msgid "Signature script must be a local file" + msgstr "서명 스크립트는 로컬 파일이어야 합니다" + +-#: ../libedataserver/e-source-webdav.c:1519 ++#: ../libedataserver/e-source-webdav.c:1529 + #, c-format + msgid "" + "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " + "you wish to accept it?" + msgstr "호스트 '%s'에 대한 SSL 인증서('%s' 주소록에서 사용)를 신뢰할 수 없습니다. 이 인증서를 허용하시겠습니까?" + +-#: ../libedataserver/e-source-webdav.c:1528 ++#: ../libedataserver/e-source-webdav.c:1538 + #, c-format + msgid "" + "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " + "wish to accept it?" + msgstr "호스트 '%s'에 대한 SSL 인증서('%s' 달력에서 사용)를 신뢰할 수 없습니다. 이 인증서를 허용하시겠습니까?" + +-#: ../libedataserver/e-source-webdav.c:1537 ++#: ../libedataserver/e-source-webdav.c:1547 + #, c-format + msgid "" + "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " + "you wish to accept it?" + msgstr "호스트 '%s'에 대한 SSL 인증서('%s' 메모 목록에서 사용)를 신뢰할 수 없습니다. 이 인증서를 허용하시겠습니까?" + +-#: ../libedataserver/e-source-webdav.c:1546 ++#: ../libedataserver/e-source-webdav.c:1556 + #, c-format + msgid "" + "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " +@@ -5005,7 +5041,8 @@ msgstr "호스트 '%s'에 대한 SSL 인 + #. * in 12-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1946 ++#: ../libedataserver/e-time-utils.c:1663 ++#: ../libedataserver/e-time-utils.c:1962 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%Y/%m/%d (%a) %p %I:%M:%S" + +@@ -5013,7 +5050,8 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S" + #. * in 24-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1937 ++#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1953 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%Y/%m/%d (%a) %H:%M:%S" + +@@ -5021,7 +5059,8 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S" + #. * in 12-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1942 ++#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1958 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%Y/%m/%d (%a) %p %I:%M" + +@@ -5029,78 +5068,83 @@ msgstr "%Y/%m/%d (%a) %p %I:%M" + #. * in 24-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1933 ++#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1949 + msgid "%a %m/%d/%Y %H:%M" + msgstr "%Y/%m/%d (%a) %H:%M" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1667 ++#: ../libedataserver/e-time-utils.c:1683 + msgid "%a %m/%d/%Y %I %p" + msgstr "%Y/%m/%d (%a) %p %I" + + #. strptime format of a weekday, a date and a time, + #. * in 24-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1672 ++#: ../libedataserver/e-time-utils.c:1688 + msgid "%a %m/%d/%Y %H" + msgstr "%Y/%m/%d (%a) %H" + + #. strptime format of a weekday and a date. + #. strftime format of a weekday and a date. +-#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795 +-#: ../libedataserver/e-time-utils.c:1928 ++#: ../libedataserver/e-time-utils.c:1691 ++#: ../libedataserver/e-time-utils.c:1811 ++#: ../libedataserver/e-time-utils.c:1944 + msgid "%a %m/%d/%Y" + msgstr "%Y/%m/%d (%a)" + + #. strptime format of a date and a time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1682 ++#: ../libedataserver/e-time-utils.c:1698 + msgid "%m/%d/%Y %I:%M:%S %p" + msgstr "%Y/%m/%d %p %I:%M:%S" + + #. strptime format of a date and a time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1686 ++#: ../libedataserver/e-time-utils.c:1702 + msgid "%m/%d/%Y %H:%M:%S" + msgstr "%Y/%m/%d %H:%M:%S" + + #. strptime format of a date and a time, in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1691 ++#: ../libedataserver/e-time-utils.c:1707 + msgid "%m/%d/%Y %I:%M %p" + msgstr "%Y/%m/%d %p %I:%M" + + #. strptime format of a date and a time, in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1696 ++#: ../libedataserver/e-time-utils.c:1712 + msgid "%m/%d/%Y %H:%M" + msgstr "%Y/%m/%d %H:%M" + + #. strptime format of a date and a time, in 12-hour format, + #. * without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1701 ++#: ../libedataserver/e-time-utils.c:1717 + msgid "%m/%d/%Y %I %p" + msgstr "%Y/%m/%d %p %I" + + #. strptime format of a date and a time, in 24-hour format, + #. * without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1706 ++#: ../libedataserver/e-time-utils.c:1722 + msgid "%m/%d/%Y %H" + msgstr "%Y/%m/%d %H" + + #. strptime format of a weekday and a date. + #. This is the preferred date format for the locale. +-#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798 ++#: ../libedataserver/e-time-utils.c:1725 ++#: ../libedataserver/e-time-utils.c:1814 + msgid "%m/%d/%Y" + msgstr "%Y/%m/%d" + + #. strptime format for a time of day, in 12-hour format. + #. strftime format of a time in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1990 ++#: ../libedataserver/e-time-utils.c:1885 ++#: ../libedataserver/e-time-utils.c:2006 + msgid "%I:%M:%S %p" + msgstr "%p %I:%M:%S" + + #. strptime format for a time of day, in 24-hour format. + #. strftime format of a time in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1982 ++#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1998 + msgid "%H:%M:%S" + msgstr "%H:%M:%S" + +@@ -5108,25 +5152,27 @@ msgstr "%H:%M:%S" + #. * in 12-hour format. + #. strftime format of a time in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1987 ++#: ../libedataserver/e-time-utils.c:1894 ++#: ../libedataserver/e-time-utils.c:2003 + msgid "%I:%M %p" + msgstr "%p %I:%M" + + #. strptime format for time of day, without seconds 24-hour format. + #. strftime format of a time in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1979 ++#: ../libedataserver/e-time-utils.c:1898 ++#: ../libedataserver/e-time-utils.c:1995 + msgid "%H:%M" + msgstr "%H:%M" + + #. strptime format for time of day, without seconds 24-hour format, + #. * and no colon. +-#: ../libedataserver/e-time-utils.c:1886 ++#: ../libedataserver/e-time-utils.c:1902 + msgid "%H%M" + msgstr "%H%M" + + #. strptime format for hour and AM/PM, 12-hour format. +-#: ../libedataserver/e-time-utils.c:1890 ++#: ../libedataserver/e-time-utils.c:1906 + msgid "%I %p" + msgstr "%p %I" + +@@ -5138,9 +5184,7 @@ msgstr "사용할 프록시 종류" + msgid "" + "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" " + "means manual proxy." +-msgstr "" +-"어떤 종류의 프록시를 사용할지 결정합니다. \"0\"은 시스템, \"1\"은 프록시 없" +-"음, \"2\"는 프록시 수동 설정." ++msgstr "어떤 종류의 프록시를 사용할지 결정합니다. \"0\"은 시스템, \"1\"은 프록시 없음, \"2\"는 프록시 수동 설정." + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 + msgid "Whether to use http-proxy" +@@ -5292,14 +5336,14 @@ msgstr "계정 요소를 찾는데 실� + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "자동 발견 응답에서 ASUrl 와 OABUrl을 찾는데 실패했습니다" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1238 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1271 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " + "from which to obtain an access token for '%s'" + msgstr "org.gnome.OnlineAccounts 서비스에서 '%s'에 대한 접근 토큰을 얻을 해당 계정을 찾을 수 없습니다" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1298 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "'%s'에 대한 접근 토큰을 얻는데 실패했습니다: " +diff -up evolution-data-server-3.8.5/po/ml.po.translations evolution-data-server-3.8.5/po/ml.po +--- evolution-data-server-3.8.5/po/ml.po.translations 2013-04-02 19:49:02.000000000 +0200 ++++ evolution-data-server-3.8.5/po/ml.po 2014-01-13 16:23:40.785630232 +0100 +@@ -6,21 +6,23 @@ + # Ani Peter , 2006, 2009, 2013. + # Anish A , 2013. + # Balasankar C , 2013. ++# apeter , 2013. #zanata + msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server.HEAD.ml\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=" ++"evolution-data-server&keywords=I18N+L10N&component=Misc.\n" + "POT-Creation-Date: 2013-03-25 17:18+0000\n" +-"PO-Revision-Date: 2013-03-26 00:08+0530\n" +-"Last-Translator: Balasankar C \n" ++"PO-Revision-Date: 2013-11-02 05:13-0400\n" ++"Last-Translator: apeter \n" + "Language-Team: American English \n" +-"Language: ml\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: ml\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + "X-DamnedLies-Scope: partial\n" +-"X-Generator: Lokalize 1.5\n" ++"X-Generator: Zanata 3.1.2\n" + "X-Project-Style: gnome\n" + + #: ../addressbook/backends/file/e-book-backend-file.c:114 +@@ -50,7 +52,7 @@ msgstr "പൊരുത്തപ്പ� + + #: ../addressbook/backends/file/e-book-backend-file.c:844 + #: ../addressbook/backends/file/e-book-backend-file.c:1038 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2615 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2656 + #, c-format + msgid "Contact '%s' not found" + msgstr "സമ്പര്‍ക്കം '%s' കണ്ടുപിടിക്കാന്‍ സാധിച്ചില്ല" +@@ -58,13 +60,15 @@ msgstr "സമ്പര്‍ക്ക� + #: ../addressbook/backends/file/e-book-backend-file.c:940 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" +-msgstr "'%s' എന്ന ബന്ധം ഏകകാലികാവസ്ഥയിലുള്ള തിരുത്തലില്ലാതെ പുതുക്കാൻ ശ്രമിച്ചു" ++msgstr "" ++"'%s' എന്ന ബന്ധം ഏകകാലികാവസ്ഥയിലുള്ള തിരുത്തലില്ലാതെ പുതുക്കാൻ ശ്രമിച്ചു" + + #: ../addressbook/backends/file/e-book-backend-file.c:1089 + #: ../addressbook/backends/file/e-book-backend-file.c:1139 + #, c-format + msgid "Query '%s' not supported" +-msgstr "'%s' ചോദ്യം പിന്തുണയ്ക്കുന്നില്ല" ++msgstr "'%s' ചോദ്യം പിന്തുണയ്ക്കുന്നില്ല" ++ + #: ../addressbook/backends/file/e-book-backend-file.c:1098 + #: ../addressbook/backends/file/e-book-backend-file.c:1148 + #, c-format +@@ -76,7 +80,7 @@ msgid "Loading..." + msgstr "കാത്തിരിക്കൂ..." + + #: ../addressbook/backends/file/e-book-backend-file.c:1250 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4963 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4978 + msgid "Searching..." + msgstr "തിരയുന്നു..." + +@@ -86,8 +90,8 @@ msgid "Failed to rename old database fro + msgstr "ഡാറ്റാബൈസ് '%s'-നെ '%s' എന്ന പേരിലേക്ക് മാറ്റുവാന്‍ സാധ്യമല്ല: %s" + + #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1222 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4858 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4873 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:338 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 +@@ -97,58 +101,58 @@ msgstr "ഡാറ്റാബൈസ് ' + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 + #: ../calendar/libecal/e-cal.c:2339 + #: ../calendar/libecal/e-cal-client.c:275 +-#: ../camel/camel-imapx-command.c:596 ++#: ../camel/camel-imapx-command.c:609 + #: ../libedataserver/e-client.c:179 + msgid "Unknown error" + msgstr "അറിയാത്ത ഏതോ പ്രശ്നം" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:649 ++#: ../addressbook/backends/google/e-book-backend-google.c:679 + msgid "Querying for updated contacts…" + msgstr "പുതുക്കിയ സമ്പര്‍ക്കങ്ങള്‍ക്കായി ചോദിക്കുന്നു…" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:786 ++#: ../addressbook/backends/google/e-book-backend-google.c:816 + msgid "Querying for updated groups…" + msgstr "പുതുക്കിയ കൂട്ടങ്ങള്‍ക്കായി ചോദിക്കുന്നു…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1235 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1653 ++#: ../addressbook/backends/google/e-book-backend-google.c:1265 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:389 + msgid "The backend does not support bulk additions" + msgstr "ഒന്നിച്ചുള്ള ചേര്‍ക്കല്‍ ബാക്കെന്റ് പിന്‍തുണയ്ക്കുന്നില്ല" + + #. Insert the entry on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1267 ++#: ../addressbook/backends/google/e-book-backend-google.c:1297 + msgid "Creating new contact…" + msgstr "ഒരു പുതിയ വിലാസം ഉണ്ടാക്കുന്നു…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1358 ++#: ../addressbook/backends/google/e-book-backend-google.c:1388 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:506 + msgid "The backend does not support bulk removals" + msgstr "ഒന്നിച്ചുള്ള നീക്കം ചെയ്യല്‍ ബാക്കെന്റ് പിന്‍തുണയ്ക്കുന്നില്ല" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1386 ++#: ../addressbook/backends/google/e-book-backend-google.c:1416 + msgid "Deleting contact…" + msgstr "ബന്ധത്തെ എടുത്തുകളയുന്നു…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1640 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2319 ++#: ../addressbook/backends/google/e-book-backend-google.c:1670 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:567 + msgid "The backend does not support bulk modifications" + msgstr "അധികമായി മാറ്റം വരുത്തിയവയില്‍ ബാക്കന്‍ഡ് പിന്തുണയ്ക്കുന്നില്ല" + + #. Update the contact on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1678 ++#: ../addressbook/backends/google/e-book-backend-google.c:1708 + msgid "Modifying contact…" + msgstr "സമ്പര്‍ക്കത്തില്‍ മാറ്റം വരുത്തുന്നു…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1849 ++#: ../addressbook/backends/google/e-book-backend-google.c:1879 + msgid "Loading…" + msgstr "ലഭ്യമാക്കുന്നു…" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1602 ++#: ../addressbook/backends/google/e-book-google-utils.c:1606 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -157,97 +161,98 @@ msgid "Personal" + msgstr "വ്യക്തിപരം" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1604 ++#: ../addressbook/backends/google/e-book-google-utils.c:1608 + msgid "Friends" + msgstr "കൂട്ടുകാര്‍" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1606 ++#: ../addressbook/backends/google/e-book-google-utils.c:1610 + msgid "Family" + msgstr "കുടുംബം" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1608 ++#: ../addressbook/backends/google/e-book-google-utils.c:1612 + msgid "Coworkers" + msgstr "സഹപ്രവര്‍ത്തകര്‍" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174 + msgid "Not connected" + msgstr "ബന്ധിപ്പിച്ചിട്ടില്ല" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:950 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "2, 3 പതിപ്പുകളുപയോഗിച്ച് ബെന്റ് ചെയ്യാന്‍ പറ്റുന്നില്ല" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1073 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088 + msgid "Reconnecting to LDAP server..." + msgstr "LDAP സര്‍വറിലേക്ക് വീണ്ടും കണക്ട് ചെയ്യുന്നു..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1203 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218 + msgid "Invalid DN syntax" + msgstr "അസാധുവായ DN വ്യാകരണം" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1219 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4857 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4872 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP പിഴവ് 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1737 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Adding contact to LDAP server..." + msgstr "LDAP സര്‍വറിലേക്ക് വിലാസങ്ങള്‍ ചേര്‍ക്കുന്നു..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1875 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1890 + msgid "Removing contact from LDAP server..." + msgstr "LDAP സര്‍വറില്‍ നിന്നും വിലാസം നീക്കം ചെയ്യുന്നു..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2019 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2431 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: ldap_first_entry യില്‍ നിന്ന് NULL കിട്ടി" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2272 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2474 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2489 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: അറിയാത്ത ഫലത്തിന്റെ തരം %d കിട്ടി" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2341 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2356 + msgid "Modifying contact from LDAP server..." + msgstr "LDAP സര്‍വറിലുളള വിലാസത്തില്‍ മാറ്റം വരുത്തുന്നു..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2703 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2935 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2718 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2950 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: അറിയാത്ത തിരയല്‍ ഫലത്തിന്റെ തരം %d കിട്ടി" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4806 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4821 + msgid "Receiving LDAP search results..." + msgstr "LDAP-ന്‍റെ തിരച്ചില്‍ ഫലങ്ങള്‍ ലഭ്യമാകുന്നു..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4985 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5000 + msgid "Error performing search" + msgstr "തിരച്ചിലില്‍ തകരാറ്" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5108 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "വിലാസങ്ങള്‍ ഡൌണ്‍‍ലോട് ചെയ്യുന്നു (%d)... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5571 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5654 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "'%s' ഉപയോക്താവിനുള്ള DN കിട്ടുന്നതില്‍ പരാജയം" + + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:420 +-#, fuzzy, c-format +-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)" ++#, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" +-msgstr "'%s'വിഭവം ഉണ്ടാക്കുന്നതില്‍ പരാജയപെട്ടു; HTTP അവസ്ഥ: %d (%s)" ++msgstr "" ++"എച്ടിടിപി അവസ്ഥയ്ക്കൊപ്പം ശ്രോതസ്സ് '%s' തയ്യാറാക്കുന്നതു് പരാജയപ്പെട്ടു: %d " ++"(%s)" + + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:522 + #, c-format +@@ -259,10 +264,10 @@ msgid "Contact on server changed -> not + msgstr "സേവകനിലെ സമ്പര്‍ക്കം മാറി -> മാറ്റം വരുത്തുന്നില്ല" + + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:597 +-#, fuzzy, c-format +-#| msgid "Modify contact failed with HTTP status: %d (%s)" ++#, c-format + msgid "Modify contact failed with HTTP status %d (%s)" +-msgstr "HTTP അവസ്ഥ തന്ന് സമ്പര്‍ക്കം മാറ്റുന്നത് പരാജയപെട്ടു: %d (%s)" ++msgstr "" ++"HTTP അവസ്ഥ %d-നൊപ്പം വിലാസത്തില്‍ മാറ്റം വരുത്തുന്നതു് പരാജയപ്പെട്ടു (%s)" + + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1007 + msgid "Loading Addressbook summary..." +@@ -892,7 +897,8 @@ msgstr "പേരിടാത്ത പ� + + #: ../addressbook/libebook-contacts/e-phone-number.c:43 + msgid "The library was built without phone number support." +-msgstr "ഈ ഗ്രന്ഥാലയം ഫോണ്‍ നമ്പര്‍ പിന്‍തുണയില്ലാതെയാണ് ഉണ്ടാക്കിയിരിക്കുന്നത്." ++msgstr "" ++"ഈ ഗ്രന്ഥാലയം ഫോണ്‍ നമ്പര്‍ പിന്‍തുണയില്ലാതെയാണ് ഉണ്ടാക്കിയിരിക്കുന്നത്." + + #: ../addressbook/libebook-contacts/e-phone-number.c:45 + msgid "The phone number parser reported an yet unkown error code." +@@ -907,10 +913,11 @@ msgid "Invalid country calling code" + msgstr "അസാധുവായ രാജ്യ കോഡ്" + + #: ../addressbook/libebook-contacts/e-phone-number.c:51 +-#, fuzzy +-#| msgid "Text is too short for a phone number" +-msgid "Remaining text after the country calling code is too short for a phone number" +-msgstr "ഫോണ്‍ നമ്പറിന് വേണ്ടത്ര ടെക്സ്റ്റ് ഇല്ല" ++msgid "" ++"Remaining text after the country calling code is too short for a phone " ++"number" ++msgstr "" ++"രാജ്യത്തിന്റെ കോളിങ് കോഡിനു് ശേഷമുള്ളതു് ഒരു ഫോണ്‍ നംബറിനേക്കാള്‍ ചെറുതാണു്." + + #: ../addressbook/libebook-contacts/e-phone-number.c:53 + msgid "Text is too short for a phone number" +@@ -920,69 +927,81 @@ msgstr "ഫോണ്‍ നമ്പറ� + msgid "Text is too long for a phone number" + msgstr "ഫോണ്‍ നമ്പറിന് ടെക്സ്റ്റ് വളരെ കൂടുതല്‍" + +-#: ../addressbook/libebook/e-book-client.c:659 ++#: ../addressbook/libebook/e-book-client.c:643 + #: ../addressbook/libedata-book/e-book-backend.c:120 + #, c-format + msgid "Unknown book property '%s'" + msgstr "അറിയാത്ത പുസ്തക സവിശേഷത '%s'" + +-#: ../addressbook/libebook/e-book-client.c:674 ++#: ../addressbook/libebook/e-book-client.c:658 + #, c-format + msgid "Cannot change value of book property '%s'" + msgstr "'%s' പുസ്തക വിശേഷതയുടെ മൂല്ല്യം മാറ്റുവാന്‍ സാധ്യമല്ല" + +-#: ../addressbook/libebook/e-book-client.c:985 +-#: ../addressbook/libebook/e-book-client.c:1158 +-#: ../calendar/libecal/e-cal-client.c:1502 +-#: ../calendar/libecal/e-cal-client.c:1682 ++#: ../addressbook/libebook/e-book-client.c:993 ++#: ../addressbook/libebook/e-book-client.c:1168 ++#: ../calendar/libecal/e-cal-client.c:1515 ++#: ../calendar/libecal/e-cal-client.c:1697 + #, c-format + msgid "Unable to connect to '%s': " + msgstr "'%s' -ലേക്ക് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല:" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:752 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793 + #, c-format + msgid "Error introspecting unknown summary field '%s'" + msgstr "സംഗ്രഹ ഭാഗത്തം '%s'-ന്റെ അകത്തേക്ക് നോക്കുന്നതിൽ പിഴവ്" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1241 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289 + #: ../camel/camel-db.c:544 + #, c-format + msgid "Insufficient memory" + msgstr "മതിയായ മെമ്മറി ലഭ്യമല്ല" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1374 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1422 + #, c-format + msgid "Invalid contact field '%d' specified in summary" + msgstr "അസാധുവായ ബന്ധ-പ്രവർതനതലം '%d' സംഗ്രഹത്തിൽ നിർദ്ദേശിച്ചിരിക്കുന്നു" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1408 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1456 + #, c-format +-msgid "Contact field '%s' of type '%s' specified in summary, but only boolean, string and string list field types are supported" +-msgstr "'%s' രീതിയിലുള്ള ബന്ധത്തിന്റെ പ്രവർത്തനതലം '%s' സംഗ്രഹത്തിൽ നിർദ്ദേശിച്ചിരിക്കുന്നു, പക്ഷേ ബൂലിയനോ, സ്ട്രിങ്ങോ അല്ലെങ്കിൽ സ്ട്രിങ്ങ് പട്ടിക പ്രവർത്തനതല രീതികളോ മാത്രമേ പിന്തുണക്കപ്പെടുന്നുള്ളൂ" ++msgid "" ++"Contact field '%s' of type '%s' specified in summary, but only boolean, " ++"string and string list field types are supported" ++msgstr "" ++"'%s' രീതിയിലുള്ള ബന്ധത്തിന്റെ പ്രവർത്തനതലം '%s' സംഗ്രഹത്തിൽ " ++"നിർദ്ദേശിച്ചിരിക്കുന്നു, പക്ഷേ ബൂലിയനോ, സ്ട്രിങ്ങോ അല്ലെങ്കിൽ സ്ട്രിങ്ങ് " ++"പട്ടിക പ്രവർത്തനതല രീതികളോ മാത്രമേ പിന്തുണക്കപ്പെടുന്നുള്ളൂ" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2603 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3686 + #, c-format +-msgid "Full search_contacts are not stored in cache. vcards cannot be returned." +-msgstr "മുഴുവൻ തിരച്ചിൽ_ബന്ധങ്ങളും കാഷെയിൽ സൂക്ഷിച്ചിട്ടില്ല. vcardകൾ തിരിച്ചേൽപിക്കാൻ കഴിയില്ല" ++msgid "" ++"Full search_contacts are not stored in cache. vcards cannot be returned." ++msgstr "" ++"മുഴുവൻ തിരച്ചിൽ_ബന്ധങ്ങളും കാഷെയിൽ സൂക്ഷിച്ചിട്ടില്ല. vcardകൾ " ++"തിരിച്ചേൽപിക്കാൻ കഴിയില്ല" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3770 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3851 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3812 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3893 + #, c-format + msgid "Query contained unsupported elements" + msgstr "ചോദ്യത്തില്‍ പിന്തണയ്ക്കാത്ത എലമെന്റുകള്‍ " + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3774 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 + #, c-format + msgid "Invalid Query" + msgstr "അസാധുവായ ആവശ്യം" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3798 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3840 + #, c-format +-msgid "Full search_contacts are not stored in cache. Hence only summary query is supported." +-msgstr "മുഴുവൻ തിരച്ചിൽ_ബന്ധങ്ങളും കാഷെയിൽ സൂക്ഷിച്ചിട്ടില്ല. അതിനാൽ സംഗ്രഹ പ്രശ്നം മാത്രമേ പിന്തുണച്ചിട്ടുള്ളൂ" ++msgid "" ++"Full search_contacts are not stored in cache. Hence only summary query is " ++"supported." ++msgstr "" ++"മുഴുവൻ തിരച്ചിൽ_ബന്ധങ്ങളും കാഷെയിൽ സൂക്ഷിച്ചിട്ടില്ല. അതിനാൽ സംഗ്രഹ പ്രശ്നം " ++"മാത്രമേ പിന്തുണച്ചിട്ടുള്ളൂ" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3855 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 + #: ../addressbook/libedata-book/e-data-book.c:669 + #: ../addressbook/libedata-book/e-data-book.c:809 + #: ../calendar/libedata-cal/e-data-cal.c:612 +@@ -992,12 +1011,15 @@ msgstr "മുഴുവൻ തിരച� + msgid "Invalid query" + msgstr "അസാധുവായ ആവശ്യം" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3940 + #, c-format +-msgid "Full vcards are not stored in cache. Hence only summary query is supported." +-msgstr "മുഴുവൻ vcardകളും കാഷെയിൽ സൂക്ഷിച്ചിട്ടില്ല. അതിനാൽ സംഗ്രഹ പ്രശ്നം മാത്രമേ പിന്തുണച്ചിട്ടുള്ളൂ" ++msgid "" ++"Full vcards are not stored in cache. Hence only summary query is supported." ++msgstr "" ++"മുഴുവൻ vcardകളും കാഷെയിൽ സൂക്ഷിച്ചിട്ടില്ല. അതിനാൽ സംഗ്രഹ പ്രശ്നം മാത്രമേ " ++"പിന്തുണച്ചിട്ടുള്ളൂ" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4598 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4643 + #, c-format + msgid "Unable to remove the db file: errno %d" + msgstr "db ഫയല്‍ നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല: errno %d" +@@ -1009,7 +1031,6 @@ msgstr "ക്ലയന്റുകള� + + #. Translators: This is prefix to a detailed error message + #. Translators: This is a prefix to a detailed error message * +-#. + #: ../addressbook/libedata-book/e-data-book.c:691 + #: ../calendar/libedata-cal/e-data-cal.c:635 + msgid "Invalid query: " +@@ -1311,7 +1332,7 @@ msgid "Not a calendar." + msgstr "ഇത് ഒരു കലണ്ടര്‍ അല്ല. " + + #: ../calendar/backends/http/e-cal-backend-http.c:926 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:514 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:520 + msgid "Could not create cache file" + msgstr "cache ഫയല്‍ നിര്‍മ്മിക്കുവാന്‍ സാധ്യമായില്ല" + +@@ -1319,43 +1340,43 @@ msgstr "cache ഫയല്‍ നിര� + msgid "Could not retrieve weather data" + msgstr "കാലാവസ്ഥ സംബന്ധിച്ചുളള വിവരങ്ങള്‍ ലഭ്യമായില്ല" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:278 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:284 + msgid "Weather: Fog" + msgstr "കാലാവസ്ഥ: മഞ്ഞ്" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:279 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:285 + msgid "Weather: Cloudy Night" + msgstr "കാലാവസ്ഥ: മഴമേഘങ്ങള്‍ നിറഞ്ഞ രാത്രി" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:280 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:286 + msgid "Weather: Cloudy" + msgstr "കാലാവസ്ഥ: മഴമേഘങ്ങള്‍ നിറഞ്ഞ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:281 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:287 + msgid "Weather: Overcast" + msgstr "കാലാവസ്ഥ: മഴക്കാര്‍ മൂടുക" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:282 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:288 + msgid "Weather: Showers" + msgstr "കാലാവസ്ഥ: മഴ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:283 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:289 + msgid "Weather: Snow" + msgstr "കാലാവസ്ഥ: മഞ്ഞ് വീഴ്ച" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:284 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:290 + msgid "Weather: Clear Night" + msgstr "കാലാവസ്ഥ: തെളിഞ്ഞ രാത്രി" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:285 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:291 + msgid "Weather: Sunny" + msgstr "കാലാവസ്ഥ: വെയിലുളള" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:286 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:292 + msgid "Weather: Thunderstorms" + msgstr "കാലാവസ്ഥ: കൊടുങ്കാറ്റ് " + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:410 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:416 + msgid "Forecast" + msgstr "പ്രവചനം" + +@@ -1416,7 +1437,7 @@ msgid "Authentication failed" + msgstr "ആധികാരകത ഉറപ്പാക്കല്‍ പരാജയപ്പെട്ടു" + + #: ../calendar/libecal/e-cal.c:2335 +-#: ../camel/providers/smtp/camel-smtp-transport.c:923 ++#: ../camel/providers/smtp/camel-smtp-transport.c:915 + #: ../libedataserver/e-client.c:141 + msgid "Authentication required" + msgstr "ആധികാരികത ഉറപ്പ് വരുത്തല്‍ ആവശ്യമുണ്ട്" +@@ -1439,13 +1460,13 @@ msgstr "അപരിചിതമായ � + msgid "Invalid range" + msgstr "അസാധുവായ പരിധി" + +-#: ../calendar/libecal/e-cal-client.c:936 ++#: ../calendar/libecal/e-cal-client.c:920 + #: ../calendar/libedata-cal/e-cal-backend.c:204 + #, c-format + msgid "Unknown calendar property '%s'" + msgstr "അറിയാത്ത കലണ്ടര്‍ സവിശേഷത '%s'" + +-#: ../calendar/libecal/e-cal-client.c:951 ++#: ../calendar/libecal/e-cal-client.c:935 + #, c-format + msgid "Cannot change value of calendar property '%s'" + msgstr "കലണ്ടറിന്റെ സവിശേഷത '%s'മാറ്റാന്‍ സാധ്യമല്ല" +@@ -1617,7 +1638,8 @@ msgstr "\"%s\" ഒരു ആര്‍ഗ + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380 + #, c-format + msgid "\"%s\" expects the first argument to be a string" +-msgstr "ആദ്യത്തെ ആര്‍ഗ്യുമെന്‍റ് സ്ടിങ് ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" ++msgstr "" ++"ആദ്യത്തെ ആര്‍ഗ്യുമെന്‍റ് സ്ടിങ് ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:160 + #, c-format +@@ -1634,7 +1656,8 @@ msgstr "\"%s\" രണ്ടോ മൂന + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548 + #, c-format + msgid "\"%s\" expects the first argument to be a time_t" +-msgstr "ആദ്യത്തെ ആര്‍ഗ്യുമെന്‍റ് time_t ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" ++msgstr "" ++"ആദ്യത്തെ ആര്‍ഗ്യുമെന്‍റ് time_t ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:176 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:264 +@@ -1642,12 +1665,15 @@ msgstr "ആദ്യത്തെ ആര� + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:826 + #, c-format + msgid "\"%s\" expects the second argument to be a time_t" +-msgstr "രണ്ടാമത്തെ ആര്‍ഗ്യുമെന്‍റ് ഒരു time_t ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" ++msgstr "" ++"രണ്ടാമത്തെ ആര്‍ഗ്യുമെന്‍റ് ഒരു time_t ആയിരിക്കുമെന്ന് \"%s\" " ++"പ്രതീക്ഷിക്കുന്നു" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:186 + #, c-format + msgid "\"%s\" expects the third argument to be a string" +-msgstr "മൂന്നാമത്തെ ആര്‍ഗ്യുമെന്‍റ് സ്ടിങ് ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" ++msgstr "" ++"മൂന്നാമത്തെ ആര്‍ഗ്യുമെന്‍റ് സ്ടിങ് ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:248 + #, c-format +@@ -1676,12 +1702,20 @@ msgstr "\"%s\" ആര്‍ഗ്യു� + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:676 + #, c-format + msgid "\"%s\" expects the second argument to be a string" +-msgstr "രണ്ടാമത്തെ ആര്‍ഗ്യുമെന്‍റ് ഒരു സ്ട്രിങ് ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" ++msgstr "" ++"രണ്ടാമത്തെ ആര്‍ഗ്യുമെന്‍റ് ഒരു സ്ട്രിങ് ആയിരിക്കുമെന്ന് \"%s\" " ++"പ്രതീക്ഷിക്കുന്നു" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:707 + #, c-format +-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\"" +-msgstr "ആദ്യത്തെ ആര്‍ഗ്യുമെന്‍റ് \"any\", \"summary\", \"description\", \"location\", \"attendee\", \"organizer\", \"classification\" എന്നിവയില്‍ ഒന്നായിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" ++msgid "" ++"\"%s\" expects the first argument to be either \"any\", \"summary\", or " ++"\"description\", or \"location\", or \"attendee\", or \"organizer\", or " ++"\"classification\"" ++msgstr "" ++"ആദ്യത്തെ ആര്‍ഗ്യുമെന്‍റ് \"any\", \"summary\", \"description\", " ++"\"location\", \"attendee\", \"organizer\", \"classification\" എന്നിവയില്‍ " ++"ഒന്നായിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 + #, c-format +@@ -1690,18 +1724,26 @@ msgstr "\"%s\" ഒരു ആര്‍ഗ + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:893 + #, c-format +-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)" +-msgstr "\"%s\" എല്ലാ വാദങ്ങളും വാക്യങ്ങളോ അല്ലെങ്കിൽ ഒരേയൊരു വാദം ബൂലിയൻ തെറ്റോ (#f) ആകുമെന്ന് പ്രതീക്ഷിക്കുന്നു" ++msgid "" ++"\"%s\" expects all arguments to be strings or one and only one argument to " ++"be a boolean false (#f)" ++msgstr "" ++"\"%s\" എല്ലാ വാദങ്ങളും വാക്യങ്ങളോ അല്ലെങ്കിൽ ഒരേയൊരു വാദം ബൂലിയൻ തെറ്റോ (#f) " ++"ആകുമെന്ന് പ്രതീക്ഷിക്കുന്നു" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389 + #, c-format + msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" +-msgstr "ആദ്യത്തെ ആര്‍ഗ്യുമെന്‍റ് ഒരു ISO 8601 തീയതി/സമയത്തിന്‍റെ സ്ടിങ് ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" ++msgstr "" ++"ആദ്യത്തെ ആര്‍ഗ്യുമെന്‍റ് ഒരു ISO 8601 തീയതി/സമയത്തിന്‍റെ സ്ടിങ് " ++"ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450 + #, c-format + msgid "\"%s\" expects the second argument to be an integer" +-msgstr "രണ്ടാമത്തെ ആര്‍ഗ്യുമെന്‍റ് ഒരു ഇന്‍റിജര്‍ ആയിരിക്കുമെന്ന് \"%s\" പ്രതീക്ഷിക്കുന്നു" ++msgstr "" ++"രണ്ടാമത്തെ ആര്‍ഗ്യുമെന്‍റ് ഒരു ഇന്‍റിജര്‍ ആയിരിക്കുമെന്ന് \"%s\" " ++"പ്രതീക്ഷിക്കുന്നു" + + #: ../calendar/libedata-cal/e-data-cal.c:763 + msgid "Unsupported method" +@@ -1738,10 +1780,9 @@ msgstr "കലണ്ടര്‍ ഒബ� + + #. Translators: This is prefix to a detailed error message + #: ../calendar/libedata-cal/e-data-cal.c:1494 +-#, fuzzy +-#| msgid "Cannot save calendar data" + msgid "Cannot retrieve calendar free/busy list: " +-msgstr "കലണ്ടറിലുളള ഡേറ്റാ സൂക്ഷിക്കുവാന്‍ സാധ്യമല്ല" ++msgstr "" ++"കലണ്ടര്‍ ഉപയോഗിയ്ക്കാത്ത/തിരക്കിലുള്ള പട്ടിക വീണ്ടെടുക്കുവാന്‍ സാധ്യമല്ല:" + + #. Translators: This is prefix to a detailed error message + #: ../calendar/libedata-cal/e-data-cal.c:1535 +@@ -1780,17 +1821,13 @@ msgstr "അറിയിപ്പു് � + + #. Translators: This is prefix to a detailed error message + #: ../calendar/libedata-cal/e-data-cal.c:1917 +-#, fuzzy +-#| msgid "Could not generate encrypting data: %s" + msgid "Could not get calendar view path: " +-msgstr "എന്‍ക്രിപ്റ്റിങ് ഡേറ്റാ ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല: %s" ++msgstr "കലണ്ടറിനുള്ള കാഴ്ച പാത ലഭ്യമാക്കുവാനായില്ല:" + + #. Translators: This is prefix to a detailed error message + #: ../calendar/libedata-cal/e-data-cal.c:1963 +-#, fuzzy +-#| msgid "Could not retrieve weather data" + msgid "Could not retrieve calendar time zone: " +-msgstr "കാലാവസ്ഥ സംബന്ധിച്ചുളള വിവരങ്ങള്‍ ലഭ്യമായില്ല" ++msgstr "കലണ്ടര്‍ സമയ മേഘല വീണ്ടെടുക്കുവാന്‍ സാധ്യമല്ല:" + + #. Translators: This is prefix to a detailed error message + #: ../calendar/libedata-cal/e-data-cal.c:2007 +@@ -1820,12 +1857,15 @@ msgstr "ഈ സിഫര്‍ രഹസ + #: ../camel/camel-cipher-context.c:264 + #, c-format + msgid "You may not import keys with this cipher" +-msgstr "ഈ സിഫര്‍ ഉപയോഗിച്ചു് നിങ്ങള്‍ക്കു് കീകള്‍ ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല" ++msgstr "" ++"ഈ സിഫര്‍ ഉപയോഗിച്ചു് നിങ്ങള്‍ക്കു് കീകള്‍ ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല" + + #: ../camel/camel-cipher-context.c:278 + #, c-format + msgid "You may not export keys with this cipher" +-msgstr "ഈ സിഫര്‍ ഉപയോഗിച്ചു് നിങ്ങള്‍ക്കു് കീകള്‍ എക്സ്പോര്‍ട്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല" ++msgstr "" ++"ഈ സിഫര്‍ ഉപയോഗിച്ചു് നിങ്ങള്‍ക്കു് കീകള്‍ എക്സ്പോര്‍ട്ട് ചെയ്യുവാന്‍ " ++"സാധ്യമല്ല" + + #: ../camel/camel-cipher-context.c:819 + msgid "Signing message" +@@ -1891,10 +1931,8 @@ msgstr "ഓഫ് ലൈനിലായ� + + #: ../camel/camel-disco-folder.c:489 + #: ../camel/camel-offline-folder.c:336 +-#, fuzzy +-#| msgid "Copy folder content locally for offline operation" + msgid "Copy folder content locally for _offline operation" +-msgstr "ഓഫ് ലൈന്‍ പ്രക്രിയയ്ക്കായി ഫോള്‍ഡറിലുളളവ ലോക്കലായി പകര്‍ത്തുക" ++msgstr "_ഓഫ് ലൈന്‍ പ്രക്രിയയ്ക്കായി ഫോള്‍ഡറിലുളളവ ലോക്കലായി പകര്‍ത്തുക" + + #: ../camel/camel-disco-store.c:475 + #: ../camel/camel-imapx-folder.c:478 +@@ -1909,12 +1947,15 @@ msgstr "ഓഫ് ലൈന്‍ പ് + #: ../camel/camel-imapx-store.c:1592 + #: ../camel/camel-imapx-store.c:1681 + #: ../camel/camel-imapx-store.c:1730 +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 +-#: ../camel/providers/pop3/camel-pop3-folder.c:677 +-#: ../camel/providers/pop3/camel-pop3-folder.c:906 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1106 +-#: ../camel/providers/pop3/camel-pop3-store.c:472 +-#: ../camel/providers/pop3/camel-pop3-store.c:896 ++#: ../camel/providers/pop3/camel-pop3-folder.c:555 ++#: ../camel/providers/pop3/camel-pop3-folder.c:705 ++#: ../camel/providers/pop3/camel-pop3-folder.c:940 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1150 ++#: ../camel/providers/pop3/camel-pop3-store.c:291 ++#: ../camel/providers/pop3/camel-pop3-store.c:519 ++#: ../camel/providers/pop3/camel-pop3-store.c:567 ++#: ../camel/providers/pop3/camel-pop3-store.c:652 ++#: ../camel/providers/pop3/camel-pop3-store.c:1052 + #, c-format + msgid "You must be working online to complete this operation" + msgstr "ഈ പ്രക്രിയ പൂര്‍ത്തിയാക്കുന്നതിനായി നിങ്ങള്‍ ഓണ്‍ ലൈന്‍ ആയിരിക്കണം" +@@ -1935,74 +1976,74 @@ msgstr "ചൈള്‍ഡ് പ്ര� + msgid "Invalid message stream received from %s: %s" + msgstr "%s-ല്‍ നിന്നും അസാധുവായ സന്ദേശം ലഭിച്ചിരിക്കുന്നു: %s" + +-#: ../camel/camel-filter-driver.c:1170 +-#: ../camel/camel-filter-driver.c:1179 ++#: ../camel/camel-filter-driver.c:1171 ++#: ../camel/camel-filter-driver.c:1180 + msgid "Syncing folders" + msgstr "ഫോള്‍ഡറുകള്‍ സിന്‍ക് ചെയ്യുന്നു" + +-#: ../camel/camel-filter-driver.c:1277 ++#: ../camel/camel-filter-driver.c:1278 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "ഫില്‍റ്റര്‍ പാര്‍സ് ചെയ്യുന്നതില്‍ പിശക്: %s: %s" + +-#: ../camel/camel-filter-driver.c:1288 ++#: ../camel/camel-filter-driver.c:1289 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "ഫില്‍റ്റര്‍ നടപ്പാക്കുന്നതില്‍ പിശക്: %s: %s" + +-#: ../camel/camel-filter-driver.c:1384 ++#: ../camel/camel-filter-driver.c:1385 + #, c-format + msgid "Unable to open spool folder" + msgstr "സ്പൂള്‍ ഫോള്‍ഡര്‍ തുറക്കുവാന്‍ സാധ്യമല്ല" + +-#: ../camel/camel-filter-driver.c:1396 ++#: ../camel/camel-filter-driver.c:1397 + #, c-format + msgid "Unable to process spool folder" + msgstr "സ്പൂള്‍ ഫോള്‍ഡര്‍ പ്രവര്‍ത്തിപ്പിക്കുവാന്‍ സാധ്യമല്ല" + +-#: ../camel/camel-filter-driver.c:1419 ++#: ../camel/camel-filter-driver.c:1420 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "സന്ദേശം ലഭ്യമാകുന്നു %d (%d%%)" + +-#: ../camel/camel-filter-driver.c:1428 +-#: ../camel/camel-filter-driver.c:1450 ++#: ../camel/camel-filter-driver.c:1429 ++#: ../camel/camel-filter-driver.c:1451 + #, c-format + msgid "Failed on message %d" + msgstr "%d സന്ദേശത്തില്‍ പരാജയപ്പെട്ടു" + +-#: ../camel/camel-filter-driver.c:1469 +-#: ../camel/camel-filter-driver.c:1583 ++#: ../camel/camel-filter-driver.c:1470 ++#: ../camel/camel-filter-driver.c:1584 + msgid "Syncing folder" + msgstr "ഫോള്‍ഡര്‍ സിന്‍ക് ചെയ്യുന്നു" + +-#: ../camel/camel-filter-driver.c:1474 +-#: ../camel/camel-filter-driver.c:1591 ++#: ../camel/camel-filter-driver.c:1475 ++#: ../camel/camel-filter-driver.c:1592 + msgid "Complete" + msgstr "പൂര്‍ത്തിയായിരിക്കുന്നു" + +-#: ../camel/camel-filter-driver.c:1537 ++#: ../camel/camel-filter-driver.c:1538 + #, c-format + msgid "Getting message %d of %d" + msgstr "%d-ന്‍റെ %d സന്ദേശം ലഭ്യമാകുന്നു" + +-#: ../camel/camel-filter-driver.c:1555 ++#: ../camel/camel-filter-driver.c:1556 + #, c-format + msgid "Failed at message %d of %d" + msgstr "%d-ന്‍റെ %d-ല്‍ സന്ദേശം പരാജയപ്പെട്ടിരിക്കുന്നു" + +-#: ../camel/camel-filter-driver.c:1751 +-#: ../camel/camel-filter-driver.c:1785 ++#: ../camel/camel-filter-driver.c:1752 ++#: ../camel/camel-filter-driver.c:1786 + #, c-format + msgid "Execution of filter '%s' failed: " + msgstr "'%s' ഫില്‍റ്റര്‍ നടപ്പിലാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: " + +-#: ../camel/camel-filter-driver.c:1775 ++#: ../camel/camel-filter-driver.c:1776 + #, c-format + msgid "Error parsing filter '%s': %s: %s" + msgstr "'%s' ഫില്‍റ്റര്‍ പാഴ്സ് ചെയ്യുന്നതില്‍ പിശക്: %s: %s" + +-#: ../camel/camel-filter-driver.c:1794 ++#: ../camel/camel-filter-driver.c:1795 + #, c-format + msgid "Error executing filter '%s': %s: %s" + msgstr "'%s' ഫില്‍റ്റര്‍ നടപ്പിലാക്കുന്നതില്‍ പിശക്: %s: %s" +@@ -2025,62 +2066,57 @@ msgstr "അസാധുവായ ആര� + msgid "Error executing filter search: %s: %s" + msgstr "ഫില്‍റ്റര്‍ തിരച്ചില്‍ നടപ്പാക്കുന്നതില്‍ പിശക്: %s: %s" + +-#: ../camel/camel-folder.c:291 +-#, fuzzy, c-format +-#| msgid "Scanning for changed messages in %s" ++#: ../camel/camel-folder.c:310 ++#, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" +-msgstr[0] "%s-ല്‍ മാറ്റം വന്നിരിക്കുന്ന സന്ദേശങ്ങള്‍ക്കായി പരിശോധിക്കുന്നു" +-msgstr[1] "%s-ല്‍ മാറ്റം വന്നിരിക്കുന്ന സന്ദേശങ്ങള്‍ക്കായി പരിശോധിക്കുന്നു" ++msgstr[0] "'%s'-ലുള്ള പുതിയ സ്പാം സന്ദേശത്തപ്പറ്റി പഠിയ്ക്കുക" ++msgstr[1] "'%s'-ലുള്ള പുതിയ സ്പാം സന്ദേശങ്ങളെപ്പറ്റി പഠിയ്ക്കുക" + +-#: ../camel/camel-folder.c:331 +-#, fuzzy, c-format +-#| msgid "Scanning for changed messages in %s" ++#: ../camel/camel-folder.c:350 ++#, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" +-msgstr[0] "%s-ല്‍ മാറ്റം വന്നിരിക്കുന്ന സന്ദേശങ്ങള്‍ക്കായി പരിശോധിക്കുന്നു" +-msgstr[1] "%s-ല്‍ മാറ്റം വന്നിരിക്കുന്ന സന്ദേശങ്ങള്‍ക്കായി പരിശോധിക്കുന്നു" ++msgstr[0] "'%s'-ലുള്ള പുതിയ ഹാം സന്ദേശത്തപ്പറ്റി പഠിയ്ക്കുക" ++msgstr[1] "'%s'-ലുള്ള പുതിയ ഹാം സന്ദേശങ്ങളെപ്പറ്റി പഠിയ്ക്കുക" + +-#: ../camel/camel-folder.c:379 +-#, fuzzy, c-format +-#| msgid "Filtering new message(s)" ++#: ../camel/camel-folder.c:398 ++#, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" +-msgstr[0] "പുതിയ സന്ദേശങ്ങള്‍ ഫില്‍റ്റര്‍ ചെയ്യുക" +-msgstr[1] "പുതിയ സന്ദേശങ്ങള്‍ ഫില്‍റ്റര്‍ ചെയ്യുക" ++msgstr[0] "'%s'-ലുള്ള പുതിയ സന്ദേശം ഫില്‍റ്റര്‍ ചെയ്യുന്നു" ++msgstr[1] "'%s'-ലുള്ള പുതിയ സന്ദേങ്ങള്‍ ഫില്‍റ്റര്‍ ചെയ്യുന്നു" + +-#: ../camel/camel-folder.c:953 ++#: ../camel/camel-folder.c:972 + #: ../camel/providers/local/camel-maildir-folder.c:321 + msgid "Moving messages" + msgstr "സന്ദേശങ്ങള്‍ മാറ്റുന്നു" + +-#: ../camel/camel-folder.c:956 ++#: ../camel/camel-folder.c:975 + msgid "Copying messages" + msgstr "സന്ദേശങ്ങള്‍ പകര്‍ത്തുന്നു" + +-#: ../camel/camel-folder.c:1276 ++#: ../camel/camel-folder.c:1295 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "'%s' ഫോള്‍ഡറിനു് കോട്ടാ വിവരങ്ങള്‍ക്കുള്ള പിന്തുണ ലഭ്യമല്ല" + +-#: ../camel/camel-folder.c:3509 +-#, fuzzy, c-format +-#| msgid "Expunging old messages" ++#: ../camel/camel-folder.c:3528 ++#, c-format + msgid "Expunging folder '%s'" +-msgstr "പഴയ സന്ദേശങ്ങള്‍ എടുത്ത് കളയുന്നു" ++msgstr "'%s' എടുത്ത് കളയുന്നു" + +-#: ../camel/camel-folder.c:3741 +-#, fuzzy, c-format +-#| msgid "Retrieving POP message %d" ++#: ../camel/camel-folder.c:3760 ++#, c-format + msgid "Retrieving message '%s' in %s" +-msgstr "POP സന്ദേശം %d ലഭ്യമാക്കുന്നു" ++msgstr "'%s' സന്ദേശം ലഭ്യമാക്കുന്നു, %s-ല്‍" + +-#: ../camel/camel-folder.c:3892 ++#: ../camel/camel-folder.c:3911 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "'%s'-നുള്ള കോട്ട വിവരം ലഭ്യമാക്കുന്നു" + +-#: ../camel/camel-folder.c:4124 ++#: ../camel/camel-folder.c:4143 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "'%s' ഫോള്‍ഡര്‍ പുതുക്കുന്നു" +@@ -2120,39 +2156,34 @@ msgstr "(%s) ഒരു ഫോള്‍� + #: ../camel/camel-folder-search.c:1862 + #: ../camel/camel-folder-search.c:2029 + #, c-format +-msgid "" +-"Cannot parse search expression: %s:\n" ++msgid "Cannot parse search expression: %s:\n" + "%s" +-msgstr "" +-"തിരച്ചിലിനുളള പ്രയോഗം പാഴ്സ് ചെയ്യുവാന്‍ സാധ്യമായില്ല: %s:\n" ++msgstr "തിരച്ചിലിനുളള പ്രയോഗം പാഴ്സ് ചെയ്യുവാന്‍ സാധ്യമായില്ല: %s:\n" + "%s" + + #: ../camel/camel-folder-search.c:1874 + #: ../camel/camel-folder-search.c:2041 + #, c-format +-msgid "" +-"Error executing search expression: %s:\n" ++msgid "Error executing search expression: %s:\n" + "%s" +-msgstr "" +-"തിരച്ചിലിനുളള പ്രയോഗം നടപ്പാക്കുന്നതില്‍ പിശക്: %s:\n" ++msgstr "തിരച്ചിലിനുളള പ്രയോഗം നടപ്പാക്കുന്നതില്‍ പിശക്: %s:\n" + "%s" + +-#: ../camel/camel-gpg-context.c:691 +-#: ../camel/camel-gpg-context.c:696 +-#: ../camel/camel-gpg-context.c:1359 ++#: ../camel/camel-gpg-context.c:730 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/camel-gpg-context.c:1398 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "gpg നടപ്പിലാക്കുന്നതില്‍ പരാജയം: %s" + +-#: ../camel/camel-gpg-context.c:696 +-#: ../camel/providers/smtp/camel-smtp-transport.c:926 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/providers/smtp/camel-smtp-transport.c:918 + msgid "Unknown" + msgstr "അറിയപ്പെടാത്ത" + +-#: ../camel/camel-gpg-context.c:761 ++#: ../camel/camel-gpg-context.c:800 + #, c-format +-msgid "" +-"Unexpected GnuPG status message encountered:\n" ++msgid "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" + msgstr "" +@@ -2160,86 +2191,90 @@ msgstr "" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:797 ++#: ../camel/camel-gpg-context.c:836 + #, c-format + msgid "Failed to parse gpg userid hint." + msgstr "gpg userid-യുടെ സൂചന പാഴ്സ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു." + +-#: ../camel/camel-gpg-context.c:822 +-#: ../camel/camel-gpg-context.c:837 ++#: ../camel/camel-gpg-context.c:861 ++#: ../camel/camel-gpg-context.c:876 + #, c-format + msgid "Failed to parse gpg passphrase request." + msgstr "gpg പാസ്സ് ഫ്രെയിസിന്‍റെ ആവശ്യം പാഴ്സ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു." + +-#: ../camel/camel-gpg-context.c:858 ++#: ../camel/camel-gpg-context.c:897 + #, c-format +-msgid "" +-"You need a PIN to unlock the key for your\n" ++msgid "You need a PIN to unlock the key for your\n" + "SmartCard: \"%s\"" +-msgstr "" +-"നിങ്ങളുടെ SmartCard തുറക്കുന്നതിനുളള\n" ++msgstr "നിങ്ങളുടെ SmartCard തുറക്കുന്നതിനുളള\n" + "PIN ആവശ്യമുണ്ട്: \"%s\"" + +-#: ../camel/camel-gpg-context.c:862 ++#: ../camel/camel-gpg-context.c:901 + #, c-format +-msgid "" +-"You need a passphrase to unlock the key for\n" ++msgid "You need a passphrase to unlock the key for\n" + "user: \"%s\"" +-msgstr "" +-"ഉപയോഗിക്കുന്ന ആളിന് ആവശ്യമുളള\n" ++msgstr "ഉപയോഗിക്കുന്ന ആളിന് ആവശ്യമുളള\n" + "പാസ്സ് ഫ്രെയിസ് ആവശ്യമുണ്ട്: \"%s\"" + +-#: ../camel/camel-gpg-context.c:868 ++#: ../camel/camel-gpg-context.c:907 + #, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "`%s'-നു് GnuPG-ല്‍ നിന്നും അപ്രതീക്ഷിതമായ ആവശ്യം" + +-#: ../camel/camel-gpg-context.c:880 +-msgid "Note the encrypted content doesn't contain information about a recipient, thus there will be a password prompt for each of stored private key." +-msgstr "രഹസ്യ ഉള്ളടക്കം ഒരു സ്വീകർത്താവിനെക്കുറിച്ചുള്ള വിവരം അടങ്ങുന്നതല്ല എന്ന് ഉറപ്പുവരുത്തുക, അതുകൊണ്ട് എല്ലാ സൂക്ഷിച്ചിരിക്കുന്ന സ്വകാര്യ താക്കോലിനും ഒരു രഹസ്യവാക്ക് പ്രചോദനം ഉണ്ടാകും." ++#: ../camel/camel-gpg-context.c:919 ++msgid "" ++"Note the encrypted content doesn't contain information about a recipient, " ++"thus there will be a password prompt for each of stored private key." ++msgstr "" ++"രഹസ്യ ഉള്ളടക്കം ഒരു സ്വീകർത്താവിനെക്കുറിച്ചുള്ള വിവരം അടങ്ങുന്നതല്ല എന്ന് " ++"ഉറപ്പുവരുത്തുക, അതുകൊണ്ട് എല്ലാ സൂക്ഷിച്ചിരിക്കുന്ന സ്വകാര്യ താക്കോലിനും ഒരു " ++"രഹസ്യവാക്ക് പ്രചോദനം ഉണ്ടാകും." + +-#: ../camel/camel-gpg-context.c:911 +-#: ../camel/camel-net-utils.c:523 ++#: ../camel/camel-gpg-context.c:950 ++#: ../camel/camel-net-utils.c:524 + #: ../camel/camel-tcp-stream-raw.c:268 +-#: ../camel/providers/nntp/camel-nntp-summary.c:388 ++#: ../camel/providers/nntp/camel-nntp-summary.c:402 + #: ../libedataserver/e-client.c:152 + #, c-format + msgid "Cancelled" + msgstr "റദ്ദാക്കിയിരിയ്ക്കുന്നു" + +-#: ../camel/camel-gpg-context.c:932 ++#: ../camel/camel-gpg-context.c:971 + #, c-format + msgid "Failed to unlock secret key: 3 bad passphrases given." +-msgstr "രഹസ്യ പൂട്ട് തുറക്കുവാന്‍ പരാജയപ്പെട്ടു: 3 തെറ്റായ പാസ്സ് ഫ്രെയിസുകള്‍ നല്‍കിയിരിക്കുന്നു." ++msgstr "" ++"രഹസ്യ പൂട്ട് തുറക്കുവാന്‍ പരാജയപ്പെട്ടു: 3 തെറ്റായ പാസ്സ് ഫ്രെയിസുകള്‍ " ++"നല്‍കിയിരിക്കുന്നു." + +-#: ../camel/camel-gpg-context.c:945 ++#: ../camel/camel-gpg-context.c:984 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "GnuPG-ല്‍ നിന്നും അപ്രതീക്ഷിതമായ മറുപടി: %s" + +-#: ../camel/camel-gpg-context.c:1076 ++#: ../camel/camel-gpg-context.c:1115 + #, c-format + msgid "Failed to encrypt: No valid recipients specified." +-msgstr "രഹസ്യഭാഷയിലാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: No valid recipients specified." ++msgstr "" ++"രഹസ്യഭാഷയിലാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: No valid recipients specified." + +-#: ../camel/camel-gpg-context.c:1626 ++#: ../camel/camel-gpg-context.c:1665 + #: ../camel/camel-smime-context.c:846 + msgid "Could not generate signing data: " + msgstr "ഒപ്പിടല്‍ വിവരം തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല: " + +-#: ../camel/camel-gpg-context.c:1675 +-#: ../camel/camel-gpg-context.c:1879 +-#: ../camel/camel-gpg-context.c:1989 +-#: ../camel/camel-gpg-context.c:2136 +-#: ../camel/camel-gpg-context.c:2236 +-#: ../camel/camel-gpg-context.c:2284 ++#: ../camel/camel-gpg-context.c:1714 ++#: ../camel/camel-gpg-context.c:1918 ++#: ../camel/camel-gpg-context.c:2028 ++#: ../camel/camel-gpg-context.c:2179 ++#: ../camel/camel-gpg-context.c:2279 ++#: ../camel/camel-gpg-context.c:2327 + msgid "Failed to execute gpg." + msgstr "gpg നടപ്പിലാക്കുന്നതില്‍ പരാജയം" + +-#: ../camel/camel-gpg-context.c:1754 +-#: ../camel/camel-gpg-context.c:1762 +-#: ../camel/camel-gpg-context.c:1770 +-#: ../camel/camel-gpg-context.c:1790 ++#: ../camel/camel-gpg-context.c:1793 ++#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1809 ++#: ../camel/camel-gpg-context.c:1829 + #: ../camel/camel-smime-context.c:973 + #: ../camel/camel-smime-context.c:987 + #: ../camel/camel-smime-context.c:996 +@@ -2247,31 +2282,31 @@ msgstr "gpg നടപ്പിലാക� + msgid "Cannot verify message signature: Incorrect message format" + msgstr "സന്ദേശത്തിന്റെ ഒപ്പ് പരിശോധിക്കുവാന്‍ സാധ്യമല്ല: തെറ്റായ സന്ദേശ മാതൃക" + +-#: ../camel/camel-gpg-context.c:1832 ++#: ../camel/camel-gpg-context.c:1871 + msgid "Cannot verify message signature: " + msgstr "സന്ദേശത്തിനുള്ള ഒപ്പു് ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല: " + +-#: ../camel/camel-gpg-context.c:1955 ++#: ../camel/camel-gpg-context.c:1994 + msgid "Could not generate encrypting data: " + msgstr "എന്‍ക്രിപ്റ്റ് ചെയ്യുവാനുള്ള ഡേറ്റാ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല: " + +-#: ../camel/camel-gpg-context.c:2008 ++#: ../camel/camel-gpg-context.c:2047 + msgid "This is a digitally encrypted message part" + msgstr "ഇതു് ഡിജിറ്റലായി എന്‍ക്രിപ്റ്റ് ചെയ്ത സന്ദേശത്തിന്റെ ഭാഗമാണു്" + +-#: ../camel/camel-gpg-context.c:2066 +-#: ../camel/camel-gpg-context.c:2075 +-#: ../camel/camel-gpg-context.c:2098 ++#: ../camel/camel-gpg-context.c:2105 ++#: ../camel/camel-gpg-context.c:2114 ++#: ../camel/camel-gpg-context.c:2137 + #, c-format + msgid "Cannot decrypt message: Incorrect message format" + msgstr "സന്ദേശം ഡീക്രിപ്റ്റ് ചെയ്യുവാന്‍ സാധ്യമല്ല: തെറ്റായ സന്ദേശ ശൈലി" + +-#: ../camel/camel-gpg-context.c:2086 ++#: ../camel/camel-gpg-context.c:2125 + #, c-format + msgid "Failed to decrypt MIME part: protocol error" + msgstr "MIME ഭാഗം ഡീക്രിപ്റ്റ് ചെയ്യുന്നതില്‍ പരാജയം: സമ്പ്രദായത്തില്‍ പിശക്" + +-#: ../camel/camel-gpg-context.c:2177 ++#: ../camel/camel-gpg-context.c:2220 + #: ../camel/camel-smime-context.c:1287 + msgid "Encrypted content" + msgstr "എന്‍ക്രിപ്റ്റ് ചെയ്ത ഉള്ളടക്കം" +@@ -2296,11 +2331,9 @@ msgid "Unable to move deleted messages" + msgstr "വെട്ടി നീക്കിയ സന്ദേശങ്ങള്‍ നീക്കുവാന്‍ സാധ്യമല്ല" + + #: ../camel/camel-imapx-folder.c:1119 +-#: ../camel/providers/nntp/camel-nntp-folder.c:738 +-#, fuzzy +-#| msgid "Cannot copy messages to the Trash folder" ++#: ../camel/providers/nntp/camel-nntp-folder.c:794 + msgid "Apply message _filters to this folder" +-msgstr "ചവറ്റുകുട്ടയിലേക്ക് സന്ദേശങ്ങള്‍ പകര്‍ത്തുവാന്‍ സാധ്യമല്ല" ++msgstr "ഈ ഫോള്‍ഡറിനു് സന്ദേശ ഫില്‍റ്ററു_കള്‍ ലഭ്യമാക്കുക" + + #: ../camel/camel-imapx-folder.c:1228 + #, c-format +@@ -2312,190 +2345,194 @@ msgstr "%s-നുള്ള ഫോള്� + msgid "Could not create cache for %s: " + msgstr "%s-നുള്ള ക്യാഷ് തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല: " + +-#: ../camel/camel-imapx-server.c:1279 ++#: ../camel/camel-imapx-server.c:1283 + msgid "Server disconnected" + msgstr "സര്‍വറിന്റെ കണക്ഷന്‍ വിഛേദിച്ചിരിയ്ക്കുന്നു" + +-#: ../camel/camel-imapx-server.c:1787 ++#: ../camel/camel-imapx-server.c:1772 + msgid "Error writing to cache stream" + msgstr "ക്യാഷ് സ്ട്രീമിലേക്കു് സൂക്ഷിയ്ക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:2997 ++#: ../camel/camel-imapx-server.c:2441 ++#, c-format ++msgid "Alert from IMAP server %s:\n" ++"%s" ++msgstr "IMAP സര്‍വര്‍ %s-ല്‍ നിന്നും അറിയിപ്പ്:\n" ++"%s" ++ ++#: ../camel/camel-imapx-server.c:3029 + #, c-format + msgid "Not authenticated" + msgstr "ആധികാരികത ഉറപ്പാക്കിയിട്ടില്ല" + +-#: ../camel/camel-imapx-server.c:3075 +-#, fuzzy +-#| msgid "Error performing search" ++#: ../camel/camel-imapx-server.c:3107 + msgid "Error performing IDLE" +-msgstr "തിരച്ചിലില്‍ തകരാറ്" ++msgstr "IDLE നടത്തുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:4032 ++#: ../camel/camel-imapx-server.c:3994 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" +-msgstr "സുരക്ഷിത മോഡില്‍ IMAP സര്‍വര്‍ %s-ലേക്ക് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമായില്ല: %s" ++msgstr "" ++"സുരക്ഷിത മോഡില്‍ IMAP സര്‍വര്‍ %s-ലേക്ക് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമായില്ല: %s" + +-#: ../camel/camel-imapx-server.c:4033 +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/camel-imapx-server.c:3995 ++#: ../camel/providers/smtp/camel-smtp-transport.c:203 + msgid "STARTTLS not supported" + msgstr "STARTTLS പിന്തുണയ്ക്കിന്നില്ല" + +-#: ../camel/camel-imapx-server.c:4072 ++#: ../camel/camel-imapx-server.c:4034 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " +-msgstr "സുരക്ഷ മോഡില്‍ IMAP സര്‍വര്‍ %s-ലേക്കു് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു:" ++msgstr "" ++"സുരക്ഷ മോഡില്‍ IMAP സര്‍വര്‍ %s-ലേക്കു് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു:" + +-#: ../camel/camel-imapx-server.c:4152 ++#: ../camel/camel-imapx-server.c:4114 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP സര്‍വര്‍ %s, %s ആധികാരികത ഉറപ്പാക്കല്‍ പിന്തുണയ്ക്കുന്നില്ല" + +-#: ../camel/camel-imapx-server.c:4163 ++#: ../camel/camel-imapx-server.c:4125 + #: ../camel/camel-session.c:495 +-#: ../camel/providers/pop3/camel-pop3-store.c:272 +-#: ../camel/providers/pop3/camel-pop3-store.c:654 +-#: ../camel/providers/smtp/camel-smtp-transport.c:517 ++#: ../camel/providers/pop3/camel-pop3-store.c:303 ++#: ../camel/providers/pop3/camel-pop3-store.c:737 ++#: ../camel/providers/smtp/camel-smtp-transport.c:509 + #, c-format + msgid "No support for %s authentication" + msgstr "%s എന്ന ആധികാരികത ഉറപ്പാക്കലിനുള്ള പിന്തുണ ലഭ്യമല്ല" + +-#: ../camel/camel-imapx-server.c:4182 +-#: ../camel/providers/nntp/camel-nntp-store.c:362 +-#: ../camel/providers/nntp/camel-nntp-store.c:562 ++#: ../camel/camel-imapx-server.c:4144 ++#: ../camel/providers/nntp/camel-nntp-store.c:407 ++#: ../camel/providers/nntp/camel-nntp-store.c:595 + msgid "Cannot authenticate without a username" + msgstr "ഒരു ഉപയോക്തൃനാമമില്ലാതെ ആധികാരികത ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല" + +-#: ../camel/camel-imapx-server.c:4191 +-#: ../camel/providers/nntp/camel-nntp-store.c:571 +-#: ../camel/providers/pop3/camel-pop3-store.c:579 +-#: ../camel/providers/pop3/camel-pop3-store.c:599 ++#: ../camel/camel-imapx-server.c:4153 ++#: ../camel/providers/nntp/camel-nntp-store.c:604 ++#: ../camel/providers/pop3/camel-pop3-store.c:662 ++#: ../camel/providers/pop3/camel-pop3-store.c:682 + msgid "Authentication password not available" + msgstr "ആധികാരകത ഉറപ്പാക്കുന്നതിനുള്ള രഹസ്യവാക്ക് ലഭ്യമല്ല" + +-#: ../camel/camel-imapx-server.c:4399 ++#: ../camel/camel-imapx-server.c:4360 + msgid "Error fetching message" + msgstr "സന്ദേശം ലഭ്യമാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:4481 +-msgid "Failed to copy the tmp file" +-msgstr "tmp ഫയല്‍ പകര്‍ത്തുന്നതില്‍ പരാജയപ്പെട്ടു" +- +-#: ../camel/camel-imapx-server.c:4495 ++#: ../camel/camel-imapx-server.c:4410 ++#: ../camel/camel-imapx-server.c:4418 + msgid "Failed to close the tmp stream" + msgstr "tmp സ്ട്രീം അടയ്ക്കുന്നതില്‍ പരാജയപ്പെട്ടു" + +-#: ../camel/camel-imapx-server.c:4616 ++#: ../camel/camel-imapx-server.c:4447 ++msgid "Failed to copy the tmp file" ++msgstr "tmp ഫയല്‍ പകര്‍ത്തുന്നതില്‍ പരാജയപ്പെട്ടു" ++ ++#: ../camel/camel-imapx-server.c:4571 + msgid "Error copying messages" + msgstr "സന്ദേശങ്ങള്‍ പകര്‍ത്തുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:4782 ++#: ../camel/camel-imapx-server.c:4740 + msgid "Error appending message" + msgstr "സന്ദേശത്തില്‍ മാറ്റം വരുത്തുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:4981 ++#: ../camel/camel-imapx-server.c:4939 + msgid "Error fetching message headers" + msgstr "സന്ദേശങ്ങള്‍ക്കുള്ള ഹെ‍ഡറുകള്‍ ലഭ്യമാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:5132 ++#: ../camel/camel-imapx-server.c:5090 + msgid "Error retrieving message" + msgstr "സന്ദേശം ലഭ്യമാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:5263 +-#: ../camel/camel-imapx-server.c:5491 +-#, fuzzy, c-format +-#| msgid "Fetching summary information for new messages in %s" ++#: ../camel/camel-imapx-server.c:5221 ++#: ../camel/camel-imapx-server.c:5449 ++#, c-format + msgid "Fetching summary information for new messages in '%s'" +-msgstr "പുതിയ സന്ദേശങ്ങള്‍ക്കുളള സമ്മറി വിവരം %s-ല്‍ നിന്നും ലഭ്യമാക്കുന്നു" ++msgstr "" ++"പുതിയ സന്ദേശങ്ങള്‍ക്കുളള സംക്ഷിപ്ത വിവരം '%s'-ല്‍ നിന്നും ലഭ്യമാക്കുന്നു" + +-#: ../camel/camel-imapx-server.c:5327 ++#: ../camel/camel-imapx-server.c:5285 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "'%s'-ല്‍ മാറ്റം വന്നിരിക്കുന്ന സന്ദേശങ്ങള്‍ക്കായി പരിശോധിക്കുന്നു" + +-#: ../camel/camel-imapx-server.c:5380 ++#: ../camel/camel-imapx-server.c:5338 + msgid "Error fetching new messages" + msgstr "പുതിയ സന്ദേശങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:5593 ++#: ../camel/camel-imapx-server.c:5551 + msgid "Error while fetching messages" + msgstr "സന്ദേശങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:5601 +-#: ../camel/camel-imapx-server.c:5634 +-#, fuzzy, c-format +-#| msgid "Fetching summary information for new messages in %s" ++#: ../camel/camel-imapx-server.c:5559 ++#: ../camel/camel-imapx-server.c:5592 ++#, c-format + msgid "Fetching summary information for %d message in '%s'" + msgid_plural "Fetching summary information for %d messages in '%s'" +-msgstr[0] "പുതിയ സന്ദേശങ്ങള്‍ക്കുളള സമ്മറി വിവരം %s-ല്‍ നിന്നും ലഭ്യമാക്കുന്നു" +-msgstr[1] "പുതിയ സന്ദേശങ്ങള്‍ക്കുളള സമ്മറി വിവരം %s-ല്‍ നിന്നും ലഭ്യമാക്കുന്നു" ++msgstr[0] "%d സന്ദേശത്തിനുള്ള സംഗ്രഹ വിവരം '%s'-ല്‍ നിന്നും ലഭ്യമാക്കുന്നു" ++msgstr[1] "" ++"%d സന്ദേശങ്ങള്‍ക്കുള്ള സംഗ്രഹ വിവരം '%s'-ല്‍ നിന്നും ലഭ്യമാക്കുന്നു" + +-#: ../camel/camel-imapx-server.c:5770 +-#: ../camel/camel-imapx-server.c:5800 ++#: ../camel/camel-imapx-server.c:5728 ++#: ../camel/camel-imapx-server.c:5758 + msgid "Error refreshing folder" + msgstr "ഫോള്‍ഡര്‍ പുതുക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:5924 +-#, fuzzy +-#| msgid "Expunging old messages" ++#: ../camel/camel-imapx-server.c:5882 + msgid "Error expunging message" +-msgstr "പഴയ സന്ദേശങ്ങള്‍ എടുത്ത് കളയുന്നു" ++msgstr "സന്ദേശം ഒഴിവാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:6035 ++#: ../camel/camel-imapx-server.c:5993 + msgid "Error fetching folders" + msgstr "ഫോള്‍ഡറുകള്‍ ലഭ്യമാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:6117 ++#: ../camel/camel-imapx-server.c:6075 + msgid "Error subscribing to folder" + msgstr "ഫോള്‍ഡറിലേക്കു് അംഗമാകുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:6182 ++#: ../camel/camel-imapx-server.c:6140 + msgid "Error creating folder" + msgstr "ഫോള്‍ഡര്‍ തയ്യാറാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:6236 ++#: ../camel/camel-imapx-server.c:6194 + msgid "Error deleting folder" + msgstr "ഫോള്‍ഡര്‍ വെട്ടിന നീക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:6310 ++#: ../camel/camel-imapx-server.c:6268 + msgid "Error renaming folder" + msgstr "ഫോള്‍ഡറിന്റെ പേരു് മാറ്റുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:6385 ++#: ../camel/camel-imapx-server.c:6343 + msgid "Error retrieving quota information" + msgstr "കോട്ടാ വിവരം ലഭ്യമാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:6450 ++#: ../camel/camel-imapx-server.c:6408 + msgid "Search failed" + msgstr "തെരച്ചില്‍ പരാജയപ്പെട്ടു" + +-#: ../camel/camel-imapx-server.c:6513 ++#: ../camel/camel-imapx-server.c:6471 + msgid "Error performing NOOP" + msgstr "എന്‍ഒഒപി നടപ്പിലാക്കുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:6622 ++#: ../camel/camel-imapx-server.c:6580 + msgid "Error syncing changes" + msgstr "മാറ്റങ്ങള്‍ സിന്‍ക് ചെയ്യുന്നതില്‍ പിശക്" + +-#: ../camel/camel-imapx-server.c:7434 ++#: ../camel/camel-imapx-server.c:7385 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "സന്ദേശം ID %s ഉള്ള സന്ദേശം ലഭ്യമല്ല: %s" + +-#: ../camel/camel-imapx-server.c:7435 ++#: ../camel/camel-imapx-server.c:7386 + msgid "No such message available." + msgstr "അത്തരം സന്ദേശം ലഭ്യമല്ല" + +-#: ../camel/camel-imapx-server.c:7593 +-#: ../camel/camel-imapx-server.c:7608 ++#: ../camel/camel-imapx-server.c:7547 ++#: ../camel/camel-imapx-server.c:7562 + msgid "Cannot create spool file: " + msgstr "സ്പൂള്‍ ഫയല്‍ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല: " + +-#: ../camel/camel-imapx-server.c:8350 +-#, fuzzy +-#| msgid "IMAP server %s does not support requested authentication type %s" ++#: ../camel/camel-imapx-server.c:8304 + msgid "IMAP server does not support quotas" +-msgstr "IMAP സര്‍വര്‍ %s-ല്‍ %s എന്ന ആധികാരികത ഉറപ്പുവരുത്തല്‍ സംവിധാനത്തിന് പിന്തുണ ലഭ്യമല്ല" ++msgstr "IMAP സര്‍വര്‍ കോട്ടകള്‍ പിന്തുണയ്ക്കുന്നില്ല" + + #: ../camel/camel-imapx-store.c:249 + #, c-format +@@ -2514,8 +2551,11 @@ msgid "Password" + msgstr "പാസ്‍വേര്‍ഡ്" + + #: ../camel/camel-imapx-store.c:345 +-msgid "This option will connect to the IMAP server using a plaintext password." +-msgstr "ഒരു പ്ളെയിന്‍ ടെക്സ്റ്റ് ഉപയോഗിച്ച് IMAP സര്‍വറിലേക്ക് ഈ ഉപാധി കണക്ട് ചെയ്യുന്നു." ++msgid "" ++"This option will connect to the IMAP server using a plaintext password." ++msgstr "" ++"ഒരു പ്ളെയിന്‍ ടെക്സ്റ്റ് ഉപയോഗിച്ച് IMAP സര്‍വറിലേക്ക് ഈ ഉപാധി കണക്ട് " ++"ചെയ്യുന്നു." + + #: ../camel/camel-imapx-store.c:453 + #, c-format +@@ -2535,15 +2575,16 @@ msgid "Inbox" + msgstr "അയച്ച മെയിലുകള്‍" + + #: ../camel/camel-imapx-store.c:1231 +-#, fuzzy, c-format +-#| msgid "Preparing folder '%s' for offline" ++#, c-format + msgid "Retrieving folder list for %s" +-msgstr "ഓഫ് ലൈനിലായി '%s' തയ്യാറാക്കുന്നു" ++msgstr "%s-നുള്ള ഫോള്‍ഡര്‍ പട്ടിക ലഭ്യമാക്കുന്നു" + + #: ../camel/camel-imapx-store.c:1614 + #, c-format + msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" +-msgstr "\"%s\" എന്ന് ഫോള്‍ജറിന്‍റെ പേര് അസാധുവാണ്, കാരണം ഇതില്‍ \"%c\" എന്ന അക്ഷരം ഉണ്ട് എന്നതാണ്" ++msgstr "" ++"\"%s\" എന്ന് ഫോള്‍ജറിന്‍റെ പേര് അസാധുവാണ്, കാരണം ഇതില്‍ \"%c\" എന്ന അക്ഷരം " ++"ഉണ്ട് എന്നതാണ്" + + #: ../camel/camel-imapx-store.c:1625 + #, c-format +@@ -2571,10 +2612,11 @@ msgid "Could not create lock file for %s + msgstr "%s-നുളള ലോക്ക് ഫയല്‍ ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല: %s" + + #: ../camel/camel-lock.c:145 +-#, fuzzy, c-format +-#| msgid "Timed out trying to get lock file on %s. Try again later." ++#, c-format + msgid "Timed out trying to get lock file on %s. Try again later." +-msgstr "%s-നുളള ലോക്ക് ഫയല്‍ ലഭ്യമാകുന്നതിനുളള സമയം കഴിഞ്ഞിരിക്കുന്നു. പിന്നീട് വീണ്ടും ശ്രമിക്കുക." ++msgstr "" ++"%s-ലുള്ള ലോക്ക് ഫയല്‍ ലഭ്യമാക്കുവാനുള്ള ശ്രമത്തിന്റെ കാലാവധി കഴിഞ്ഞു. " ++"പിന്നീടു് വീണ്ടും ശ്രമിയ്ക്കുക." + + #: ../camel/camel-lock.c:205 + #, c-format +@@ -2677,38 +2719,42 @@ msgstr "ഒപ്പു് ലഭ്യ� + msgid "parse error" + msgstr "പാഴ്സ് പിശക്" + +-#: ../camel/camel-net-utils.c:703 ++#: ../camel/camel-net-utils.c:704 + #, c-format + msgid "Resolving: %s" + msgstr "ലഭ്യമാക്കുന്നു: %s" + +-#: ../camel/camel-net-utils.c:726 ++#: ../camel/camel-net-utils.c:727 + msgid "Host lookup failed" + msgstr "ഹോസ്റ്റ് തിരച്ചില്‍ പരാജയപ്പെട്ടു" + +-#: ../camel/camel-net-utils.c:732 ++#: ../camel/camel-net-utils.c:733 + #, c-format + msgid "Host lookup '%s' failed. Check your host name for spelling errors." +-msgstr "ഹോസ്റ്റ് തെരച്ചില്‍ '%s' പരാജയപ്പെട്ടു. അക്ഷരത്തെറ്റുകള്‍ക്കായി ഹോസ്റ്റ് നാമം പരിശോധിയ്ക്കുക." ++msgstr "" ++"ഹോസ്റ്റ് തെരച്ചില്‍ '%s' പരാജയപ്പെട്ടു. അക്ഷരത്തെറ്റുകള്‍ക്കായി ഹോസ്റ്റ് " ++"നാമം പരിശോധിയ്ക്കുക." + +-#: ../camel/camel-net-utils.c:736 ++#: ../camel/camel-net-utils.c:737 + #, c-format + msgid "Host lookup '%s' failed: %s" + msgstr "ഹോസ്റ്റ് തിരച്ചില്‍ '%s' പരാജയപ്പെട്ടു: %s" + +-#: ../camel/camel-net-utils.c:857 ++#: ../camel/camel-net-utils.c:858 + msgid "Resolving address" + msgstr "വിലാസം ലഭ്യമാക്കുന്നു" + +-#: ../camel/camel-net-utils.c:878 ++#: ../camel/camel-net-utils.c:879 + msgid "Name lookup failed" + msgstr "പേര് തിരച്ചില്‍ പരാജയപ്പെട്ടു" + +-#: ../camel/camel-net-utils.c:885 ++#: ../camel/camel-net-utils.c:886 + msgid "Name lookup failed. Check your host name for spelling errors." +-msgstr "നാമം തെരച്ചില്‍ പരാജയപ്പെട്ടു. ഹോസ്റ്റ്നാമത്തില്‍ അക്ഷരത്തെറ്റുണ്ടോ എന്നു് പരിശോധിയ്ക്കുക." ++msgstr "" ++"നാമം തെരച്ചില്‍ പരാജയപ്പെട്ടു. ഹോസ്റ്റ്നാമത്തില്‍ അക്ഷരത്തെറ്റുണ്ടോ എന്നു് " ++"പരിശോധിയ്ക്കുക." + +-#: ../camel/camel-net-utils.c:889 ++#: ../camel/camel-net-utils.c:890 + #, c-format + msgid "Name lookup failed: %s" + msgstr "പേര് തിരച്ചില്‍ പരാജയപ്പെട്ടു: %s" +@@ -2740,7 +2786,9 @@ msgstr "ഫോള്‍ഡറുകള� + #: ../camel/camel-provider.c:263 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." +-msgstr "%s ലോഡ് ചെയ്യുവാന്‍ സാധ്യമല്ല: ഈ സിസ്റ്റത്തില്‍ ഘടകങ്ങള്‍ ലോഡ് ചെയ്യുന്നത് അനുവദിക്കുന്നില്ല." ++msgstr "" ++"%s ലോഡ് ചെയ്യുവാന്‍ സാധ്യമല്ല: ഈ സിസ്റ്റത്തില്‍ ഘടകങ്ങള്‍ ലോഡ് ചെയ്യുന്നത് " ++"അനുവദിക്കുന്നില്ല." + + #: ../camel/camel-provider.c:272 + #, c-format +@@ -2750,7 +2798,8 @@ msgstr "%s ലോഡ് ചെയ്യ� + #: ../camel/camel-provider.c:281 + #, c-format + msgid "Could not load %s: No initialization code in module." +-msgstr "%s ലോഡ് ചെയ്യുവാന്‍ സാധ്യമായില്ല: ഇനിഷ്യലൈസേഷന്‍ കോഡ് ഘടകത്തില്‍ ലഭ്യമല്ല." ++msgstr "" ++"%s ലോഡ് ചെയ്യുവാന്‍ സാധ്യമായില്ല: ഇനിഷ്യലൈസേഷന്‍ കോഡ് ഘടകത്തില്‍ ലഭ്യമല്ല." + + #: ../camel/camel-provider.c:429 + #: ../camel/camel-session.c:407 +@@ -2765,7 +2814,9 @@ msgstr "അജ്ഞാതം" + + #: ../camel/camel-sasl-anonymous.c:37 + msgid "This option will connect to the server using an anonymous login." +-msgstr "ഈ ഉപാധി ഉപയോഗിച്ച് നിങ്ങള്‍ക്ക് സര്‍വറിലേക്ക് ഒരു അജ്ഞാതം ലോഗിന്‍ വഴി കണക്ട് ചെയ്യാവുന്നതാണ്." ++msgstr "" ++"ഈ ഉപാധി ഉപയോഗിച്ച് നിങ്ങള്‍ക്ക് സര്‍വറിലേക്ക് ഒരു അജ്ഞാതം ലോഗിന്‍ വഴി കണക്ട് " ++"ചെയ്യാവുന്നതാണ്." + + #: ../camel/camel-sasl-anonymous.c:70 + #, c-format +@@ -2774,29 +2825,23 @@ msgstr "ആധികാരികത ഉ� + + #: ../camel/camel-sasl-anonymous.c:81 + #, c-format +-msgid "" +-"Invalid email address trace information:\n" ++msgid "Invalid email address trace information:\n" + "%s" +-msgstr "" +-"തെറ്റായ ഈമെയില്‍ വിലാസ വിവരം:\n" ++msgstr "തെറ്റായ ഈമെയില്‍ വിലാസ വിവരം:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:95 + #, c-format +-msgid "" +-"Invalid opaque trace information:\n" ++msgid "Invalid opaque trace information:\n" + "%s" +-msgstr "" +-"Invalid opaque trace information:\n" ++msgstr "Invalid opaque trace information:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:109 + #, c-format +-msgid "" +-"Invalid trace information:\n" ++msgid "Invalid trace information:\n" + "%s" +-msgstr "" +-"Invalid trace information:\n" ++msgstr "Invalid trace information:\n" + "%s" + + #: ../camel/camel-sasl-cram-md5.c:46 +@@ -2804,16 +2849,24 @@ msgid "CRAM-MD5" + msgstr "CRAM-MD5" + + #: ../camel/camel-sasl-cram-md5.c:48 +-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it." +-msgstr "സര്‍വറിന്‍റെ പിന്തുണ ലഭ്യമെങ്കില്‍, ഈ ഉപാധി നിങ്ങളെ സര്‍വറിലേക്ക് ഒരു സുരക്ഷിത CRAM-MD5 പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് കണക്ട് ചെയ്യിക്കുന്നു." ++msgid "" ++"This option will connect to the server using a secure CRAM-MD5 password, if " ++"the server supports it." ++msgstr "" ++"സര്‍വറിന്‍റെ പിന്തുണ ലഭ്യമെങ്കില്‍, ഈ ഉപാധി നിങ്ങളെ സര്‍വറിലേക്ക് ഒരു " ++"സുരക്ഷിത CRAM-MD5 പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് കണക്ട് ചെയ്യിക്കുന്നു." + + #: ../camel/camel-sasl-digest-md5.c:59 + msgid "DIGEST-MD5" + msgstr "DIGEST-MD5" + + #: ../camel/camel-sasl-digest-md5.c:61 +-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it." +-msgstr "സര്‍വറിന്‍റെ പിന്തുണ ലഭ്യമെങ്കില്‍, ഈ ഉപാധി നിങ്ങളെ സര്‍വറിലേക്ക് ഒരു സുരക്ഷിത DIGEST-MD5 പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് കണക്ട് ചെയ്യിക്കുന്നു." ++msgid "" ++"This option will connect to the server using a secure DIGEST-MD5 password, " ++"if the server supports it." ++msgstr "" ++"സര്‍വറിന്‍റെ പിന്തുണ ലഭ്യമെങ്കില്‍, ഈ ഉപാധി നിങ്ങളെ സര്‍വറിലേക്ക് ഒരു " ++"സുരക്ഷിത DIGEST-MD5 പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് കണക്ട് ചെയ്യിക്കുന്നു." + + #: ../camel/camel-sasl-digest-md5.c:855 + #, c-format +@@ -2850,32 +2903,56 @@ msgid "GSSAPI" + msgstr "GSSAPI" + + #: ../camel/camel-sasl-gssapi.c:93 +-msgid "This option will connect to the server using Kerberos 5 authentication." +-msgstr "Kerberos 5-ലൂടെ ആധികാരികത ഉറപ്പാക്കി ഈ ഉപാധി സര്‍വറിലേക്ക് കണക്ട് ചെയ്യുന്നു." ++msgid "" ++"This option will connect to the server using Kerberos 5 authentication." ++msgstr "" ++"Kerberos 5-ലൂടെ ആധികാരികത ഉറപ്പാക്കി ഈ ഉപാധി സര്‍വറിലേക്ക് കണക്ട് ചെയ്യുന്നു." ++"" + + #: ../camel/camel-sasl-gssapi.c:134 +-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation." +-msgstr "നിർദ്ദേശിച്ചിരിക്കുന്ന രീതി തന്നിരിക്കുന്ന അധികാരപത്രം പിന്തുണയ്ക്കുന്നതല്ല, അല്ലെങ്കിൽ അത് നടപ്പിലാക്കലിന് തിരിച്ചറിയാൻ പറ്റുന്നില്ല" ++msgid "" ++"The specified mechanism is not supported by the provided credential, or is " ++"unrecognized by the implementation." ++msgstr "" ++"നിർദ്ദേശിച്ചിരിക്കുന്ന രീതി തന്നിരിക്കുന്ന അധികാരപത്രം പിന്തുണയ്ക്കുന്നതല്ല, " ++"അല്ലെങ്കിൽ അത് നടപ്പിലാക്കലിന് തിരിച്ചറിയാൻ പറ്റുന്നില്ല" + + #: ../camel/camel-sasl-gssapi.c:139 + msgid "The provided target_name parameter was ill-formed." +-msgstr "തെറ്റായ രീതിയില്‍ രൂപപ്പെട്ട target_name പരാമീറ്റര്‍ നല്‍കിയിരിക്കുന്നു." ++msgstr "" ++"തെറ്റായ രീതിയില്‍ രൂപപ്പെട്ട target_name പരാമീറ്റര്‍ നല്‍കിയിരിക്കുന്നു." + + #: ../camel/camel-sasl-gssapi.c:142 +-msgid "The provided target_name parameter contained an invalid or unsupported type of name." +-msgstr "തന്നിരിക്കുന്ന target_name സ്വഭാവം ഒരു അസാധുവായ അല്ലെങ്കിൽ പിന്തുണയ്ക്കാത്ത തരം പേര് ഉൾപ്പെട്ടതാണ്" ++msgid "" ++"The provided target_name parameter contained an invalid or unsupported type " ++"of name." ++msgstr "" ++"തന്നിരിക്കുന്ന target_name സ്വഭാവം ഒരു അസാധുവായ അല്ലെങ്കിൽ പിന്തുണയ്ക്കാത്ത " ++"തരം പേര് ഉൾപ്പെട്ടതാണ്" + + #: ../camel/camel-sasl-gssapi.c:146 +-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter." +-msgstr "input_token input_chan_bindings സ്വഭാവം നിർദ്ദേശിച്ചതുമായി വിവിധ ചാനൽ ബന്ധങ്ങൾ ഉൾപ്പെട്ടതാണ്" ++msgid "" ++"The input_token contains different channel bindings to those specified via " ++"the input_chan_bindings parameter." ++msgstr "" ++"input_token input_chan_bindings സ്വഭാവം നിർദ്ദേശിച്ചതുമായി വിവിധ ചാനൽ " ++"ബന്ധങ്ങൾ ഉൾപ്പെട്ടതാണ്" + + #: ../camel/camel-sasl-gssapi.c:151 +-msgid "The input_token contains an invalid signature, or a signature that could not be verified." +-msgstr "input_token അസാധുവായ ഒരു ഒപ്പ്, അല്ലെങ്കിൽ സാധൂകരിക്കാൻ പറ്റാത്ത ഒരു ഒപ്പ് അടങ്ങുന്നതാണ്" ++msgid "" ++"The input_token contains an invalid signature, or a signature that could not " ++"be verified." ++msgstr "" ++"input_token അസാധുവായ ഒരു ഒപ്പ്, അല്ലെങ്കിൽ സാധൂകരിക്കാൻ പറ്റാത്ത ഒരു ഒപ്പ് " ++"അടങ്ങുന്നതാണ്" + + #: ../camel/camel-sasl-gssapi.c:155 +-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials." +-msgstr "തന്നിട്ടുള്ള അധികാരപത്രങ്ങൾ ഉള്ളടക്ക ഉപക്രമത്തിന് സാധുവല്ല, അല്ലെങ്കിൽ അധികാരപത്ര കൈപ്പിടി ഏതെങ്കിലും അധികാരപത്രങ്ങൾ പരാമർശിച്ചില്ല" ++msgid "" ++"The supplied credentials were not valid for context initiation, or the " ++"credential handle did not reference any credentials." ++msgstr "" ++"തന്നിട്ടുള്ള അധികാരപത്രങ്ങൾ ഉള്ളടക്ക ഉപക്രമത്തിന് സാധുവല്ല, അല്ലെങ്കിൽ " ++"അധികാരപത്ര കൈപ്പിടി ഏതെങ്കിലും അധികാരപത്രങ്ങൾ പരാമർശിച്ചില്ല" + + #: ../camel/camel-sasl-gssapi.c:160 + msgid "The supplied context handle did not refer to a valid context." +@@ -2897,7 +2974,7 @@ msgstr "സൂചിപ്പിച്� + #: ../camel/camel-sasl-gssapi.c:340 + #: ../camel/camel-sasl-gssapi.c:388 + #: ../camel/camel-sasl-gssapi.c:405 +-#: ../camel/providers/smtp/camel-smtp-transport.c:624 ++#: ../camel/providers/smtp/camel-smtp-transport.c:616 + #, c-format + msgid "Bad authentication response from server." + msgstr "ആധികാരികത ഉറപ്പാക്കുന്നതില്‍ സര്‍വറില്‍ നിന്നും തെറ്റായ മറുപടി." +@@ -2914,20 +2991,25 @@ msgstr "ലോഗിന്‍" + #: ../camel/camel-sasl-login.c:42 + #: ../camel/camel-sasl-plain.c:46 + msgid "This option will connect to the server using a simple password." +-msgstr "ഈ ഉപാധി നിങ്ങളെ സര്‍വറിലേക്ക് ഒരു പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് കണക്ട് ചെയ്യുന്നു." ++msgstr "" ++"ഈ ഉപാധി നിങ്ങളെ സര്‍വറിലേക്ക് ഒരു പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് കണക്ട് ചെയ്യുന്നു." + + #: ../camel/camel-sasl-login.c:110 + #, c-format + msgid "Unknown authentication state." + msgstr "അപരിചിതമായ ആധികാരികത ഉറപ്പാക്കുന്ന അവസ്ഥ." + +-#: ../camel/camel-sasl-ntlm.c:47 ++#: ../camel/camel-sasl-ntlm.c:48 + msgid "NTLM / SPA" + msgstr "NTLM / SPA" + +-#: ../camel/camel-sasl-ntlm.c:49 +-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication." +-msgstr "NTLM / സുരക്ഷിത പാസ്‍വേര്‍ഡിലൂടെ ഒരു Windows സര്‍വറിലേക്ക് ആധികാരികത ഉറപ്പാക്കി കണ്ക്ട് ചെയ്യുന്നതിനായി ഈ ഉപാധി സഹായിക്കുന്നു " ++#: ../camel/camel-sasl-ntlm.c:50 ++msgid "" ++"This option will connect to a Windows-based server using NTLM / Secure " ++"Password Authentication." ++msgstr "" ++"NTLM / സുരക്ഷിത പാസ്‍വേര്‍ഡിലൂടെ ഒരു Windows സര്‍വറിലേക്ക് ആധികാരികത " ++"ഉറപ്പാക്കി കണ്ക്ട് ചെയ്യുന്നതിനായി ഈ ഉപാധി സഹായിക്കുന്നു " + + #: ../camel/camel-sasl-plain.c:44 + msgid "PLAIN" +@@ -2939,17 +3021,19 @@ msgstr "SMTP-യ്ക്ക് മു� + + #: ../camel/camel-sasl-popb4smtp.c:48 + msgid "This option will authorise a POP connection before attempting SMTP" +-msgstr "SMTP ശ്രമിക്കുന്നതിന് മുന്പ് ഒരു POP കണക്ഷനെ ഈ ഉപാധി അധികാരപ്പെടുത്തുന്നു" ++msgstr "" ++"SMTP ശ്രമിക്കുന്നതിന് മുന്പ് ഒരു POP കണക്ഷനെ ഈ ഉപാധി അധികാരപ്പെടുത്തുന്നു" + + #: ../camel/camel-sasl-popb4smtp.c:84 + msgid "POP Source UID" + msgstr "പിഒപി സോഴ്സ് യുഐഡി" + + #: ../camel/camel-sasl-popb4smtp.c:98 +-#, fuzzy, c-format +-#| msgid "POP Before SMTP auth using an unknown transport" ++#, c-format + msgid "POP Before SMTP authentication using an unknown transport" +-msgstr "SMTP auth-ന് മുന്പുളള POP ഒരു non-pop അപരിചിതമായ സംവിധാനം ഉപയോഗിക്കുന്നു" ++msgstr "" ++"അപരിചിതമായ ട്രാന്‍സ്പോര്‍ട്ട് ഉപയോഗിച്ചു് SMTP ആധികാരികത ഉറപ്പാക്കുന്നതിനു് " ++"മുമ്പു് POP" + + #: ../camel/camel-sasl-popb4smtp.c:110 + #: ../camel/camel-sasl-popb4smtp.c:119 +@@ -2973,10 +3057,8 @@ msgid "%s authentication failed" + msgstr "%s ആധികാരകത ഉറപ്പാക്കല്‍ പരാജയപ്പെട്ടു" + + #: ../camel/camel-session.c:646 +-#, fuzzy +-#| msgid "Operation not supported" + msgid "Forwarding messages is not supported" +-msgstr "പ്രക്രിയ പിന്തുണയ്ക്കപ്പെടുന്നില്ല" ++msgstr "സന്ദേശം ഫോര്‍വേഡ് ചെയ്യുന്നതു് പിന്തുണയ്ക്കുന്നില്ല" + + #. Translators: The first argument is the account type + #. * (e.g. "IMAP"), the second is the user name, and the +@@ -3109,12 +3191,15 @@ msgstr "സര്‍ട്ടിഫി� + #: ../camel/camel-smime-context.c:638 + #, c-format + msgid "Certificate is the only message, cannot verify certificates" +-msgstr "സാക്ഷ്യപത്രമാണ് ആകെയുള്ള സന്ദേശം, സാക്ഷ്യപത്രങ്ങൾ സാധൂകരിക്കാൻ സാധിക്കില്ല" ++msgstr "" ++"സാക്ഷ്യപത്രമാണ് ആകെയുള്ള സന്ദേശം, സാക്ഷ്യപത്രങ്ങൾ സാധൂകരിക്കാൻ സാധിക്കില്ല" + + #: ../camel/camel-smime-context.c:641 + #, c-format + msgid "Certificate is the only message, certificates imported and verified" +-msgstr "സാക്ഷ്യപത്രമാണ് ആകെയുള്ള സന്ദേശം, സാക്ഷ്യപത്രങ്ങൾ ഇറക്കുമതി ചെയ്യുകയും സാധൂകരീക്കുകയും ചെയ്തു" ++msgstr "" ++"സാക്ഷ്യപത്രമാണ് ആകെയുള്ള സന്ദേശം, സാക്ഷ്യപത്രങ്ങൾ ഇറക്കുമതി ചെയ്യുകയും " ++"സാധൂകരീക്കുകയും ചെയ്തു" + + #: ../camel/camel-smime-context.c:645 + msgid "Cannot find signature digests" +@@ -3128,7 +3213,7 @@ msgstr "ഒപ്പ് വയ്ക്� + #: ../camel/camel-smime-context.c:858 + #: ../camel/camel-smime-context.c:1148 + msgid "Cannot create encoder context" +-msgstr "" ++msgstr "എന്‍കോഡര്‍ കോണ്ടെക്സ്റ്റ് തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല" + + #: ../camel/camel-smime-context.c:864 + msgid "Failed to add data to CMS encoder" +@@ -3147,10 +3232,13 @@ msgstr "ഡീകോഡര്‍ പര� + #: ../camel/camel-smime-context.c:1082 + msgid "Cannot find common bulk encryption algorithm" + msgstr "" ++"പൊതുവായുള്ള ബള്‍ക്ക് എന്‍ക്രിപ്ഷന്‍ ആല്‍ഗോരിഥം കണ്ടുപിടിയ്ക്കുവാന്‍ " ++"സാധ്യമല്ല" + + #: ../camel/camel-smime-context.c:1090 + msgid "Cannot allocate slot for encryption bulk key" + msgstr "" ++"എന്‍ക്രിപ്ഷന്‍ ബള്‍ക്ക് കീയ്ക്കുള്ള സ്ലോട്ട് അനുവദിയ്ക്കുവാന്‍ സാധ്യമല്ല" + + #: ../camel/camel-smime-context.c:1101 + msgid "Cannot create CMS Message" +@@ -3158,11 +3246,11 @@ msgstr "CMS സന്ദേശം നി + + #: ../camel/camel-smime-context.c:1107 + msgid "Cannot create CMS Enveloped data" +-msgstr "" ++msgstr "സിഎംഎസ് എന്‍വലോപ്പ് ചെയ്ത ഡേറ്റാ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല" + + #: ../camel/camel-smime-context.c:1113 + msgid "Cannot attach CMS Enveloped data" +-msgstr "" ++msgstr "സിഎംഎസ് എന്‍വലോപ്പ് ചെയ്ത ഡേറ്റാ കൂട്ടിച്ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല" + + #: ../camel/camel-smime-context.c:1119 + msgid "Cannot attach CMS data object" +@@ -3170,11 +3258,11 @@ msgstr "CMS ഡേറ്റാ ഒബ് + + #: ../camel/camel-smime-context.c:1128 + msgid "Cannot create CMS Recipient information" +-msgstr "" ++msgstr "സിഎംഎസ് റസീപ്യന്റ് വിവരം തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല" + + #: ../camel/camel-smime-context.c:1133 + msgid "Cannot add CMS Recipient information" +-msgstr "" ++msgstr "സിഎംഎസ് റസീപ്യന്റ് വിവരം ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല" + + #: ../camel/camel-smime-context.c:1159 + msgid "Failed to add data to encoder" +@@ -3182,7 +3270,7 @@ msgstr "എന്‍കോഡറില� + + #: ../camel/camel-smime-context.c:1269 + msgid "S/MIME Decrypt: No encrypted content found" +-msgstr "" ++msgstr "എസ്/എംഐഎംഇ ഡീക്രിപ്റ്റ്: എന്‍ക്രിപ്റ്റ് ചെയ്ത ഉള്ളടക്കം ലഭ്യമായില്ല" + + #: ../camel/camel-store.c:1871 + #, c-format +@@ -3238,10 +3326,14 @@ msgstr "ഫോള്‍ഡറിന്� + #: ../camel/camel-stream-filter.c:334 + msgid "Only reset to beginning is supported with CamelStreamFilter" + msgstr "" ++"CamelStreamFilter-നൊപ്പം മാത്രമേ ആരംഭത്തിലേക്കു് വീണ്ടും സജ്ജമാക്കുക " ++"പിന്തുണയ്ക്കുന്നുള്ളൂ" + + #: ../camel/camel-stream-null.c:78 + msgid "Only reset to beginning is supported with CamelHttpStream" + msgstr "" ++"CamelHttpStream-നൊപ്പം മാത്രമേ ആരംഭത്തിലേക്കു് വീണ്ടും സജ്ജമാക്കുക " ++"പിന്തുണയ്ക്കുന്നുള്ളൂ" + + #: ../camel/camel-stream-process.c:275 + #, c-format +@@ -3277,7 +3369,7 @@ msgstr "പ്രോക്സി ഹോ� + #: ../camel/camel-tcp-stream-raw.c:675 + #, c-format + msgid "The proxy host denied our request: code %d" +-msgstr "" ++msgstr "ആവശ്യം പ്രോക്സി ഹോസ്റ്റ് നിഷേധിച്ചിരിയ്ക്കുന്നു: കോഡ് %d" + + #: ../camel/camel-tcp-stream-raw.c:773 + #: ../camel/camel-tcp-stream-raw.c:781 +@@ -3288,15 +3380,17 @@ msgstr "പ്രോക്സി ഹോ� + #: ../camel/camel-tcp-stream-raw.c:789 + #, c-format + msgid "Could not find a suitable authentication type: code 0x%x" +-msgstr "ഉചിതമായൊരു ആധികാരികത ഉറപ്പാക്കല്‍ രീതി കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമായില്ല: കോഡ് 0x%x" ++msgstr "" ++"ഉചിതമായൊരു ആധികാരികത ഉറപ്പാക്കല്‍ രീതി കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമായില്ല: " ++"കോഡ് 0x%x" + + #: ../camel/camel-tcp-stream-raw.c:801 + msgid "General SOCKS server failure" +-msgstr "" ++msgstr "സാധാരണയുള്ള SOCKS സര്‍വര്‍ പരാജയം" + + #: ../camel/camel-tcp-stream-raw.c:802 + msgid "SOCKS server's rules do not allow connection" +-msgstr "" ++msgstr "SOCKS സര്‍വറിനുള്ള നിയമങ്ങള്‍ കണക്ഷന്‍ അനുവദിയ്ക്കുന്നില്ല" + + #: ../camel/camel-tcp-stream-raw.c:803 + msgid "Network is unreachable from SOCKS server" +@@ -3304,7 +3398,7 @@ msgstr "SOCKS സര്‍വറില� + + #: ../camel/camel-tcp-stream-raw.c:804 + msgid "Host is unreachable from SOCKS server" +-msgstr "" ++msgstr "SOCKS സര്‍വറില്‍ നിന്നും ഹോസ്റ്റ് ലഭ്യമല്ല" + + #: ../camel/camel-tcp-stream-raw.c:805 + msgid "Connection refused" +@@ -3312,7 +3406,7 @@ msgstr "കണക്ഷന്‍ റദ� + + #: ../camel/camel-tcp-stream-raw.c:806 + msgid "Time-to-live expired" +-msgstr "" ++msgstr "ടൈം-ടു-ലീവ് കാലാവധി കഴിഞ്ഞു" + + #: ../camel/camel-tcp-stream-raw.c:807 + msgid "Command not supported by SOCKS server" +@@ -3363,7 +3457,9 @@ msgstr "'%s' ഫോള്‍ഡര്‍ + #: ../camel/camel-vee-folder.c:965 + #, c-format + msgid "Cannot copy or move messages into a Virtual Folder" +-msgstr "ഒരു വിര്‍ച്ച്വല്‍ ഫോള്‍ഡറിലേക്ക് സന്ദേശങ്ങള്‍ പകര്‍ത്തുവാനോ നീക്കുവാനോ സാധ്യമല്ല" ++msgstr "" ++"ഒരു വിര്‍ച്ച്വല്‍ ഫോള്‍ഡറിലേക്ക് സന്ദേശങ്ങള്‍ പകര്‍ത്തുവാനോ നീക്കുവാനോ " ++"സാധ്യമല്ല" + + #: ../camel/camel-vee-folder.c:888 + #, c-format +@@ -3377,7 +3473,7 @@ msgstr "`%s' സൂക്ഷിക്ക + + #: ../camel/camel-vee-folder.c:1171 + msgid "Automatically _update on change in source folders" +-msgstr "" ++msgstr "ശ്രോതസ്സ് ഫോള്‍ഡറുകളിലുള്ള മാറ്റം സ്വയമായി പുതുക്കു_ക" + + #. Translators: 'Unmatched' is a folder name under Search folders where are shown + #. * all messages not belonging into any other configured search folder +@@ -3388,16 +3484,19 @@ msgstr "ചേര്‍ച്ചയി� + #: ../camel/camel-vee-store.c:442 + #, c-format + msgid "Cannot delete folder: %s: No such folder" +-msgstr "ഫോള്‍ഡര്‍ നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല: %s: ഇങ്ങനെ ഒരു ഫോള്‍ഡര്‍ നിലവിലില്ല" ++msgstr "" ++"ഫോള്‍ഡര്‍ നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല: %s: ഇങ്ങനെ ഒരു ഫോള്‍ഡര്‍ നിലവിലില്ല" + + #: ../camel/camel-vee-store.c:476 + #, c-format + msgid "Cannot rename folder: %s: No such folder" +-msgstr "ഫോള്‍ഡറിന്‍റെ പേര് മാറ്റുവാന്‍ സാധ്യമല്ല: %s: ഇങ്ങനെ ഒരു ഫോള്‍ഡര്‍ നിലവിലില്ല" ++msgstr "" ++"ഫോള്‍ഡറിന്‍റെ പേര് മാറ്റുവാന്‍ സാധ്യമല്ല: %s: ഇങ്ങനെ ഒരു ഫോള്‍ഡര്‍ " ++"നിലവിലില്ല" + + #: ../camel/camel-vee-store.c:538 + msgid "Enable _Unmatched folder" +-msgstr "" ++msgstr "പൊരുത്തപ്പെ_ടാത്ത ഫോള്‍ഡര്‍ പ്രവര്‍ത്തന സജ്ജാക്കുക" + + #: ../camel/camel-vtrash-folder.c:49 + msgid "Cannot copy messages to the Trash folder" +@@ -3405,7 +3504,9 @@ msgstr "ചവറ്റുകുട്� + + #: ../camel/camel-vtrash-folder.c:51 + msgid "Cannot copy messages to the Junk folder" +-msgstr "ആവശ്യമില്ലാത്ത സന്ദേശങ്ങളുടെ ഫോള്‍ഡറിലേക്ക് സന്ദേശങ്ങള്‍ പകര്‍ത്തുവാന്‍ സാധ്യമല്ല" ++msgstr "" ++"ആവശ്യമില്ലാത്ത സന്ദേശങ്ങളുടെ ഫോള്‍ഡറിലേക്ക് സന്ദേശങ്ങള്‍ പകര്‍ത്തുവാന്‍ " ++"സാധ്യമല്ല" + + #: ../camel/providers/imapx/camel-imapx-provider.c:38 + msgid "Checking for New Mail" +@@ -3421,11 +3522,11 @@ msgstr "എല്ലാ ഫോള്‍� + + #: ../camel/providers/imapx/camel-imapx-provider.c:44 + msgid "Use _Quick Resync if the server supports it" +-msgstr "" ++msgstr "സര്‍വര്‍ _Quick Resync പിന്തുണയ്ക്കുന്നെങ്കില്‍ അതുപയോഗിയ്ക്കുക" + + #: ../camel/providers/imapx/camel-imapx-provider.c:46 + msgid "_Listen for server change notifications" +-msgstr "" ++msgstr "സര്‍വറിന്റെ മാറ്റങ്ങള്‍ക്കുള്ള അറിയിപ്പുകള്‍ക്കായി ശ്രദ്ധിയ്ക്കു_ക" + + #: ../camel/providers/imapx/camel-imapx-provider.c:49 + #: ../camel/providers/nntp/camel-nntp-provider.c:46 +@@ -3439,6 +3540,7 @@ msgstr "അംഗത്വമുളള � + #: ../camel/providers/imapx/camel-imapx-provider.c:54 + msgid "O_verride server-supplied folder namespace" + msgstr "" ++"സര്‍വര്‍ ലഭ്യമാക്കിയ നെയിംസ്പെയിസ് _മാറ്റി സ്ഥാപിയ്ക്കുവാന്‍ സാധ്യമല്ല" + + #: ../camel/providers/imapx/camel-imapx-provider.c:56 + msgid "Namespace:" +@@ -3454,14 +3556,15 @@ msgstr "ബദലുകള്‌" + + #: ../camel/providers/imapx/camel-imapx-provider.c:61 + #: ../camel/providers/nntp/camel-nntp-provider.c:43 +-#, fuzzy +-#| msgid "_Apply filters to new messages in INBOX" + msgid "Apply _filters to new messages in all folders" +-msgstr "അയച്ച മെയിലുകളുടെ ഫോള്‍ഡറില്‍ ഫില്‍റ്ററുകള്‍ അംഗീകരിക്കുക" ++msgstr "" ++"എല്ലാ ഫോള്‍ഡറുകളിലും പുതിയ സന്ദേശങ്ങള്‍ക്കു് ഫില്‍റ്ററു_കള്‍ ലഭ്യമാക്കുക" + + #: ../camel/providers/imapx/camel-imapx-provider.c:63 + msgid "_Apply filters to new messages in Inbox on this server" +-msgstr "ഈ സര്‍വറിലുളള പോയ മെയിലുകളുടെ ഫോള്‍ഡറിലുളള പുതിയ സന്ദേശങ്ങള്‍ക്ക് ഫില്‍‌റ്ററുകള്‍ _അംഗീകരിക്കുക" ++msgstr "" ++"ഈ സര്‍വറിലുളള പോയ മെയിലുകളുടെ ഫോള്‍ഡറിലുളള പുതിയ സന്ദേശങ്ങള്‍ക്ക് " ++"ഫില്‍‌റ്ററുകള്‍ _അംഗീകരിക്കുക" + + #: ../camel/providers/imapx/camel-imapx-provider.c:65 + msgid "Check new messages for _Junk contents" +@@ -3469,21 +3572,20 @@ msgstr "പുതിയ മെയില� + + #: ../camel/providers/imapx/camel-imapx-provider.c:67 + msgid "Only check for Junk messages in the IN_BOX folder" +-msgstr "_വരുന്ന മെയിലുകളുടെ ഫോള്‍ഡറില്‍ ആവശ്യമില്ലാത്ത മെയിലുകള്‍ മാത്രം തിരയുക" ++msgstr "" ++"_വരുന്ന മെയിലുകളുടെ ഫോള്‍ഡറില്‍ ആവശ്യമില്ലാത്ത മെയിലുകള്‍ മാത്രം തിരയുക" + + #: ../camel/providers/imapx/camel-imapx-provider.c:69 + msgid "Automatically synchroni_ze remote mail locally" +-msgstr "" ++msgstr "റിമോട്ട് മെയില്‍ ലോക്കലായി സ്വയമേ _സിന്‍ക്രൊണൈസ് ചെയ്യുക" + + #: ../camel/providers/imapx/camel-imapx-provider.c:75 + msgid "Default IMAP port" + msgstr "സ്വതവേയുള്ള IMAP പോര്‍ട്ട്" + + #: ../camel/providers/imapx/camel-imapx-provider.c:76 +-#, fuzzy +-#| msgid "IMAP server %s" + msgid "IMAP over SSL" +-msgstr "IMAP സര്‍വര്‍ %s" ++msgstr "എസ്എസ്എല്ലില്‍ ഐഎംഎപി" + + #: ../camel/providers/imapx/camel-imapx-provider.c:83 + msgid "IMAP+" +@@ -3511,15 +3613,13 @@ msgstr "%s (%s)" + + #: ../camel/providers/local/camel-local-folder.c:499 + msgid "_Index message body data" +-msgstr "" ++msgstr "സൂചി_ക സന്ദേശത്തിനുള്ള ഡേറ്റാ" + + #: ../camel/providers/local/camel-local-folder.c:727 + #, c-format +-msgid "" +-"Cannot get message %s from folder %s\n" ++msgid "Cannot get message %s from folder %s\n" + "%s" +-msgstr "" +-"%s സന്ദേശം %s ഫോള്‍ഡറില്‍ നിന്നും ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല\n" ++msgstr "%s സന്ദേശം %s ഫോള്‍ഡറില്‍ നിന്നും ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല\n" + "%s" + + #: ../camel/providers/local/camel-local-provider.c:43 +@@ -3539,15 +3639,17 @@ msgid "Local delivery" + msgstr "ലോക്കല്‍ ഡലിവറി" + + #: ../camel/providers/local/camel-local-provider.c:69 +-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution." +-msgstr "mbox-ഫോര്‍മാറ്റിലുളള സ്പൂളുകളില്‍ നിന്നും Evolution കൈകാര്യം ചെയ്യുന്ന ഫോള്‍ഡറുകളിലേക്ക് ലോക്കല്‍ മെയില്‍ മാറ്റുവാന്‍ ഉപയോഗിക്കുന്നു" ++msgid "" ++"For retrieving (moving) local mail from standard mbox-formatted spools into " ++"folders managed by Evolution." ++msgstr "" ++"mbox-ഫോര്‍മാറ്റിലുളള സ്പൂളുകളില്‍ നിന്നും Evolution കൈകാര്യം ചെയ്യുന്ന " ++"ഫോള്‍ഡറുകളിലേക്ക് ലോക്കല്‍ മെയില്‍ മാറ്റുവാന്‍ ഉപയോഗിക്കുന്നു" + + #: ../camel/providers/local/camel-local-provider.c:83 + #: ../camel/providers/local/camel-local-provider.c:103 +-#, fuzzy +-#| msgid "_Apply filters to new messages in INBOX" + msgid "_Apply filters to new messages in Inbox" +-msgstr "അയച്ച മെയിലുകളുടെ ഫോള്‍ഡറില്‍ ഫില്‍റ്ററുകള്‍ അംഗീകരിക്കുക" ++msgstr "അയച്ച മെയിലുകളുടെ ഫോള്‍ഡറില്‍ ഫില്‍റ്ററുകള്‍ അംഗീകരിക്കു_ക" + + #: ../camel/providers/local/camel-local-provider.c:90 + msgid "Maildir-format mail directories" +@@ -3571,8 +3673,10 @@ msgid "" + "For reading and storing local mail in external standard mbox spool files.\n" + "May also be used to read a tree of Elm, Pine, or Mutt style folders." + msgstr "" +-"പുറത്തുളള നിലവാരമുളളmbox spool ഫയലുകളില്‍ ഉളള ലോക്കല്‍ മെയില്‍ വായിക്കുന്നതിനും സൂക്ഷിക്കുന്നതിനും.\n" +-"Elm, Pine, Mutt ശൈലിയുളള ഫോള്‍ഡറുകളിലുളള ട്രീ വായിക്കുവാനും ഇത് ഉപയോഗിക്കുന്നു." ++"പുറത്തുളള നിലവാരമുളളmbox spool ഫയലുകളില്‍ ഉളള ലോക്കല്‍ മെയില്‍ " ++"വായിക്കുന്നതിനും സൂക്ഷിക്കുന്നതിനും.\n" ++"Elm, Pine, Mutt ശൈലിയുളള ഫോള്‍ഡറുകളിലുളള ട്രീ വായിക്കുവാനും ഇത് " ++"ഉപയോഗിക്കുന്നു." + + #: ../camel/providers/local/camel-local-provider.c:125 + msgid "Standard Unix mbox spool directory" +@@ -3662,7 +3766,7 @@ msgstr "%s സന്ദേശം %s ഫ� + #: ../camel/providers/local/camel-maildir-folder.c:353 + #, c-format + msgid "Cannot transfer message to destination folder: %s" +-msgstr "" ++msgstr "ലക്ഷ്യ ഫോള്‍ഡറിലേക്കു് സന്ദേശം നീക്കുവാന്‍ സാധ്യമല്ല: %s" + + #: ../camel/providers/local/camel-maildir-store.c:125 + #: ../camel/providers/local/camel-maildir-store.c:848 +@@ -3680,14 +3784,14 @@ msgstr "ഫോള്‍ഡര്‍ `%s' + + #: ../camel/providers/local/camel-maildir-store.c:245 + #: ../camel/providers/local/camel-mbox-store.c:369 +-#: ../camel/providers/local/camel-mh-store.c:522 ++#: ../camel/providers/local/camel-mh-store.c:514 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "ഫോള്‍ഡര്‍ `%s' ലഭ്യമല്ല: %s" + + #: ../camel/providers/local/camel-maildir-store.c:251 + #: ../camel/providers/local/camel-mbox-store.c:379 +-#: ../camel/providers/local/camel-mh-store.c:531 ++#: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "ഫോള്‍ഡര്‍ `%s' ലഭ്യമല്ല: ഫോള്‍ഡര്‍ നിലവിലില്ല." +@@ -3699,14 +3803,14 @@ msgstr "ഫോള്‍ഡര്‍ `%s' + + #: ../camel/providers/local/camel-maildir-store.c:283 + #: ../camel/providers/local/camel-mbox-store.c:442 +-#: ../camel/providers/local/camel-mh-store.c:564 ++#: ../camel/providers/local/camel-mh-store.c:556 + #, c-format + msgid "Cannot create folder '%s': folder exists." + msgstr "ഫോള്‍ഡര്‍ `%s' നിര്‍മ്മിക്കുവാന്‍ സാധ്യമല്ല: ഫോള്‍ഡര്‍ നിലവിലുണ്ട്." + + #: ../camel/providers/local/camel-maildir-store.c:347 + #: ../camel/providers/local/camel-maildir-store.c:387 +-#: ../camel/providers/local/camel-mh-store.c:682 ++#: ../camel/providers/local/camel-mh-store.c:674 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "ഫോള്‍ഡര്‍ `%s' നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല: %s" +@@ -3751,10 +3855,9 @@ msgid "Cannot open mailbox: %s: " + msgstr "തപാല്‍ പെട്ടി തുറക്കുവാന്‍ സാധ്യമല്ല: %s:" + + #: ../camel/providers/local/camel-mbox-folder.c:253 +-#, fuzzy, c-format +-#| msgid "Cannot append message to mbox file: %s: %s" ++#, c-format + msgid "Cannot append message to mbox file: %s: " +-msgstr "mbox ഫയലിലേക്ക് സന്ദേശം മാറ്റുവാന്‍ സാധ്യമാണ്: %s: %s" ++msgstr "സന്ദേശം mbox ഫയലിലേക്കു് ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല: %s: " + + #: ../camel/providers/local/camel-mbox-folder.c:382 + msgid "The folder appears to be irrecoverably corrupted." +@@ -3795,11 +3898,9 @@ msgstr "ഫോള്‍ഡര്‍ ന� + #: ../camel/providers/local/camel-mbox-store.c:672 + #: ../camel/providers/local/camel-mbox-store.c:701 + #, c-format +-msgid "" +-"Could not delete folder '%s':\n" ++msgid "Could not delete folder '%s':\n" + "%s" +-msgstr "" +-"ഫോള്‍ഡര്‍ `%s' നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല:\n" ++msgstr "ഫോള്‍ഡര്‍ `%s' നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല:\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:682 +@@ -3839,10 +3940,9 @@ msgid "Could not open folder: %s: %s" + msgstr "ഫോള്‍ഡര്‍ തുറക്കുവാന്‍ സാധ്യമായില്ല: %s: %s" + + #: ../camel/providers/local/camel-mbox-summary.c:522 +-#, fuzzy, c-format +-#| msgid "Fatal mail parser error near position %ld in folder %s" ++#, c-format + msgid "Fatal mail parser error near position %s in folder %s" +-msgstr "%ld-ആം ഫോള്‍ഡര്‍ %s-ല്‍ സ്ഥാനത്ത് തെറ്റായ മെയില്‍ പാഴ്സര്‍" ++msgstr "സ്ഥാനം %s-നു് അടുത്തു്, %s ഫോള്‍ഡറിലുള്ളതു്, സാരമായ പാഴ്സ് പിശക്" + + #: ../camel/providers/local/camel-mbox-summary.c:607 + #, c-format +@@ -3887,7 +3987,9 @@ msgstr "ഫോള്‍ഡര്‍ സ� + #: ../camel/providers/local/camel-mbox-summary.c:892 + #: ../camel/providers/local/camel-mbox-summary.c:1162 + #, c-format +-msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)" ++msgid "" ++"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " ++"it.)" + msgstr "MBOX ഫയലില്‍ തകരാര്‍, ദയവായി പരിഹരിയ്ക്കുക." + + #: ../camel/providers/local/camel-mbox-summary.c:902 +@@ -3914,17 +4016,16 @@ msgid "Writing to temporary mailbox fail + msgstr "താല്‍ക്കാലിക തപാല്‍ പെട്ടിയിലേക്ക് എഴുതുവാന്‍ സാധ്യമായില്ല: %s: %s" + + #: ../camel/providers/local/camel-mh-folder.c:118 +-#, fuzzy, c-format +-#| msgid "Cannot append message to mh folder: %s: %s" ++#, c-format + msgid "Cannot append message to mh folder: %s: " +-msgstr "mh ഫോള്‍ഡറിലേക്ക് സന്ദേശം മാറ്റുവാന്‍ സാധ്യമായില്ല: %s: %s" ++msgstr "സന്ദേശം mh ഫോള്‍ഡറിലേക്കു് ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല: %s: " + +-#: ../camel/providers/local/camel-mh-store.c:541 ++#: ../camel/providers/local/camel-mh-store.c:533 + #, c-format + msgid "Could not create folder '%s': %s" + msgstr "ഫോള്‍ഡര്‍`%s' ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല: %s" + +-#: ../camel/providers/local/camel-mh-store.c:557 ++#: ../camel/providers/local/camel-mh-store.c:549 + #, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "ഫോള്‍ഡര്‍ `%s' ലഭ്യമല്ല: ഒരു ഡയറക്ടറി അല്ല." +@@ -3965,11 +4066,9 @@ msgstr "ഫോള്‍ഡര്‍ `%s/ + + #: ../camel/providers/local/camel-spool-store.c:505 + #, c-format +-msgid "" +-"Could not open folder '%s':\n" ++msgid "Could not open folder '%s':\n" + "%s" +-msgstr "" +-"ഫോള്‍ഡര്‍ `%s' തുറക്കുവാന്‍ സാധ്യമല്ല:\n" ++msgstr "ഫോള്‍ഡര്‍ `%s' തുറക്കുവാന്‍ സാധ്യമല്ല:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:511 +@@ -3979,11 +4078,9 @@ msgstr "ഫോള്‍ഡര്‍ `%s' + + #: ../camel/providers/local/camel-spool-store.c:519 + #, c-format +-msgid "" +-"Could not create folder '%s':\n" ++msgid "Could not create folder '%s':\n" + "%s" +-msgstr "" +-"ഫോള്‍ഡര്‍ `%s' നിര്‍മ്മിക്കുവാന്‍ സാധ്യമല്ല:\n" ++msgstr "ഫോള്‍ഡര്‍ `%s' നിര്‍മ്മിക്കുവാന്‍ സാധ്യമല്ല:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:532 +@@ -4009,10 +4106,9 @@ msgstr "spool ഫോള്‍ഡറു� + #: ../camel/providers/local/camel-spool-summary.c:179 + #: ../camel/providers/local/camel-spool-summary.c:191 + #: ../camel/providers/local/camel-spool-summary.c:203 +-#, fuzzy, c-format +-#| msgid "Could not sync temporary folder %s: %s" ++#, c-format + msgid "Could not synchronize temporary folder %s: %s" +-msgstr "താല്‍ക്കാലിക ഫോള്‍ഡര്‍ %s സിന്‍ക് ചെയ്യുവാന്‍ സാധ്യമായില്ല: %s" ++msgstr "താല്‍ക്കാലിക ഫോള്‍ഡര്‍ %s സിന്‍ക്രൊണൈസ് ചെയ്യുവാനായില്ല: %s" + + #: ../camel/providers/local/camel-spool-summary.c:221 + #, c-format +@@ -4022,76 +4118,77 @@ msgstr "spool ഫോള്‍ഡര്� + #: ../camel/providers/local/camel-spool-summary.c:253 + #: ../camel/providers/local/camel-spool-summary.c:272 + #: ../camel/providers/local/camel-spool-summary.c:285 +-#, fuzzy, c-format +-#| msgid "" +-#| "Could not sync spool folder %s: %s\n" +-#| "Folder may be corrupt, copy saved in '%s'" ++#, c-format + msgid "" + "Could not synchronize spool folder %s: %s\n" + "Folder may be corrupt, copy saved in '%s'" + msgstr "" +-"spool ഫോള്‍ഡര്‍ %s സിന്‍ക് ചെയ്യുവാന്‍ സാധ്യമായില്ല: %s\n" +-"ഫോള്‍ഡറില്‍ തകരാറുണ്ടാവാം, പകര്‍പ്പ്`%s'-ല്‍ ലഭ്യമാണ്" ++"സ്പൂള്‍ ഫോള്‍ഡര്‍ %s സിന്‍ക്രൊണൈസ് ചെയ്യുവാനായില്ല: %s\n" ++"ഫോള്‍ഡറില്‍ തകരാറുണ്ടാകാം, '%s'-ല്‍ പകര്‍പ്പു് സൂക്ഷിച്ചിരിയ്ക്കുന്നു" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:278 +-#: ../camel/providers/nntp/camel-nntp-folder.c:360 +-#: ../camel/providers/nntp/camel-nntp-folder.c:481 ++#: ../camel/providers/nntp/camel-nntp-folder.c:285 ++#: ../camel/providers/nntp/camel-nntp-folder.c:388 ++#: ../camel/providers/nntp/camel-nntp-folder.c:510 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "ആന്തരിക പിശക്: UID അസാധുവായ രീതിയില്‍: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:332 +-#: ../camel/providers/pop3/camel-pop3-folder.c:633 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1065 ++#: ../camel/providers/nntp/camel-nntp-folder.c:349 ++#: ../camel/providers/nntp/camel-nntp-folder.c:354 ++#: ../camel/providers/pop3/camel-pop3-folder.c:657 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1107 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "സന്ദേശം %s ലഭ്യമായില്ല: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:339 +-#: ../camel/providers/nntp/camel-nntp-folder.c:504 +-#: ../camel/providers/pop3/camel-pop3-folder.c:558 +-#: ../camel/providers/pop3/camel-pop3-folder.c:623 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/nntp/camel-nntp-folder.c:361 ++#: ../camel/providers/nntp/camel-nntp-folder.c:536 ++#: ../camel/providers/pop3/camel-pop3-folder.c:582 ++#: ../camel/providers/pop3/camel-pop3-folder.c:647 ++#: ../camel/providers/pop3/camel-pop3-folder.c:666 + #, c-format + msgid "Cannot get message %s: " + msgstr "സന്ദേശം %s ലഭ്യമായില്ല:" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:493 ++#: ../camel/providers/nntp/camel-nntp-folder.c:525 + #, c-format + msgid "This message is not currently available" + msgstr "ഈ സന്ദേശം നിലവില്‍ ലഭ്യമല്ല" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:559 +-#: ../camel/providers/nntp/camel-nntp-folder.c:565 +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:593 ++#: ../camel/providers/nntp/camel-nntp-folder.c:599 + #, c-format + msgid "Posting failed: %s" + msgstr "അയയ്ക്കുവാന്‍ സാധ്യമായില്ല: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:606 +-#, fuzzy +-#| msgid "Posting failed: %s" ++#: ../camel/providers/nntp/camel-nntp-folder.c:664 + msgid "Posting failed: " +-msgstr "അയയ്ക്കുവാന്‍ സാധ്യമായില്ല: %s" ++msgstr "പോസ്റ്റിങ് പരാജയപ്പെട്ടു: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:633 ++#: ../camel/providers/nntp/camel-nntp-folder.c:689 + #, c-format + msgid "You cannot post NNTP messages while working offline!" +-msgstr "ഓഫ് ലൈന്‍ ജോലിചെയ്യുന്പോള്‍ നിങ്ങള്‍ക്ക് NNTP ഫോള്‍ഡറില്‍ സന്ദേശങ്ങള്‍ സന്ദേശങ്ങള്‍ അയയ്ക്കുവാന്‍ സാധ്യമല്ല!" ++msgstr "" ++"ഓഫ് ലൈന്‍ ജോലിചെയ്യുന്പോള്‍ നിങ്ങള്‍ക്ക് NNTP ഫോള്‍ഡറില്‍ സന്ദേശങ്ങള്‍ " ++"സന്ദേശങ്ങള്‍ അയയ്ക്കുവാന്‍ സാധ്യമല്ല!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:653 ++#: ../camel/providers/nntp/camel-nntp-folder.c:709 + #, c-format + msgid "You cannot copy messages from a NNTP folder!" +-msgstr "നിങ്ങള്‍ക്ക് NNTP ഫോള്‍ഡറില്‍ നിന്നും സന്ദേശങ്ങള്‍ പകര്‍ത്തുവാന്‍ സാധ്യമല്ല!" ++msgstr "" ++"നിങ്ങള്‍ക്ക് NNTP ഫോള്‍ഡറില്‍ നിന്നും സന്ദേശങ്ങള്‍ പകര്‍ത്തുവാന്‍ സാധ്യമല്ല!" + + #: ../camel/providers/nntp/camel-nntp-provider.c:48 +-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" +-msgstr "ചെറിയ നൊട്ടേഷനില്‍ ഫോള്‍ഡറുകള്‍ _കാണിക്കുന്നു (ഉദാ. comp.os.linux-ന് പകരം c.o.linux)" ++msgid "" ++"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" ++msgstr "" ++"ചെറിയ നൊട്ടേഷനില്‍ ഫോള്‍ഡറുകള്‍ _കാണിക്കുന്നു (ഉദാ. comp.os.linux-ന് പകരം c." ++"o.linux)" + + #: ../camel/providers/nntp/camel-nntp-provider.c:51 + msgid "In the subscription _dialog, show relative folder names" +-msgstr "വരിക്കാരാകുന്നതിനുളള _ഡയലോഗ് ബോക്സില്‍, ബന്ധമുളള ഫോള്‍ഡറുകളും കാണിക്കുക" ++msgstr "" ++"വരിക്കാരാകുന്നതിനുളള _ഡയലോഗ് ബോക്സില്‍, ബന്ധമുളള ഫോള്‍ഡറുകളും കാണിക്കുക" + + #: ../camel/providers/nntp/camel-nntp-provider.c:57 + msgid "Default NNTP port" +@@ -4099,7 +4196,7 @@ msgstr "സ്വതവേയുള്� + + #: ../camel/providers/nntp/camel-nntp-provider.c:58 + msgid "NNTP over SSL" +-msgstr "" ++msgstr "എസ്എസ്എല്ലില്‍ എന്‍എന്‍ടിപി" + + #: ../camel/providers/nntp/camel-nntp-provider.c:64 + msgid "USENET news" +@@ -4107,62 +4204,72 @@ msgstr "USENET വാര്‍ത്ത� + + #: ../camel/providers/nntp/camel-nntp-provider.c:66 + msgid "This is a provider for reading from and posting to USENET newsgroups." +-msgstr "USENET വാര്‍ത്താഗ്രൂപ്പുകളിലില്‍ നിന്നും വായിക്കുവാനും അതിലേക്ക് അയയ്ക്കുവാനും സാധ്യമാകുന്ന ഒരു സംവിധാനം ആണിത്." ++msgstr "" ++"USENET വാര്‍ത്താഗ്രൂപ്പുകളിലില്‍ നിന്നും വായിക്കുവാനും അതിലേക്ക് " ++"അയയ്ക്കുവാനും സാധ്യമാകുന്ന ഒരു സംവിധാനം ആണിത്." + + #: ../camel/providers/nntp/camel-nntp-provider.c:87 +-#, fuzzy +-#| msgid "" +-#| "This option will connect to the server using Kerberos 5 authentication." +-msgid "This option will connect to the NNTP server anonymously, without authentication." +-msgstr "Kerberos 5-ലൂടെ ആധികാരികത ഉറപ്പാക്കി ഈ ഉപാധി സര്‍വറിലേക്ക് കണക്ട് ചെയ്യുന്നു." ++msgid "" ++"This option will connect to the NNTP server anonymously, without " ++"authentication." ++msgstr "" ++"ആധികാരികത ഉറപ്പാക്കുന്ന സംവിധാനമില്ലാതെ, ഈ ഐച്ഛികം അജ്ഞാതമായി എന്‍എന്‍ടിപി " ++"സര്‍വറിലേക്കു് കണക്ട് ചെയ്യുന്നു." + + #: ../camel/providers/nntp/camel-nntp-provider.c:97 +-msgid "This option will authenticate with the NNTP server using a plaintext password." +-msgstr "പ്ളെയിന്‍ ടെക്സ്റ്റ് പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് ഈ ഉപാധി NNTP സര്‍വറുമായി നിങ്ങളുടെ ആധികാരികത ഉറപ്പാക്കുന്നു." ++msgid "" ++"This option will authenticate with the NNTP server using a plaintext " ++"password." ++msgstr "" ++"പ്ളെയിന്‍ ടെക്സ്റ്റ് പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് ഈ ഉപാധി NNTP സര്‍വറുമായി " ++"നിങ്ങളുടെ ആധികാരികത ഉറപ്പാക്കുന്നു." + +-#: ../camel/providers/nntp/camel-nntp-store.c:333 +-#, fuzzy, c-format +-#| msgid "Could not read greeting from %s: %s" ++#: ../camel/providers/nntp/camel-nntp-store.c:386 ++#, c-format + msgid "Could not read greeting from %s: " +-msgstr "%s-ല്‍ നിന്നും ഗ്രീറ്റിങ് വായിക്കുവാന്‍ സാധ്യമായില്ല: %s" ++msgstr "%s-ല്‍ നിന്നും ആശംസ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:345 ++#: ../camel/providers/nntp/camel-nntp-store.c:394 + #, c-format + msgid "NNTP server %s returned error code %d: %s" + msgstr "NNTP സര്‍വര്‍ %s പിശക് കോഡ് %d നല്‍കിയിരിക്കുന്നു: %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:522 ++#: ../camel/providers/nntp/camel-nntp-store.c:555 + #, c-format + msgid "USENET News via %s" + msgstr "via %s വഴി USENET വാര്‍ത്തകള്‍" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1123 ++#: ../camel/providers/nntp/camel-nntp-store.c:1218 + #, c-format +-msgid "" +-"Error retrieving newsgroups:\n" ++msgid "Error retrieving newsgroups:\n" + "\n" + "%s" +-msgstr "" +-"വാര്‍ത്താഗ്രൂപ്പുകള്‍ ലഭ്യമാക്കുന്നതില്‍ പിശക്:\n" ++msgstr "വാര്‍ത്താഗ്രൂപ്പുകള്‍ ലഭ്യമാക്കുന്നതില്‍ പിശക്:\n" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1217 ++#: ../camel/providers/nntp/camel-nntp-store.c:1319 + #, c-format + msgid "You cannot create a folder in a News store: subscribe instead." +-msgstr "നിങ്ങള്‍ക്ക് വാര്‍ത്തകളുടെ ശേഖരത്തില്‍ ഒരു ഫോള്‍ഡര്‍ ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല: പകരം അംഗത്വം നേടുക." ++msgstr "" ++"നിങ്ങള്‍ക്ക് വാര്‍ത്തകളുടെ ശേഖരത്തില്‍ ഒരു ഫോള്‍ഡര്‍ ഉണ്ടാക്കുവാന്‍ " ++"സാധ്യമല്ല: പകരം അംഗത്വം നേടുക." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1233 ++#: ../camel/providers/nntp/camel-nntp-store.c:1335 + #, c-format + msgid "You cannot rename a folder in a News store." +-msgstr "ഒരു വാര്‍ത്തയുടെ ശേഖരത്തിലുളള ഫോള്‍ഡറിന്‍റെ പേര് നിങ്ങള്‍ക്ക് മാറ്റുവാന്‍ സാധ്യമല്ല." ++msgstr "" ++"ഒരു വാര്‍ത്തയുടെ ശേഖരത്തിലുളള ഫോള്‍ഡറിന്‍റെ പേര് നിങ്ങള്‍ക്ക് മാറ്റുവാന്‍ " ++"സാധ്യമല്ല." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1256 ++#: ../camel/providers/nntp/camel-nntp-store.c:1358 + #, c-format + msgid "You cannot remove a folder in a News store: unsubscribe instead." +-msgstr "നിങ്ങള്‍ക്ക് വാര്‍ത്തകളുടെ ശേഖരത്തില്‍ നിന്ന് ഒരു ഫോള്‍ഡര്‍ നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല: പകരം അംഗത്വം ഉപേക്ഷിക്കുക." ++msgstr "" ++"നിങ്ങള്‍ക്ക് വാര്‍ത്തകളുടെ ശേഖരത്തില്‍ നിന്ന് ഒരു ഫോള്‍ഡര്‍ നീക്കം " ++"ചെയ്യുവാന്‍ സാധ്യമല്ല: പകരം അംഗത്വം ഉപേക്ഷിക്കുക." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1455 ++#: ../camel/providers/nntp/camel-nntp-store.c:1577 + #, c-format + msgid "" + "You cannot subscribe to this newsgroup:\n" +@@ -4171,86 +4278,87 @@ msgid "" + msgstr "" + "ഈ വാര്‍ത്താഗ്രൂപ്പില്‍ നിന്നും നിങ്ങള്‍ക്ക് അംഗത്വം നേടുവാന്‍ സാധ്യമല്ല:\n" + "\n" +-"ഇങ്ങനെ ഒരു വാര്‍ത്താഗ്രൂപ്പ് നിലവിലില്ല. നിങ്ങള്‍ തിരഞ്ഞെടുത്ത വസ്തു മിക്കവാറും ഒരു പേരന്‍റ് ഫോള്‍ഡര്‍ ആവാം." ++"ഇങ്ങനെ ഒരു വാര്‍ത്താഗ്രൂപ്പ് നിലവിലില്ല. നിങ്ങള്‍ തിരഞ്ഞെടുത്ത വസ്തു " ++"മിക്കവാറും ഒരു പേരന്‍റ് ഫോള്‍ഡര്‍ ആവാം." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1503 ++#: ../camel/providers/nntp/camel-nntp-store.c:1644 + #, c-format +-msgid "" +-"You cannot unsubscribe to this newsgroup:\n" ++msgid "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" + msgstr "" +-"ഈ വാര്‍ത്താഗ്രൂപ്പില്‍ നിന്നും നിങ്ങള്‍ക്ക് അംഗത്വം ഉപേക്ഷിക്കുവാന്‍ സാധ്യമല്ല:\n" ++"ഈ വാര്‍ത്താഗ്രൂപ്പില്‍ നിന്നും നിങ്ങള്‍ക്ക് അംഗത്വം ഉപേക്ഷിക്കുവാന്‍ " ++"സാധ്യമല്ല:\n" + "\n" + "ഇങ്ങനെ ഒരു വാര്‍ത്താഗ്രൂപ്പ് നിലവിലില്ല!" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1707 ++#: ../camel/providers/nntp/camel-nntp-store.c:2081 + msgid "NNTP Command failed: " + msgstr "എന്‍എന്‍റ്റിപി കമാന്‍ഡ് പരാജയപ്പെട്ടിരിക്കുന്നു:" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1794 ++#: ../camel/providers/nntp/camel-nntp-store.c:2178 + #, c-format + msgid "Not connected." + msgstr "കണക്ട് ചെയ്തിട്ടില്ല." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1856 ++#: ../camel/providers/nntp/camel-nntp-store.c:2272 + #, c-format + msgid "No such folder: %s" + msgstr "ഈ ഫോള്‍ഡര്‍ ലഭ്യമല്ല: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:198 +-#: ../camel/providers/nntp/camel-nntp-summary.c:328 ++#: ../camel/providers/nntp/camel-nntp-summary.c:200 ++#: ../camel/providers/nntp/camel-nntp-summary.c:339 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: പുതിയ മെയിലുകള്‍ പരിശോധിക്കുന്നു" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:216 ++#: ../camel/providers/nntp/camel-nntp-summary.c:222 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "xover-ല്‍ നിന്നും അപ്രതീക്ഷിതമായ സര്‍വറിന്‍റെ മറുപടി: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:346 ++#: ../camel/providers/nntp/camel-nntp-summary.c:360 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "തലക്കെട്ടില്‍ നിന്നും അപ്രതീക്ഷിതമായി സര്‍വറിന്‍റെ മറുപടി: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:393 ++#: ../camel/providers/nntp/camel-nntp-summary.c:407 + #, c-format + msgid "Operation failed: %s" + msgstr "പ്രക്രിയ പരാജയപ്പെട്ടിരിക്കുന്നു: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:453 +-#: ../camel/providers/pop3/camel-pop3-folder.c:526 ++#: ../camel/providers/pop3/camel-pop3-folder.c:468 ++#: ../camel/providers/pop3/camel-pop3-folder.c:547 + #, c-format + msgid "No message with UID %s" + msgstr "UID %s-ല്‍ സന്ദേശം ലഭ്യമല്ല" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:542 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 + #, c-format + msgid "Retrieving POP message %d" + msgstr "POP സന്ദേശം %d ലഭ്യമാക്കുന്നു" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:634 ++#: ../camel/providers/pop3/camel-pop3-folder.c:658 + msgid "Unknown reason" + msgstr "അപരിചിതമായ കാരണം" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:682 ++#: ../camel/providers/pop3/camel-pop3-folder.c:710 + msgid "Retrieving POP summary" + msgstr "POP സമ്മറി ലഭ്യമാക്കുന്നു" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:741 +-#: ../camel/providers/pop3/camel-pop3-folder.c:744 +-#: ../camel/providers/pop3/camel-pop3-folder.c:757 +-#: ../camel/providers/pop3/camel-pop3-folder.c:770 +-#: ../camel/providers/pop3/camel-pop3-folder.c:784 ++#: ../camel/providers/pop3/camel-pop3-folder.c:771 ++#: ../camel/providers/pop3/camel-pop3-folder.c:774 ++#: ../camel/providers/pop3/camel-pop3-folder.c:787 ++#: ../camel/providers/pop3/camel-pop3-folder.c:800 ++#: ../camel/providers/pop3/camel-pop3-folder.c:814 + msgid "Cannot get POP summary: " + msgstr "POP ചുരുക്കം ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല:" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:891 ++#: ../camel/providers/pop3/camel-pop3-folder.c:925 + msgid "Expunging old messages" + msgstr "പഴയ സന്ദേശങ്ങള്‍ എടുത്ത് കളയുന്നു" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:911 ++#: ../camel/providers/pop3/camel-pop3-folder.c:945 + msgid "Expunging deleted messages" + msgstr "നീക്കം ചെയ്ത സന്ദേശങ്ങള്‍ എടുത്ത് കളയുന്നു" + +@@ -4271,7 +4379,7 @@ msgstr "%s ദിവസങ്ങള്� + + #: ../camel/providers/pop3/camel-pop3-provider.c:47 + msgid "Delete _expunged from local Inbox" +-msgstr "" ++msgstr "പ്രാദേശിക ഇന്‍ബോക്സില്‍ നിന്നും _എടുത്തു കളഞ്ഞവ നീക്കം ചെയ്യുക" + + #: ../camel/providers/pop3/camel-pop3-provider.c:49 + msgid "Disable _support for all POP3 extensions" +@@ -4283,7 +4391,7 @@ msgstr "സ്വതവേയുള്� + + #: ../camel/providers/pop3/camel-pop3-provider.c:56 + msgid "POP3 over SSL" +-msgstr "" ++msgstr "എസ്എസ്എല്ലില്‍ പോപ്പ്3" + + #: ../camel/providers/pop3/camel-pop3-provider.c:63 + msgid "POP" +@@ -4291,79 +4399,94 @@ msgstr "POP" + + #: ../camel/providers/pop3/camel-pop3-provider.c:65 + msgid "For connecting to and downloading mail from POP servers." +-msgstr "POP സര്‍വറുകളിലേക്ക് കണക്ട് ചെയ്യുന്നതിനും മെയില്‍ ഡൌണ്‍‍ലോഡ് ചെയ്യുന്നതിനും" ++msgstr "" ++"POP സര്‍വറുകളിലേക്ക് കണക്ട് ചെയ്യുന്നതിനും മെയില്‍ ഡൌണ്‍‍ലോഡ് ചെയ്യുന്നതിനും" + + #: ../camel/providers/pop3/camel-pop3-provider.c:85 +-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers." +-msgstr "പ്ളെയിന്‍ ടെകസ്റ്റ് പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് POP സര്‍വറിലേക്ക് കണക്ട് ചെയ്യുന്ന ഉപാധിയാണ് ഇത്. POP സര്‍വറുകള്‍ മാത്രം ഈ ഉപാധി പിന്തുണയ്ക്കുന്നു" ++msgid "" ++"This option will connect to the POP server using a plaintext password. This " ++"is the only option supported by many POP servers." ++msgstr "" ++"പ്ളെയിന്‍ ടെകസ്റ്റ് പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് POP സര്‍വറിലേക്ക് കണക്ട് " ++"ചെയ്യുന്ന ഉപാധിയാണ് ഇത്. POP സര്‍വറുകള്‍ മാത്രം ഈ ഉപാധി പിന്തുണയ്ക്കുന്നു" + + #: ../camel/providers/pop3/camel-pop3-provider.c:95 +-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it." +-msgstr "APOP സന്പ്രദായം വഴി രഹസ്യ പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് POP സര്‍വറിലേക്ക് കണക്ട് ചെയ്യുന്ന ഉപാധിയാണ് ഇത്.ഇത് പിന്തുണയ്ക്കുന്നു എന്ന് അവകാശപ്പെടുന്ന സര്‍വറുകളിലുളള ഉപയോക്താക്കള്‍ക്കും ഇത് ശരിയായി പ്രവര്‍ത്തിക്കണമെന്നില്ല." ++msgid "" ++"This option will connect to the POP server using an encrypted password via " ++"the APOP protocol. This may not work for all users even on servers that " ++"claim to support it." ++msgstr "" ++"APOP സന്പ്രദായം വഴി രഹസ്യ പാസ്‍വേര്‍ഡ് ഉപയോഗിച്ച് POP സര്‍വറിലേക്ക് കണക്ട് " ++"ചെയ്യുന്ന ഉപാധിയാണ് ഇത്.ഇത് പിന്തുണയ്ക്കുന്നു എന്ന് അവകാശപ്പെടുന്ന " ++"സര്‍വറുകളിലുളള ഉപയോക്താക്കള്‍ക്കും ഇത് ശരിയായി പ്രവര്‍ത്തിക്കണമെന്നില്ല." + + #. Translators: This is the separator between an error and an explanation +-#: ../camel/providers/pop3/camel-pop3-store.c:89 ++#: ../camel/providers/pop3/camel-pop3-store.c:99 + msgid ": " + msgstr ": " + +-#: ../camel/providers/pop3/camel-pop3-store.c:150 ++#: ../camel/providers/pop3/camel-pop3-store.c:161 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "POP സര്‍വര്‍ %s-ല്‍ നിന്നും ഉളള ഗ്രീറ്റിങ് വായിക്കുന്നതില്‍ പരാജയം" + +-#: ../camel/providers/pop3/camel-pop3-store.c:165 ++#: ../camel/providers/pop3/camel-pop3-store.c:176 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" +-msgstr "സുരക്ഷിത രീതിയില്‍ POP സര്‍വര്‍ %s-ലേക്ക് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയം: %s" ++msgstr "" ++"സുരക്ഷിത രീതിയില്‍ POP സര്‍വര്‍ %s-ലേക്ക് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയം: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:166 ++#: ../camel/providers/pop3/camel-pop3-store.c:177 + msgid "STLS not supported by server" + msgstr "STLS ഈ സര്‍വര്‍ പിന്തുണയ്ക്കുന്നില്ല" + + #. Translators: Last %s is an optional + #. * explanation beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:187 +-#, fuzzy, c-format +-#| msgid "Failed to connect to POP server %s in secure mode: %s" ++#: ../camel/providers/pop3/camel-pop3-store.c:198 ++#, c-format + msgid "Failed to connect to POP server %s in secure mode%s" +-msgstr "സുരക്ഷിത രീതിയില്‍ POP സര്‍വര്‍ %s-ലേക്ക് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയം: %s" ++msgstr "POP സര്‍വര്‍ %s സുരക്ഷ മോഡ്%s-ല്‍ കണക്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു" + +-#: ../camel/providers/pop3/camel-pop3-store.c:200 +-#, fuzzy, c-format +-#| msgid "Failed to connect to POP server %s in secure mode: %s" ++#: ../camel/providers/pop3/camel-pop3-store.c:211 ++#, c-format + msgid "Failed to connect to POP server %s in secure mode: " +-msgstr "സുരക്ഷിത രീതിയില്‍ POP സര്‍വര്‍ %s-ലേക്ക് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയം: %s" ++msgstr "" ++"സുരക്ഷിത രീതിയില്‍ POP സര്‍വര്‍ %s-ലേക്ക് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയം:" + +-#: ../camel/providers/pop3/camel-pop3-store.c:311 ++#: ../camel/providers/pop3/camel-pop3-store.c:351 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" +-msgstr "POP സര്‍വര്‍ %s-ലേക്ക് ലോഗിന്‍ ചെയ്യുവാന്‍ സാധ്യമല്ല: SASL സന്പ്രദായത്തില്‍ പിശക്" ++msgstr "" ++"POP സര്‍വര്‍ %s-ലേക്ക് ലോഗിന്‍ ചെയ്യുവാന്‍ സാധ്യമല്ല: SASL സന്പ്രദായത്തില്‍ " ++"പിശക്" + +-#: ../camel/providers/pop3/camel-pop3-store.c:333 ++#: ../camel/providers/pop3/camel-pop3-store.c:373 + #, c-format + msgid "Failed to authenticate on POP server %s: " + msgstr "POP സര്‍വര്‍ %s-ല്‍ ആധികാരികത ഉറപ്പാക്കുന്നതില്‍ പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/pop3/camel-pop3-store.c:435 ++#: ../camel/providers/pop3/camel-pop3-store.c:481 + #, c-format + msgid "POP3 server %s" + msgstr "POP3 സര്‍വര്‍ %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:438 +-#, fuzzy, c-format +-#| msgid "IMAP service for %s on %s" ++#: ../camel/providers/pop3/camel-pop3-store.c:484 ++#, c-format + msgid "POP3 server for %s on %s" +-msgstr "%s-ല്‍ %s-നുളള IMAP സര്‍വീസ്" ++msgstr "%s-നുള്ള POP3 സര്‍വര്‍, %s-ല്‍" + +-#: ../camel/providers/pop3/camel-pop3-store.c:613 ++#: ../camel/providers/pop3/camel-pop3-store.c:696 + #, c-format +-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin." ++msgid "" ++"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " ++"attack suspected. Please contact your admin." + msgstr "" ++"POP സര്‍വര്‍ %s-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല:\tതെറ്റായ APOP ID " ++"ലഭ്യമായി. ദയവായി അഡ്മിനുമായി ബന്ധപ്പെടുക." + +-#: ../camel/providers/pop3/camel-pop3-store.c:665 ++#: ../camel/providers/pop3/camel-pop3-store.c:748 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending password: " + msgstr "" + "POP സര്‍വര്‍ %s-ലേക്ക് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല.\n" +@@ -4371,24 +4494,23 @@ msgstr "" + + #. Translators: Last %s is an optional explanation + #. * beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:680 ++#: ../camel/providers/pop3/camel-pop3-store.c:763 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending username%s" + msgstr "" + "POP സര്‍വര്‍ %s-ലേക്ക് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല.\n" + "%s ഉപയോക്തൃനാമം അയയ്ക്കുന്നതില്‍ പിശക്" + +-#: ../camel/providers/pop3/camel-pop3-store.c:751 ++#: ../camel/providers/pop3/camel-pop3-store.c:845 + #, c-format + msgid "No such folder '%s'." + msgstr "`%s' എന്ന ഫോള്‍ഡര്‍ നിലവിലില്ല." + +-#: ../camel/providers/pop3/camel-pop3-store.c:768 ++#: ../camel/providers/pop3/camel-pop3-store.c:862 + #, c-format + msgid "POP3 stores have no folder hierarchy" +-msgstr "" ++msgstr "POP3 സ്റ്റോറുകള്‍ക്കു് ഫോള്‍ഡര്‍ ശൈലി ലഭ്യമല്ല" + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:36 + #: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1 +@@ -4396,8 +4518,12 @@ msgid "Sendmail" + msgstr "Sendmail" + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:38 +-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system." +-msgstr "ലോക്കല്‍ സിസ്റ്റത്തിലുളള \"sendmail\" പ്രോഗ്രാമിലേക്ക് മെയില്‍ അയച്ച് അത് ലക്ഷ്യസ്ഥാനത്തേക്ക് പോകുന്നു." ++msgid "" ++"For delivering mail by passing it to the \"sendmail\" program on the local " ++"system." ++msgstr "" ++"ലോക്കല്‍ സിസ്റ്റത്തിലുളള \"sendmail\" പ്രോഗ്രാമിലേക്ക് മെയില്‍ അയച്ച് അത് " ++"ലക്ഷ്യസ്ഥാനത്തേക്ക് പോകുന്നു." + + #: ../camel/providers/sendmail/camel-sendmail-transport.c:50 + msgid "sendmail" +@@ -4420,7 +4546,8 @@ msgstr "ആര്‍ഗ്യുമെ� + #: ../camel/providers/sendmail/camel-sendmail-transport.c:213 + #, c-format + msgid "Could not create pipe to '%s': %s: mail not sent" +-msgstr "'%s'-ലേക്കു് പൈപ്പ് തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല: %s: മെയില്‍ അയച്ചിട്ടില്ല" ++msgstr "" ++"'%s'-ലേക്കു് പൈപ്പ് തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല: %s: മെയില്‍ അയച്ചിട്ടില്ല" + + #: ../camel/providers/sendmail/camel-sendmail-transport.c:238 + #, c-format +@@ -4432,10 +4559,11 @@ msgid "Could not send message: " + msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമായില്ല:" + + #: ../camel/providers/sendmail/camel-sendmail-transport.c:317 +-#, fuzzy, c-format +-#| msgid "sendmail exited with signal %s: mail not sent." ++#, c-format + msgid "'%s' exited with signal %s: mail not sent." +-msgstr "%s സിഗ്നലില്‍ sendmail-ല്‍ നിന്നും പുറത്ത് കടന്നിരിക്കുന്നു: മെയില്‍ അയച്ചിട്ടില്ല." ++msgstr "" ++"%s സിഗ്നലില്‍ ‍ നിന്നും '%s' പുറത്ത് കടന്നിരിക്കുന്നു: മെയില്‍ അയച്ചിട്ടില്ല." ++"" + + #: ../camel/providers/sendmail/camel-sendmail-transport.c:327 + #, c-format +@@ -4443,24 +4571,23 @@ msgid "Could not execute '%s': mail not + msgstr "'%s' നടപ്പിലാക്കുവാന്‍ സാധ്യമായില്ല: മെയില്‍ അയച്ചിട്ടില്ല." + + #: ../camel/providers/sendmail/camel-sendmail-transport.c:332 +-#, fuzzy, c-format +-#| msgid "sendmail exited with status %d: mail not sent." ++#, c-format + msgid "'%s' exited with status %d: mail not sent." +-msgstr "%d നിലവാരത്തില്‍ sendmail-ല്‍ നിന്നും പുറത്ത് കടന്നിരിക്കുന്നു: മെയില്‍ അയച്ചിട്ടില്ല." ++msgstr "" ++"%d സിഗ്നലില്‍ ‍ നിന്നും '%s' പുറത്ത് കടന്നിരിക്കുന്നു: മെയില്‍ അയച്ചിട്ടില്ല." ++"" + + #: ../camel/providers/smtp/camel-smtp-provider.c:42 + msgid "Default SMTP port" + msgstr "സ്വതവേയുള്ള എസ്എംറ്റിപി പോര്‍ട്ട്" + + #: ../camel/providers/smtp/camel-smtp-provider.c:43 +-#, fuzzy +-#| msgid "SMTP server %s" + msgid "SMTP over SSL" +-msgstr "SMTP സര്‍വര്‍ %s" ++msgstr "എസ്എസ്എല്ലില്‍ എസ്എംടിപി" + + #: ../camel/providers/smtp/camel-smtp-provider.c:44 + msgid "Message submission port" +-msgstr "" ++msgstr "സന്ദേശം സമര്‍പ്പിയ്ക്കുന്നതിനുള്ള പോര്‍ട്ട്" + + #: ../camel/providers/smtp/camel-smtp-provider.c:50 + msgid "SMTP" +@@ -4468,220 +4595,245 @@ msgstr "SMTP" + + #: ../camel/providers/smtp/camel-smtp-provider.c:52 + msgid "For delivering mail by connecting to a remote mailhub using SMTP." +-msgstr "SMTP ഉപയോഗിച്ച് വിദൂരത്തുളള ഒരു mailhub-ലോട്ട് കണക്ട് ചെയ്ത് മെയില്‍ അയയ്ക്കുന്നു." ++msgstr "" ++"SMTP ഉപയോഗിച്ച് വിദൂരത്തുളള ഒരു mailhub-ലോട്ട് കണക്ട് ചെയ്ത് മെയില്‍ " ++"അയയ്ക്കുന്നു." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:160 +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:158 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 + msgid "Welcome response error: " + msgstr "സ്വാഗതത്തിനുളള മറുപടിയില്‍ പിശക്:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:207 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" +-msgstr "സുരക്ഷിതമായി രീതിയില്‍ SMTP സര്‍വര്‍ %s-ലേക്കുളള കണക്ഷന്‍ പരാജയപ്പെട്ടിരിക്കുന്നു: %s" ++msgstr "" ++"സുരക്ഷിതമായി രീതിയില്‍ SMTP സര്‍വര്‍ %s-ലേക്കുളള കണക്ഷന്‍ " ++"പരാജയപ്പെട്ടിരിക്കുന്നു: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 +-#: ../camel/providers/smtp/camel-smtp-transport.c:229 +-#: ../camel/providers/smtp/camel-smtp-transport.c:236 ++#: ../camel/providers/smtp/camel-smtp-transport.c:211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:224 ++#: ../camel/providers/smtp/camel-smtp-transport.c:231 + msgid "STARTTLS command failed: " + msgstr "STARTTLS കമാന്‍ഡ് പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:247 ++#: ../camel/providers/smtp/camel-smtp-transport.c:242 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: " +-msgstr "സുരക്ഷിത മോഡില്‍ എസ്എംറ്റിപി സര്‍വര്‍ %s-ലേക്കു് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു:" ++msgstr "" ++"സുരക്ഷിത മോഡില്‍ എസ്എംറ്റിപി സര്‍വര്‍ %s-ലേക്കു് കണക്ട് ചെയ്യുന്നതില്‍ " ++"പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:349 ++#: ../camel/providers/smtp/camel-smtp-transport.c:342 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP സര്‍വര്‍ %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:352 ++#: ../camel/providers/smtp/camel-smtp-transport.c:345 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "%s വഴി SMTP മെയില്‍ അയയ്ക്കുന്നു" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:426 ++#: ../camel/providers/smtp/camel-smtp-transport.c:419 + #, c-format + msgid "SMTP server %s does not support %s authentication" +-msgstr "എസ്എംറ്റിപി സര്‍വര്‍ %s, %s ആധികാരികത ഉറപ്പാക്കല്‍ സംവിധാനം പിന്തുണയ്ക്കുന്നില്ല" ++msgstr "" ++"എസ്എംറ്റിപി സര്‍വര്‍ %s, %s ആധികാരികത ഉറപ്പാക്കല്‍ സംവിധാനം " ++"പിന്തുണയ്ക്കുന്നില്ല" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:508 ++#: ../camel/providers/smtp/camel-smtp-transport.c:500 + #, c-format + msgid "No SASL mechanism was specified" + msgstr "എസ്എഎസ്എല്‍ സംവിധാനം നല്‍കിയിട്ടില്ല" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:538 +-#: ../camel/providers/smtp/camel-smtp-transport.c:549 +-#: ../camel/providers/smtp/camel-smtp-transport.c:562 ++#: ../camel/providers/smtp/camel-smtp-transport.c:530 ++#: ../camel/providers/smtp/camel-smtp-transport.c:541 ++#: ../camel/providers/smtp/camel-smtp-transport.c:554 + msgid "AUTH command failed: " + msgstr "AUTH കമാന്‍ഡ് പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:695 + #, c-format + msgid "Cannot send message: service not connected." + msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമായില്ല: സര്‍വീസ് കണക്ട് ചെയ്തിട്ടില്ല." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:710 ++#: ../camel/providers/smtp/camel-smtp-transport.c:702 + #, c-format + msgid "Cannot send message: sender address not valid." +-msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമായില്ല: അയച്ച മെയിലിന്‍റെ മേല്‍വിലാസം തെറ്റാണ്." ++msgstr "" ++"സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമായില്ല: അയച്ച മെയിലിന്‍റെ മേല്‍വിലാസം തെറ്റാണ്." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:714 ++#: ../camel/providers/smtp/camel-smtp-transport.c:706 + msgid "Sending message" + msgstr "സന്ദേശം അയയ്ക്കുന്നു" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:731 + #, c-format + msgid "Cannot send message: no recipients defined." + msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമായില്ല: തെറ്റായ വിലാസം" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:752 ++#: ../camel/providers/smtp/camel-smtp-transport.c:744 + #, c-format + msgid "Cannot send message: one or more invalid recipients" + msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമായില്ല: ഒന്നോ അധികമോ തെറ്റായ വിലാസങ്ങള്‍" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:873 ++#: ../camel/providers/smtp/camel-smtp-transport.c:865 + msgid "Syntax error, command unrecognized" + msgstr "തെറ്റായ കമാന്‍ഡ്, സിന്‍റാക്സ് പിശക്" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:875 ++#: ../camel/providers/smtp/camel-smtp-transport.c:867 + msgid "Syntax error in parameters or arguments" + msgstr "പരാമീറ്ററുകള്‍ അല്ലെങ്കില്‍ ആര്‍ഗ്യുമെന്‍റുകളില്‍ സിന്‍റ്റാക്സ് പിശക്" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:877 ++#: ../camel/providers/smtp/camel-smtp-transport.c:869 + msgid "Command not implemented" + msgstr "കമാന്‍ഡ് നടപ്പിലാക്കുവാന്‍ സാധ്യമല്ല" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:879 ++#: ../camel/providers/smtp/camel-smtp-transport.c:871 + msgid "Command parameter not implemented" + msgstr "കമാന്‍ഡ് പരാമീറ്റര്‍ പ്രാവര്‍ത്തികമല്ല" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:881 ++#: ../camel/providers/smtp/camel-smtp-transport.c:873 + msgid "System status, or system help reply" +-msgstr "സിസ്റ്റത്തിന്‍റെ നിലവാരം, അല്ലെങ്കില്‍ സിസ്റ്റത്തിന്‍റെ സഹായത്തിനുളള മറുപടി" ++msgstr "" ++"സിസ്റ്റത്തിന്‍റെ നിലവാരം, അല്ലെങ്കില്‍ സിസ്റ്റത്തിന്‍റെ സഹായത്തിനുളള മറുപടി" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:883 ++#: ../camel/providers/smtp/camel-smtp-transport.c:875 + msgid "Help message" + msgstr "സഹായത്തിനുളള സന്ദേശം" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:885 ++#: ../camel/providers/smtp/camel-smtp-transport.c:877 + msgid "Service ready" + msgstr "സേവനം തയ്യാറാണ്" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:887 ++#: ../camel/providers/smtp/camel-smtp-transport.c:879 + msgid "Service closing transmission channel" + msgstr "സേവനം സംപ്രേക്ഷണത്തിനുളള ചാനല്‍ അടയ്ക്കുന്നു" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:889 ++#: ../camel/providers/smtp/camel-smtp-transport.c:881 + msgid "Service not available, closing transmission channel" + msgstr "സേവനം ലഭ്യമല്ല, സംപ്രേക്ഷണത്തിനുളള ചാനല്‍ അടയ്ക്കുന്നു" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:891 ++#: ../camel/providers/smtp/camel-smtp-transport.c:883 + msgid "Requested mail action okay, completed" + msgstr "ആവശ്യപ്പെട്ട മെയില്‍ പ്രവര്‍ത്തനം ശരിയാണ്: പൂര്‍ത്തിയായിരിക്കുന്നു" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:893 ++#: ../camel/providers/smtp/camel-smtp-transport.c:885 + msgid "User not local; will forward to " +-msgstr "ഉപയോഗിക്കുന്ന ആള്‍ ഈ സിസ്റ്റത്തിലുളളതല്ല; -ലേക്ക് അയയ്ക്കുന്നതാണ്" ++msgstr "" ++"ഉപയോഗിക്കുന്ന ആള്‍ ഈ സിസ്റ്റത്തിലുളളതല്ല; -ലേക്ക് " ++"അയയ്ക്കുന്നതാണ്" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:895 ++#: ../camel/providers/smtp/camel-smtp-transport.c:887 + msgid "Requested mail action not taken: mailbox unavailable" +-msgstr "ആവശ്യപ്പെട്ട മെയില്‍ പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: സിസ്റ്റത്തിലുളള ശേഖരം മതിയാവില്ല" ++msgstr "" ++"ആവശ്യപ്പെട്ട മെയില്‍ പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: സിസ്റ്റത്തിലുളള " ++"ശേഖരം മതിയാവില്ല" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:897 ++#: ../camel/providers/smtp/camel-smtp-transport.c:889 + msgid "Requested action not taken: mailbox unavailable" +-msgstr "ആവശ്യപ്പെട്ട പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: തപാല്‍ പെട്ടി ലഭ്യമല്ല" ++msgstr "" ++"ആവശ്യപ്പെട്ട പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: തപാല്‍ പെട്ടി ലഭ്യമല്ല" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:899 ++#: ../camel/providers/smtp/camel-smtp-transport.c:891 + msgid "Requested action aborted: error in processing" +-msgstr "ആവശ്യപ്പെട്ട മെയില്‍ പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: പ്രവര്‍ത്തനത്തില്‍ പിശക്" ++msgstr "" ++"ആവശ്യപ്പെട്ട മെയില്‍ പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: പ്രവര്‍ത്തനത്തില്‍ " ++"പിശക്" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:901 ++#: ../camel/providers/smtp/camel-smtp-transport.c:893 + msgid "User not local; please try " +-msgstr "ഉപയോഗിക്കുന്ന ആള്‍ ഈ സിസ്റ്റത്തിലുളളതല്ല; ദയവായി ശ്രമിക്കുക" ++msgstr "" ++"ഉപയോഗിക്കുന്ന ആള്‍ ഈ സിസ്റ്റത്തിലുളളതല്ല; ദയവായി ശ്രമിക്കുക" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:903 ++#: ../camel/providers/smtp/camel-smtp-transport.c:895 + msgid "Requested action not taken: insufficient system storage" +-msgstr "ആവശ്യപ്പെട്ട മെയില്‍ പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: സിസ്റ്റത്തിലുളള ശേഖരം മതിയാവില്ല" ++msgstr "" ++"ആവശ്യപ്പെട്ട മെയില്‍ പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: സിസ്റ്റത്തിലുളള " ++"ശേഖരം മതിയാവില്ല" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:905 ++#: ../camel/providers/smtp/camel-smtp-transport.c:897 + msgid "Requested mail action aborted: exceeded storage allocation" +-msgstr "ആവശ്യപ്പെട്ട മെയില്‍ പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: ശേഖരണത്തിനായുളള സ്ഥലത്തില്‍ കവിഞ്ഞിരിക്കുന്നു" ++msgstr "" ++"ആവശ്യപ്പെട്ട മെയില്‍ പ്രവര്‍ത്തനം നിര്‍ത്തിയിരിക്കുന്നു: ശേഖരണത്തിനായുളള " ++"സ്ഥലത്തില്‍ കവിഞ്ഞിരിക്കുന്നു" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:907 ++#: ../camel/providers/smtp/camel-smtp-transport.c:899 + msgid "Requested action not taken: mailbox name not allowed" +-msgstr "ആവശ്യപ്പെട്ട പ്രവര്‍ത്തനം എടുത്തില്ല: തപാല്‍ പെട്ടിയുടെ പേര് അനുവദിക്കുന്നതല്ല" ++msgstr "" ++"ആവശ്യപ്പെട്ട പ്രവര്‍ത്തനം എടുത്തില്ല: തപാല്‍ പെട്ടിയുടെ പേര് " ++"അനുവദിക്കുന്നതല്ല" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:909 ++#: ../camel/providers/smtp/camel-smtp-transport.c:901 + msgid "Start mail input; end with ." + msgstr "മെയില്‍ ഇന്‍പുട്ട് ആരംഭിച്ച്, .-ല്‍ അവസാനിക്കുക" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:911 ++#: ../camel/providers/smtp/camel-smtp-transport.c:903 + msgid "Transaction failed" + msgstr "ഇടപാടുകള്‍ പരാജയപ്പെട്ടിരിക്കുന്നു" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:915 ++#: ../camel/providers/smtp/camel-smtp-transport.c:907 + msgid "A password transition is needed" + msgstr "ഒരു പാസ്‍വേര്‍ഡ് സ്ഥിതിമാറ്റം ആവശ്യമുണ്ട്" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:917 ++#: ../camel/providers/smtp/camel-smtp-transport.c:909 + msgid "Authentication mechanism is too weak" + msgstr "ആധികാരികത ഉറപ്പാക്കുന്ന സംവിധാനം വളരെ ദുര്‍ബലമാണ്" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:919 ++#: ../camel/providers/smtp/camel-smtp-transport.c:911 + msgid "Encryption required for requested authentication mechanism" +-msgstr "ആവശ്യപ്പെട്ട ആധികാരികത ഉറപ്പാക്കുന്ന സംവിധാനത്തില്‍ രഹസ്യഭാഷ ആവശ്യമുണ്ട്" ++msgstr "" ++"ആവശ്യപ്പെട്ട ആധികാരികത ഉറപ്പാക്കുന്ന സംവിധാനത്തില്‍ രഹസ്യഭാഷ ആവശ്യമുണ്ട്" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:921 ++#: ../camel/providers/smtp/camel-smtp-transport.c:913 + msgid "Temporary authentication failure" + msgstr "താല്‍ക്കാലികമായിയുളള ആധികാരികത ഉറപ്പാക്കല്‍ പരാജയപ്പെട്ടു" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1170 + msgid "SMTP Greeting" + msgstr "SMTP ഗ്രീറ്റിങ്" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1205 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1223 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1231 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1197 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1219 + msgid "HELO command failed: " + msgstr "HELO കമാന്‍ഡ് പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1306 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1321 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1331 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1294 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1309 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1319 + msgid "MAIL FROM command failed: " + msgstr "MAIL FROM കമാന്‍ഡ് പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1358 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1346 + msgid "RCPT TO command failed: " + msgstr "RCPT TO കമാന്‍ഡ് പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1375 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1385 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1363 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1373 + #, c-format + msgid "RCPT TO <%s> failed: " + msgstr "RCPT TO <%s> പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1428 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1439 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1450 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1509 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1529 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1543 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1552 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1416 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1427 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1438 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1497 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1517 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1531 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1540 + msgid "DATA command failed: " + msgstr "DATA കമാന്‍ഡ് പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1577 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1592 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1601 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1565 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1580 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1589 + msgid "RSET command failed: " + msgstr "RSET കമാന്‍ഡ് പരാജയപ്പെട്ടു:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1626 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1640 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1647 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1614 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1628 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1635 + msgid "QUIT command failed: " + msgstr "QUIT കമാന്‍ഡ് പരാജയപ്പെട്ടു:" + +@@ -4693,12 +4845,40 @@ msgstr "ഒരു ഉപയോക്ത� + msgid "Birthday and anniversary reminder" + msgstr "പിറന്നാള്‍, വാര്‍ഷിക ഓര്‍മ്മപ്പെടുത്തല്‍" + ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2 ++msgid "Whether to set a reminder for birthdays and anniversaries" ++msgstr "" ++"പിറന്നാളുകള്‍ക്കും വാര്‍ഷികങ്ങള്‍ക്കും ഓര്‍മ്മപ്പെടുത്തല്‍ സജ്ജമാക്കണമോ " ++"എന്നു്" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3 ++msgid "Birthday and anniversary reminder value" ++msgstr "പിറന്നാള്‍, വാര്‍ഷിക ഓര്‍മ്മപ്പെടുത്തല്‍ മൂല്ല്യം" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4 ++msgid "Number of units for determining a birthday or anniversary reminder" ++msgstr "" ++"ഒരു പിറന്നാള്‍ അല്ലെങ്കില്‍ വാര്‍ഷികം ഓര്‍മ്മപ്പെടുത്തുന്നതിനുള്ള " ++"യൂണിറ്റുകളുടെ എണ്ണം" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5 ++msgid "Birthday and anniversary reminder units" ++msgstr "പിറന്നാള്‍, വാര്‍ഷിക ഓര്‍മ്മപ്പെടുത്തല്‍ യൂണിറ്റുകള്‍" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6 ++msgid "" ++"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or " ++"\"days\"" ++msgstr "" ++"ഒരു പിറന്നാള്‍ അല്ലെങ്കില്‍ വാര്‍ഷിക ഓര്‍മ്മപ്പെടുത്തല്‍, \"മിനിറ്റുകള്‍\", " ++"\"മണിക്കൂറുകള്‍\" അല്ലെങ്കില്‍ \"ദിവസങ്ങള്‍\" എന്നിവയ്ക്കുള്ള യൂണിറ്റുകള്‍" ++ + #: ../libebackend/e-authentication-mediator.c:205 + #: ../libebackend/e-authentication-mediator.c:216 + #: ../libebackend/e-authentication-mediator.c:852 + #: ../libebackend/e-authentication-mediator.c:1185 + msgid "Bus name vanished (client terminated?)" +-msgstr "" ++msgstr "ബസ് നാമം അപ്രത്യക്ഷമായി (ക്ലയന്റ് നിര്‍ത്തിയിരിയ്ക്കുന്നുവോ?)" + + #: ../libebackend/e-authentication-mediator.c:264 + msgid "No response from client" +@@ -4713,13 +4893,13 @@ msgstr "ക്ലയന്റ് പ്� + + #: ../libebackend/e-authentication-mediator.c:416 + msgid "Client reports password was rejected" +-msgstr "" ++msgstr "ക്ലയന്റ് റിപോര്‍ട്ടുകള്‍ക്കുള്ള രഹസ്യവാക്ക് നിഷേധിച്ചിരിയ്ക്കുന്നു" + +-#: ../libebackend/e-authentication-session.c:532 ++#: ../libebackend/e-authentication-session.c:543 + msgid "Add this password to your keyring" + msgstr "നിങ്ങളുടെ കീറിങിലേക്കു് ഈ രഹസ്യവാക്ക് ചേര്‍ക്കുക" + +-#: ../libebackend/e-authentication-session.c:622 ++#: ../libebackend/e-authentication-session.c:648 + msgid "Password was incorrect" + msgstr "രഹസ്യവാക്ക് തെറ്റു്" + +@@ -4731,51 +4911,62 @@ msgstr "%s ആധികാരികത � + #: ../libebackend/e-collection-backend.c:800 + #, c-format + msgid "%s does not support creating remote resources" +-msgstr "" ++msgstr "വിദൂര ശ്രോതസ്സുകള്‍ തയ്യാറാക്കുന്നതു് %s പിന്തുണയ്ക്കുന്നില്ല" + + #: ../libebackend/e-collection-backend.c:859 + #, c-format + msgid "%s does not support deleting remote resources" +-msgstr "" ++msgstr "വിദൂര ശ്രോതസ്സുകള്‍ വെട്ടി നീക്കുന്നതു് %s പിന്തുണയ്ക്കുന്നില്ല" + + #: ../libebackend/e-data-factory.c:320 + #, c-format + msgid "No backend factory for hash key '%s'" +-msgstr "" ++msgstr "'%s' ഹാഷ് കീയ്ക്കുള്ള ബാക്കന്‍ഡ് ഫാക്ടറി ലഭ്യമല്ല" + + #: ../libebackend/e-server-side-source.c:134 + #, c-format + msgid "Data source is missing a [%s] group" +-msgstr "" ++msgstr "ഡേറ്റാ ശ്രോതസ്സില്‍ ഒരു [%s] ഗ്രൂപ്പ് ലഭ്യമല്ല" + + #: ../libebackend/e-server-side-source.c:1008 +-#: ../libedataserver/e-source.c:1120 ++#: ../libedataserver/e-source.c:1138 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "" ++"വിദൂര ശ്രോതസ്സുകള്‍ തയ്യാറാക്കുന്നതു് '%s' ഡേറ്റാ ശ്രോതസ്സ് " ++"പിന്തുണയ്ക്കുന്നില്ല" + + #: ../libebackend/e-server-side-source.c:1022 + #, c-format +-msgid "Data source '%s' has no collection backend to create the remote resource" ++msgid "" ++"Data source '%s' has no collection backend to create the remote resource" + msgstr "" ++"വിദൂര ശ്രോതസ്സ് തയ്യാറാക്കുന്നതിനുള്ള കലക്ഷന്‍ ബാക്കന്‍ഡിനു് '%s' ഡേറ്റാ " ++"ശ്രോതസ്സ് ലഭ്യമല്ല" + + #: ../libebackend/e-server-side-source.c:1050 +-#: ../libedataserver/e-source.c:1227 ++#: ../libedataserver/e-source.c:1251 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "" ++"വിദൂര ശ്രോതസ്സുകള്‍ വെട്ടി നീക്കുന്നതു് '%s' ഡേറ്റാ ശ്രോതസ്സ് " ++"പിന്തുണയ്ക്കുന്നില്ല" + + #: ../libebackend/e-server-side-source.c:1064 + #, c-format +-msgid "Data source '%s' has no collection backend to delete the remote resource" ++msgid "" ++"Data source '%s' has no collection backend to delete the remote resource" + msgstr "" ++"വിദൂര ശ്രോതസ്സ് വെട്ടി നീക്കുന്നതിനുള്ള കലക്ഷന്‍ ബാക്കന്‍ഡിനു് '%s' ഡേറ്റാ " ++"ശ്രോതസ്സ് ലഭ്യമല്ല" + + #: ../libebackend/e-server-side-source.c:1095 +-#: ../libedataserver/e-source.c:1317 ++#: ../libedataserver/e-source.c:1347 + #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" +-msgstr "'%s' ഡേറ്റാ സോഴ്സ് OAuth 2.0 ആധികാരികത ഉറപ്പാക്കല്‍ പിന്തുണയ്ക്കുന്നില്ല" ++msgstr "" ++"'%s' ഡേറ്റാ സോഴ്സ് OAuth 2.0 ആധികാരികത ഉറപ്പാക്കല്‍ പിന്തുണയ്ക്കുന്നില്ല" + + #: ../libebackend/e-server-side-source.c:1438 + #, c-format +@@ -4783,9 +4974,9 @@ msgid "File must have a '.source' extens + msgstr "ഫയലിനു് '.source' എക്സ്റ്റന്‍ഷനുണ്ടായിരിയ്ക്കണം" + + #: ../libebackend/e-source-registry-server.c:523 +-#: ../libedataserver/e-source-registry.c:1625 ++#: ../libedataserver/e-source-registry.c:1882 + msgid "The user declined to authenticate" +-msgstr "" ++msgstr "ആധികാരികത ഉറപ്പാക്കല്‍ സംവിധാനം ഉപയോക്താവു് നിര്‍ത്തിയിരിയ്ക്കുന്നു" + + #: ../libebackend/e-source-registry-server.c:792 + #, c-format +@@ -4795,7 +4986,7 @@ msgstr "'%s' യുഐഡി നില� + #: ../libebackend/e-user-prompter-server.c:303 + #, c-format + msgid "Extension dialog '%s' not found." +-msgstr "" ++msgstr "എക്സ്റ്റെന്‍ഷന്‍ ഡയലോഗ് '%s' ലഭ്യമായില്ല." + + #: ../libedataserver/e-categories.c:46 + msgctxt "CategoryName" +@@ -4980,22 +5171,22 @@ msgstr "ദയവായി \"%s\" ജോ + msgid "Please enter the password for account \"%s\"." + msgstr "ദയവായി \"%s\" അക്കൌണ്ടിനുള്ള രഹസ്യവാക്ക് നല്‍കുക." + +-#: ../libedataserver/e-source.c:622 ++#: ../libedataserver/e-source.c:627 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "ശ്രോതസ്സ് ഫയലില്‍ ഒരു [%s] ഗ്രൂപ്പ് ലഭ്യമല്ല" + +-#: ../libedataserver/e-source.c:943 ++#: ../libedataserver/e-source.c:949 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "'%s' ഡേറ്റാ ശ്രോതസ്സ് നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല" + +-#: ../libedataserver/e-source.c:1029 ++#: ../libedataserver/e-source.c:1041 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "'%s' എന്ന ഡേറ്റാ ശ്രോതസ്സിലേക്കു് ഒന്നും സൂക്ഷിയ്ക്കുവാന്‍ സാധ്യമല്ല" + +-#: ../libedataserver/e-source.c:1523 ++#: ../libedataserver/e-source.c:1559 + msgid "Unnamed" + msgstr "പേരിടാത്തതു്" + +@@ -5006,23 +5197,39 @@ msgstr "സിഗ്നേച്ചര� + + #: ../libedataserver/e-source-webdav.c:1529 + #, c-format +-msgid "SSL certificate for host '%s', used by address book '%s', is not trusted. Do you wish to accept it?" ++msgid "" ++"SSL certificate for host '%s', used by address book '%s', is not trusted. Do " ++"you wish to accept it?" + msgstr "" ++"ഹോസ്റ്റ് '%s'-നുള്ള എസ്എസ്എല്‍ സര്‍ട്ടിഫിക്കേറ്റ്, '%s' വിലാസപുസ്തകം " ++"ഉപയോഗിയ്ക്കുന്നതു്, വിശ്വസനീയമല്ല. നിങ്ങള്‍ക്കിതു് സ്വീകാര്യമാണോ?" + + #: ../libedataserver/e-source-webdav.c:1538 + #, c-format +-msgid "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you wish to accept it?" ++msgid "" ++"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " ++"wish to accept it?" + msgstr "" ++"ഹോസ്റ്റ് '%s'-നുള്ള എസ്എസ്എല്‍ സര്‍ട്ടിഫിക്കേറ്റ്, '%s' കലണ്ടര്‍ " ++"ഉപയോഗിയ്ക്കുന്നതു്, വിശ്വസനീയമല്ല. നിങ്ങള്‍ക്കിതു് സ്വീകാര്യമാണോ?" + + #: ../libedataserver/e-source-webdav.c:1547 + #, c-format +-msgid "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do you wish to accept it?" ++msgid "" ++"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " ++"you wish to accept it?" + msgstr "" ++"ഹോസ്റ്റ് '%s'-നുള്ള എസ്എസ്എല്‍ സര്‍ട്ടിഫിക്കേറ്റ്, '%s' മെമ്മോ ലിസ്റ്റ് " ++"ഉപയോഗിയ്ക്കുന്നതു്, വിശ്വസനീയമല്ല. നിങ്ങള്‍ക്കിതു് സ്വീകാര്യമാണോ?" + + #: ../libedataserver/e-source-webdav.c:1556 + #, c-format +-msgid "SSL certificate for host '%s', used by task list '%s', is not trusted. Do you wish to accept it?" ++msgid "" ++"SSL certificate for host '%s', used by task list '%s', is not trusted. Do " ++"you wish to accept it?" + msgstr "" ++"ഹോസ്റ്റ് '%s'-നുള്ള എസ്എസ്എല്‍ സര്‍ട്ടിഫിക്കേറ്റ്, '%s' ജോലി പട്ടിക " ++"ഉപയോഗിയ്ക്കുന്നതു്, വിശ്വസനീയമല്ല. നിങ്ങള്‍ക്കിതു് സ്വീകാര്യമാണോ?" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format. +@@ -5168,8 +5375,12 @@ msgid "Proxy type to use" + msgstr "ഉപയോഗിയ്ക്കുവാനുള്ള പ്രോക്സി രീതി" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2 +-msgid "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" means manual proxy." +-msgstr "ഉപയോഗിയ്ക്കേണ്ട പ്രോക്സി രീതി. \"0\" - സിസ്റ്റം, \"1\" - പ്രോക്സി ലഭ്യമല്ല, \"2\" - മാനുവല്‍ പ്രോക്സി." ++msgid "" ++"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" " ++"means manual proxy." ++msgstr "" ++"ഉപയോഗിയ്ക്കേണ്ട പ്രോക്സി രീതി. \"0\" - സിസ്റ്റം, \"1\" - പ്രോക്സി ലഭ്യമല്ല, " ++"\"2\" - മാനുവല്‍ പ്രോക്സി." + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 + msgid "Whether to use http-proxy" +@@ -5185,7 +5396,8 @@ msgstr "പ്രോക്സി സര� + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6 + msgid "Whether authentication is required to access proxy server." +-msgstr "പ്രോക്സി സര്‍വറിലേക്കുള്ള പ്രവേശനത്തിനു് ആധികാരികത ഉറപ്പാക്കണമോ എന്നു്." ++msgstr "" ++"പ്രോക്സി സര്‍വറിലേക്കുള്ള പ്രവേശനത്തിനു് ആധികാരികത ഉറപ്പാക്കണമോ എന്നു്." + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7 + msgid "Host name for HTTP requests" +@@ -5209,7 +5421,8 @@ msgstr "പ്രോക്സി ആധ� + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12 + msgid "User name to use to authenticate against proxy server." +-msgstr "പ്രോക്സി സര്‍വറിലേക്കുള്ള ആധികാരികത ഉറപ്പാക്കുന്നതിനുള്ള ഉപയോക്തൃനാമം." ++msgstr "" ++"പ്രോക്സി സര്‍വറിലേക്കുള്ള ആധികാരികത ഉറപ്പാക്കുന്നതിനുള്ള ഉപയോക്തൃനാമം." + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13 + msgid "Proxy authentication password" +@@ -5275,8 +5488,12 @@ msgstr "'%s' യുഐഡിയ്ക് + + #: ../modules/gnome-online-accounts/e-goa-password-based.c:144 + #, c-format +-msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain a password for '%s'" ++msgid "" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain a password for '%s'" + msgstr "" ++"'%s'-നുള്ള രഹസ്യവാക്ക് ലഭ്യമാക്കുന്നതിനുള്ള org.gnome.OnlineAccounts " ++"സേവനത്തിനുചിതമായൊരു അക്കൌണ്ട് കണ്ടുപിടിയ്ക്കുവാനായില്ല." + + #: ../modules/gnome-online-accounts/e-goa-password-based.c:216 + #, c-format +@@ -5291,10 +5508,10 @@ msgstr "കോഡ്: %u - സര്‍� + + #. TODO: more specific + #: ../modules/gnome-online-accounts/goaewsclient.c:244 +-#, fuzzy, c-format +-#| msgid "Failed to retrieve message" ++#, c-format + msgid "Failed to parse autodiscover response XML" +-msgstr "സന്ദേശം ലഭ്യമാക്കുന്നതില്‍ പിശക്" ++msgstr "" ++"ഓട്ടോഡിസ്കവര്‍ മറുപടിയുടെ എക്സ്എംഎല്‍ പാഴ്സ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു" + + #. TODO: more specific + #: ../modules/gnome-online-accounts/goaewsclient.c:253 +@@ -5319,17 +5536,22 @@ msgstr "അക്കൌണ്ട് എ� + #, c-format + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "" ++"ഓട്ടോഡിസ്കവര്‍ റസ്പോണ്‍സില്‍ ASUrl, OABUrl എന്നിവ കണ്ടുപിടിയ്ക്കുന്നതില്‍ " ++"പരാജയം" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1237 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1271 + #, c-format +-msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain an access token for '%s'" ++msgid "" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain an access token for '%s'" + msgstr "" ++"'%s'-നുള്ള ആക്സസ്സ് ടോക്കന്‍ ലഭ്യമാക്കുന്നതിനുള്ള org.gnome.OnlineAccounts " ++"സേവനത്തിനുചിതമായൊരു അക്കൌണ്ട് കണ്ടുപിടിയ്ക്കുവാനായില്ല." + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1264 +-#, fuzzy, c-format +-#| msgid "Failed to store mail in temp file %s: %s" ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1298 ++#, c-format + msgid "Failed to obtain an access token for '%s': " +-msgstr "temp ഫയല്‍ %s-ല്‍ മെയില്‍ സൂക്ഷിക്കുന്നതില്‍ പരാജയം: %s" ++msgstr "'%s'-നുള്ള ആക്സസ്സ് ടോക്കന്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയം: " + + #: ../modules/google-backend/module-google-backend.c:140 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 +@@ -5367,11 +5589,11 @@ msgstr "ഈമെയില്‍ സൈ� + + #: ../modules/trust-prompt/certificate-viewer.c:619 + msgid "Email Recipient Certificate" +-msgstr "" ++msgstr "ഈമെയില്‍ റെസീപിയന്റ് സര്‍ട്ടിഫിക്കേറ്റ്" + + #: ../modules/trust-prompt/certificate-viewer.c:634 + msgid "Issued To" +-msgstr "" ++msgstr "ലഭ്യമാക്കുന്നതു്" + + #: ../modules/trust-prompt/certificate-viewer.c:635 + #: ../modules/trust-prompt/certificate-viewer.c:641 +@@ -5395,7 +5617,7 @@ msgstr "സീരിയല്‍ നം� + + #: ../modules/trust-prompt/certificate-viewer.c:640 + msgid "Issued By" +-msgstr "" ++msgstr "ലഭ്യമാക്കിയതു്" + + #: ../modules/trust-prompt/certificate-viewer.c:645 + msgid "Validity" +@@ -5403,7 +5625,7 @@ msgstr "കാലാവധി" + + #: ../modules/trust-prompt/certificate-viewer.c:646 + msgid "Issued On" +-msgstr "" ++msgstr "ലഭ്യമാക്കിയ തീയതി" + + #: ../modules/trust-prompt/certificate-viewer.c:647 + msgid "Expires On" +@@ -5426,10 +5648,8 @@ msgid "General" + msgstr "സാധാരണ" + + #: ../modules/trust-prompt/certificate-viewer.c:672 +-#, fuzzy +-#| msgid "Certificate rejected" + msgid "Certificate Hierarchy" +-msgstr "സര്‍ട്ടീഫിക്കേറ്റ് നിഷേധിച്ചിരിക്കുന്നു" ++msgstr "സര്‍ട്ടിഫിക്കറ്റ് ഹയറാര്‍ക്കി" + + #: ../modules/trust-prompt/certificate-viewer.c:676 + msgid "Certificate Fields" +@@ -5496,10 +5716,8 @@ msgid "Netscape Certificate Type" + msgstr "നെറ്റ്സ്കേപ്പ് സര്‍ട്ടിഫിക്കേറ്റ് രീതി" + + #: ../modules/trust-prompt/e-asn1-object.c:243 +-#, fuzzy +-#| msgid "Certificate untrusted" + msgid "Certificate Authority Key Identifier" +-msgstr "സര്‍ട്ടീഫിക്കേറ്റ് അവിശ്വസനീയം" ++msgstr "സര്‍ട്ടീഫിക്കേറ്റ് അഥോറിറ്റി കീ ഐഡന്‍റിഫയര്‍" + + #: ../modules/trust-prompt/e-asn1-object.c:255 + #, c-format +@@ -5516,11 +5734,11 @@ msgstr "ആല്‍ഗോരിഥം � + + #: ../modules/trust-prompt/e-asn1-object.c:336 + msgid "Subject Public Key Info" +-msgstr "" ++msgstr "പബ്ളിക് കീ വിവരം" + + #: ../modules/trust-prompt/e-asn1-object.c:341 + msgid "Subject Public Key Algorithm" +-msgstr "" ++msgstr "പബ്ളിക് കീ ആല്‍ഗോരിതം" + + #: ../modules/trust-prompt/e-asn1-object.c:356 + msgid "Subject's Public Key" +@@ -5538,7 +5756,7 @@ msgstr "ഈമെയില്‍" + #: ../modules/trust-prompt/e-asn1-object.c:399 + #: ../modules/trust-prompt/e-asn1-object.c:411 + msgid "Object Signer" +-msgstr "" ++msgstr "ഒബ്ജക്ട് സൈനര്‍" + + #: ../modules/trust-prompt/e-asn1-object.c:403 + msgid "SSL Certificate Authority" +@@ -5553,28 +5771,24 @@ msgid "Signing" + msgstr "ഒപ്പിടുന്നു" + + #: ../modules/trust-prompt/e-asn1-object.c:440 +-#, fuzzy +-#| msgid "Non-editing Author" + msgid "Non-repudiation" +-msgstr "എഡിറ്റിങ് ചെയ്യാത്ത രചയിതാവ്" ++msgstr "തള്ളിക്കളയാതിരിക്കുക" + + #: ../modules/trust-prompt/e-asn1-object.c:444 + msgid "Key Encipherment" +-msgstr "" ++msgstr "കീ എന്‍സിഫര്‍മെന്റ്" + + #: ../modules/trust-prompt/e-asn1-object.c:448 + msgid "Data Encipherment" +-msgstr "" ++msgstr "ഡേറ്റാ എന്‍സിഫര്‍മെന്റ്" + + #: ../modules/trust-prompt/e-asn1-object.c:452 + msgid "Key Agreement" + msgstr "കീ എഗ്രീമെന്റ്" + + #: ../modules/trust-prompt/e-asn1-object.c:456 +-#, fuzzy +-#| msgid "Certificate signature failure" + msgid "Certificate Signer" +-msgstr "സര്‍ട്ടീഫിക്കേറ്റില്‍ ഒപ്പിടല്‍ സാധ്യമായില്ല" ++msgstr "സര്‍ട്ടിഫിക്കേറ്റ് സൈനര്‍" + + #: ../modules/trust-prompt/e-asn1-object.c:460 + msgid "CRL Signer" +@@ -5617,51 +5831,50 @@ msgstr "സര്‍ട്ടിഫി� + + #: ../modules/trust-prompt/e-asn1-object.c:683 + msgid "Issuer" +-msgstr "" ++msgstr "ലഭ്യമാക്കിയവര്‍" + + #: ../modules/trust-prompt/e-asn1-object.c:714 + msgid "Subject" + msgstr "വിഷയം" + + #: ../modules/trust-prompt/e-asn1-object.c:738 +-#, fuzzy +-#| msgid "Unique ID" + msgid "Issuer Unique ID" +-msgstr "അസാമാനമായ ID" ++msgstr "ലഭ്യമാക്കിയവരുടെ ID" + + #: ../modules/trust-prompt/e-asn1-object.c:757 +-#, fuzzy +-#| msgid "Unique ID" + msgid "Subject Unique ID" +-msgstr "അസാമാനമായ ID" ++msgstr "വിഷയത്തിനുള്ള ID" + + #: ../modules/trust-prompt/e-asn1-object.c:818 +-#, fuzzy +-#| msgid "Certificate signature failure" + msgid "Certificate Signature Value" +-msgstr "സര്‍ട്ടീഫിക്കേറ്റില്‍ ഒപ്പിടല്‍ സാധ്യമായില്ല" ++msgstr "സര്‍ട്ടിഫിക്കേറ്റ് സിഗ്നേച്ചര്‍ മൂല്ല്യം" + + #: ../modules/trust-prompt/module-trust-prompt.c:201 +-#, fuzzy +-#| msgid "Signing certificate not found" + msgid "The signing certificate authority is not known." +-msgstr "ഒപ്പ് വയ്ക്കുന്നതിലുളള സര്‍ട്ടീഫിക്കേറ്റ് ലഭ്യമായില്ല" ++msgstr "സാക്ഷ്യപത്രം സാക്ഷ്യപ്പെടുത്തിയ ആളിനെ അറിയില്ല." + + #: ../modules/trust-prompt/module-trust-prompt.c:203 +-msgid "The certificate does not match the expected identity of the site that it was retrieved from." ++msgid "" ++"The certificate does not match the expected identity of the site that it was " ++"retrieved from." + msgstr "" ++"സാക്ഷ്യപത്രം കിട്ടിയ സൈറ്റിന്റെ തിരിച്ചറിയല്‍ സാക്ഷ്യപത്രവുമായി ചേരുന്നില്ല." + + #: ../modules/trust-prompt/module-trust-prompt.c:205 + msgid "The certificate's activation time is still in the future." +-msgstr "" ++msgstr "ഈ സാക്ഷ്യപത്രത്തിന്റെ ആരംഭ സമയം ഭാവിയിലാണ്." + + #: ../modules/trust-prompt/module-trust-prompt.c:207 + msgid "The certificate has expired." + msgstr "സര്‍ട്ടീഫിക്കേറ്റിന്റെ കാലാവധി കഴിഞ്ഞിരിക്കുന്നു." + + #: ../modules/trust-prompt/module-trust-prompt.c:209 +-msgid "The certificate has been revoked according to the connection's certificate revocation list." ++msgid "" ++"The certificate has been revoked according to the connection's certificate " ++"revocation list." + msgstr "" ++"കണക്ഷനുള്ള സര്‍ട്ടിഫിക്കേറ്റ് റിവോക്കേഷന്‍ പട്ടികയനുസരിച്ചു് സമ്മതപത്രം " ++"ലഭ്യമാക്കുന്നു." + + #: ../modules/trust-prompt/module-trust-prompt.c:211 + msgid "The certificate's algorithm is considered insecure." +@@ -5690,7 +5903,9 @@ msgstr "_എന്നേക്കുമ� + #: ../modules/trust-prompt/trust-prompt-gtk.c:203 + #, c-format + msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?" +-msgstr "'%s'-നുളള എസ്എസ്എല്‍ സര്‍ട്ടീഫിക്കേറ്റ് അവിശ്വസനീയം. നിങ്ങള്‍ക്ക് സ്വീകാര്യമാണോ?" ++msgstr "" ++"'%s'-നുളള എസ്എസ്എല്‍ സര്‍ട്ടീഫിക്കേറ്റ് അവിശ്വസനീയം. നിങ്ങള്‍ക്ക് " ++"സ്വീകാര്യമാണോ?" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:209 + msgid "Detailed information about the certificate:" +@@ -5698,7 +5913,7 @@ msgstr "സര്‍ട്ടിഫി� + + #: ../modules/trust-prompt/trust-prompt-gtk.c:223 + msgid "Issuer:" +-msgstr "" ++msgstr "ഇഷ്യൂവര്‍:" + + #: ../modules/trust-prompt/trust-prompt-gtk.c:224 + msgid "Subject:" +@@ -5722,7 +5937,7 @@ msgstr "നിങ്ങളുടെ വ� + + #: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257 + msgid "Signon service did not return a secret" +-msgstr "" ++msgstr "Signon സേവനം ഒരു രഹസ്യം തിരികെ നല്‍കിയില്ല" + + #: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1 + msgid "Google Calendar" +@@ -5746,13 +5961,19 @@ msgstr "നിങ്ങളുടെ എ� + + #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971 + #, c-format +-msgid "Cannot find a corresponding account service in the accounts database from which to obtain an access token for '%s'" ++msgid "" ++"Cannot find a corresponding account service in the accounts database from " ++"which to obtain an access token for '%s'" + msgstr "" ++"'%s'-നുള്ള ആക്സസ്സ് ടോക്കന്‍ ലഭ്യമാക്കുന്നതിനുള്ള അക്കൌണ്ട് " ++"ഡേറ്റാബെയിസിനുചിതമായ അക്കൌണ്ട് കണ്ടുപിടിയ്ക്കുവാനായില്ല." + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:79 + #, c-format + msgid "Expected status 200 when requesting guid, instead got status %d (%s)" + msgstr "" ++"Guid ന് അപേക്ഷിച്ചപ്പോള്‍ പ്രതീക്ഷിച്ച സ്ഥിതി 200 പകരം ലഭിച്ചത് സ്ഥിതി %d " ++"(%s) ആണ്" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:96 + msgid "Error parsing response as JSON: " +@@ -5760,7 +5981,7 @@ msgstr "JSON ആയി മറുപട� + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:112 + msgid "Didn't find email member in JSON data" +-msgstr "" ++msgstr "JSON ഡേറ്റയില്‍ ഈമെയില്‍ അംഗം ലഭ്യമായില്ല" + + #: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1 + msgid "Yahoo! Calendar" +@@ -5783,7 +6004,9 @@ msgstr "അവസാന ക്ലയന� + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53 + msgid "Wait running until at least one client is connected" +-msgstr "കുറഞ്ഞതു് ഒരു ക്ലയന്റ് എങ്കിലും കണക്ട് ആകുന്നതു് വരെ പ്രവര്‍ത്തിച്ചു് കാത്തിരിയ്ക്കുക" ++msgstr "" ++"കുറഞ്ഞതു് ഒരു ക്ലയന്റ് എങ്കിലും കണക്ട് ആകുന്നതു് വരെ പ്രവര്‍ത്തിച്ചു് " ++"കാത്തിരിയ്ക്കുക" + + #: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1 + msgid "Birthdays & Anniversaries" +@@ -5825,75 +6048,3 @@ msgstr "WebDAV" + #: ../services/evolution-user-prompter/prompt-user-gtk.c:122 + msgid "_Dismiss" + msgstr "_ഉപേക്ഷിയ്ക്കുക" +- +-msgid "Updating contacts cache (%d)... " +-msgstr "വിലാസങ്ങളുടെ cache പുതുക്കുന്നു (%d)..." +- +-msgid "Using Distinguished Name (DN)" +-msgstr "ഡിസ്റ്റിന്‍ക്വിഷ്ട് നെയിം ഉപയോഗിക്കുന്നു (DN)" +- +-msgid "Using Email Address" +-msgstr "ഇമെയില് വിലാസം ഉപയോഗിക്കുന്നു" +- +-msgid "\"%s\" on book before \"%s\"" +-msgstr "\"%s\" മുൻപ് \"%s\" പുസ്തകത്തിലുണ്ട്" +- +-msgid "book busy" +-msgstr "പുസ്തകം ഉപയോഗത്തില്‍" +- +-msgid "CORBA exception making \"%s\" call" +-msgstr "\"%s\" വിളി ആരംഭിക്കുന്ന CORBA എക്സെപ്ഷന്‍" +- +-msgid "%s: there is no current operation" +-msgstr "%s: നിലവില്‍ ഒരു പ്രക്രിയയും ഇല്ല" +- +-msgid "\"%s\" on book after \"%s\"" +-msgstr "\"%s\"-ന് ശേഷം \"%s\" പുസ്തകത്തിലുണ്ട്" +- +-msgid "%s: canceled" +-msgstr "%s: റദ്ദാക്കപ്പെട്ടു" +- +-msgid "%s: Invalid source." +-msgstr "%s: അസാധുവായ ഉറവിടം." +- +-msgid "%s: no factories available for URI `%s'" +-msgstr "%s: URI `%s'-ന് ഒരു ഫാക്ടറികളും ലഭ്യമല്ല" +- +-msgid "%s: Could not create EBookListener" +-msgstr "%s: EBookListener ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല" +- +-msgid "%s: there was no self contact UID stored in gconf" +-msgstr "%s: gconf-ല്‍ സംരക്ഷിച്ചിരിക്കുന്ന UID-യില്‍ വിലാസമില്ല" +- +-msgid "%s: there was no source for uid `%s' stored in gconf." +-msgstr "%s: gconf-ല്‍ സംരക്ഷിച്ചിരിക്കുന്ന uid `%s' ഉറവിടം ലഭ്യമല്ല." +- +-msgid "Could not create thread for getting deltas" +-msgstr "ഡെല്‍റ്റകള്‍ ലഭ്യമാകുന്നതിനുളള ത്രെഡ് ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല" +- +-msgid "Could not create thread for populating cache" +-msgstr "cache-നുളള ത്രെഡ് നിര്‍മ്മിക്കുവാന്‍ സാധ്യമായില്ല" +- +-msgid "Reply Requested: by " +-msgstr "മറുപടി ആവശ്യപ്പെട്ടത്: ആര്" +-msgid "Reply Requested: When convenient" +-msgstr "മറുപടി ആവശ്യപ്പെട്ടത്: സാധ്യമാകുമ്പോൾ" +- +-msgid "Loading %s items" +-msgstr "%s വസ്തുക്കള്‍ ലോഡ് ചെയ്യുന്നു" +- +-msgid "Enter password for %s (user %s)" +-msgstr "%s-നുളള പാസ്‌വേര്‍ഡ് നല്‍കുക (ഉപയോഗിക്കുന്ന ആള്‍ - %s)" +- +-msgid "Enter password for %s to enable proxy for user %s" +-msgstr "" +-"%s എന്ന ഉപയോഗിക്കുന്ന വ്യക്തിയുടെ പ്രോക്സി സജ്ജമാക്കുന്നതിനായി %s-നുളള പാസ്‌വേർഡ് നല്‍കുക" +- +-msgid "Cannot open message" +-msgstr "സന്ദേശം തുറക്കുവാന്‍ സാധ്യമാകുന്നില്ല" +- +-msgid "Unsupported operation: append message: for %s" +-msgstr "പിന്തുണയ്ക്കാത്ത പ്രക്രിയ: സന്ദേശത്തലില്‍ മാറ്റം വരുത്തുക: %s-നുളളത്" +- +-msgid "Unsupported operation: search by expression: for %s" +-msgstr "പിന്തുണയ്ക്കാത്ത പ്രക്രിയ: പ്രയോഗം അനുസരിച്ച് തിരയുക: %s-നുളളത്" +diff -up evolution-data-server-3.8.5/po/ta.po.translations evolution-data-server-3.8.5/po/ta.po +--- evolution-data-server-3.8.5/po/ta.po.translations 2013-04-28 15:34:29.000000000 +0200 ++++ evolution-data-server-3.8.5/po/ta.po 2014-01-13 16:23:40.788630231 +0100 +@@ -2,30 +2,30 @@ + # translation of evolution-data-server.HEAD.ta.po to + # This file is distributed under the same license as the PACKAGE package. + # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER. +-# ++# + # Jayaradha N , 2004. + # Felix , 2006. + # Dr.T.Vasudevan , 2007, 2008, 2009, 2010, 2012. + # I. Felix , 2009. + # I Felix , 2011. + # Shantha kumar , 2013. ++# shkumar , 2013. #zanata + msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server.gnome-2-28\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=" ++"evolution-data-server&keywords=I18N+L10N&component=Misc.\n" + "POT-Creation-Date: 2013-04-24 14:36+0000\n" +-"PO-Revision-Date: 2013-04-25 18:18+0000\n" +-"Last-Translator: Shantha kumar \n" ++"PO-Revision-Date: 2013-11-12 01:50-0500\n" ++"Last-Translator: shkumar \n" + "Language-Team: Tamil <>\n" +-"Language: ta\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=2; plural=(n!=1);\\n" +-"\n" ++"Language: ta\n" ++"Plural-Forms: nplurals=2; plural=(n!=1);\\n\n" + "\n" +-"X-Generator: Lokalize 1.5\n" ++"X-Generator: Zanata 3.1.2\n" + + #: ../addressbook/backends/file/e-book-backend-file.c:114 + #, c-format +@@ -54,7 +54,7 @@ msgstr "சேர்க்கப்ப� + + #: ../addressbook/backends/file/e-book-backend-file.c:844 + #: ../addressbook/backends/file/e-book-backend-file.c:1038 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2661 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2656 + #, c-format + msgid "Contact '%s' not found" + msgstr "தொடர்பு '%s' ஐ காணவில்லை" +@@ -81,7 +81,7 @@ msgid "Loading..." + msgstr "ஏற்றுகிறது..." + + #: ../addressbook/backends/file/e-book-backend-file.c:1250 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4963 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4978 + msgid "Searching..." + msgstr "தேடுகிறது..." + +@@ -92,8 +92,8 @@ msgstr "" + " பழைய தரவுத்தளம் %s இலிருந்து %s ஆக பெயர் மாற்றம் செய்ய முடியவில்லை: %s" + + #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1222 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4858 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4873 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:338 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 +@@ -101,58 +101,60 @@ msgstr "" + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:562 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:592 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 +-#: ../calendar/libecal/e-cal.c:2339 ../calendar/libecal/e-cal-client.c:275 +-#: ../camel/camel-imapx-command.c:596 ../libedataserver/e-client.c:179 ++#: ../calendar/libecal/e-cal.c:2339 ++#: ../calendar/libecal/e-cal-client.c:275 ++#: ../camel/camel-imapx-command.c:609 ++#: ../libedataserver/e-client.c:179 + msgid "Unknown error" + msgstr "தெரியாத பிழை" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:649 ++#: ../addressbook/backends/google/e-book-backend-google.c:679 + msgid "Querying for updated contacts…" + msgstr "புதுப்பிக்கப்பட்ட தொடர்புகளுக்கான கேள்வி..." + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:786 ++#: ../addressbook/backends/google/e-book-backend-google.c:816 + msgid "Querying for updated groups…" + msgstr "புதுப்பிக்கப்பட்ட குழுக்களுக்கான கேள்வி..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1235 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1653 ++#: ../addressbook/backends/google/e-book-backend-google.c:1265 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:389 + msgid "The backend does not support bulk additions" + msgstr "மொத்தமாக சேர்த்தலை பின்புல அமைப்பு ஆதரிக்காது" + + #. Insert the entry on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1267 ++#: ../addressbook/backends/google/e-book-backend-google.c:1297 + msgid "Creating new contact…" + msgstr "புதிய தொடர்பை உருவாக்குகிறது..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1358 ++#: ../addressbook/backends/google/e-book-backend-google.c:1388 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:506 + msgid "The backend does not support bulk removals" + msgstr "மொத்தமாக நீக்குதலை பின்புல அமைப்பு ஆதரிக்காது" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1386 ++#: ../addressbook/backends/google/e-book-backend-google.c:1416 + msgid "Deleting contact…" + msgstr "தொடர்பை அழிக்கிறது..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1640 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2319 ++#: ../addressbook/backends/google/e-book-backend-google.c:1670 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:567 + msgid "The backend does not support bulk modifications" + msgstr "மொத்தமாக மாற்றம் செய்தலை பின்புல அமைப்பு ஆதரிக்காது" + + #. Update the contact on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1678 ++#: ../addressbook/backends/google/e-book-backend-google.c:1708 + msgid "Modifying contact…" + msgstr "தொடர்பை மாற்றியமைக்கிறது..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1849 ++#: ../addressbook/backends/google/e-book-backend-google.c:1879 + msgid "Loading…" + msgstr "ஏற்றுகிறது..." + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1602 ++#: ../addressbook/backends/google/e-book-google-utils.c:1606 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -161,88 +163,88 @@ msgid "Personal" + msgstr "தனிப்பட்ட" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1604 ++#: ../addressbook/backends/google/e-book-google-utils.c:1608 + msgid "Friends" + msgstr "நண்பர்" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1606 ++#: ../addressbook/backends/google/e-book-google-utils.c:1610 + msgid "Family" + msgstr "குடும்பம்" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1608 ++#: ../addressbook/backends/google/e-book-google-utils.c:1612 + msgid "Coworkers" + msgstr "சக பணியாளர்கள்" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174 + msgid "Not connected" + msgstr "இணைக்கப்படவில்லை" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:950 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965 + msgid "Failed to bind using either v3 or v2 binds" + msgstr " v3 அல்லது v2 பைன்டுகளை பயன்படுத்தி பிணைக்கும் முயற்சி தோல்வி" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1073 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088 + msgid "Reconnecting to LDAP server..." + msgstr "LDAP சேவையகத்துடன் மீண்டும் இணைக்கப்படுகிறது..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1203 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218 + msgid "Invalid DN syntax" + msgstr "செல்லுபடியாகாத டிஎன் இலக்கணம்" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1219 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4857 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4872 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP பிழை 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1737 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Adding contact to LDAP server..." + msgstr "LDAP சேவையகத்தின் தொடர்பை சேர்க்கிறது..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1875 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1890 + msgid "Removing contact from LDAP server..." + msgstr "LDAP சேவையகத்திலுருந்து தொடர்பு நீக்கப்படுகிறது..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2019 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2431 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: NULL ldap_first_entry இலிருந்து திருப்பப்பட்டது." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2272 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2474 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2489 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: கையாளப்படாத விடை வகை %d திருப்பப்பட்டது" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2341 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2356 + msgid "Modifying contact from LDAP server..." + msgstr "LDAP லின் உள்ள தொடர்பில் மாற்றம் செய்கிறது..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2703 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2935 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2718 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2950 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: கையாளப்படாத தேடல் விடை வகை %d திருப்பப்பட்டது" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4806 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4821 + msgid "Receiving LDAP search results..." + msgstr "LDAP இல் தேடலின் முடிவை பெறுகிறது..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4985 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5000 + msgid "Error performing search" + msgstr "பிழையான செயற்பாட்டை சோதனையிடுதல்" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5108 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "தொடர்புகளை பதிவிறக்கம் செய்கிறது (%d)... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5571 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5654 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "பயனர் '%s' க்கு டிஎன் ஐ பெறுதல் தோல்வியுற்றது" +@@ -328,7 +330,7 @@ msgstr "கீழே உள்ள கோ + #. URI of the book to which the contact belongs to + #: ../addressbook/libebook-contacts/e-contact.c:127 + msgid "Book UID" +-msgstr "புத்தக யூஆர்டி(UID) " ++msgstr "புத்தக UID" + + #. Name fields + #. FN isn't really a structured field - we use a getter/setter +@@ -912,11 +914,11 @@ msgstr "செல்லுபடிய� + + #: ../addressbook/libebook-contacts/e-phone-number.c:51 + msgid "" +-"Remaining text after the country calling code is too short for a phone number" ++"Remaining text after the country calling code is too short for a phone " ++"number" + msgstr "" + "தேச அழைப்புக் குறியீட்டுக்கு அடுத்துள்ள மீதமுள்ள உரையானது தொலைபேசி எண்ணாக " +-"இருக்க " +-"முடியாது, அது மிகச் சிறியதாக உள்ளது" ++"இருக்க முடியாது, அது மிகச் சிறியதாக உள்ளது" + + #: ../addressbook/libebook-contacts/e-phone-number.c:53 + msgid "Text is too short for a phone number" +@@ -939,8 +941,8 @@ msgstr "புத்தக பண்ப� + + #: ../addressbook/libebook/e-book-client.c:993 + #: ../addressbook/libebook/e-book-client.c:1168 +-#: ../calendar/libecal/e-cal-client.c:1510 +-#: ../calendar/libecal/e-cal-client.c:1692 ++#: ../calendar/libecal/e-cal-client.c:1515 ++#: ../calendar/libecal/e-cal-client.c:1697 + #, c-format + msgid "Unable to connect to '%s': " + msgstr "'%s' உடன் இணைக்க முடியவில்லை: " +@@ -950,46 +952,45 @@ msgstr "'%s' உடன் இணைக� + msgid "Error introspecting unknown summary field '%s'" + msgstr "தெரியாத சுருக்க புலம் '%s' ஐ கவனிப்பதில் பிழை" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1287 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289 + #: ../camel/camel-db.c:544 + #, c-format + msgid "Insufficient memory" + msgstr "நினைவகம் போதவில்லை " + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1420 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1422 + #, c-format + msgid "Invalid contact field '%d' specified in summary" + msgstr "செல்லுபடியாகாத தொடர்பு புலம் '%d' சுருக்கத்தில் குறிக்கப்பட்டுள்ளது" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1454 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1456 + #, c-format + msgid "" + "Contact field '%s' of type '%s' specified in summary, but only boolean, " + "string and string list field types are supported" + msgstr "" + " சுருக்கத்தில் புலம் '%s' இல் '%s' வகை குறிக்கப்பட்டுள்ளது. ஆனால் பூலியன், " +-"சரம், " +-"சரப்பட்டியல் புல வகைகள் மட்டுமே ஆதரிக்கப்படுகிறது." ++"சரம், சரப்பட்டியல் புல வகைகள் மட்டுமே ஆதரிக்கப்படுகிறது." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2649 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3690 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3686 + #, c-format + msgid "" + "Full search_contacts are not stored in cache. vcards cannot be returned." + msgstr "_c" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3812 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3893 + #, c-format + msgid "Query contained unsupported elements" + msgstr "வினவலில் ஆதரிக்கப்படாத கூறுகள் இருந்தன" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3820 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 + #, c-format + msgid "Invalid Query" + msgstr "செல்லுபடியாகாத வினவல்" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3844 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3840 + #, c-format + msgid "" + "Full search_contacts are not stored in cache. Hence only summary query is " +@@ -998,16 +999,17 @@ msgstr "" + "_c முழு தொடர்பு தேட இடையகத்தில் இல்லை. ஆகவே சுருக்கமான உசாவல் மட்டுமே " + "ஆதரிக்கப்படுகிறது." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3901 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 + #: ../addressbook/libedata-book/e-data-book.c:669 + #: ../addressbook/libedata-book/e-data-book.c:809 + #: ../calendar/libedata-cal/e-data-cal.c:612 +-#: ../calendar/libedata-cal/e-data-cal.c:771 ../libedataserver/e-client.c:166 ++#: ../calendar/libedata-cal/e-data-cal.c:771 ++#: ../libedataserver/e-client.c:166 + #, c-format + msgid "Invalid query" + msgstr "செல்லுபடியாகாத கேள்வி" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3943 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3940 + #, c-format + msgid "" + "Full vcards are not stored in cache. Hence only summary query is supported." +@@ -1015,7 +1017,7 @@ msgstr "" + "விகார்டுகள் இடையகத்தில் இல்லை. ஆகவே சுருக்கமான உசாவல் மட்டுமே " + "ஆதரிக்கப்படுகிறது." + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4643 + #, c-format + msgid "Unable to remove the db file: errno %d" + msgstr "டிபி கோப்பை நீக்குவதில் தோல்வி errno %d" +@@ -1027,7 +1029,6 @@ msgstr "கிளையன்ட்ட� + + #. Translators: This is prefix to a detailed error message + #. Translators: This is a prefix to a detailed error message * +-#. + #: ../addressbook/libedata-book/e-data-book.c:691 + #: ../calendar/libedata-cal/e-data-cal.c:635 + msgid "Invalid query: " +@@ -1039,18 +1040,21 @@ msgid "Success" + msgstr "வெற்றி" + + #: ../addressbook/libedata-book/e-data-book.c:794 +-#: ../calendar/libecal/e-cal.c:2307 ../calendar/libedata-cal/e-data-cal.c:753 ++#: ../calendar/libecal/e-cal.c:2307 ++#: ../calendar/libedata-cal/e-data-cal.c:753 + #: ../libedataserver/e-client.c:133 + msgid "Backend is busy" + msgstr "பின்தரவு தளம் வேலையில் உள்ளது" + + #: ../addressbook/libedata-book/e-data-book.c:795 +-#: ../calendar/libedata-cal/e-data-cal.c:754 ../libedataserver/e-client.c:143 ++#: ../calendar/libedata-cal/e-data-cal.c:754 ++#: ../libedataserver/e-client.c:143 + msgid "Repository offline" + msgstr "கிடங்கு இணைப்பில் இல்லை" + + #: ../addressbook/libedata-book/e-data-book.c:796 +-#: ../calendar/libecal/e-cal.c:2321 ../calendar/libedata-cal/e-data-cal.c:755 ++#: ../calendar/libecal/e-cal.c:2321 ++#: ../calendar/libedata-cal/e-data-cal.c:755 + #: ../libedataserver/e-client.c:150 + msgid "Permission denied" + msgstr "அனுமதி மறுக்கப்பட்டது" +@@ -1071,12 +1075,14 @@ msgid "Unsupported field" + msgstr "ஆதரவில்லா புலம்" + + #: ../addressbook/libedata-book/e-data-book.c:802 +-#: ../calendar/libedata-cal/e-data-cal.c:764 ../libedataserver/e-client.c:158 ++#: ../calendar/libedata-cal/e-data-cal.c:764 ++#: ../libedataserver/e-client.c:158 + msgid "Unsupported authentication method" + msgstr "துணையில்லாத உறுதி செய்யும் செயல்பாடு " + + #: ../addressbook/libedata-book/e-data-book.c:803 +-#: ../calendar/libedata-cal/e-data-cal.c:765 ../libedataserver/e-client.c:160 ++#: ../calendar/libedata-cal/e-data-cal.c:765 ++#: ../libedataserver/e-client.c:160 + msgid "TLS not available" + msgstr "டிஎல்எஸ் (TLS) கிடைக்கவில்லை" + +@@ -1094,22 +1100,26 @@ msgid "Not available in offline mode" + msgstr "இணைப்பில்லா முறையில் கிடைக்காது" + + #: ../addressbook/libedata-book/e-data-book.c:807 +-#: ../calendar/libedata-cal/e-data-cal.c:769 ../libedataserver/e-client.c:162 ++#: ../calendar/libedata-cal/e-data-cal.c:769 ++#: ../libedataserver/e-client.c:162 + msgid "Search size limit exceeded" + msgstr "தேடு அளவு வரையரை மீறப்பட்டது" + + #: ../addressbook/libedata-book/e-data-book.c:808 +-#: ../calendar/libedata-cal/e-data-cal.c:770 ../libedataserver/e-client.c:164 ++#: ../calendar/libedata-cal/e-data-cal.c:770 ++#: ../libedataserver/e-client.c:164 + msgid "Search time limit exceeded" + msgstr "தேடு நேரம் வரையரை மீறப்பட்டது" + + #: ../addressbook/libedata-book/e-data-book.c:810 +-#: ../calendar/libedata-cal/e-data-cal.c:772 ../libedataserver/e-client.c:168 ++#: ../calendar/libedata-cal/e-data-cal.c:772 ++#: ../libedataserver/e-client.c:168 + msgid "Query refused" + msgstr "கேள்வி நிராகரிக்கப்பட்டது" + + #: ../addressbook/libedata-book/e-data-book.c:811 +-#: ../calendar/libedata-cal/e-data-cal.c:773 ../libedataserver/e-client.c:154 ++#: ../calendar/libedata-cal/e-data-cal.c:773 ++#: ../libedataserver/e-client.c:154 + msgid "Could not cancel" + msgstr "ரத்து செய்ய முடியாது" + +@@ -1121,22 +1131,27 @@ msgid "Invalid server version" + msgstr "தவறான சேவையக பதிப்பு " + + #: ../addressbook/libedata-book/e-data-book.c:815 +-#: ../calendar/libecal/e-cal.c:2305 ../calendar/libedata-cal/e-data-cal.c:776 ++#: ../calendar/libecal/e-cal.c:2305 ++#: ../calendar/libedata-cal/e-data-cal.c:776 + #: ../libedataserver/e-client.c:131 + msgid "Invalid argument" + msgstr "தவரான அளவுரு" + + #. Translators: The string for NOT_SUPPORTED error + #: ../addressbook/libedata-book/e-data-book.c:817 +-#: ../calendar/libecal/e-cal.c:1064 ../calendar/libecal/e-cal.c:1432 +-#: ../calendar/libecal/e-cal.c:1912 ../calendar/libecal/e-cal.c:2344 +-#: ../calendar/libedata-cal/e-data-cal.c:778 ../libedataserver/e-client.c:156 ++#: ../calendar/libecal/e-cal.c:1064 ++#: ../calendar/libecal/e-cal.c:1432 ++#: ../calendar/libecal/e-cal.c:1912 ++#: ../calendar/libecal/e-cal.c:2344 ++#: ../calendar/libedata-cal/e-data-cal.c:778 ++#: ../libedataserver/e-client.c:156 + #, c-format + msgid "Not supported" + msgstr "ஆதரவு இல்லை" + + #: ../addressbook/libedata-book/e-data-book.c:818 +-#: ../calendar/libedata-cal/e-data-cal.c:779 ../libedataserver/e-client.c:174 ++#: ../calendar/libedata-cal/e-data-cal.c:779 ++#: ../libedataserver/e-client.c:174 + msgid "Backend is not opened yet" + msgstr "பின்முனை இதுவரை திறக்கப்பட்டது" + +@@ -1146,7 +1161,8 @@ msgid "Object is out of sync" + msgstr "பொருள் ஒத்திசைவில் இல்லை" + + #: ../addressbook/libedata-book/e-data-book.c:827 +-#: ../calendar/libedata-cal/e-data-cal.c:787 ../libedataserver/e-client.c:172 ++#: ../calendar/libedata-cal/e-data-cal.c:787 ++#: ../libedataserver/e-client.c:172 + msgid "Other error" + msgstr "மற்ற பிழை" + +@@ -1315,7 +1331,7 @@ msgid "Not a calendar." + msgstr "நாள்காட்டி இல்லை" + + #: ../calendar/backends/http/e-cal-backend-http.c:926 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:514 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:520 + msgid "Could not create cache file" + msgstr "தற்காலிக கோப்பை உருவாக்க முடியவில்லை" + +@@ -1323,43 +1339,43 @@ msgstr "தற்காலிக கோ� + msgid "Could not retrieve weather data" + msgstr "வானிலை தரவினை எடுக்க முடியாது" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:278 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:284 + msgid "Weather: Fog" + msgstr "வானிலை: பனி" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:279 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:285 + msgid "Weather: Cloudy Night" + msgstr "வானிலை: மேக மூட்ட இரவு" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:280 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:286 + msgid "Weather: Cloudy" + msgstr "வானிலை: மேக மூட்டம்" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:281 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:287 + msgid "Weather: Overcast" + msgstr "வானிலை: அதிக மழை" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:282 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:288 + msgid "Weather: Showers" + msgstr "வானிலை: மழைத்தூரல்கள்" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:283 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:289 + msgid "Weather: Snow" + msgstr "வானிலை: பனிகட்டி" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:284 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:290 + msgid "Weather: Clear Night" + msgstr "வானிலை: தெளிவான இரவு" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:285 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:291 + msgid "Weather: Sunny" + msgstr "வானிலை: வெயில்" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:286 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:292 + msgid "Weather: Thunderstorms" + msgstr "வானிலை: இடி மழை" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:410 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:416 + msgid "Forecast" + msgstr "வானிலை" + +@@ -1367,16 +1383,19 @@ msgstr "வானிலை" + msgid "Repository is offline" + msgstr "கிடங்கு இணையத்தொடர்பில் இல்லை" + +-#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:262 ++#: ../calendar/libecal/e-cal.c:2311 ++#: ../calendar/libecal/e-cal-client.c:262 + msgid "No such calendar" + msgstr "இப்படி ஒரு நாள்காட்டி இல்லை" + +-#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:264 ++#: ../calendar/libecal/e-cal.c:2313 ++#: ../calendar/libecal/e-cal-client.c:264 + #: ../calendar/libedata-cal/e-data-cal.c:757 + msgid "Object not found" + msgstr "பொருள் காணவில்லை" + +-#: ../calendar/libecal/e-cal.c:2315 ../calendar/libecal/e-cal-client.c:266 ++#: ../calendar/libecal/e-cal.c:2315 ++#: ../calendar/libecal/e-cal-client.c:266 + #: ../calendar/libedata-cal/e-data-cal.c:758 + msgid "Invalid object" + msgstr "பயன்றற நோக்கம்" +@@ -1393,7 +1412,8 @@ msgstr "யூஆர்ஐ(URI) ஏற� + msgid "Unknown User" + msgstr "பயனபடுத்துவதை அறிந்திராதவர் " + +-#: ../calendar/libecal/e-cal.c:2325 ../calendar/libecal/e-cal-client.c:270 ++#: ../calendar/libecal/e-cal.c:2325 ++#: ../calendar/libecal/e-cal-client.c:270 + #: ../calendar/libedata-cal/e-data-cal.c:759 + msgid "Object ID already exists" + msgstr "நோக்கம் ID ஏற்கெனவே தோற்றுவிக்கப் பட்டுள்ளது" +@@ -1410,12 +1430,13 @@ msgstr "செயல்பாடு ர� + msgid "Could not cancel operation" + msgstr "செயல்பாட்டை ரத்து செய்ய முடியவில்லை" + +-#: ../calendar/libecal/e-cal.c:2333 ../libedataserver/e-client.c:139 ++#: ../calendar/libecal/e-cal.c:2333 ++#: ../libedataserver/e-client.c:139 + msgid "Authentication failed" + msgstr "அனுமதித்தல் தோல்வி" + + #: ../calendar/libecal/e-cal.c:2335 +-#: ../camel/providers/smtp/camel-smtp-transport.c:923 ++#: ../camel/providers/smtp/camel-smtp-transport.c:915 + #: ../libedataserver/e-client.c:141 + msgid "Authentication required" + msgstr "அனுமதி தேவை" +@@ -1577,17 +1598,20 @@ msgstr "30 ஆவது" + msgid "31st" + msgstr "31 ஆவது" + +-#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734 ++#: ../calendar/libecal/e-cal-util.c:707 ++#: ../calendar/libecal/e-cal-util.c:734 + msgctxt "Priority" + msgid "High" + msgstr "அதிகமான" + +-#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736 ++#: ../calendar/libecal/e-cal-util.c:709 ++#: ../calendar/libecal/e-cal-util.c:736 + msgctxt "Priority" + msgid "Normal" + msgstr "இயல்பானது" + +-#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738 ++#: ../calendar/libecal/e-cal-util.c:711 ++#: ../calendar/libecal/e-cal-util.c:738 + msgctxt "Priority" + msgid "Low" + msgstr "குறைவான" +@@ -1683,8 +1707,7 @@ msgid "" + msgstr "" + "\"%s\" முதல் அளபுரு \"any\", \"summary\", அல்லது\"description\", அல்லது " + "\"location\" அல்லது \"attendee\", அல்லது \"organizer\", அல்லது " +-"\"classification" +-"\" ஆக இருக்க வேண்டும் என எதிர்பார்க்கிறது." ++"\"classification\" ஆக இருக்க வேண்டும் என எதிர்பார்க்கிறது." + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 + #, c-format +@@ -1698,14 +1721,14 @@ msgid "" + "be a boolean false (#f)" + msgstr "" + "\"%s\" எல்லா அளபுருக்களும் சரமாகவோ அல்லது ஒரே ஒரு அளபுரு மட்டும் பூலியன் " +-"மதிப்பு " +-"தவறாகவோ(#f) இருக்க வேண்டும் என எதிர்பார்க்கிறது" ++"மதிப்பு தவறாகவோ(#f) இருக்க வேண்டும் என எதிர்பார்க்கிறது" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389 + #, c-format + msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" + msgstr "" +-"\"%s\" முதல் அளபுரு ISO 860 தேதி/நேர சரமாக இருக்க வேண்டும் என எதிர்பார்க்கிறது" ++"\"%s\" முதல் அளபுரு ISO 860 தேதி/நேர சரமாக இருக்க வேண்டும் என " ++"எதிர்பார்க்கிறது" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450 + #, c-format +@@ -1882,7 +1905,8 @@ msgstr "" + msgid "Resynchronizing with server" + msgstr "சேவனோடு மீண்டும் ஒத்திசைவு நிகழ்கிறது" + +-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93 ++#: ../camel/camel-disco-folder.c:76 ++#: ../camel/camel-offline-folder.c:93 + msgid "Downloading new messages for offline mode" + msgstr "இணையத்தின் இணையாமல் வேலை செய்ய புதிய செய்தியை பதிவிறக்கம் செய்கிறது" + +@@ -1891,24 +1915,35 @@ msgstr "இணையத்தின் � + msgid "Preparing folder '%s' for offline" + msgstr "இணையத்தொடர்பில்லாத நிலைக்காக '%s' அடைவு தயாராகிறது" + +-#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336 ++#: ../camel/camel-disco-folder.c:489 ++#: ../camel/camel-offline-folder.c:336 + msgid "Copy folder content locally for _offline operation" + msgstr "" +-"_o இணையத்தின் இணையாமல் வேலை செய்ய அடைவின் உள்ளடக்கத்தை கணினியில் நகலெடுக்கவும்" ++"_o இணையத்தின் இணையாமல் வேலை செய்ய அடைவின் உள்ளடக்கத்தை கணினியில் " ++"நகலெடுக்கவும்" + +-#: ../camel/camel-disco-store.c:475 ../camel/camel-imapx-folder.c:478 +-#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553 +-#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748 +-#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993 +-#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:368 +-#: ../camel/camel-imapx-store.c:1592 ../camel/camel-imapx-store.c:1681 ++#: ../camel/camel-disco-store.c:475 ++#: ../camel/camel-imapx-folder.c:478 ++#: ../camel/camel-imapx-folder.c:514 ++#: ../camel/camel-imapx-folder.c:553 ++#: ../camel/camel-imapx-folder.c:613 ++#: ../camel/camel-imapx-folder.c:748 ++#: ../camel/camel-imapx-folder.c:933 ++#: ../camel/camel-imapx-folder.c:993 ++#: ../camel/camel-imapx-folder.c:1032 ++#: ../camel/camel-imapx-store.c:368 ++#: ../camel/camel-imapx-store.c:1592 ++#: ../camel/camel-imapx-store.c:1681 + #: ../camel/camel-imapx-store.c:1730 +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 +-#: ../camel/providers/pop3/camel-pop3-folder.c:677 +-#: ../camel/providers/pop3/camel-pop3-folder.c:906 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1106 +-#: ../camel/providers/pop3/camel-pop3-store.c:472 +-#: ../camel/providers/pop3/camel-pop3-store.c:896 ++#: ../camel/providers/pop3/camel-pop3-folder.c:555 ++#: ../camel/providers/pop3/camel-pop3-folder.c:705 ++#: ../camel/providers/pop3/camel-pop3-folder.c:940 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1150 ++#: ../camel/providers/pop3/camel-pop3-store.c:291 ++#: ../camel/providers/pop3/camel-pop3-store.c:519 ++#: ../camel/providers/pop3/camel-pop3-store.c:567 ++#: ../camel/providers/pop3/camel-pop3-store.c:652 ++#: ../camel/providers/pop3/camel-pop3-store.c:1052 + #, c-format + msgid "You must be working online to complete this operation" + msgstr "இந்த செயலை முடிக்க இணையதொடர்பு தேவை" +@@ -1918,7 +1953,8 @@ msgstr "இந்த செயலை ம + msgid "Canceled" + msgstr "நீக்கப்பட்டுள்ளது" + +-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797 ++#: ../camel/camel-filter-driver.c:916 ++#: ../camel/camel-filter-search.c:797 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "துணை செயலை உருவாக்குவதில் தோல்வி '%s': %s" +@@ -1928,69 +1964,74 @@ msgstr "துணை செயலை உ + msgid "Invalid message stream received from %s: %s" + msgstr "செல்லாத செய்தி தொடர்பு %s: லிருந்து பெறப்பட்டது %s" + +-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1179 ++#: ../camel/camel-filter-driver.c:1171 ++#: ../camel/camel-filter-driver.c:1180 + msgid "Syncing folders" + msgstr "அடைவுகளை ஒத்திசைக்கிறது" + +-#: ../camel/camel-filter-driver.c:1277 ++#: ../camel/camel-filter-driver.c:1278 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "வடிகட்டியை பகுக்கும் போது பிழை : %s: %s" + +-#: ../camel/camel-filter-driver.c:1288 ++#: ../camel/camel-filter-driver.c:1289 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "வடிகட்டியை இயக்கும் போது பிழை: %s: %s" + +-#: ../camel/camel-filter-driver.c:1384 ++#: ../camel/camel-filter-driver.c:1385 + #, c-format + msgid "Unable to open spool folder" + msgstr "ஸ்பூல் அடைவை திறக்க முடியவில்லை" + +-#: ../camel/camel-filter-driver.c:1396 ++#: ../camel/camel-filter-driver.c:1397 + #, c-format + msgid "Unable to process spool folder" + msgstr "ஸ்பூட் அடைவை செயல்படுத்த முடியவில்லை" + +-#: ../camel/camel-filter-driver.c:1419 ++#: ../camel/camel-filter-driver.c:1420 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "%d (%d%%) செய்தியை பெறுகிறது" + +-#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1450 ++#: ../camel/camel-filter-driver.c:1429 ++#: ../camel/camel-filter-driver.c:1451 + #, c-format + msgid "Failed on message %d" + msgstr "%d செய்தி தோல்வியில் முடிந்தது" + +-#: ../camel/camel-filter-driver.c:1469 ../camel/camel-filter-driver.c:1583 ++#: ../camel/camel-filter-driver.c:1470 ++#: ../camel/camel-filter-driver.c:1584 + msgid "Syncing folder" + msgstr "அடைவு ஒத்திசைகிறது" + +-#: ../camel/camel-filter-driver.c:1474 ../camel/camel-filter-driver.c:1591 ++#: ../camel/camel-filter-driver.c:1475 ++#: ../camel/camel-filter-driver.c:1592 + msgid "Complete" + msgstr "முடிந்தது" + +-#: ../camel/camel-filter-driver.c:1537 ++#: ../camel/camel-filter-driver.c:1538 + #, c-format + msgid "Getting message %d of %d" + msgstr "%d யில் %d செய்தியை பெறுகிறது" + +-#: ../camel/camel-filter-driver.c:1555 ++#: ../camel/camel-filter-driver.c:1556 + #, c-format + msgid "Failed at message %d of %d" + msgstr "%d யில் %d செய்தியை பெறும்போது தோல்வி" + +-#: ../camel/camel-filter-driver.c:1751 ../camel/camel-filter-driver.c:1785 ++#: ../camel/camel-filter-driver.c:1752 ++#: ../camel/camel-filter-driver.c:1786 + #, c-format + msgid "Execution of filter '%s' failed: " + msgstr "'%s' வடிகட்டியைச் செயல்படுத்துவது தோல்வி அடைந்தது: " + +-#: ../camel/camel-filter-driver.c:1775 ++#: ../camel/camel-filter-driver.c:1776 + #, c-format + msgid "Error parsing filter '%s': %s: %s" + msgstr "'%s' வடிகட்டியைப் பாகுபடுத்தும் போது பிழை: %s: %s" + +-#: ../camel/camel-filter-driver.c:1794 ++#: ../camel/camel-filter-driver.c:1795 + #, c-format + msgid "Error executing filter '%s': %s: %s" + msgstr "'%s' வடிகட்டியை செயல்படுத்தும் போது பிழை: %s: %s" +@@ -2007,68 +2048,70 @@ msgstr "செல்லாத பயன� + msgid "Invalid arguments to (user-tag)" + msgstr "செல்லாத பயனிலை (user-tag)" + +-#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055 ++#: ../camel/camel-filter-search.c:1046 ++#: ../camel/camel-filter-search.c:1055 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "வடிகட்டி தேடலை இயக்கும் போது பிழை : %s: %s" + +-#: ../camel/camel-folder.c:291 ++#: ../camel/camel-folder.c:310 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" + msgstr[0] "'%s' இல் புதிய குப்பை செய்தியை கண்டுபிடிக்க கற்றல்" + msgstr[1] "'%s' இல் புதிய குப்பை செய்திகளை கண்டுபிடிக்க கற்றல்" + +-#: ../camel/camel-folder.c:331 ++#: ../camel/camel-folder.c:350 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" + msgstr[0] "'%s' இல் புதிய ஹாம் குப்பை செய்தியை கண்டுபிடிக்க கற்றல்" + msgstr[1] "'%s' இல் புதிய ஹாம் குப்பை செய்திகளை கண்டுபிடிக்க கற்றல்" + +-#: ../camel/camel-folder.c:379 ++#: ../camel/camel-folder.c:398 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "'%s' இல் புதிய செய்தியை வடிகட்டுகிறது" + msgstr[1] "'%s' இல் புதிய செய்திகளை வடிகட்டுகிறது" + +-#: ../camel/camel-folder.c:953 ++#: ../camel/camel-folder.c:972 + #: ../camel/providers/local/camel-maildir-folder.c:321 + msgid "Moving messages" + msgstr "செய்திகளை நகர்த்துகிறது" + +-#: ../camel/camel-folder.c:956 ++#: ../camel/camel-folder.c:975 + msgid "Copying messages" + msgstr "செய்திகளை படியெடுக்கிறது" + +-#: ../camel/camel-folder.c:1276 ++#: ../camel/camel-folder.c:1295 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "கோப்புறை '%s' க்கான ஒதுக்கீடு தகவலுக்கு துணைபுரியவில்லை" + +-#: ../camel/camel-folder.c:3509 ++#: ../camel/camel-folder.c:3528 + #, c-format + msgid "Expunging folder '%s'" + msgstr "'%s' அடைவை அழிக்கிறது" + +-#: ../camel/camel-folder.c:3741 ++#: ../camel/camel-folder.c:3760 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "'%s' இல் %s செய்தியை மீட்டெடுக்கிறது" + +-#: ../camel/camel-folder.c:3892 ++#: ../camel/camel-folder.c:3911 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "'%s' க்கான மீட்டெடுக்கும் ஒதுக்கீடு தகவல்" + +-#: ../camel/camel-folder.c:4124 ++#: ../camel/camel-folder.c:4143 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "'%s' அடைவை புதுப்பிக்கிறது" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:838 ../camel/camel-folder-search.c:881 ++#: ../camel/camel-folder-search.c:838 ++#: ../camel/camel-folder-search.c:881 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) க்கு ஒரே ஒரு பூலியன் விடை தேவைப்படுகிறது" +@@ -2080,7 +2123,8 @@ msgid "(%s) not allowed inside %s" + msgstr "(%s) ஐ %s உள்ளே அனைத்தையும் பொருத்த அனுமதி இல்லை" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:923 ../camel/camel-folder-search.c:931 ++#: ../camel/camel-folder-search.c:923 ++#: ../camel/camel-folder-search.c:931 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) சரப்பொருத்தம் அவசியம்" +@@ -2097,154 +2141,157 @@ msgstr "(%s) அணி விடை த� + msgid "(%s) requires the folder set" + msgstr "(%s) அடைவை அமைக்க வேண்டியது அவசியம்" + +-#: ../camel/camel-folder-search.c:1862 ../camel/camel-folder-search.c:2029 ++#: ../camel/camel-folder-search.c:1862 ++#: ../camel/camel-folder-search.c:2029 + #, c-format +-msgid "" +-"Cannot parse search expression: %s:\n" ++msgid "Cannot parse search expression: %s:\n" + "%s" +-msgstr "" +-"இது போன்ற தொடர்களை பகுக்க முடியாது: %s:\n" ++msgstr "இது போன்ற தொடர்களை பகுக்க முடியாது: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1874 ../camel/camel-folder-search.c:2041 ++#: ../camel/camel-folder-search.c:1874 ++#: ../camel/camel-folder-search.c:2041 + #, c-format +-msgid "" +-"Error executing search expression: %s:\n" ++msgid "Error executing search expression: %s:\n" + "%s" +-msgstr "" +-"தேடல் தொடரை இயக்கும் போது பிழை: %s:\n" ++msgstr "தேடல் தொடரை இயக்கும் போது பிழை: %s:\n" + "%s" + +-#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696 +-#: ../camel/camel-gpg-context.c:1359 ++#: ../camel/camel-gpg-context.c:730 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/camel-gpg-context.c:1398 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "gpgயை இயக்க முடியவில்லை: %s" + +-#: ../camel/camel-gpg-context.c:696 +-#: ../camel/providers/smtp/camel-smtp-transport.c:926 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/providers/smtp/camel-smtp-transport.c:918 + msgid "Unknown" + msgstr "தெரியாது" + +-#: ../camel/camel-gpg-context.c:761 ++#: ../camel/camel-gpg-context.c:800 + #, c-format +-msgid "" +-"Unexpected GnuPG status message encountered:\n" ++msgid "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" +-msgstr "" +-"எதிர்பாராத GnuPG நிலை செய்தி கிடைத்துள்ளது:\n" ++msgstr "எதிர்பாராத GnuPG நிலை செய்தி கிடைத்துள்ளது:\n" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:797 ++#: ../camel/camel-gpg-context.c:836 + #, c-format + msgid "Failed to parse gpg userid hint." + msgstr "gpg பயனீட்டாளர் அடையாள எண் குறிப்பை பகுக்க முடியவில்லை" + +-#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837 ++#: ../camel/camel-gpg-context.c:861 ++#: ../camel/camel-gpg-context.c:876 + #, c-format + msgid "Failed to parse gpg passphrase request." + msgstr "gpg கடவுச்சொல் கோரிக்கையை பகுத்தல் தோல்வியடைந்தது" + +-#: ../camel/camel-gpg-context.c:858 ++#: ../camel/camel-gpg-context.c:897 + #, c-format +-msgid "" +-"You need a PIN to unlock the key for your\n" ++msgid "You need a PIN to unlock the key for your\n" + "SmartCard: \"%s\"" +-msgstr "" +-"நீங்கள் ஸ்மார்ட்கார்ட் பூட்டை \n" ++msgstr "நீங்கள் ஸ்மார்ட்கார்ட் பூட்டை \n" + "திறக்க கடவுச்சொல் தேவை: \"%s\"" + +-#: ../camel/camel-gpg-context.c:862 ++#: ../camel/camel-gpg-context.c:901 + #, c-format +-msgid "" +-"You need a passphrase to unlock the key for\n" ++msgid "You need a passphrase to unlock the key for\n" + "user: \"%s\"" +-msgstr "" +-"இந்த பயனருக்கு பூட்டை திறக்க கடவுச்சொல் தேவை \n" ++msgstr "இந்த பயனருக்கு பூட்டை திறக்க கடவுச்சொல் தேவை \n" + ": \"%s\"" + +-#: ../camel/camel-gpg-context.c:868 ++#: ../camel/camel-gpg-context.c:907 + #, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "'%s' க்கு க்னுபிஜி இடமிருந்து எதிர்பாராத விண்ணப்பம்" + +-#: ../camel/camel-gpg-context.c:880 ++#: ../camel/camel-gpg-context.c:919 + msgid "" + "Note the encrypted content doesn't contain information about a recipient, " + "thus there will be a password prompt for each of stored private key." + msgstr "" + "குறியாக்கம் செய்யப்பட்ட உள்ளடக்கட்தில் ரசீதைப் பற்றிய தகவல் இல்லை என்பதை " +-"கவனத்தில் கொள்ளவும், " +-"ஆகவே சேமிக்கப்பட்டுள்ள ஒவ்வொரு தனிப்பட்ட திறப்புக்கும் கடவுச்சொல் " +-"கேட்கப்படும்." ++"கவனத்தில் கொள்ளவும், ஆகவே சேமிக்கப்பட்டுள்ள ஒவ்வொரு தனிப்பட்ட திறப்புக்கும் " ++"கடவுச்சொல் கேட்கப்படும்." + +-#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523 ++#: ../camel/camel-gpg-context.c:950 ++#: ../camel/camel-net-utils.c:524 + #: ../camel/camel-tcp-stream-raw.c:268 +-#: ../camel/providers/nntp/camel-nntp-summary.c:388 ++#: ../camel/providers/nntp/camel-nntp-summary.c:402 + #: ../libedataserver/e-client.c:152 + #, c-format + msgid "Cancelled" + msgstr "ரத்து செய்யப்பட்டது" + +-#: ../camel/camel-gpg-context.c:932 ++#: ../camel/camel-gpg-context.c:971 + #, c-format + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "ரகசிய பூட்டை திறக்க முடியவில்லை 3 முறை தவறாக கடவுச்சொல் தரப்பட்டது" + +-#: ../camel/camel-gpg-context.c:945 ++#: ../camel/camel-gpg-context.c:984 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "GnuPG விலிருந்து எதிர்பாராத கோரிக்கை : %s" + +-#: ../camel/camel-gpg-context.c:1076 ++#: ../camel/camel-gpg-context.c:1115 + #, c-format + msgid "Failed to encrypt: No valid recipients specified." + msgstr "குறிமுறையாக்க முடியவில்லை: சரியான பெறுநர் குறிப்பிடப்படவில்லை" + +-#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846 ++#: ../camel/camel-gpg-context.c:1665 ++#: ../camel/camel-smime-context.c:846 + msgid "Could not generate signing data: " + msgstr " கைஓப்ப தகவல் உருவாக்க முடியவில்லை: " + +-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879 +-#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136 +-#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284 ++#: ../camel/camel-gpg-context.c:1714 ++#: ../camel/camel-gpg-context.c:1918 ++#: ../camel/camel-gpg-context.c:2028 ++#: ../camel/camel-gpg-context.c:2179 ++#: ../camel/camel-gpg-context.c:2279 ++#: ../camel/camel-gpg-context.c:2327 + msgid "Failed to execute gpg." + msgstr "gpg யை இயக்க முடியவில்லை" + +-#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762 +-#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790 +-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987 ++#: ../camel/camel-gpg-context.c:1793 ++#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1809 ++#: ../camel/camel-gpg-context.c:1829 ++#: ../camel/camel-smime-context.c:973 ++#: ../camel/camel-smime-context.c:987 + #: ../camel/camel-smime-context.c:996 + #, c-format + msgid "Cannot verify message signature: Incorrect message format" + msgstr "செய்தி கையொப்பத்தை சரிபார்க்க முடியவில்லை: தவறான வடிவம்" + +-#: ../camel/camel-gpg-context.c:1832 ++#: ../camel/camel-gpg-context.c:1871 + msgid "Cannot verify message signature: " + msgstr "செய்தி கையொப்பத்தை சரிபார்க்க முடியவில்லை: " + +-#: ../camel/camel-gpg-context.c:1955 ++#: ../camel/camel-gpg-context.c:1994 + msgid "Could not generate encrypting data: " + msgstr "குறியாக்கப்பட்ட தகவலை உருவாக்க முடியவில்லை: " + +-#: ../camel/camel-gpg-context.c:2008 ++#: ../camel/camel-gpg-context.c:2047 + msgid "This is a digitally encrypted message part" + msgstr "இது டிஜிடல் குறியாக்கம் செய்யப்பட்ட தகவல்" + +-#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075 +-#: ../camel/camel-gpg-context.c:2098 ++#: ../camel/camel-gpg-context.c:2105 ++#: ../camel/camel-gpg-context.c:2114 ++#: ../camel/camel-gpg-context.c:2137 + #, c-format + msgid "Cannot decrypt message: Incorrect message format" + msgstr "செய்தியை குறிமுறை நீக்க முடியாது: தவறான செய்தி வடிவம்" + +-#: ../camel/camel-gpg-context.c:2086 ++#: ../camel/camel-gpg-context.c:2125 + #, c-format + msgid "Failed to decrypt MIME part: protocol error" + msgstr "MIME பகுதியை மறைநீக்கம் செய்வது தோல்வியுற்றது: விதிமுறை பிழை" + +-#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1287 ++#: ../camel/camel-gpg-context.c:2220 ++#: ../camel/camel-smime-context.c:1287 + msgid "Encrypted content" + msgstr "குறியாக்கம் செய்யப்பட்ட தகவல்" + +@@ -2253,7 +2300,8 @@ msgstr "குறியாக்கம� + msgid "No quota information available for folder '%s'" + msgstr "கோப்புறை '%s' க்கான ஒதுக்கீடு தகவல் கிடைக்கவில்லை" + +-#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882 ++#: ../camel/camel-imapx-folder.c:809 ++#: ../camel/camel-imapx-folder.c:882 + #, c-format + msgid "No destination folder specified" + msgstr "இலக்குக் கோப்புறை குறிப்பிடப்படவில்லை" +@@ -2267,7 +2315,7 @@ msgid "Unable to move deleted messages" + msgstr "நீக்கப்பட்ட செய்திகளை நகர்த்த முடியவில்லை" + + #: ../camel/camel-imapx-folder.c:1119 +-#: ../camel/providers/nntp/camel-nntp-folder.c:738 ++#: ../camel/providers/nntp/camel-nntp-folder.c:794 + msgid "Apply message _filters to this folder" + msgstr "_f இந்த அடைவுக்கு செய்தி வடிப்பிகளை பொருத்துக" + +@@ -2281,187 +2329,188 @@ msgstr "%s க்கான அடைவ� + msgid "Could not create cache for %s: " + msgstr "%s க்கான தற்காலிக நினைவிடத்தை உருவாக்க முடியவில்லை" + +-#: ../camel/camel-imapx-server.c:1282 ++#: ../camel/camel-imapx-server.c:1283 + msgid "Server disconnected" + msgstr "சேவையகம் துண்டிக்கப்பட்டது" + +-#: ../camel/camel-imapx-server.c:1793 ++#: ../camel/camel-imapx-server.c:1772 + msgid "Error writing to cache stream" + msgstr "தற்காலிக ஓடைக்கு எழுதும்போது பிழை: " + +-#: ../camel/camel-imapx-server.c:2446 ++#: ../camel/camel-imapx-server.c:2441 + #, c-format +-#| msgid "" +-#| "Alert from IMAP server %s@%s:\n" +-#| "%s" +-msgid "" +-"Alert from IMAP server %s:\n" ++msgid "Alert from IMAP server %s:\n" + "%s" +-msgstr "" +-"IMAP சேவையகத்திலிருந்து விழிப்பூட்டல் %s:\n" ++msgstr "IMAP சேவையகத்திலிருந்து விழிப்பூட்டல் %s:\n" + "%s" + +-#: ../camel/camel-imapx-server.c:3034 ++#: ../camel/camel-imapx-server.c:3029 + #, c-format + msgid "Not authenticated" + msgstr " அங்கீகாரம் உறுதிசெய்யப்படவில்லை" + +-#: ../camel/camel-imapx-server.c:3112 ++#: ../camel/camel-imapx-server.c:3107 + msgid "Error performing IDLE" + msgstr "IDLE ஐ செய்வதில் பிழை" + +-#: ../camel/camel-imapx-server.c:4069 ++#: ../camel/camel-imapx-server.c:3994 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "IMAP சேவகன் %s உடன் பாதுக்காப்பாக %s ஐ இணைப்பதில் தோல்வி" + +-#: ../camel/camel-imapx-server.c:4070 +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/camel-imapx-server.c:3995 ++#: ../camel/providers/smtp/camel-smtp-transport.c:203 + msgid "STARTTLS not supported" + msgstr "STARTTLS ஆதரவு இல்லை" + +-#: ../camel/camel-imapx-server.c:4109 ++#: ../camel/camel-imapx-server.c:4034 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "IMAP சேவகயக %s க்கு பாதுகாப்பு முறையில் இணைக்க முடியவில்லை:" + +-#: ../camel/camel-imapx-server.c:4189 ++#: ../camel/camel-imapx-server.c:4114 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP சேவையகம் %s, %s வகை உறுதிப்படுத்துதலுக்கு ஆதரவு தராது" + +-#: ../camel/camel-imapx-server.c:4200 ../camel/camel-session.c:495 +-#: ../camel/providers/pop3/camel-pop3-store.c:272 +-#: ../camel/providers/pop3/camel-pop3-store.c:654 +-#: ../camel/providers/smtp/camel-smtp-transport.c:517 ++#: ../camel/camel-imapx-server.c:4125 ++#: ../camel/camel-session.c:495 ++#: ../camel/providers/pop3/camel-pop3-store.c:303 ++#: ../camel/providers/pop3/camel-pop3-store.c:737 ++#: ../camel/providers/smtp/camel-smtp-transport.c:509 + #, c-format + msgid "No support for %s authentication" + msgstr "%s வகை உறுதிப்படுத்துதலுக்கு ஆதரவு இல்லை" + +-#: ../camel/camel-imapx-server.c:4219 +-#: ../camel/providers/nntp/camel-nntp-store.c:362 +-#: ../camel/providers/nntp/camel-nntp-store.c:562 ++#: ../camel/camel-imapx-server.c:4144 ++#: ../camel/providers/nntp/camel-nntp-store.c:407 ++#: ../camel/providers/nntp/camel-nntp-store.c:595 + msgid "Cannot authenticate without a username" + msgstr "பயனர்பெயர் இல்லாமல் உறுதிப்படுத்துத முடியாது" + +-#: ../camel/camel-imapx-server.c:4228 +-#: ../camel/providers/nntp/camel-nntp-store.c:571 +-#: ../camel/providers/pop3/camel-pop3-store.c:579 +-#: ../camel/providers/pop3/camel-pop3-store.c:599 ++#: ../camel/camel-imapx-server.c:4153 ++#: ../camel/providers/nntp/camel-nntp-store.c:604 ++#: ../camel/providers/pop3/camel-pop3-store.c:662 ++#: ../camel/providers/pop3/camel-pop3-store.c:682 + msgid "Authentication password not available" + msgstr "அனுமதி உறுதிபடுத்த கடவுச்சொல் கிடைக்கவில்லை" + +-#: ../camel/camel-imapx-server.c:4436 ++#: ../camel/camel-imapx-server.c:4360 + msgid "Error fetching message" + msgstr "செய்தியை கொண்டு வருவதில் பிழை" + +-#: ../camel/camel-imapx-server.c:4518 +-msgid "Failed to copy the tmp file" +-msgstr "tmp கோப்பை பிரதி எடுப்பதில் தோல்வி" +- +-#: ../camel/camel-imapx-server.c:4532 ++#: ../camel/camel-imapx-server.c:4410 ++#: ../camel/camel-imapx-server.c:4418 + msgid "Failed to close the tmp stream" + msgstr "டிஎம்பி ஓடையை மூடுவதில் தோல்வி" + +-#: ../camel/camel-imapx-server.c:4653 ++#: ../camel/camel-imapx-server.c:4447 ++msgid "Failed to copy the tmp file" ++msgstr "tmp கோப்பை பிரதி எடுப்பதில் தோல்வி" ++ ++#: ../camel/camel-imapx-server.c:4571 + msgid "Error copying messages" + msgstr "செய்திகளை படியெடுப்பதில் பிழை" + +-#: ../camel/camel-imapx-server.c:4819 ++#: ../camel/camel-imapx-server.c:4740 + msgid "Error appending message" + msgstr "செய்தி சேர்ப்பதில் பிழை" + +-#: ../camel/camel-imapx-server.c:5018 ++#: ../camel/camel-imapx-server.c:4939 + msgid "Error fetching message headers" + msgstr "செய்திகளின் மேற்குறிப்புகளைப் பெறுவதில் பிழை" + +-#: ../camel/camel-imapx-server.c:5169 ++#: ../camel/camel-imapx-server.c:5090 + msgid "Error retrieving message" + msgstr "செய்தியை மீட்டு எடுப்பதில் பிழை" + +-#: ../camel/camel-imapx-server.c:5300 ../camel/camel-imapx-server.c:5528 ++#: ../camel/camel-imapx-server.c:5221 ++#: ../camel/camel-imapx-server.c:5449 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "சுருக்க தகவலுக்கான புதிய செய்திகளை '%s' உள்ளே ஏற்றவும்" + +-#: ../camel/camel-imapx-server.c:5364 ++#: ../camel/camel-imapx-server.c:5285 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "'%s' இல் மாற்றப்பட்ட செய்திகளுக்கு ஆராய்வு" + +-#: ../camel/camel-imapx-server.c:5417 ++#: ../camel/camel-imapx-server.c:5338 + msgid "Error fetching new messages" + msgstr "புதிய செய்தியை கொண்டுவருவதில் பிழை" + +-#: ../camel/camel-imapx-server.c:5630 ++#: ../camel/camel-imapx-server.c:5551 + msgid "Error while fetching messages" + msgstr "செய்திகளை கொண்டுவருவதில் பிழை" + +-#: ../camel/camel-imapx-server.c:5638 ../camel/camel-imapx-server.c:5671 ++#: ../camel/camel-imapx-server.c:5559 ++#: ../camel/camel-imapx-server.c:5592 + #, c-format + msgid "Fetching summary information for %d message in '%s'" + msgid_plural "Fetching summary information for %d messages in '%s'" + msgstr[0] " %d செய்திக்கு '%s' இல் சுருக்க தகவலை கொண்டு வருகிறது." + msgstr[1] " %d செய்திகளுக்கு '%s' இல் சுருக்க தகவலை கொண்டு வருகிறது." + +-#: ../camel/camel-imapx-server.c:5807 ../camel/camel-imapx-server.c:5837 ++#: ../camel/camel-imapx-server.c:5728 ++#: ../camel/camel-imapx-server.c:5758 + msgid "Error refreshing folder" + msgstr " அடைவை புதுப்பிப்பதில் பிழை" + +-#: ../camel/camel-imapx-server.c:5961 ++#: ../camel/camel-imapx-server.c:5882 + msgid "Error expunging message" + msgstr "செய்தியை நீக்குவதில் பிழை" + +-#: ../camel/camel-imapx-server.c:6072 ++#: ../camel/camel-imapx-server.c:5993 + msgid "Error fetching folders" + msgstr "அடைவுகளை கொண்டு வருவதில் பிழை" + +-#: ../camel/camel-imapx-server.c:6154 ++#: ../camel/camel-imapx-server.c:6075 + msgid "Error subscribing to folder" + msgstr " அடைவுக்கு சந்தா செலுத்துவதில் பிழை" + +-#: ../camel/camel-imapx-server.c:6219 ++#: ../camel/camel-imapx-server.c:6140 + msgid "Error creating folder" + msgstr "அடைவை உருவாக்கும் போது பிழை " + +-#: ../camel/camel-imapx-server.c:6273 ++#: ../camel/camel-imapx-server.c:6194 + msgid "Error deleting folder" + msgstr "அடைவை அழித்தலில் பிழை" + +-#: ../camel/camel-imapx-server.c:6347 ++#: ../camel/camel-imapx-server.c:6268 + msgid "Error renaming folder" + msgstr "அடைவை மறுபெயரிடும் போது பிழை " + +-#: ../camel/camel-imapx-server.c:6422 ++#: ../camel/camel-imapx-server.c:6343 + msgid "Error retrieving quota information" + msgstr "ஒதுக்கீடு தகவலை மீட்டெடுக்கும் போது பிழை" + +-#: ../camel/camel-imapx-server.c:6487 ++#: ../camel/camel-imapx-server.c:6408 + msgid "Search failed" + msgstr "தேடுதல் தோல்வியடைந்தது" + +-#: ../camel/camel-imapx-server.c:6550 ++#: ../camel/camel-imapx-server.c:6471 + msgid "Error performing NOOP" + msgstr "NOOP ஐ செய்வதில் பிழை" + +-#: ../camel/camel-imapx-server.c:6659 ++#: ../camel/camel-imapx-server.c:6580 + msgid "Error syncing changes" + msgstr "மாற்றங்களை ஒத்திசைப்பதில் பிழை" + +-#: ../camel/camel-imapx-server.c:7459 ++#: ../camel/camel-imapx-server.c:7385 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "செய்திகள் அடையாளம் ID %s உடன் ஒரு செய்தியையும் பெறமுடியவில்லை: %s" + +-#: ../camel/camel-imapx-server.c:7460 ++#: ../camel/camel-imapx-server.c:7386 + msgid "No such message available." + msgstr "அப்படிப்பட்ட செய்தி ஏதும். இல்லை " + +-#: ../camel/camel-imapx-server.c:7613 ../camel/camel-imapx-server.c:7628 ++#: ../camel/camel-imapx-server.c:7547 ++#: ../camel/camel-imapx-server.c:7562 + msgid "Cannot create spool file: " + msgstr "சுருள் கோப்பை உருவாக்க முடியவில்லை:" + +-#: ../camel/camel-imapx-server.c:8370 ++#: ../camel/camel-imapx-server.c:8304 + msgid "IMAP server does not support quotas" + msgstr "IMAP சேவையகம் ஒதுக்கீட்டுகளுக்கு ஆதரவு தராது" + +@@ -2482,8 +2531,10 @@ msgid "Password" + msgstr "கடவுச்சொல்" + + #: ../camel/camel-imapx-store.c:345 +-msgid "This option will connect to the IMAP server using a plaintext password." +-msgstr "இந்த தேர்வு IMAP சேவகனை சாதாரண உரை கடவுச்சொல்லை பயன்படுத்தி இணைக்கம்வு" ++msgid "" ++"This option will connect to the IMAP server using a plaintext password." ++msgstr "" ++"இந்த தேர்வு IMAP சேவகனை சாதாரண உரை கடவுச்சொல்லை பயன்படுத்தி இணைக்கம்வு" + + #: ../camel/camel-imapx-store.c:453 + #, c-format +@@ -2491,7 +2542,8 @@ msgid "No such folder %s" + msgstr "இப்படி ஒரு அடைவு இல்லை %s" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/camel-imapx-store.c:478 ../camel/camel-imapx-store.c:968 ++#: ../camel/camel-imapx-store.c:478 ++#: ../camel/camel-imapx-store.c:968 + #: ../camel/providers/local/camel-maildir-folder.c:473 + #: ../camel/providers/local/camel-maildir-store.c:316 + #: ../camel/providers/local/camel-maildir-store.c:750 +@@ -2508,8 +2560,7 @@ msgstr "'%s' க்காக அடை� + + #: ../camel/camel-imapx-store.c:1614 + #, c-format +-msgid "" +-"The folder name \"%s\" is invalid because it contains the character \"%c\"" ++msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "அடைவின் பெயர் \"%s\" செல்லாது காரணம் எழுத்து \"%c\" உள்ளது" + + #: ../camel/camel-imapx-store.c:1625 +@@ -2562,7 +2613,8 @@ msgstr "பூட்டப்பட்� + msgid "Cannot fork locking helper: %s" + msgstr "பூட்டப்பட்ட உதவியை பிளக்க முடியாது: %s" + +-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239 ++#: ../camel/camel-lock-client.c:211 ++#: ../camel/camel-lock-client.c:239 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" + msgstr "'%s' ஐ பூட்ட முடியாது. பூட்டு-உதவியில் விதிமுறை பிழை" +@@ -2621,7 +2673,8 @@ msgstr "மின்னஞ்சல் � + msgid "Error writing mail temp file: %s" + msgstr "மின்னஞ்சலை தற்காலிக கோப்பில் எழுதும்போது பிழை: %s" + +-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562 ++#: ../camel/camel-movemail.c:493 ++#: ../camel/camel-movemail.c:562 + #, c-format + msgid "Error copying mail temp file: %s" + msgstr "மின்னஞ்சலை தற்காலிக கோப்பில் நகலெடுக்கும் போது பிழை: %s" +@@ -2641,41 +2694,42 @@ msgstr "கையொப்பம் ஏ� + msgid "parse error" + msgstr "சொற்றோடர் பிழை" + +-#: ../camel/camel-net-utils.c:703 ++#: ../camel/camel-net-utils.c:704 + #, c-format + msgid "Resolving: %s" + msgstr "கண்டுபிடிக்கிறது: %s" + +-#: ../camel/camel-net-utils.c:726 ++#: ../camel/camel-net-utils.c:727 + msgid "Host lookup failed" + msgstr "புரவலனை தேட முடியவில்லை''" + +-#: ../camel/camel-net-utils.c:732 ++#: ../camel/camel-net-utils.c:733 + #, c-format + msgid "Host lookup '%s' failed. Check your host name for spelling errors." + msgstr "" + "'%s' புரவலன் சோதித்தல் தோல்வி. உங்கள் புரவலன் பெயரை எழுத்துப்பிழைகளுக்கு " + "சோதிக்கவும்." + +-#: ../camel/camel-net-utils.c:736 ++#: ../camel/camel-net-utils.c:737 + #, c-format + msgid "Host lookup '%s' failed: %s" + msgstr "புரவலனை தேடல் '%s' தோல்வி: %s" + +-#: ../camel/camel-net-utils.c:857 ++#: ../camel/camel-net-utils.c:858 + msgid "Resolving address" + msgstr "முகவரியை பெயருடன் பொருத்துகிறது" + +-#: ../camel/camel-net-utils.c:878 ++#: ../camel/camel-net-utils.c:879 + msgid "Name lookup failed" + msgstr "பெயர் தேட முடியவில்லை" + +-#: ../camel/camel-net-utils.c:885 ++#: ../camel/camel-net-utils.c:886 + msgid "Name lookup failed. Check your host name for spelling errors." + msgstr "" +-"பெயர் சோதித்தல் தோல்வி. உங்கள் புரவலன் பெயரை எழுத்துப்பிழைகளுக்கு சோதிக்கவும்." ++"பெயர் சோதித்தல் தோல்வி. உங்கள் புரவலன் பெயரை எழுத்துப்பிழைகளுக்கு " ++"சோதிக்கவும்." + +-#: ../camel/camel-net-utils.c:889 ++#: ../camel/camel-net-utils.c:890 + #, c-format + msgid "Name lookup failed: %s" + msgstr "''பெயரை தேட முடியவில்லை (: %s)''" +@@ -2690,7 +2744,8 @@ msgstr "இதற்கு இணைக� + msgid "Syncing messages in folder '%s' to disk" + msgstr "வட்டுக்கு '%s' அடைவிலுள்ள ஒருங்கிணைக்கப்பட்ட செய்திகள்" + +-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177 ++#: ../camel/camel-offline-journal.c:145 ++#: ../camel/camel-offline-journal.c:177 + #, c-format + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "" +@@ -2719,7 +2774,8 @@ msgstr "ஏற்ற முடியவ� + msgid "Could not load %s: No initialization code in module." + msgstr "ஏற்ற முடியவில்லை %s: இந்த பகுதியில் துவக்க அடையாளம் இல்லை" + +-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:407 ++#: ../camel/camel-provider.c:429 ++#: ../camel/camel-session.c:407 + #, c-format + msgid "No provider available for protocol '%s'" + msgstr "பணி முறை '%s' க்கு தருபவர் இல்லை" +@@ -2740,29 +2796,23 @@ msgstr "அனுமதி மறுக� + + #: ../camel/camel-sasl-anonymous.c:81 + #, c-format +-msgid "" +-"Invalid email address trace information:\n" ++msgid "Invalid email address trace information:\n" + "%s" +-msgstr "" +-"செல்லாத மின்னஞ்சல் முகவரி சுவடு தகவல்:\n" ++msgstr "செல்லாத மின்னஞ்சல் முகவரி சுவடு தகவல்:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:95 + #, c-format +-msgid "" +-"Invalid opaque trace information:\n" ++msgid "Invalid opaque trace information:\n" + "%s" +-msgstr "" +-"செல்லாத ஒபேக் சுவடு தகவல்:\n" ++msgstr "செல்லாத ஒபேக் சுவடு தகவல்:\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:109 + #, c-format +-msgid "" +-"Invalid trace information:\n" ++msgid "Invalid trace information:\n" + "%s" +-msgstr "" +-"செல்லாத சுவடு தகவல்:\n" ++msgstr "செல்லாத சுவடு தகவல்:\n" + "%s" + + #: ../camel/camel-sasl-cram-md5.c:46 +@@ -2775,8 +2825,7 @@ msgid "" + "the server supports it." + msgstr "" + "இந்த தேர்வு உங்களை பாதுகாக்க CRAM-MD5 கடவுச்சொல்லை பயன்படுத்தி சேகனுடன் " +-"இணைக்கும். " +-"இதற்கு சேவகன் ஆதரவு தேவை" ++"இணைக்கும். இதற்கு சேவகன் ஆதரவு தேவை" + + #: ../camel/camel-sasl-digest-md5.c:59 + msgid "DIGEST-MD5" +@@ -2788,8 +2837,7 @@ msgid "" + "if the server supports it." + msgstr "" + "இந்த தேர்வு உங்களை பாதுகாக்க DIGEST-MD5 கடவுச்சொல்லை பயன்படுத்தி சேகனுடன் " +-"இணைக்கும். " +-"இதற்கு சேவகன் ஆதரவு தேவை" ++"இணைக்கும். இதற்கு சேவகன் ஆதரவு தேவை" + + #: ../camel/camel-sasl-digest-md5.c:855 + #, c-format +@@ -2826,7 +2874,8 @@ msgid "GSSAPI" + msgstr "GSSAPI" + + #: ../camel/camel-sasl-gssapi.c:93 +-msgid "This option will connect to the server using Kerberos 5 authentication." ++msgid "" ++"This option will connect to the server using Kerberos 5 authentication." + msgstr "இந்த தேர்வு கர்ப்ரோஸ் கடவுச்சொல்லை பயன்படுத்தி இணைக்கும்" + + #: ../camel/camel-sasl-gssapi.c:134 +@@ -2855,15 +2904,15 @@ msgid "" + "the input_chan_bindings parameter." + msgstr "" + "input_token இல் வேறு அலைவரிசை குறிப்பிடப்பட்டுள்ளதால் nput_chan_bindings " +-"பயனிலை " +-"வழியாக குறிப்பிட வேண்டும்." ++"பயனிலை வழியாக குறிப்பிட வேண்டும்." + + #: ../camel/camel-sasl-gssapi.c:151 + msgid "" + "The input_token contains an invalid signature, or a signature that could not " + "be verified." + msgstr "" +-"input_token இல் செல்லாத கையொப்பம் உள்ளது அல்லது சரிபார்க்காத கையொப்பம் உள்ளது." ++"input_token இல் செல்லாத கையொப்பம் உள்ளது அல்லது சரிபார்க்காத கையொப்பம் " ++"உள்ளது." + + #: ../camel/camel-sasl-gssapi.c:155 + msgid "" +@@ -2889,9 +2938,11 @@ msgstr "தகவலுக்காக � + msgid "The referenced credentials have expired." + msgstr "கொடுக்கப்பட்ட நம்பக தகவலின் காலம் முடிவுற்றது" + +-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340 +-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405 +-#: ../camel/providers/smtp/camel-smtp-transport.c:624 ++#: ../camel/camel-sasl-gssapi.c:175 ++#: ../camel/camel-sasl-gssapi.c:340 ++#: ../camel/camel-sasl-gssapi.c:388 ++#: ../camel/camel-sasl-gssapi.c:405 ++#: ../camel/providers/smtp/camel-smtp-transport.c:616 + #, c-format + msgid "Bad authentication response from server." + msgstr "சேவகனிலிருந்து மோசமான அனுமதி சோதனை பதில்" +@@ -2905,7 +2956,8 @@ msgstr "ஆதரவு இல்லா� + msgid "Login" + msgstr "உள்நுழை" + +-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46 ++#: ../camel/camel-sasl-login.c:42 ++#: ../camel/camel-sasl-plain.c:46 + msgid "This option will connect to the server using a simple password." + msgstr "இந்த தேர்வு சுலபமான கடவுச்சொல்லை பயன்படுத்தி சேவகனுடன் இணையும்." + +@@ -2914,18 +2966,17 @@ msgstr "இந்த தேர்வு + msgid "Unknown authentication state." + msgstr "தெரியாத அனுமதி சரிபார்த்தல் நிலை." + +-#: ../camel/camel-sasl-ntlm.c:47 ++#: ../camel/camel-sasl-ntlm.c:48 + msgid "NTLM / SPA" + msgstr "NTLM / SPA" + +-#: ../camel/camel-sasl-ntlm.c:49 ++#: ../camel/camel-sasl-ntlm.c:50 + msgid "" + "This option will connect to a Windows-based server using NTLM / Secure " + "Password Authentication." + msgstr "" + "NTLM/ பாதுகாப்பான கடவுச்சொல் அனுமதி முறையை பயன்படுத்தி விண்டோஸ் சார்ந்த " +-"சேவகனுடன் இணைய " +-"இந்த முறை பயன்படும்." ++"சேவகனுடன் இணைய இந்த முறை பயன்படும்." + + #: ../camel/camel-sasl-plain.c:44 + msgid "PLAIN" +@@ -2948,7 +2999,8 @@ msgstr "POP மூல UID" + msgid "POP Before SMTP authentication using an unknown transport" + msgstr "SMTP அனுமதிக்கு முன் POP தகவல் தெரியாத பறிமாற்றத்தில்." + +-#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119 ++#: ../camel/camel-sasl-popb4smtp.c:110 ++#: ../camel/camel-sasl-popb4smtp.c:119 + #, c-format + msgid "POP Before SMTP authentication attempted with a %s service" + msgstr "ஒரு %s சேவையுடன் பாப்பிற்கு முற் SMTP அங்கீகாரம் முயற்சிக்கப்பட்டது" +@@ -2980,7 +3032,8 @@ msgstr "செய்திகளைப� + msgid "Please enter the %s password for %s on host %s." + msgstr "தயவு செய்து %s கடவுச்சொல்லை %s க்கு (புரவலன் %s இல் உள்ள) உள்ளிடுக" + +-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074 ++#: ../camel/camel-smime-context.c:351 ++#: ../camel/camel-smime-context.c:1074 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "`%s' க்கான சான்றிதழ் காணவில்லை" +@@ -3013,7 +3066,8 @@ msgstr "சான்றிதழ் த� + msgid "Cannot add CMS Signing time" + msgstr "CMS கையொப்பத்தின் நேரத்தை உருவாக்க முடியவில்லை" + +-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454 ++#: ../camel/camel-smime-context.c:439 ++#: ../camel/camel-smime-context.c:454 + #, c-format + msgid "Encryption certificate for '%s' does not exist" + msgstr "'%s' க்கான குறிமுறையாக்க சான்றிதழ் இருப்பில் இல்லை" +@@ -3085,15 +3139,18 @@ msgstr "கையொப்பத்த� + msgid "Digests missing from enveloped data" + msgstr "கடித உறையில் சுருக்க தகவல் காணவில்லை" + +-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602 ++#: ../camel/camel-smime-context.c:591 ++#: ../camel/camel-smime-context.c:602 + msgid "Cannot calculate digests" + msgstr "சுருக்கத் தொகுப்பை கணக்கிட முடியவில்லை" + +-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613 ++#: ../camel/camel-smime-context.c:609 ++#: ../camel/camel-smime-context.c:613 + msgid "Cannot set message digests" + msgstr "சுருக்கத் தொகுப்பை அமைக்க முடியவில்லை" + +-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628 ++#: ../camel/camel-smime-context.c:623 ++#: ../camel/camel-smime-context.c:628 + msgid "Certificate import failed" + msgstr "சான்றிதழ் உள்வாங்குதல் தோல்வியுற்றது" + +@@ -3118,7 +3175,8 @@ msgstr "கையொப்ப சுர� + msgid "Signer: %s <%s>: %s\n" + msgstr "கையொப்பமிட்டவர்: %s <%s>: %s\n" + +-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148 ++#: ../camel/camel-smime-context.c:858 ++#: ../camel/camel-smime-context.c:1148 + msgid "Cannot create encoder context" + msgstr "குறியாக்க செய்தியை உருவாக்க முடியவில்லை" + +@@ -3126,11 +3184,13 @@ msgstr "குறியாக்க ச� + msgid "Failed to add data to CMS encoder" + msgstr "CMS குறியாக்கியில் தகவலை சேர்க்க முடியவில்லை" + +-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165 ++#: ../camel/camel-smime-context.c:869 ++#: ../camel/camel-smime-context.c:1165 + msgid "Failed to encode data" + msgstr "தகவலை குறியாக்கல் தோல்வியுற்றது" + +-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262 ++#: ../camel/camel-smime-context.c:1013 ++#: ../camel/camel-smime-context.c:1262 + msgid "Decoder failed" + msgstr "மறைநீக்கம் தோல்வியுற்றது" + +@@ -3173,7 +3233,8 @@ msgstr "குறியாக்கி� + + #: ../camel/camel-smime-context.c:1269 + msgid "S/MIME Decrypt: No encrypted content found" +-msgstr "S/MIME மறைநீக்கி, குறிமுறையாக்கப்பட்ட செய்திகள் எதுவும் கிடைக்க வில்லை" ++msgstr "" ++"S/MIME மறைநீக்கி, குறிமுறையாக்கப்பட்ட செய்திகள் எதுவும் கிடைக்க வில்லை" + + #: ../camel/camel-store.c:1871 + #, c-format +@@ -3190,12 +3251,14 @@ msgstr "கோப்புறை '%s' � + msgid "Scanning folders in '%s'" + msgstr "'%s' இல் கோப்புறைகளை ஸ்கேனிங் செய்கிறது" + +-#: ../camel/camel-store.c:2115 ../camel/camel-store.c:2146 ++#: ../camel/camel-store.c:2115 ++#: ../camel/camel-store.c:2146 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Trash" + msgstr "குப்பைதொட்டி" + +-#: ../camel/camel-store.c:2127 ../camel/camel-store.c:2162 ++#: ../camel/camel-store.c:2127 ++#: ../camel/camel-store.c:2162 + #: ../camel/camel-vtrash-folder.c:50 + msgid "Junk" + msgstr "தேவையற்ற" +@@ -3210,13 +3273,15 @@ msgstr "அடைவை உருவா� + msgid "Creating folder '%s'" + msgstr "கோப்புறை '%s' ஐ உருவாக்குகிறது" + +-#: ../camel/camel-store.c:2747 ../camel/camel-vee-store.c:416 ++#: ../camel/camel-store.c:2747 ++#: ../camel/camel-vee-store.c:416 + #: ../camel/providers/local/camel-maildir-store.c:315 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "அடைவை நீக்க முடியவில்லை %s: செல்லாத செயல்" + +-#: ../camel/camel-store.c:2890 ../camel/camel-vee-store.c:466 ++#: ../camel/camel-store.c:2890 ++#: ../camel/camel-vee-store.c:466 + #: ../camel/providers/local/camel-maildir-store.c:839 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" +@@ -3255,7 +3320,8 @@ msgstr "அடைவு '%s' லிர� + msgid "NSPR error code %d" + msgstr "NSPR பிழை குறியீடு %d" + +-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662 ++#: ../camel/camel-tcp-stream-raw.c:649 ++#: ../camel/camel-tcp-stream-raw.c:662 + #, c-format + msgid "The proxy host does not support SOCKS4" + msgstr "ப்ராக்ஸி புரவலன் SOCKS4 க்கு துணைபுரியவில்லை" +@@ -3265,7 +3331,8 @@ msgstr "ப்ராக்ஸி பு� + msgid "The proxy host denied our request: code %d" + msgstr "ப்ராக்ஸி புரவலன் நம்முடைய கோரிக்கையை மறுத்துவிட்டது: குறியீடு %d" + +-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781 ++#: ../camel/camel-tcp-stream-raw.c:773 ++#: ../camel/camel-tcp-stream-raw.c:781 + #, c-format + msgid "The proxy host does not support SOCKS5" + msgstr "பதிலாள் சாக்ஸ்5 க்கு ஆதரவு தரவில்லை" +@@ -3329,7 +3396,8 @@ msgstr "புரவலன் பெய� + + #. SOCKS5 + #. reserved - must be 0 +-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922 ++#: ../camel/camel-tcp-stream-raw.c:912 ++#: ../camel/camel-tcp-stream-raw.c:922 + #, c-format + msgid "Invalid reply from proxy server" + msgstr "பதில் சேவகனிலிருந்து செல்லுபடியாகாத பதில்" +@@ -3344,7 +3412,8 @@ msgstr "URL '%s'ஐ அலகிட ம� + msgid "Updating folder '%s'" + msgstr "அடைவு '%s' ஐ மேம்படுத்துகிறது" + +-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965 ++#: ../camel/camel-vee-folder.c:855 ++#: ../camel/camel-vee-folder.c:965 + #, c-format + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "மெய்நிகர் அடைவில் செய்தியை நகர்த்த நகலெடுக்க முடியவில்லை" +@@ -3445,8 +3514,7 @@ msgstr "_f எல்லா அடைவ� + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "" + "இந்த சேவகனில் உள்ள மின்னஞ்சல்பெட்டியில் உள்ள அனைத்து புதிய அஞ்சல்களுக்கும் " +-"வடிகட்டியை " +-"பொருத்துகிறது" ++"வடிகட்டியை பொருத்துகிறது" + + #: ../camel/providers/imapx/camel-imapx-provider.c:65 + msgid "Check new messages for _Junk contents" +@@ -3498,11 +3566,9 @@ msgstr "_I செய்தியின� + + #: ../camel/providers/local/camel-local-folder.c:727 + #, c-format +-msgid "" +-"Cannot get message %s from folder %s\n" ++msgid "Cannot get message %s from folder %s\n" + "%s" +-msgstr "" +-"செய்தி %s ஐ %s அடைவிலிருந்து பெற முடியவில்லை\n" ++msgstr "செய்தி %s ஐ %s அடைவிலிருந்து பெற முடியவில்லை\n" + " %s" + + #: ../camel/providers/local/camel-local-provider.c:43 +@@ -3527,8 +3593,7 @@ msgid "" + "folders managed by Evolution." + msgstr "" + "உங்கள் மின்னஞ்சல்களை mbox அமைப்பிலுள்ள எவல்யூஷனால் மேலாண்மை செய்யப்படும் " +-"அடைவிலிருந்து " +-"பெற்றுக்கொள்ள (நகர்த்த)." ++"அடைவிலிருந்து பெற்றுக்கொள்ள (நகர்த்த)." + + #: ../camel/providers/local/camel-local-provider.c:83 + #: ../camel/providers/local/camel-local-provider.c:103 +@@ -3667,14 +3732,14 @@ msgstr "அடைவு '%s' ஐ உ� + + #: ../camel/providers/local/camel-maildir-store.c:245 + #: ../camel/providers/local/camel-mbox-store.c:369 +-#: ../camel/providers/local/camel-mh-store.c:522 ++#: ../camel/providers/local/camel-mh-store.c:514 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "அடைவு '%s' ஐ பெற முடியவில்லை: %s" + + #: ../camel/providers/local/camel-maildir-store.c:251 + #: ../camel/providers/local/camel-mbox-store.c:379 +-#: ../camel/providers/local/camel-mh-store.c:531 ++#: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "அடைவு '%s' ஐ பெற முடியவில்லை: அடைவு இருப்பில் இல்லை" +@@ -3686,14 +3751,14 @@ msgstr "அடைவு '%s' ஐ பெ� + + #: ../camel/providers/local/camel-maildir-store.c:283 + #: ../camel/providers/local/camel-mbox-store.c:442 +-#: ../camel/providers/local/camel-mh-store.c:564 ++#: ../camel/providers/local/camel-mh-store.c:556 + #, c-format + msgid "Cannot create folder '%s': folder exists." + msgstr "அடைவை உருவாக்க முடியவில்லை %s: அடைவு ஏற்கெனவே உள்ளது" + + #: ../camel/providers/local/camel-maildir-store.c:347 + #: ../camel/providers/local/camel-maildir-store.c:387 +-#: ../camel/providers/local/camel-mh-store.c:682 ++#: ../camel/providers/local/camel-mh-store.c:674 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "அடைவு '%s' ஐ நீக்க முடியவில்லை: %s" +@@ -3781,11 +3846,9 @@ msgstr "அடைவு ஏற்கெ� + #: ../camel/providers/local/camel-mbox-store.c:672 + #: ../camel/providers/local/camel-mbox-store.c:701 + #, c-format +-msgid "" +-"Could not delete folder '%s':\n" ++msgid "Could not delete folder '%s':\n" + "%s" +-msgstr "" +-"அடைவு '%s' ஐ நீக்க முடியவில்லை':\n" ++msgstr "அடைவு '%s' ஐ நீக்க முடியவில்லை':\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:682 +@@ -3907,12 +3970,12 @@ msgstr "தற்காலிக மி� + msgid "Cannot append message to mh folder: %s: " + msgstr "mh அடைவிலிருந்து செய்தியை பின்சேர்க்க முடியவில்லை : %s: " + +-#: ../camel/providers/local/camel-mh-store.c:541 ++#: ../camel/providers/local/camel-mh-store.c:533 + #, c-format + msgid "Could not create folder '%s': %s" + msgstr " %s அடைவை உருவாக்க முடியவில்லை : %s " + +-#: ../camel/providers/local/camel-mh-store.c:557 ++#: ../camel/providers/local/camel-mh-store.c:549 + #, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "'%s' அடைவை பெற் முடியவில்லை.: அடைவு இல்லை" +@@ -3953,11 +4016,9 @@ msgstr "அடைவு '%s/%s' இர� + + #: ../camel/providers/local/camel-spool-store.c:505 + #, c-format +-msgid "" +-"Could not open folder '%s':\n" ++msgid "Could not open folder '%s':\n" + "%s" +-msgstr "" +-"இந்த அடைவை திறக்க முடியவில்லை'%s':\n" ++msgstr "இந்த அடைவை திறக்க முடியவில்லை'%s':\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:511 +@@ -3967,11 +4028,9 @@ msgstr "அடைவு '%s' இரு� + + #: ../camel/providers/local/camel-spool-store.c:519 + #, c-format +-msgid "" +-"Could not create folder '%s':\n" ++msgid "Could not create folder '%s':\n" + "%s" +-msgstr "" +-"'%s' இல் அடைவை உருவாக்கமுடியாது:\n" ++msgstr "'%s' இல் அடைவை உருவாக்கமுடியாது:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:532 +@@ -4017,52 +4076,51 @@ msgstr "" + "ஸ்பூல் அடைவு %sஐ ஒருங்கிணைக்க முடியவில்லை: %s\n" + "அடைவு அழிக்கப்பட்டிருக்கலாம், நகல் '%s'இல் சேமிக்கப்பட்டுள்ளது" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:278 +-#: ../camel/providers/nntp/camel-nntp-folder.c:360 +-#: ../camel/providers/nntp/camel-nntp-folder.c:481 ++#: ../camel/providers/nntp/camel-nntp-folder.c:285 ++#: ../camel/providers/nntp/camel-nntp-folder.c:388 ++#: ../camel/providers/nntp/camel-nntp-folder.c:510 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "உள்ளார்ந்த பிழை: UID தவறான வடிவத்தில் உள்ளது: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:332 +-#: ../camel/providers/pop3/camel-pop3-folder.c:633 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1065 ++#: ../camel/providers/nntp/camel-nntp-folder.c:349 ++#: ../camel/providers/nntp/camel-nntp-folder.c:354 ++#: ../camel/providers/pop3/camel-pop3-folder.c:657 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1107 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "%s செய்தியை பெற முடியவில்லை: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:339 +-#: ../camel/providers/nntp/camel-nntp-folder.c:504 +-#: ../camel/providers/pop3/camel-pop3-folder.c:558 +-#: ../camel/providers/pop3/camel-pop3-folder.c:623 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/nntp/camel-nntp-folder.c:361 ++#: ../camel/providers/nntp/camel-nntp-folder.c:536 ++#: ../camel/providers/pop3/camel-pop3-folder.c:582 ++#: ../camel/providers/pop3/camel-pop3-folder.c:647 ++#: ../camel/providers/pop3/camel-pop3-folder.c:666 + #, c-format + msgid "Cannot get message %s: " + msgstr "%s செய்தியை பெற முடியவில்லை:" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:493 ++#: ../camel/providers/nntp/camel-nntp-folder.c:525 + #, c-format + msgid "This message is not currently available" + msgstr "இந்த செய்தி தற்போது கிடைக்கவில்லை" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:559 +-#: ../camel/providers/nntp/camel-nntp-folder.c:565 +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:593 ++#: ../camel/providers/nntp/camel-nntp-folder.c:599 + #, c-format + msgid "Posting failed: %s" + msgstr "சமர்ப்பிதல் தோல்வி: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:606 ++#: ../camel/providers/nntp/camel-nntp-folder.c:664 + msgid "Posting failed: " + msgstr "சமர்ப்பிதல் தோல்வி: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:633 ++#: ../camel/providers/nntp/camel-nntp-folder.c:689 + #, c-format + msgid "You cannot post NNTP messages while working offline!" + msgstr "NNTP செய்தியை இணைய இணைப்பில் இல்லாத போது பயன்படுத்த முடியாது" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:653 ++#: ../camel/providers/nntp/camel-nntp-folder.c:709 + #, c-format + msgid "You cannot copy messages from a NNTP folder!" + msgstr "NNTP அடைவை நகலெடுக்க முடியாது" +@@ -4092,7 +4150,8 @@ msgstr "USENET செய்திகள� + #: ../camel/providers/nntp/camel-nntp-provider.c:66 + msgid "This is a provider for reading from and posting to USENET newsgroups." + msgstr "" +-"USENET செய்தி குழுவிலிருந்து படிக்க மற்றும் செய்தி அனுப்ப இந்த சேவை பயன்படும்" ++"USENET செய்தி குழுவிலிருந்து படிக்க மற்றும் செய்தி அனுப்ப இந்த சேவை " ++"பயன்படும்" + + #: ../camel/providers/nntp/camel-nntp-provider.c:87 + msgid "" +@@ -4109,49 +4168,47 @@ msgid "" + msgstr "" + "இந்த தேர்வு NNTP சேவகனில் வெற்று உரை கடவுச்சொல்லை பயன்படுத்தி அனுமதி பெறும்" + +-#: ../camel/providers/nntp/camel-nntp-store.c:333 ++#: ../camel/providers/nntp/camel-nntp-store.c:386 + #, c-format + msgid "Could not read greeting from %s: " + msgstr "%s லிருந்து அழைப்பை படிக்க முடியவில்லை: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:345 ++#: ../camel/providers/nntp/camel-nntp-store.c:394 + #, c-format + msgid "NNTP server %s returned error code %d: %s" + msgstr "%s சேவகன் %dபிழை செய்தி கிடைத்துள்ளது: %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:522 ++#: ../camel/providers/nntp/camel-nntp-store.c:555 + #, c-format + msgid "USENET News via %s" + msgstr "USENET செய்தி %s வழியாக" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1123 ++#: ../camel/providers/nntp/camel-nntp-store.c:1218 + #, c-format +-msgid "" +-"Error retrieving newsgroups:\n" ++msgid "Error retrieving newsgroups:\n" + "\n" + "%s" +-msgstr "" +-"செய்திகுழுவை பெறுகையில் பிழை:\n" ++msgstr "செய்திகுழுவை பெறுகையில் பிழை:\n" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1217 ++#: ../camel/providers/nntp/camel-nntp-store.c:1319 + #, c-format + msgid "You cannot create a folder in a News store: subscribe instead." + msgstr "செய்தி கிடங்கில் அடைவை உருவாக்க முடியாது: சந்தாதாரராகவும்" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1233 ++#: ../camel/providers/nntp/camel-nntp-store.c:1335 + #, c-format + msgid "You cannot rename a folder in a News store." + msgstr "செய்தி கிடங்கில் உள்ள அடைவிற்கு மறுபெயரிட முடியாது" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1256 ++#: ../camel/providers/nntp/camel-nntp-store.c:1358 + #, c-format + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "" + "இந்த செய்தி கிடங்கில் உள்ள அடைவை நீக்க முடியாது: சந்தாவை ரத்து செய்யலாம்" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1455 ++#: ../camel/providers/nntp/camel-nntp-store.c:1577 + #, c-format + msgid "" + "You cannot subscribe to this newsgroup:\n" +@@ -4163,10 +4220,9 @@ msgstr "" + "இப்படி ஒரு செய்திகுழு இல்லை. தேர்வு செய்யப்பட்ட அடைவு முதன்மை அடைவாக " + "இருக்கலாம்." + +-#: ../camel/providers/nntp/camel-nntp-store.c:1503 ++#: ../camel/providers/nntp/camel-nntp-store.c:1644 + #, c-format +-msgid "" +-"You cannot unsubscribe to this newsgroup:\n" ++msgid "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" + msgstr "" +@@ -4174,73 +4230,73 @@ msgstr "" + "\n" + "இப்படி ஒரு செய்தி குழு இல்லை" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1707 ++#: ../camel/providers/nntp/camel-nntp-store.c:2081 + msgid "NNTP Command failed: " + msgstr "NNTP கட்டளை தோல்வி: " + +-#: ../camel/providers/nntp/camel-nntp-store.c:1794 ++#: ../camel/providers/nntp/camel-nntp-store.c:2178 + #, c-format + msgid "Not connected." + msgstr "இணைப்பு இல்லை" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1856 ++#: ../camel/providers/nntp/camel-nntp-store.c:2272 + #, c-format + msgid "No such folder: %s" + msgstr "அடைவி இல்லை : %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:198 +-#: ../camel/providers/nntp/camel-nntp-summary.c:328 ++#: ../camel/providers/nntp/camel-nntp-summary.c:200 ++#: ../camel/providers/nntp/camel-nntp-summary.c:339 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: செய்திகளை சோதிக்கிறது" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:216 ++#: ../camel/providers/nntp/camel-nntp-summary.c:222 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "xover லிருந்து எதிர்பாராத சேவகன் பதில்: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:346 ++#: ../camel/providers/nntp/camel-nntp-summary.c:360 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "தலைப்பிலி்லிருந்து எதிர்பாராத சேவகன் பதில்: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:393 ++#: ../camel/providers/nntp/camel-nntp-summary.c:407 + #, c-format + msgid "Operation failed: %s" + msgstr "செயல் தோல்வியுற்றது: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:453 +-#: ../camel/providers/pop3/camel-pop3-folder.c:526 ++#: ../camel/providers/pop3/camel-pop3-folder.c:468 ++#: ../camel/providers/pop3/camel-pop3-folder.c:547 + #, c-format + msgid "No message with UID %s" + msgstr " UID உடன் செய்தி இல்லை (%s)" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:542 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 + #, c-format + msgid "Retrieving POP message %d" + msgstr "பாப் செய்தி %d ஐ பெறுகிறது" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:634 ++#: ../camel/providers/pop3/camel-pop3-folder.c:658 + msgid "Unknown reason" + msgstr "தெரியாத காரணம்" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:682 ++#: ../camel/providers/pop3/camel-pop3-folder.c:710 + msgid "Retrieving POP summary" + msgstr "பாப் சுருக்கத்தை பெறுகிறது" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:741 +-#: ../camel/providers/pop3/camel-pop3-folder.c:744 +-#: ../camel/providers/pop3/camel-pop3-folder.c:757 +-#: ../camel/providers/pop3/camel-pop3-folder.c:770 +-#: ../camel/providers/pop3/camel-pop3-folder.c:784 ++#: ../camel/providers/pop3/camel-pop3-folder.c:771 ++#: ../camel/providers/pop3/camel-pop3-folder.c:774 ++#: ../camel/providers/pop3/camel-pop3-folder.c:787 ++#: ../camel/providers/pop3/camel-pop3-folder.c:800 ++#: ../camel/providers/pop3/camel-pop3-folder.c:814 + msgid "Cannot get POP summary: " + msgstr "பாப் சுருக்கத்தை பெற முடியவில்லை: " + +-#: ../camel/providers/pop3/camel-pop3-folder.c:891 ++#: ../camel/providers/pop3/camel-pop3-folder.c:925 + msgid "Expunging old messages" + msgstr "பழைய செய்திகளை Expunging செய்யவும்" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:911 ++#: ../camel/providers/pop3/camel-pop3-folder.c:945 + msgid "Expunging deleted messages" + msgstr "நீக்கிய செய்திகளை அழிக்கிறது" + +@@ -4288,9 +4344,8 @@ msgid "" + "This option will connect to the POP server using a plaintext password. This " + "is the only option supported by many POP servers." + msgstr "" +-"இந்த தேர்வு பாப் சேவகனுடன் வெற்று உரை கடவுச்சொல்லை பயன்படுத்தி இணைக்கும். இது " +-"பாப் சேவகன் " +-"ஆதரவு தரும் ஒரே சேவை" ++"இந்த தேர்வு பாப் சேவகனுடன் வெற்று உரை கடவுச்சொல்லை பயன்படுத்தி இணைக்கும். " ++"இது பாப் சேவகன் ஆதரவு தரும் ஒரே சேவை" + + #: ../camel/providers/pop3/camel-pop3-provider.c:95 + msgid "" +@@ -4299,74 +4354,71 @@ msgid "" + "claim to support it." + msgstr "" + "இந்த தேர்வு பாப் சேவகனை குறிமுறையாக்கம் செய்யப்பட்ட கடவுச்சொல்லுவன் APOP " +-"விதிமுறை " +-"வழியாக இணைக்கு. இது எல்லா பயனீட்டாளர்களுக்கும் வேலை செய்யாது" ++"விதிமுறை வழியாக இணைக்கு. இது எல்லா பயனீட்டாளர்களுக்கும் வேலை செய்யாது" + + #. Translators: This is the separator between an error and an explanation +-#: ../camel/providers/pop3/camel-pop3-store.c:89 ++#: ../camel/providers/pop3/camel-pop3-store.c:99 + msgid ": " + msgstr ": " + +-#: ../camel/providers/pop3/camel-pop3-store.c:150 ++#: ../camel/providers/pop3/camel-pop3-store.c:161 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "POP சேவையகத்திலிருந்து வரும் உண்மையான வரவேற்பை படிக்க இயலவில்லை (%s) " + +-#: ../camel/providers/pop3/camel-pop3-store.c:165 ++#: ../camel/providers/pop3/camel-pop3-store.c:176 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "பாப் சேவகன் %s ஐ பாதுகாப்பாக இணைப்பதில் தோல்வி: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:166 ++#: ../camel/providers/pop3/camel-pop3-store.c:177 + msgid "STLS not supported by server" + msgstr "STLS சேவையகத்தால் ஆதரவு இல்லை" + + #. Translators: Last %s is an optional + #. * explanation beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:187 ++#: ../camel/providers/pop3/camel-pop3-store.c:198 + #, c-format + msgid "Failed to connect to POP server %s in secure mode%s" + msgstr "பாப் சேவகன் %s ஐ பாதுகாப்பாக இணைப்பதில் தோல்வி %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:200 ++#: ../camel/providers/pop3/camel-pop3-store.c:211 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: " + msgstr "பாப் சேவையக %s ஐ பாதுகாப்பு முறைமையில் இணைக்க முடியவில்லை: " + +-#: ../camel/providers/pop3/camel-pop3-store.c:311 ++#: ../camel/providers/pop3/camel-pop3-store.c:351 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "பாப் சேவகன் %s இல் நுழைய முடியவில்லை:SASL விதிமுறை பிழை" + +-#: ../camel/providers/pop3/camel-pop3-store.c:333 ++#: ../camel/providers/pop3/camel-pop3-store.c:373 + #, c-format + msgid "Failed to authenticate on POP server %s: " + msgstr "பாப் சேவகனில் அனுமதி பெறுதல் தோல்வியடைந்தது %s:" + +-#: ../camel/providers/pop3/camel-pop3-store.c:435 ++#: ../camel/providers/pop3/camel-pop3-store.c:481 + #, c-format + msgid "POP3 server %s" + msgstr "POP3 சேவையகம் %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:438 ++#: ../camel/providers/pop3/camel-pop3-store.c:484 + #, c-format + msgid "POP3 server for %s on %s" + msgstr "பாப்3 சேவையகம் %s க்கு %s இல் " + +-#: ../camel/providers/pop3/camel-pop3-store.c:613 ++#: ../camel/providers/pop3/camel-pop3-store.c:696 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " + "attack suspected. Please contact your admin." + msgstr "" + "பாப் சேவயகம் %s உடன் இணைக்க முடியவில்லை:\t செல்லுபடியாகாத APOP ID கிடைத்தது. " +-"ஆள் " +-"மாறாட்டம் சந்தேகிக்க்கப்படுகிறது. உங்கள் மேலாளரை தொடர்பு கொள்க" ++"ஆள் மாறாட்டம் சந்தேகிக்க்கப்படுகிறது. உங்கள் மேலாளரை தொடர்பு கொள்க" + +-#: ../camel/providers/pop3/camel-pop3-store.c:665 ++#: ../camel/providers/pop3/camel-pop3-store.c:748 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending password: " + msgstr "" + "பாப் சேவையத்துடன் இணைக்க முடியவில்லை %s.\n" +@@ -4374,21 +4426,20 @@ msgstr "" + + #. Translators: Last %s is an optional explanation + #. * beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:680 ++#: ../camel/providers/pop3/camel-pop3-store.c:763 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending username%s" + msgstr "" + "பாப் சேவகனுடன் இணைக்க முடியவில்லை %s.\n" + "பயனீட்டாளர் பெயரை அனுப்புவதில் பிழை %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:751 ++#: ../camel/providers/pop3/camel-pop3-store.c:845 + #, c-format + msgid "No such folder '%s'." + msgstr "'%s'. என்ற அடைவு ஏதும் இல்லை " + +-#: ../camel/providers/pop3/camel-pop3-store.c:768 ++#: ../camel/providers/pop3/camel-pop3-store.c:862 + #, c-format + msgid "POP3 stores have no folder hierarchy" + msgstr "பாப்3 சேமிப்பு கிடங்குகளில் அடைவு அடுக்கமைப்பு இல்லை" +@@ -4472,224 +4523,223 @@ msgstr "SMTP" + msgid "For delivering mail by connecting to a remote mailhub using SMTP." + msgstr "" + "தொலை மின்னஞ்சல் மையத்தின் வழியாக SMTP பயன்படுத்தி இணையத்துடன் இணைக்கப்பட்டு " +-"மின்னஞ்சல் " +-"அனுபப்படுகிறது." ++"மின்னஞ்சல் அனுபப்படுகிறது." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:160 +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:158 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 + msgid "Welcome response error: " + msgstr "வரவேற்புபதில் பிழை:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:207 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "SMTP சேவகன் %s உடன் பாதுகாப்பாக இணைவது தோல்வியுற்றது : %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 +-#: ../camel/providers/smtp/camel-smtp-transport.c:229 +-#: ../camel/providers/smtp/camel-smtp-transport.c:236 ++#: ../camel/providers/smtp/camel-smtp-transport.c:211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:224 ++#: ../camel/providers/smtp/camel-smtp-transport.c:231 + msgid "STARTTLS command failed: " + msgstr "STARTTLS கட்டளை தோல்வுயுற்றது: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:247 ++#: ../camel/providers/smtp/camel-smtp-transport.c:242 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: " + msgstr "SMTP சேவக %s க்கு பாதுகாப்பு முறையில் இணைக்க முடியவில்லை:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:349 ++#: ../camel/providers/smtp/camel-smtp-transport.c:342 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP சேவகம் %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:352 ++#: ../camel/providers/smtp/camel-smtp-transport.c:345 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "%s SMTP வழியாக மின்னஞ்சல் அனுப்புதல்" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:426 ++#: ../camel/providers/smtp/camel-smtp-transport.c:419 + #, c-format + msgid "SMTP server %s does not support %s authentication" + msgstr "SMTP சேவகன் %s , %s வகை உறுதிப்படுத்துதலுக்கு ஆதரவு தராது " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:508 ++#: ../camel/providers/smtp/camel-smtp-transport.c:500 + #, c-format + msgid "No SASL mechanism was specified" + msgstr "SASL இயங்கம்சம் குறிப்பிடப்படவில்லை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:538 +-#: ../camel/providers/smtp/camel-smtp-transport.c:549 +-#: ../camel/providers/smtp/camel-smtp-transport.c:562 ++#: ../camel/providers/smtp/camel-smtp-transport.c:530 ++#: ../camel/providers/smtp/camel-smtp-transport.c:541 ++#: ../camel/providers/smtp/camel-smtp-transport.c:554 + msgid "AUTH command failed: " + msgstr "AUTH கட்டளை தோல்வியுற்றது: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:695 + #, c-format + msgid "Cannot send message: service not connected." + msgstr "செய்தி அனுப்ப முடியவில்லை : சேவை இணைப்பில் இல்லை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:710 ++#: ../camel/providers/smtp/camel-smtp-transport.c:702 + #, c-format + msgid "Cannot send message: sender address not valid." + msgstr "செய்தி அனுப்ப முடியவில்லை : அனுப்பியவர் முகவரி செல்லாது" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:714 ++#: ../camel/providers/smtp/camel-smtp-transport.c:706 + msgid "Sending message" + msgstr "செய்தி அனுப்பப்படுகிறது" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:731 + #, c-format + msgid "Cannot send message: no recipients defined." + msgstr "செய்தி அனுப்ப முடியவில்லை : பெறுபவர் முகவரி குறிப்பிடப்படவில்லை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:752 ++#: ../camel/providers/smtp/camel-smtp-transport.c:744 + #, c-format + msgid "Cannot send message: one or more invalid recipients" + msgstr "" + "செய்தி அனுப்ப முடியவில்லை: ஒன்றுக்கும் மேற்பட்ட செல்லாத பெறுநர் முகவரிகள்" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:873 ++#: ../camel/providers/smtp/camel-smtp-transport.c:865 + msgid "Syntax error, command unrecognized" + msgstr "தொடரியல் பிழை, கட்டளையை புரிந்துகொள்ள முடியவில்லைிழை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:875 ++#: ../camel/providers/smtp/camel-smtp-transport.c:867 + msgid "Syntax error in parameters or arguments" + msgstr "அளவுரு அல்லது பயனிலையில் தொடர் பிழை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:877 ++#: ../camel/providers/smtp/camel-smtp-transport.c:869 + msgid "Command not implemented" + msgstr "கட்டளையை செயல்படுத்த முடியவில்லை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:879 ++#: ../camel/providers/smtp/camel-smtp-transport.c:871 + msgid "Command parameter not implemented" + msgstr "கட்டளை அளவுருவை செயல்படுத்த முடியவில்லை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:881 ++#: ../camel/providers/smtp/camel-smtp-transport.c:873 + msgid "System status, or system help reply" + msgstr "கணினி நிலை, அல்லது கணினி உதவி பதில்" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:883 ++#: ../camel/providers/smtp/camel-smtp-transport.c:875 + msgid "Help message" + msgstr "உதவி செய்திகள்" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:885 ++#: ../camel/providers/smtp/camel-smtp-transport.c:877 + msgid "Service ready" + msgstr "சேவை தயார்" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:887 ++#: ../camel/providers/smtp/camel-smtp-transport.c:879 + msgid "Service closing transmission channel" + msgstr "சேவை அனுப்பும் பாதை மூடப்படுகிறது" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:889 ++#: ../camel/providers/smtp/camel-smtp-transport.c:881 + msgid "Service not available, closing transmission channel" + msgstr "சேவை இல்லை, அனுப்பும் பாதை மூடப்படுகிறது" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:891 ++#: ../camel/providers/smtp/camel-smtp-transport.c:883 + msgid "Requested mail action okay, completed" + msgstr "மின்னஞ்சல் செயல்பாட்டுக்கான கோரிக்கை ஏற்கப்பட்டது, முடிவுற்றது" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:893 ++#: ../camel/providers/smtp/camel-smtp-transport.c:885 + msgid "User not local; will forward to " + msgstr "உள் பயனீடாளர் இல்லை என்றால், பாதைக்கு அனுப்பப்படும்" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:895 ++#: ../camel/providers/smtp/camel-smtp-transport.c:887 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "" + "கோரப்பட்ட மின்னஞ்சல் செயல் பெறவில்லை :மின்னஞ்சல் பெட்டிபெட்டி கிடைக்கவில்லை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:897 ++#: ../camel/providers/smtp/camel-smtp-transport.c:889 + msgid "Requested action not taken: mailbox unavailable" + msgstr "கோரப்பட்ட செயல் பெறவில்லை: மின்னஞ்சல் பெட்டி கிடைக்கவில்லை " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:899 ++#: ../camel/providers/smtp/camel-smtp-transport.c:891 + msgid "Requested action aborted: error in processing" + msgstr "கோரப்பட்ட செயல் தடை செய்யபப்ட்டது: செயல் படுத்துகையில் பிழை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:901 ++#: ../camel/providers/smtp/camel-smtp-transport.c:893 + msgid "User not local; please try " + msgstr "பயனீடாளர் உள்ளூர் இல்லை ; முயற்சிக்கவும் " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:903 ++#: ../camel/providers/smtp/camel-smtp-transport.c:895 + msgid "Requested action not taken: insufficient system storage" + msgstr "கோரப்பட்ட செயல் நடைபெறவில்லை : கணினியில் இடம் இல்லை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:905 ++#: ../camel/providers/smtp/camel-smtp-transport.c:897 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "கோரப்பட்ட மின்னஞ்சல் செயல் தடை செய்யப்பட்டது: சேமித்த இடம் போதவில்லை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:907 ++#: ../camel/providers/smtp/camel-smtp-transport.c:899 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "" + "கோரப்பட்ட செயல் நடைபெறவில்லை: மின்னஞ்சல் பெட்டியில் பெயருக்கு அனுமதி இல்லை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:909 ++#: ../camel/providers/smtp/camel-smtp-transport.c:901 + msgid "Start mail input; end with ." + msgstr "மின்னஞ்சல் உள்ளீடு துவங்கியது; . ஓடு முடிந்தது" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:911 ++#: ../camel/providers/smtp/camel-smtp-transport.c:903 + msgid "Transaction failed" + msgstr "பரிமாற்றம் தோல்வியுற்றது" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:915 ++#: ../camel/providers/smtp/camel-smtp-transport.c:907 + msgid "A password transition is needed" + msgstr "கடவுச்சொல் மாற்றம் தேவை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:917 ++#: ../camel/providers/smtp/camel-smtp-transport.c:909 + msgid "Authentication mechanism is too weak" + msgstr "அனுமதி முறை மிகவும் மோசமாக உள்ளது" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:919 ++#: ../camel/providers/smtp/camel-smtp-transport.c:911 + msgid "Encryption required for requested authentication mechanism" + msgstr "கோரப்பட்ட அனுமதி முறைமைக்கு குறிமுறையாக்கம் தேவை" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:921 ++#: ../camel/providers/smtp/camel-smtp-transport.c:913 + msgid "Temporary authentication failure" + msgstr "தற்காலிக அனுமதி முறைமை தோல்வியுற்றது" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1170 + msgid "SMTP Greeting" + msgstr "SMTP வரவேற்பு" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1205 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1223 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1231 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1197 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1219 + msgid "HELO command failed: " + msgstr "HELO கட்டளை தோல்வியுற்றது: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1306 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1321 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1331 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1294 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1309 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1319 + msgid "MAIL FROM command failed: " + msgstr "MAIL FROM கட்டளை தோல்வியுற்றது: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1358 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1346 + msgid "RCPT TO command failed: " + msgstr "RSET கட்டளை தோல்வியுற்றது: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1375 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1385 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1363 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1373 + #, c-format + msgid "RCPT TO <%s> failed: " + msgstr "RCPT TO <%s> தோல்வியுற்றது: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1428 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1439 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1450 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1509 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1529 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1543 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1552 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1416 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1427 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1438 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1497 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1517 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1531 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1540 + msgid "DATA command failed: " + msgstr "DATA கட்டளை தோல்வியுற்றது: " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1577 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1592 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1601 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1565 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1580 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1589 + msgid "RSET command failed: " + msgstr "RSET கட்டளை தோல்வியுற்றது:" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1626 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1640 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1647 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1614 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1628 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1635 + msgid "QUIT command failed: " + msgstr "QUIT கட்டளை தோல்வியுற்றது:" + +@@ -4725,8 +4775,7 @@ msgid "" + "\"days\"" + msgstr "" + "பிறந்தநாள் அல்லது ஆண்டுவிழா நினைவூட்டிக்கான அலகுகள், \"minutes\", \"hours\" " +-"அல்லது " +-"\"days\"" ++"அல்லது \"days\"" + + #: ../libebackend/e-authentication-mediator.c:205 + #: ../libebackend/e-authentication-mediator.c:216 +@@ -4784,7 +4833,7 @@ msgid "Data source is missing a [%s] gro + msgstr "தரவு மூலத்தில் ஒரு [%s] குழு இல்லை" + + #: ../libebackend/e-server-side-source.c:1008 +-#: ../libedataserver/e-source.c:1133 ++#: ../libedataserver/e-source.c:1138 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "தரவு மூலம் '%s' தொலைநிலை வளங்களை உருவாக்குவதை ஆதரிக்காது" +@@ -4794,11 +4843,11 @@ msgstr "தரவு மூலம் '%s + msgid "" + "Data source '%s' has no collection backend to create the remote resource" + msgstr "" +-"தரவு மூலம் '%s' இல் தொலைநிலை வளத்தை உருவாக்குவதற்கான பின்புல சேகரிப்பு முறைமை " +-"இல்லை" ++"தரவு மூலம் '%s' இல் தொலைநிலை வளத்தை உருவாக்குவதற்கான பின்புல சேகரிப்பு " ++"முறைமை இல்லை" + + #: ../libebackend/e-server-side-source.c:1050 +-#: ../libedataserver/e-source.c:1246 ++#: ../libedataserver/e-source.c:1251 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "தரவு மூலம் '%s' தொலைநிலை வளங்களை நீக்குவதை ஆதரிக்காது" +@@ -4812,7 +4861,7 @@ msgstr "" + "இல்லை" + + #: ../libebackend/e-server-side-source.c:1095 +-#: ../libedataserver/e-source.c:1342 ++#: ../libedataserver/e-source.c:1347 + #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" +@@ -4824,7 +4873,7 @@ msgid "File must have a '.source' extens + msgstr "கோப்புக்கு '.source' என்ற நீட்டிப்பு இருக்க வேண்டும்" + + #: ../libebackend/e-source-registry-server.c:523 +-#: ../libedataserver/e-source-registry.c:1627 ++#: ../libedataserver/e-source-registry.c:1882 + msgid "The user declined to authenticate" + msgstr "பயனர் உறுதிபடுத்த இசையவில்லை" + +@@ -5021,22 +5070,22 @@ msgstr "தயவு செய்து + msgid "Please enter the password for account \"%s\"." + msgstr "தயவு செய்து \"%s\" கணக்குக்கான கடவுச்சொல்லை உள்ளிடவும்" + +-#: ../libedataserver/e-source.c:622 ++#: ../libedataserver/e-source.c:627 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "மூலக் கோப்பில் [%s] குழு இல்லை" + +-#: ../libedataserver/e-source.c:944 ++#: ../libedataserver/e-source.c:949 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "'%s' தரவு மூலம் நீக்கத்தக்கதல்ல" + +-#: ../libedataserver/e-source.c:1036 ++#: ../libedataserver/e-source.c:1041 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "'%s' தரவு மூலம் எழுதத்தக்கதல்ல" + +-#: ../libedataserver/e-source.c:1554 ++#: ../libedataserver/e-source.c:1559 + msgid "Unnamed" + msgstr "பெயரில்லாத" + +@@ -5052,8 +5101,7 @@ msgid "" + "you wish to accept it?" + msgstr "" + "முகவரிப்புத்தகம் '%s' பயன்படுத்திய ஹோஸ்ட் '%s' க்கான SSL சான்றிதழ், " +-"நம்பகமானதல்ல. அதை " +-"ஏற்க விரும்புகிறீர்களா?" ++"நம்பகமானதல்ல. அதை ஏற்க விரும்புகிறீர்களா?" + + #: ../libedataserver/e-source-webdav.c:1538 + #, c-format +@@ -5062,8 +5110,7 @@ msgid "" + "wish to accept it?" + msgstr "" + "நாள்காட்டி '%s' பயன்படுத்திய ஹோஸ்ட் '%s' க்கான SSL சான்றிதழ் நம்பகமாக இல்லை. " +-"அதை " +-"ஏற்றுக்கொள்ள விரும்புகிறீர்களா?" ++"அதை ஏற்றுக்கொள்ள விரும்புகிறீர்களா?" + + #: ../libedataserver/e-source-webdav.c:1547 + #, c-format +@@ -5081,14 +5128,14 @@ msgid "" + "you wish to accept it?" + msgstr "" + "பணிப் பட்டியல் '%s' பயன்படுத்திய ஹோஸ்ட் '%s' க்கான SSL சான்றிதழ் " +-"நம்பகமானதல்ல. அதை ஏற்க " +-"விரும்புகிறீர்களா?" ++"நம்பகமானதல்ல. அதை ஏற்க விரும்புகிறீர்களா?" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962 ++#: ../libedataserver/e-time-utils.c:1663 ++#: ../libedataserver/e-time-utils.c:1962 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%a %m/%d/%Y %I:%M:%S %p" + +@@ -5096,7 +5143,8 @@ msgstr "%a %m/%d/%Y %I:%M:%S %p" + #. * in 24-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953 ++#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1953 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%a %m/%d/%Y %H:%M:%S" + +@@ -5104,7 +5152,8 @@ msgstr "%a %m/%d/%Y %H:%M:%S" + #. * in 12-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958 ++#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1958 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%a %m/%d/%Y %I:%M %p" + +@@ -5112,7 +5161,8 @@ msgstr "%a %m/%d/%Y %I:%M %p" + #. * in 24-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949 ++#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1949 + msgid "%a %m/%d/%Y %H:%M" + msgstr "%a %m/%d/%Y %H:%M" + +@@ -5130,7 +5180,8 @@ msgstr "%a %m/%d/%Y %H" + + #. strptime format of a weekday and a date. + #. strftime format of a weekday and a date. +-#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811 ++#: ../libedataserver/e-time-utils.c:1691 ++#: ../libedataserver/e-time-utils.c:1811 + #: ../libedataserver/e-time-utils.c:1944 + msgid "%a %m/%d/%Y" + msgstr "%a %m/%d/%Y" +@@ -5171,19 +5222,22 @@ msgstr "%m/%d/%Y %H" + + #. strptime format of a weekday and a date. + #. This is the preferred date format for the locale. +-#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814 ++#: ../libedataserver/e-time-utils.c:1725 ++#: ../libedataserver/e-time-utils.c:1814 + msgid "%m/%d/%Y" + msgstr "%m/%d/%Y" + + #. strptime format for a time of day, in 12-hour format. + #. strftime format of a time in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006 ++#: ../libedataserver/e-time-utils.c:1885 ++#: ../libedataserver/e-time-utils.c:2006 + msgid "%I:%M:%S %p" + msgstr "%I:%M:%S %p" + + #. strptime format for a time of day, in 24-hour format. + #. strftime format of a time in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998 ++#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1998 + msgid "%H:%M:%S" + msgstr "%H:%M:%S" + +@@ -5191,14 +5245,16 @@ msgstr "%H:%M:%S" + #. * in 12-hour format. + #. strftime format of a time in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003 ++#: ../libedataserver/e-time-utils.c:1894 ++#: ../libedataserver/e-time-utils.c:2003 + msgid "%I:%M %p" + msgstr "%I:%M %p" + + #. strptime format for time of day, without seconds 24-hour format. + #. strftime format of a time in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995 ++#: ../libedataserver/e-time-utils.c:1898 ++#: ../libedataserver/e-time-utils.c:1995 + msgid "%H:%M" + msgstr "%H:%M" + +@@ -5223,8 +5279,7 @@ msgid "" + "means manual proxy." + msgstr "" + "எந்த வகை பதிலியைப் பயன்படுத்த வேண்டும். \"0\" என்றால் கணினியினுடையது, \"1\" " +-"என்றால் " +-"பதிலி வேண்டாம், \"2\" என்றால் பதிலியை கைமுறையாக அமைப்பது." ++"என்றால் பதிலி வேண்டாம், \"2\" என்றால் பதிலியை கைமுறையாக அமைப்பது." + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 + msgid "Whether to use http-proxy" +@@ -5334,9 +5389,8 @@ msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " + "from which to obtain a password for '%s'" + msgstr "" +-"'%s' க்கான கடவுச்சொல்லைப் பெறுவதற்குத் தேவையான கணக்கு " +-"org.gnome.OnlineAccounts " +-"சேவையில் இல்லை " ++"'%s' க்கான கடவுச்சொல்லைப் பெறுவதற்குத் தேவையான கணக்கு org.gnome." ++"OnlineAccounts சேவையில் இல்லை " + + #: ../modules/gnome-online-accounts/e-goa-password-based.c:216 + #, c-format +@@ -5382,17 +5436,16 @@ msgstr "" + "தானியக்கக் கண்டறிதல் பதிலளிப்பில் ASUrl மற்றும் OABUrl ஐக் கண்டறிவதில் " + "தோல்வியடைந்தது" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1237 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1271 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " + "from which to obtain an access token for '%s'" + msgstr "" +-"'%s' க்கான அணுகல் டோக்கனைப் பெறுவதற்குத் தேவையான கணக்கு " +-"org.gnome.OnlineAccounts " +-"சேவையில் இல்லை " ++"'%s' க்கான அணுகல் டோக்கனைப் பெறுவதற்குத் தேவையான கணக்கு org.gnome." ++"OnlineAccounts சேவையில் இல்லை " + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1264 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1298 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "'%s' க்கு அணுகல் டோக்கனைப் பெறுவதில் தோல்வியடைந்தது: " +@@ -5808,17 +5861,15 @@ msgid "" + "Cannot find a corresponding account service in the accounts database from " + "which to obtain an access token for '%s'" + msgstr "" +-"கணக்குகள் தரவுத்தளத்திலிருந்து '%s' க்கான அணுகல் டோக்கனைப் பெறத் தேவையான உரிய " +-"கணக்கு " +-"சேவையைக்க் கண்டறிய முடியவில்லை" ++"கணக்குகள் தரவுத்தளத்திலிருந்து '%s' க்கான அணுகல் டோக்கனைப் பெறத் தேவையான " ++"உரிய கணக்கு சேவையைக்க் கண்டறிய முடியவில்லை" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:79 + #, c-format + msgid "Expected status 200 when requesting guid, instead got status %d (%s)" + msgstr "" +-"ஸ்டேடஸ் 200 guid ஐ கோரியபோது எதிர்பார்க்கப்பட்டது, அதற்கு பதில் ஸ்டேடஸ் %d (%" +-"s) " +-"கிடைத்தது" ++"ஸ்டேடஸ் 200 guid ஐ கோரியபோது எதிர்பார்க்கப்பட்டது, அதற்கு பதில் ஸ்டேடஸ் %d " ++"(%s) கிடைத்தது" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:96 + msgid "Error parsing response as JSON: " +@@ -5891,721 +5942,3 @@ msgstr "WebDAV" + #: ../services/evolution-user-prompter/prompt-user-gtk.c:122 + msgid "_Dismiss" + msgstr "பணிநீக்கு (_D)" +- +-#~ msgid "Failed to run book factory" +-#~ msgstr "புத்தக தொழிற்சாலையை இயக்க முடியவில்லை" +- +-#~ msgid "Cannot get connection to view" +-#~ msgstr "பார்ப்பதற்கு இணைப்பை பெற முடியவில்லை" +- +-#~ msgid "Cannot process, book backend is opening" +-#~ msgstr "செயற்படுத்த முடியவில்லை, புத்தக பின்முனை திறக்கிறது" +- +-#~ msgid "Empty query: " +-#~ msgstr "வெற்று கேள்வி: " +- +-#~ msgid "Cannot get backend property: " +-#~ msgstr "பின்முனை பண்பை பெற முடியவில்லை:" +- +-#~ msgid "Invalid backend name '%s' in source '%s'" +-#~ msgstr "மூலம் '%s' இல் தவறான பின்புலப் பெயர் '%s'" +- +-#~ msgid "" +-#~ "Failed to connect to a server using SSL. One possible reason is an " +-#~ "invalid certificate being used by the server. If this is expected, like " +-#~ "self-signed certificate being used on the server, then disable " +-#~ "certificate validity tests by selecting 'Ignore invalid SSL certificate' " +-#~ "option in Properties" +-#~ msgstr "" +-#~ "SSL ஐப் பயன்படுத்தி ஒரு சேவையகத்துடன் இணைவதில் தோல்வியடைந்தது. சேவையாகம் தவறான " +-#~ "சான்றிதழைப் பயன்படுத்தியது இதற்கு ஒரு காரணமாக இருக்கக்கூடும். சேவையகம் தானாக " +-#~ "கையொப்பாமிட்ட சான்றிதழைப் பயன்படுத்துதல் போன்ற இத்தகைய சூழல் இருக்கலாம் எனத் தெரிந்தால் " +-#~ "பண்புகளுக்குச் சென்று 'தவறான SSL சான்றிழைப் புறக்கணி' என்ற விருப்பத்தை முடக்கவும்" +- +-#~ msgid "Cannot create local store" +-#~ msgstr "உள்ளமை சேஎமிப்புகிடங்கை உருவாக்க முடியவில்லை:" +- +-#~ msgid "Failed to run calendar factory" +-#~ msgstr "நாள்காட்டி தொழிற்சாலையை இயக்க முடியவில்லை" +- +-#~ msgid "Cannot process, calendar backend is opening" +-#~ msgstr "செயற்படுத்த முடியவில்லை, நாள்காட்டி பின்முனையை திறக்கிறது" +- +-#~ msgid "Invalid call" +-#~ msgstr "தவறான அழைப்பு" +- +-#~ msgid "" +-#~ " Issuer: %s\n" +-#~ " Subject: %s\n" +-#~ " Fingerprint: %s\n" +-#~ " Signature: %s" +-#~ msgstr "" +-#~ "வழங்கியவர்: %s\n" +-#~ "பொருள்: %s\n" +-#~ "கைரேகை: %s\n" +-#~ "கையொப்பம்: %s" +- +-#~ msgid "GOOD" +-#~ msgstr "நன்று" +- +-#~ msgid "BAD" +-#~ msgstr "தவறு" +- +-#~ msgid "" +-#~ "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n" +-#~ "\n" +-#~ "Detailed information about the certificate:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "'%s' க்கான SSL சான்றிதழ் நம்பகமாக இல்லை. அதை ஏற்றுக்கொள்ள விரும்புகிறீர்களா?\n" +-#~ "\n" +-#~ "சான்றிதழைப் பற்றிய விரிவான தகவல்:\n" +-#~ "%s" +- +-#~ msgid "" +-#~ "Certificate problem: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "சான்றிதழ் பிரச்சனை %s\n" +-#~ "வழங்கியவர்: %s" +- +-#~ msgid "" +-#~ "Bad certificate domain: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "தவறான சான்றிதழ்: %s\n" +-#~ "வழங்கியவர்: %s" +- +-#~ msgid "" +-#~ "Certificate expired: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "சான்றிதழ் காலாவதியானது: %s\n" +-#~ "வழங்கியவர்: %s" +- +-#~ msgid "" +-#~ "Certificate revocation list expired: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "சான்றிதழ் மீட்டல் பட்டியல் காலாவதியானது: %s\n" +-#~ "வழங்கியவர்: %s" +- +-#~ msgid "No output stream" +-#~ msgstr " வெளியீட்டு ஓடஒ இல்லை" +- +-#~ msgid "No input stream" +-#~ msgstr "உள்ளீட்டு ஓடை இல்லை" +- +-#~ msgid "Server unexpectedly disconnected: %s" +-#~ msgstr "எதிர்பாராமல் சேவகன் இணைப்பு துண்டிக்கப்பட்டது: %s" +- +-#~ msgid "" +-#~ "Alert from IMAP server %s@%s in folder %s:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "IMAP சேவகன் %s@%s இலிருந்து அடைவு %s இல் எச்சரிக்கை:\n" +-#~ "%s" +- +-#~ msgid "Unexpected response from IMAP server: %s" +-#~ msgstr "IMAP சேவகனிலிருந்து எதிர்பாராத பதில் : %s" +- +-#~ msgid "IMAP command failed: %s" +-#~ msgstr "IMAP கட்டளை தோல்வியுற்றது : %s" +- +-#~ msgid "Server response ended too soon." +-#~ msgstr "சேவகன் பதில் அதிவேகமாக முடிந்தது" +- +-#~ msgid "IMAP server response did not contain %s information" +-#~ msgstr "IMAP சேவகனில் %s தகவலுக்கான பதில் இல்லை" +- +-#~ msgid "Unexpected OK response from IMAP server: %s" +-#~ msgstr "IMAP சேவகனிலிருந்து எதிர்பாராத சரி பதில்: %s" +- +-#~ msgid "Always check for _new mail in this folder" +-#~ msgstr "_n எப்போதும் இந்த அடைவில் புதிய அஞ்சல்களுக்கு சோதிக்கவும்" +- +-#~ msgid "Could not create directory %s: %s" +-#~ msgstr "அடைவை உருவாக்க முடியவில்லை %s: %s" +- +-#~ msgid "Could not load summary for %s" +-#~ msgstr "%s க்கான சுருக்கத்தை உருவாக்க முடியவில்லை" +- +-#~ msgid "Scanning for changed messages in %s" +-#~ msgstr "மாற்றம் செய்யப்பட்ட செய்தியை ஆராய்ந்து பார்க்கவும் (%s)" +- +-#~ msgid "Fetching summary information for new messages in %s" +-#~ msgstr "சுருக்க தகவலுக்கான புதிய செய்திகளை %s உள்ளே ஏற்றவும்" +- +-#~ msgid "Incomplete server response: no information provided for message %d" +-#~ msgstr "முடியாத சேவகன் பதில்:%d க்கான தகவல் எதுவுமில்லை" +- +-#~ msgid "Incomplete server response: no UID provided for message %d" +-#~ msgstr "அறைகுறையாக சேவகன் பதில் : %d செய்திக்கான UID கொடுக்கப்படவில்லை" +- +-#~ msgid "Could not find message body in FETCH response." +-#~ msgstr "FETCH பதிலில் செய்தியை காணவில்லை" +- +-#~ msgid "Could not open cache directory: " +-#~ msgstr "தற்காலிக அடைவை திறக்க முடியவில்லை : " +- +-#~ msgid "Failed to cache message %s: %s" +-#~ msgstr "தற்காலிகமாக செய்தியை சேமிக்க முடியவில்லை%s: %s" +- +-#~ msgid "Failed to cache message %s: " +-#~ msgstr "%s செய்தியை தற்காலிகமாக சேமிக்க முடியவில்லை: " +- +-#~ msgid "Failed to cache %s: " +-#~ msgstr "%s ஐ தற்காலிக நினைவிடத்தில் சேர்பதில் தோல்வி:" +- +-#~ msgid "Names_pace:" +-#~ msgstr "_p பெயர் நிரப்பிடம்:" +- +-#~ msgid "IMAP default port" +-#~ msgstr "IMAP முன்னிருப்பு துறை" +- +-#~ msgid "IMAP" +-#~ msgstr "IMAP" +- +-#~ msgid "Retrieving list of folders at '%s'" +-#~ msgstr "'%s' இல் அடைவுகளுக்கான பட்டியலை மீட்டெடுக்கிறது" +- +-#~ msgid "Server unexpectedly disconnected" +-#~ msgstr "எதிர்பாராமல் சேவையகம் துண்டிக்கப்பட்டது" +- +-#~ msgid "Server unexpectedly disconnected: " +-#~ msgstr "எதிர்பாராமல் சேவையகம் துண்டிக்கப்பட்டது:" +- +-#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot" +-#~ msgstr "" +-#~ "கோப்புறையை உருவாக்க முடியவில்லை: %s: கோப்புறை பெயர் ஒரு புள்ளியை கொண்டிருக்கலாகாது" +- +-#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot" +-#~ msgstr "" +-#~ "கோப்புறைக்கு மறுபெயரிட முடியவில்லை: %s: கோப்புறை பெயர் ஒரு புள்ளியை " +-#~ "கொண்டிருக்கவில்லை" +- +-#~ msgid "Currently _used categories:" +-#~ msgstr "_u நடப்பில் பயன்படுத்திய வகைகள்:" +- +-#~ msgid "_Available Categories:" +-#~ msgstr "கிடைக்கக் கூடிய வகைகள்:_A" +- +-#~ msgid "Icon" +-#~ msgstr "சின்னம்" +- +-#~ msgid "Category" +-#~ msgstr "வகை" +- +-#~ msgid "Create category \"%s\"" +-#~ msgstr "வகையை \"%s\"ஐ உருவாக்கு" +- +-#~ msgid "Category Icon" +-#~ msgstr "வகையின் உருவம்" +- +-#~ msgid "_No Image" +-#~ msgstr "பிம்பம் இல்லை (_N)" +- +-#~ msgid "Category _Name" +-#~ msgstr "வகையின் பெயர் (_N)" +- +-#~ msgid "Category _Icon" +-#~ msgstr "வகை ( _Icon)" +- +-#~ msgid "Category Properties" +-#~ msgstr "உடைமை வகைகள்" +- +-#~ msgid "" +-#~ "There is already a category '%s' in the configuration. Please use another " +-#~ "name" +-#~ msgstr "ஏற்கனவே வகையின் வெளித்தோற்றம் உள்ளது.ஏற்ற வேறு பெயரை பயன்படுத்தவும் ('%s')" +- +-#~ msgid "Show Contacts" +-#~ msgstr "தொடர்புகளை காட்டவும்" +- +-#~ msgid "Address B_ook:" +-#~ msgstr "முகவரி புத்தகம் (_o) :" +- +-#~ msgid "Cat_egory:" +-#~ msgstr "வகை:(_e)" +- +-#~ msgid "_Search:" +-#~ msgstr "தேடல்: (_S)" +- +-#~ msgid "Any Category" +-#~ msgstr "எந்த ஒரு வகையானாலும்" +- +-#~ msgid "Co_ntacts" +-#~ msgstr "தொடர்புகள் (_n) " +- +-#~ msgid "Search" +-#~ msgstr "தேடல்" +- +-#~ msgid "Address Book" +-#~ msgstr "முகவரி புத்தகம்" +- +-#~ msgid "Select Contacts from Address Book" +-#~ msgstr "முகவரிப்புத்தகத்திலிருந்து தொடர்புகளை தேர்வுசெய்" +- +-#~ msgid "_Add" +-#~ msgstr "சேர்(_A)" +- +-#~ msgid "_Remove" +-#~ msgstr "நீக்கவும் (_R)" +- +-#~ msgid "Error loading address book: %s" +-#~ msgstr "முகவரி புத்தகத்தை ஏற்றும் போது பிழை: %s" +- +-#~ msgid "E_xpand %s Inline" +-#~ msgstr "விரிவான வழிமுறை (E_)%s" +- +-#~ msgid "Cop_y %s" +-#~ msgstr "%s ஐ பிரதி எடு (_y)" +- +-#~ msgid "C_ut %s" +-#~ msgstr "%s ஐ வெட்டுக" +- +-#~ msgid "_Edit %s" +-#~ msgstr "%s ஐ திருத்தியமை (_E)" +- +-#~ msgid "_Delete %s" +-#~ msgstr "அழிக்கவும் %s (_D)" +- +-#~ msgid "Keyring key is unusable: no user or host name" +-#~ msgstr "விசைவளைய விசை பயன்பாடு இழந்தது. பயனர் அல்லது புரவலன் பெயர் இல்லை " +- +-#~ msgid "You have the Caps Lock key on." +-#~ msgstr "நீங்கள் உயர் நிலை எழுத்து பூட்டு விசையை செயலாக்கி உள்ளீர்கள்." +- +-#~ msgid "_Remember this passphrase" +-#~ msgstr "சொற்றோடரின் மூலம் நினைவு கொள்ளல் (_R)" +- +-#~ msgid "_Remember this passphrase for the remainder of this session" +-#~ msgstr "(_R) இந்த அமைவின் மீதி நேரத்துக்கு இந்த கடவு சொல்லை நினைவு கொள்க." +- +-#~ msgid "_Remember this password" +-#~ msgstr "இந்த கடவுச் சொல்லை நினைவில் கொள்ளவும் (_R)" +- +-#~ msgid "_Remember this password for the remainder of this session" +-#~ msgstr "இந்த அமர்வில் எஞ்சியுள்ள கடவுச்சொல்லை நினைவு கொள்ளவும் (_R)" +- +-#~ msgid "_Destination" +-#~ msgstr "சேருமிடம் (_D)" +- +-#~ msgid "Select destination" +-#~ msgstr "சேருமிடத்தை தேர்வு செய்" +- +-#~ msgid "Evolution Source Viewer" +-#~ msgstr "எவல்யூஷன் மூலக் காட்சிப்படுத்தி" +- +-#~ msgid "Display Name" +-#~ msgstr "பெயரைக் காட்டு:" +- +-#~ msgid "Flags" +-#~ msgstr "கொடிகள்" +- +-#~ msgid "Identity" +-#~ msgstr "அடையாளம்" +- +-#~ msgid "Could not connect to %s: " +-#~ msgstr "%s க்கு இணைக்க முடியவில்லை: " +- +-#~ msgid "Could not connect to POP server %s" +-#~ msgstr "பாப் சேவகனுடன் இணைக்க முடியவில்லை %s" +- +-#~ msgid "Using Distinguished Name (DN)" +-#~ msgstr "புகழ்பெற்ற பெயர் பயன்படுத்துகிறது (DN)" +- +-#~ msgid "Using Email Address" +-#~ msgstr "மின்னஞ்சல் முகவரி பயன்படுத்தப்படுகிறது" +- +-#~ msgid "Failed to build summary for an address book %s" +-#~ msgstr "முகவரிப் புத்தகம் %s க்கான ஒரு சுருக்கத்தை உருவாக்குவதில் தோல்வியடைந்தது" +- +-#~ msgid "Cannot remove book: " +-#~ msgstr "புத்தகத்தை நீக்க முடியவில்லை: " +- +-#~ msgid "Could not create synch slave thread" +-#~ msgstr "ஒருங்கமை உதவி இழையை உருவாக்க முடியவில்லை" +- +-#~ msgid "Cannot remove calendar: " +-#~ msgstr "நாள்காட்டியை நீக்க முடியவில்லை: " +- +-#~ msgid "Keyring operation was cancelled" +-#~ msgstr "விசை வளைய செயல்பாடு ரத்து செய்யப்பட்டது" +- +-#~ msgid "Authenticating with the server…" +-#~ msgstr "சேவையகத்துடன் அங்கீகரிக்கிறது..." +- +-#~ msgid "%s: there was no source for UID '%s' stored in GConf." +-#~ msgstr "%s: UID க்கு மூலம் எதுவும் இல்லை`%s' gconfல் சேமிக்கப்பட்டுள்ளது." +- +-#~ msgid "Incorrect uri '%s'" +-#~ msgstr "தவறான uri '%s'" +- +-#~ msgid "Failed to find system book" +-#~ msgstr "கணினி புத்தகத்தை தேட முடியவில்லை" +- +-#~ msgid "There was no source for UID '%s' stored in a source list." +-#~ msgstr "UID '%s' க்கான மூலம் இல்லை இது ஒரு மூலப்பட்டியலில் சேமிகப்பட்டது." +- +-#~ msgid "Empty URI" +-#~ msgstr "வெற்று யூஆர்ஐ" +- +-#~ msgid "Enter password for %s (user %s)" +-#~ msgstr "%s க்கு கடவுச்சொல்லை உள்ளிடவும் (பயனர் %s)" +- +-#~ msgid "Enter password for %s to enable proxy for user %s" +-#~ msgstr "%s பயனருக்கு பதிலாளை செயல்படுத்த %sக்கு கடவுச்சொல்லை உள்ளிடவும்" +- +-#~ msgid "Invalid source type" +-#~ msgstr "தவறான மூல வகை" +- +-#~ msgid "Invalid URI" +-#~ msgstr "செல்லாத யூஆர்ஐ" +- +-#~ msgid "Could not instantiate backend" +-#~ msgstr "பின் இயக்கியை துவக்க முடியவில்லை" +- +-#~ msgid "SSL unavailable" +-#~ msgstr "SSL கிடைக்கவில்லை" +- +-#~ msgid "URL '%s' needs a user component" +-#~ msgstr "URL '%s' ஒரு பயனர் கூறு தேவைப்படுகிறது" +- +-#~ msgid "URL '%s' needs a host component" +-#~ msgstr "URL '%s' புரவலன் பெயர் தேவை" +- +-#~ msgid "URL '%s' needs a path component" +-#~ msgstr "URL '%s' க்கு பாதை தேவை" +- +-#~ msgid "" +-#~ "SSL Certificate check for %s:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "Do you wish to accept?" +-#~ msgstr "" +-#~ "SSL சான்றிதழ் சோதனை %s:\n" +-#~ "\n" +-#~ "%s\n" +-#~ "\n" +-#~ "ஏற்க விருப்பமா?" +- +-#~ msgid "Connection to Server" +-#~ msgstr "சேவகனுடன் இணைப்பு" +- +-#~ msgid "_Use custom command to connect to server" +-#~ msgstr "சேவையகத்துடன் இணைய கட்டளைகளை பயன்படுத்தவும் (_U)" +- +-#~ msgid "Co_mmand:" +-#~ msgstr "(_m) கட்டளை:" +- +-#~ msgid "Check new messages for Jun_k contents" +-#~ msgstr "புதிய செய்திகளை குப்பை உள்ளடக்கத்துக்கு சோதிக்கவும்" +- +-#~ msgid "SSL is not available in this build" +-#~ msgstr "SSL உருவாக்கம் கிடைக்கப் பெறவில்லை" +- +-#~ msgid "Error creating SASL authentication object." +-#~ msgstr "SASL அனுமதியை உருவாக்குவதில் பிழை" +- +-#~ msgid "You did not enter a password." +-#~ msgstr "நீங்கள் கடவுச்சொல்லை புகுத்த வில்லை" +- +-#~ msgid "Use I_dle if the server supports it" +-#~ msgstr "_d சேவையகம் ஆதரவு தருமாயின் சும்மா இரு ஐ பயன்படுத்துக." +- +-#~ msgid "Command:" +-#~ msgstr "கட்டளை:" +- +-#~ msgid "Numbe_r of cached connections to use" +-#~ msgstr "_r பயன்படுத்த இடை நினைவக இணைப்புகளின் எண்ணிக்கை " +- +-#~ msgid "Closing tmp stream failed: " +-#~ msgstr "தற்காலிக ஓடையை மூடுதல் தோல்வி: " +- +-#~ msgid "Authentication requested but no username provided" +-#~ msgstr "அங்கீகாரம் கோரப்பட்டது ஆனால் பயனரின் பெயர் கொடுக்கப்படவில்லை" +- +-#~ msgid "TLS is not available in this build" +-#~ msgstr "TLS " +- +-#~ msgid "" +-#~ "Unable to connect to POP server %s: No support for requested " +-#~ "authentication mechanism." +-#~ msgstr "பாப் சேவகனுடன் இணைக்க முடியவில்லை %s வேண்டப்பட்ட அனுமதி முறைக்கு ஆதரவு இல்லை" +- +-#~ msgid "SASL '%s' Login failed for POP server %s%s" +-#~ msgstr "SASL '%s' உள்நுழைவு பாப் (POP) சேவையகத்துக்கு தோல்வி அடைந்தது %s %s" +- +-#~ msgid "" +-#~ "Unable to connect to POP server %s.\n" +-#~ "Error sending password%s" +-#~ msgstr "" +-#~ "பாப் சேவகனுடன் இணைக்க முடியவில்லை %s.\n" +-#~ "கடவுச்சொல்லை அனுப்புவதில் பிழை %s" +- +-#~ msgid "" +-#~ "Unable to authenticate to SMTP server.\n" +-#~ "%s\n" +-#~ "\n" +-#~ msgstr "" +-#~ "SMTP சேவகனுடன் அனுமதி பெற முடியவில்லை \n" +-#~ "%s\n" +-#~ "\n" +- +-#~ msgid "SMTP Authentication" +-#~ msgstr "SMTP அனுமதி முறை" +- +-#~ msgid "Accessing LDAP Server anonymously" +-#~ msgstr "LDAP சேவையகத்தை யார்வேண்டுமாலும் அணுக முடிகிறது" +- +-#~ msgid "" +-#~ "Enter password for calendar %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "நாள்காட்டி %s க்கான கடவுச்சொல்லை உள்ளிடவும் (பயனர் %s)\n" +-#~ "காரணம்: %s" +- +-#~ msgid "Enter password for calendar %s (user %s)" +-#~ msgstr "நாள்காட்டி %s க்கான கடவுச்சொல்லை உள்ளிடவும் (பயனர் %s)" +- +-#~ msgid "" +-#~ "Enter password for task list %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "பணி பட்டியல் %s க்கான கடவுச்சொல்லை உள்ளிடவும் (பயனர் %s)\n" +-#~ "காரணம்: %s" +- +-#~ msgid "Enter password for task list %s (user %s)" +-#~ msgstr "பணி பட்டியல் %s க்கான கடவுச்சொல்லை உள்ளிடவும் (பயனர் %s)" +- +-#~ msgid "" +-#~ "Enter password for memo list %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "மெமோ பட்டியல் %s க்கான கடவுச்சொல்லை உள்ளிடவும் (பயனர் %s)\n" +-#~ "காரணம்: %s" +- +-#~ msgid "Enter password for memo list %s (user %s)" +-#~ msgstr "முகவரி பட்டியல் %s க்கான கடவுச்சொல்லை உள்ளிடவும் (பயனர் %s)" +- +-#~ msgid "" +-#~ "Enter password for address book %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "முகவரி புத்தகம் %s க்கான கடவுச்சொல்லை உள்ளிடவும் (பயனர் %s)\n" +-#~ "காரணம்: %s" +- +-#~ msgid "Enter password for address book %s (user %s)" +-#~ msgstr "முகவரி புத்தகம் %s க்கான கடவுச்சொல்லை உள்ளிடவும் (பயனர் %s)" +- +-#~ msgid "Enter Passphrase" +-#~ msgstr "கடவுச்சொல்லை உள்ளிடவும்" +- +-#~ msgid "Enter Password" +-#~ msgstr "கடவுச்சொல்லை உள்ளிடவும்" +- +-#~ msgid "Updating contacts cache (%d)... " +-#~ msgstr "தொடர்புகள் இடமாற்றினை மேம்படுத்துகிறது (%d)... " +- +-#~ msgid "Cannot get supported fields: %s" +-#~ msgstr "ஆதரவுள்ள புலங்களை பெற முடியவில்லை: %s" +- +-#~ msgid "Cannot get required fields: %s" +-#~ msgstr " தேவையான புலங்களை பெற முடியவில்லை: %s" +- +-#~ msgid "Cannot get supported authentication methods: %s" +-#~ msgstr "உறுதி செய்யும் செயல்பாடுகள் ஆதரவை பெற முடியவில்லை: %s" +- +-#~ msgid "Cannot get changes: %s" +-#~ msgstr "மாற்றங்களை பெற முடியவில்லை: %s" +- +-#~ msgid "Cancel operation failed: %s" +-#~ msgstr "ரத்து செயல் தோல்வியுற்றது: %s" +- +-#~ msgid "Reply Requested: by " +-#~ msgstr "பதில் கோரப்பட்டது:" +- +-#~ msgid "Reply Requested: When convenient" +-#~ msgstr "பதில் கோரப்பட்டது: சாதகமாக இருக்கும் போது" +- +-#~ msgid "Loading %s items" +-#~ msgstr "பொறுப்பான வகைகள் (%s)" +- +-#~ msgid "Could not create thread for populating cache" +-#~ msgstr "இடமாற்றினை பரப்ப த்ரட்டை உருவாக்க முடியாது" +- +-#~ msgid "Cannot retrieve calendar alarm e-mail address: %s" +-#~ msgstr "நாள்காட்டி எச்சரிக்கை மின்னஞ்சல் முகவரியை மீட்க முடியவில்லை: %s" +- +-#~ msgid "Cannot retrieve calendar's LDAP attribute: %s" +-#~ msgstr "நாள்காட்டியின் எல்டேப் LDAP பண்புக்கூற்றை மீட்க முடியவில்லை: %s" +- +-#~ msgid "Cannot retrieve calendar scheduling information: %s" +-#~ msgstr "நாள்காட்டி திட்ட அட்டவணை தகவலை மீட்க முடியவில்லை: %s" +- +-#~ msgid "Cannot discard calendar alarm: %s" +-#~ msgstr "நாள்காட்டி எச்சரிக்கையை நீக்க முடியாது: %s" +- +-#~ msgid "Cannot retrieve default calendar object path: %s" +-#~ msgstr "முன்னிருப்பு நாள்காட்டி பொருள் பாதையை மீட்க முடியவில்லை: %s" +- +-#~ msgid "Could not complete calendar query: %s" +-#~ msgstr "நாள்காட்டி உசாவலை முடிக்க முடியவில்லை: %s" +- +-#~ msgid "Could not set default calendar time zone: %s" +-#~ msgstr "முன்னிருப்பு நாள்காட்டி நேர மண்டலத்தை அமைக்க முடியவில்லை: %s" +- +-#~ msgid "Cannot retrieve calendar changes: %s" +-#~ msgstr "நாள்காட்டி மாற்றங்களை மீட்க முடியவில்லை: %s" +- +-#~ msgid "No stream available" +-#~ msgstr "ஓடை ஏதும் இல்லை " +- +-#~ msgid "" +-#~ "Could not create directory %s:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "அடைவை உருவாக்க முடியவில்லை%s:\n" +-#~ "%s" +- +-#~ msgid "" +-#~ "Cannot get message: %s\n" +-#~ " %s" +-#~ msgstr "" +-#~ "செய்தியை பெற முடியவில்லை: %s\n" +-#~ " %s" +- +-#~ msgid "This message is not available in offline mode." +-#~ msgstr "இணையத் தொடர்பு முறையில் இந்த செய்தி கிடைக்கவில்லை." +- +-#~ msgid "Could not get message" +-#~ msgstr "செய்தியை பெற முடியவில்லை" +- +-#~ msgid "Checking for deleted messages %s" +-#~ msgstr "அழிக்கப்பட்ட செய்திகள் %sக்கு சோதிக்கிறது" +- +-#~ msgid "Cannot append message to folder '%s': %s" +-#~ msgstr " அடைவு %s' க்கு செய்தி சேர்க்க முடியாது: %s" +- +-#~ msgid "Cannot create message: %s" +-#~ msgstr " செய்தியை உருவாக்க முடியவில்லை (: %s)" +- +-#~ msgid "Cannot get folder container %s" +-#~ msgstr "கொள்கல அடைவை பெறமுடியவில்லை (%s)" +- +-#~ msgid "Cannot append message in offline mode: cache unavailable" +-#~ msgstr "" +-#~ "இணையத்தொடர்பு இல்லாத போது செய்தியை சேர்க்க முடியாது:இடைமாற்றம் கிடைக்க வில்லை''" +- +-#~ msgid "Cannot append message in offline mode: " +-#~ msgstr "இணையத்தொடர்பில் இல்லாத போது செய்தியை ஒட்டு சேர்க்க முடியாது:" +- +-#~ msgid "Checking for new mail" +-#~ msgstr "புதிய மின்னஞ்சல் உள்ளதா என பார்க்கிறது" +- +-#~ msgid "Automatically synchroni_ze account locally" +-#~ msgstr "தானியங்கியாக உள்ளமை கணக்கை ஒத்திசைக்கவும்" +- +-#~ msgid "SOAP Settings" +-#~ msgstr "SOAP பதித்தல்" +- +-#~ msgid "Post Office Agent SOAP _Port:" +-#~ msgstr "போஸ் ஆபீஸ் ஏஜென்டுக்கான SOAP துறை (_P)" +- +-#~ msgid "Novell GroupWise" +-#~ msgstr "நாவல் க்ரூப்வைஸ்" +- +-#~ msgid "For accessing Novell GroupWise servers" +-#~ msgstr "நாவல் க்ரூப்வைஸ் சேவையகத்தை அணுகுதல்" +- +-#~ msgid "" +-#~ "This option will connect to the GroupWise server using a plaintext " +-#~ "password." +-#~ msgstr "இந்த தேர்வு க்ரூப்வைஸ் சேவகனை சாதாரண உரை கடவுச்சொல்லை பயன்படுத்தி இணைக்கும்" +- +-#~ msgid "Host or user not available in url" +-#~ msgstr "புரவலன் அல்லது பயனர் இணைய முகவரியில் இல்லை" +- +-#~ msgid "" +-#~ "Some features may not work correctly with your current server version" +-#~ msgstr "நடப்பு சேவையக பதிப்பில் சில வசதிகள் சரியாக வேலை செய்யாது" +- +-#~ msgid "Cannot create GroupWise folders in offline mode." +-#~ msgstr "இம்முறையில் க்ரூப்வைஸ் அடைவினை உருவாக்க முடியாது." +- +-#~ msgid "Cannot create a special system folder" +-#~ msgstr "சிறப்பு கணினி அடைவு ஒன்று உருவாக்க்க முடியவில்லை" +- +-#~ msgid "Cannot rename GroupWise folder '%s' to '%s'" +-#~ msgstr "'%s' க்ரூப்வைஸ் அடைவை '%s' என மறுபெயரிட முடியாது " +- +-#~ msgid "GroupWise server %s" +-#~ msgstr "க்ரூப் வைஸ் சேவையகம் (%s)" +- +-#~ msgid "GroupWise service for %s on %s" +-#~ msgstr "க்ரூப்வைஸ் சேவை (%s on %s)" +- +-#~ msgid "GroupWise mail delivery via %s" +-#~ msgstr "க்ரூப்வைஸ் மின்னஞ்சல் அனுப்புதல் %s மூலமாக" +- +-#~ msgid "Sending Message" +-#~ msgstr " அனுப்பப்படும் செய்தி" +- +-#~ msgid "Cannot get folder: Invalid operation on this store" +-#~ msgstr "அடைவை பெற முடியவில்லை: இந்த கிடங்கில் செல்லாத செயல்" +- +-#~ msgid "" +-#~ "You have exceeded this account's storage limit. Your messages are queued " +-#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving " +-#~ "some of your mail.\n" +-#~ msgstr "" +-#~ "இந்த கணக்கின் சேமிப்பு வரையரையை தாண்டி விட்டீகள். உங்கள் வெளிசெல் பெட்டியில் உங்கள் " +-#~ "செய்திகள் க்யூவில் உள்ளன. உங்கள் அஞ்சலில் சிலவற்றை நீக்கி அல்லது நகர்த்திவிட்டு அவற்றை " +-#~ "மீண்டும் அனுப்புக.\n" +- +-#~ msgid "Could not send message: %s" +-#~ msgstr "செய்தி அனுப்ப முடியவில்லை: %s" +- +-#~ msgid "_Apply filters to new messages in INBOX on this server" +-#~ msgstr "சேவையகத்தின் உள்பெட்டியில் புதிய செய்திகளுக்கு வடிப்பியை செயல்படுத்தவும்" +- +-#~ msgid "SSL negotiations failed" +-#~ msgstr "SSL பேரம் தோல்வியுற்றது" +- +-#~ msgid "Could not connect to %s (port %s): " +-#~ msgstr "%s க்கு இணைக்க முடியவில்லை(துறை %s): " +- +-#~ msgid "Cannot create spool file: %s" +-#~ msgstr "சுருள் கோப்பை உருவாக்க முடியவில்லை: %s" +- +-#~ msgid "TLS negotiations failed" +-#~ msgstr "TLS பேச்சு வார்த்தை தோல்வியுற்றது" +- +-#~ msgid "_Edit" +-#~ msgstr " திருத்தவும் (_E)" +- +-#~ msgid "categories" +-#~ msgstr "வகைகள்" +- +-#~ msgid "*" +-#~ msgstr "*" +- +-#~ msgid "Co_ntacts" +-#~ msgstr "தொடர்புகள் (_n)" +- +-#~ msgid "Show Contacts" +-#~ msgstr "தொடர்புகளை காட்டு" +- +-#~ msgid "Invalid connection" +-#~ msgstr "செல்லாத இணைப்பு" +- +-#~ msgid "Invalid response from server" +-#~ msgstr "சேவகனிலிருந்து செல்லாத பதில்" +- +-#~ msgid "Bad parameter" +-#~ msgstr "தவறான நிலையளவுரு" +- +-#~ msgid "UnknownUser" +-#~ msgstr "தெரியாத பயனர் " +diff -up evolution-data-server-3.8.5/po/zh_CN.po.translations evolution-data-server-3.8.5/po/zh_CN.po +--- evolution-data-server-3.8.5/po/zh_CN.po.translations 2013-03-17 13:46:02.000000000 +0100 ++++ evolution-data-server-3.8.5/po/zh_CN.po 2014-01-13 16:23:40.791630231 +0100 +@@ -15,1692 +15,1839 @@ + # Wylmer Wang , 2011. + # YunQiang Su , 2011. + # Aron Xu , 2009, 2012. +-# ++# Leah Liu , 2013. #zanata + msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server master\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=" ++"evolution-data-server&keywords=I18N+L10N&component=Misc.\n" + "POT-Creation-Date: 2012-02-23 12:45+0000\n" +-"PO-Revision-Date: 2012-03-20 16:08+0000\n" +-"Last-Translator: Aron Xu \n" ++"PO-Revision-Date: 2013-11-06 11:01-0500\n" ++"Last-Translator: Leah Liu \n" + "Language-Team: Chinese (simplified) \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bits\n" +-"Language: zh_CN\n" ++"Language: zh-CN\n" + "Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: Zanata 3.1.2\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:129 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939 +-#: ../addressbook/libebook/e-book-client.c:106 +-#: ../addressbook/libedata-book/e-data-book.c:441 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:577 +-#: ../calendar/backends/http/e-cal-backend-http.c:424 +-#: ../calendar/libecal/e-cal.c:4596 ../calendar/libecal/e-cal-client.c:150 +-#: ../camel/providers/imap/camel-imap-command.c:515 +-#: ../camel/providers/imap/camel-imap-store.c:464 +-#: ../camel/providers/imapx/camel-imapx-command.c:538 +-#: ../libedataserver/e-client.c:164 +-msgid "Unknown error" +-msgstr "未知的错误" +- +-#: ../addressbook/backends/file/e-book-backend-file.c:154 ++#: ../addressbook/backends/file/e-book-backend-file.c:114 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "删除文件“%s”失败：%s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:177 ++#: ../addressbook/backends/file/e-book-backend-file.c:138 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "创建目录“%s”失败：%s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:472 ++#: ../addressbook/backends/file/e-book-backend-file.c:385 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "创建资源“%s”的硬链接失败：%s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:574 +-#: ../addressbook/backends/file/e-book-backend-file.c:1129 ++#: ../addressbook/backends/file/e-book-backend-file.c:487 ++#: ../addressbook/backends/file/e-book-backend-file.c:911 + msgid "No UID in the contact" + msgstr "联系人没有 UID" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1563 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516 ++#: ../addressbook/backends/file/e-book-backend-file.c:757 ++#, c-format ++msgid "Conflicting UIDs found in added contacts" ++msgstr "在已添加的联系人中找到冲突的 UID" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:844 ++#: ../addressbook/backends/file/e-book-backend-file.c:1038 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2656 ++#, c-format ++msgid "Contact '%s' not found" ++msgstr "未找到联系人 %s" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:940 ++#, c-format ++msgid "Tried to modify contact '%s' with out of sync revision" ++msgstr "在没有同步修订本的情况下尝试修改联系人 '%s'" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:1089 ++#: ../addressbook/backends/file/e-book-backend-file.c:1139 ++#, c-format ++msgid "Query '%s' not supported" ++msgstr "不支持查询 '%s'" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:1098 ++#: ../addressbook/backends/file/e-book-backend-file.c:1148 ++#, c-format ++msgid "Invalid Query '%s'" ++msgstr "无效查询 '%s'" ++ ++#: ../addressbook/backends/file/e-book-backend-file.c:1248 + msgid "Loading..." + msgstr "正在载入..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1566 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518 ++#: ../addressbook/backends/file/e-book-backend-file.c:1250 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4978 + msgid "Searching..." + msgstr "正在搜索..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:2108 ++#: ../addressbook/backends/file/e-book-backend-file.c:1568 + #, c-format +-msgid "Failed to build summary for an address book %s" +-msgstr "为地址簿 %s 创建摘要失败" ++msgid "Failed to rename old database from '%s' to '%s': %s" ++msgstr "将旧数据库从 '%s' 重命名为 '%s' 失败：%s" ++ ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4873 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:338 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 ++#: ../addressbook/libebook-contacts/e-phone-number.c:58 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:562 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:592 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 ++#: ../calendar/libecal/e-cal.c:2339 ++#: ../calendar/libecal/e-cal-client.c:275 ++#: ../camel/camel-imapx-command.c:609 ++#: ../libedataserver/e-client.c:179 ++msgid "Unknown error" ++msgstr "未知的错误" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:874 ++#: ../addressbook/backends/google/e-book-backend-google.c:679 + msgid "Querying for updated contacts…" + msgstr "查询更新的联系人..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:923 +-#: ../addressbook/libebook/e-book.c:3531 ../calendar/libecal/e-cal.c:1380 +-#: ../libedataserver/e-client.c:1918 +-msgid "Personal" +-msgstr "个人" +- +-#: ../addressbook/backends/google/e-book-backend-google.c:925 +-msgid "Friends" +-msgstr "朋友" +- +-#: ../addressbook/backends/google/e-book-backend-google.c:927 +-msgid "Family" +-msgstr "家人" +- +-#: ../addressbook/backends/google/e-book-backend-google.c:929 +-msgid "Coworkers" +-msgstr "同事" +- + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1019 ++#: ../addressbook/backends/google/e-book-backend-google.c:816 + msgid "Querying for updated groups…" + msgstr "查询更新的组..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1424 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1639 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:295 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326 ++#: ../addressbook/backends/google/e-book-backend-google.c:1265 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:389 + msgid "The backend does not support bulk additions" + msgstr "后端不支持批量添加" + + #. Insert the entry on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1451 ++#: ../addressbook/backends/google/e-book-backend-google.c:1297 + msgid "Creating new contact…" + msgstr "创建新的联系人..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1540 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433 ++#: ../addressbook/backends/google/e-book-backend-google.c:1388 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:506 + msgid "The backend does not support bulk removals" + msgstr "后端不支持批量删除" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1568 ++#: ../addressbook/backends/google/e-book-backend-google.c:1416 + msgid "Deleting contact…" + msgstr "删除联系人..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1818 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2296 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:375 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487 ++#: ../addressbook/backends/google/e-book-backend-google.c:1670 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:567 + msgid "The backend does not support bulk modifications" + msgstr "后端不支持批量修改" + + #. Update the contact on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1851 ++#: ../addressbook/backends/google/e-book-backend-google.c:1708 + msgid "Modifying contact…" + msgstr "修改联系人..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:2058 ++#: ../addressbook/backends/google/e-book-backend-google.c:1879 + msgid "Loading…" + msgstr "正在载入..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:2187 +-msgid "Authenticating with the server…" +-msgstr "正在与服务器进行认证..." ++#. System Group: My Contacts ++#: ../addressbook/backends/google/e-book-google-utils.c:1606 ++#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1 ++msgid "Personal" ++msgstr "个人" ++ ++#. System Group: Friends ++#: ../addressbook/backends/google/e-book-google-utils.c:1608 ++msgid "Friends" ++msgstr "朋友" ++ ++#. System Group: Family ++#: ../addressbook/backends/google/e-book-google-utils.c:1610 ++msgid "Family" ++msgstr "家人" ++ ++#. System Group: Coworkers ++#: ../addressbook/backends/google/e-book-google-utils.c:1612 ++msgid "Coworkers" ++msgstr "同事" + +-#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:177 ++#. Translators: An error message shown to a user when trying to do an ++#. * operation on the LDAP address book which is not connected to the server ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174 + msgid "Not connected" + msgstr "未连接。" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797 +-msgid "Using Distinguished Name (DN)" +-msgstr "使用已识别的姓名 (DN)" +- +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800 +-msgid "Using Email Address" +-msgstr "使用电子邮件地址" ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965 ++msgid "Failed to bind using either v3 or v2 binds" ++msgstr "使用 v3 或者 v2 捆绑进行绑定失败" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088 + msgid "Reconnecting to LDAP server..." + msgstr "正在重新连接 LDAP 服务器..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218 + msgid "Invalid DN syntax" + msgstr "无效 DN 语法" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4872 ++#, c-format ++msgid "LDAP error 0x%x (%s)" ++msgstr "LDAP 错误 0x%x (%s)" ++ ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Adding contact to LDAP server..." + msgstr "正在将联系人添加到 LDAP 服务器..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1869 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1890 + msgid "Removing contact from LDAP server..." + msgstr "正在从 LDAP 服务器删除联系人..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2318 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2431 ++#, c-format ++msgid "%s: NULL returned from ldap_first_entry" ++msgstr "%s: ldap_first_entry 返回 NULL" ++ ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2489 ++#, c-format ++msgid "%s: Unhandled result type %d returned" ++msgstr "%s：返回未处理的结果类型 %d" ++ ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2356 + msgid "Modifying contact from LDAP server..." + msgstr "正在修改 LDAP 服务器上的联系人..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4720 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2718 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2950 ++#, c-format ++msgid "%s: Unhandled search result type %d returned" ++msgstr "%s：返回未处理的搜索结果类型 %d" ++ ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4821 + msgid "Receiving LDAP search results..." + msgstr "正在接收 LDAP 的搜索结果..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5000 + msgid "Error performing search" + msgstr "执行搜索错误" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "正在下载联系人(%d)..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5654 + #, c-format +-msgid "Create resource '%s' failed with HTTP status: %d (%s)" +-msgstr "创建资源“%s”失败，HTTP 状态码为: %d(%s)" ++msgid "Failed to get the DN for user '%s'" ++msgstr "为用户 '%s' 获取 DN 失败" + +-#: ../addressbook/libebook/e-book.c:3198 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:420 + #, c-format +-msgid "%s: there was no source for UID '%s' stored in GConf." +-msgstr "%s：GConf 中没有存储 UID“%s”的源。" ++msgid "Create resource '%s' failed with HTTP status %d (%s)" ++msgstr "使用 HTTP 状态 %d（%s）创建资源 '%s' 失败" + +-#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360 +-#: ../libedataserver/e-client.c:1913 +-msgid "On This Computer" +-msgstr "在此计算机中" ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:522 ++#, c-format ++msgid "DELETE failed with HTTP status %d" ++msgstr "使用 HTTP 状态 %d 删除失败" + +-#: ../addressbook/libebook/e-book.c:3640 +-#: ../addressbook/libebook/e-book-client.c:702 +-#: ../addressbook/libedata-book/e-data-book.c:322 +-msgid "Address book does not exist" +-msgstr "地址簿不存在" ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588 ++msgid "Contact on server changed -> not modifying" ++msgstr "服务器中的联系人更改 -> 未修改" ++ ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:597 ++#, c-format ++msgid "Modify contact failed with HTTP status %d (%s)" ++msgstr "使用 HTTP 状态 %d（%s）修改联系人失败" ++ ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1007 ++msgid "Loading Addressbook summary..." ++msgstr "贼如地址簿概述......" ++ ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026 ++#, c-format ++msgid "PROPFIND on webdav failed with HTTP status %d (%s)" ++msgstr "使用 HTTP 状态 %d（%s）在 webdav 中 PROPFIND 失败" ++ ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1051 ++msgid "No response body in webdav PROPFIND result" ++msgstr "在 PROPFIND 结果中没有回复邮件" ++ ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1083 ++#, c-format ++msgid "Loading Contacts (%d%%)" ++msgstr "载入联系人（%d%%）" ++ ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1416 ++msgid "Cannot transform SoupURI to string" ++msgstr "无法将 SoupURI 转换为字符串" + +-#: ../addressbook/libebook/e-book-client.c:95 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24 + msgid "No such book" + msgstr "没有该地址簿" + +-#: ../addressbook/libebook/e-book-client.c:97 +-#: ../addressbook/libedata-book/e-data-book.c:315 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26 ++#: ../addressbook/libedata-book/e-data-book.c:797 + msgid "Contact not found" + msgstr "找不到联系人" + +-#: ../addressbook/libebook/e-book-client.c:99 +-#: ../addressbook/libedata-book/e-data-book.c:316 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28 ++#: ../addressbook/libedata-book/e-data-book.c:798 + msgid "Contact ID already exists" + msgstr "联系人 ID 已经存在" + +-#: ../addressbook/libebook/e-book-client.c:101 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30 + msgid "No such source" + msgstr "没有该源" + +-#: ../addressbook/libebook/e-book-client.c:103 +-#: ../addressbook/libedata-book/e-data-book.c:332 ++#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32 ++#: ../addressbook/libedata-book/e-data-book.c:814 + msgid "No space" + msgstr "没有空间" + +-#: ../addressbook/libebook/e-book-client.c:515 +-msgid "Failed to run book factory" +-msgstr "运行地址簿工厂失败" +- +-#: ../addressbook/libebook/e-book-client.c:525 +-#: ../addressbook/libedata-book/e-data-book-factory.c:196 +-#: ../addressbook/libedata-book/e-data-book-factory.c:228 +-#: ../calendar/libecal/e-cal-client.c:613 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:213 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:242 +-#, c-format +-msgid "Invalid source" +-msgstr "无效的源" +- +-#: ../addressbook/libebook/e-book-client.c:627 +-#: ../calendar/libecal/e-cal-client.c:728 +-#, c-format +-msgid "Incorrect uri '%s'" +-msgstr "不正确的 URI “%s”" +- +-#: ../addressbook/libebook/e-book-client.c:665 +-msgid "Failed to find system book" +-msgstr "找不到系统地址簿" +- +-#: ../addressbook/libebook/e-book-client.c:774 +-#: ../calendar/libecal/e-cal-client.c:881 +-#, c-format +-msgid "There was no source for UID '%s' stored in a source list." +-msgstr "源列表中没有存储对应 UID “%s”的源。" +- +-#: ../addressbook/libebook/e-book-client.c:2566 +-#: ../calendar/libecal/e-cal-client.c:4483 +-msgid "Cannot get connection to view" +-msgstr "无法获取到视图的连接" +- + #. Dummy row as EContactField starts from 1 +-#: ../addressbook/libebook/e-contact.c:121 ++#: ../addressbook/libebook-contacts/e-contact.c:120 + msgid "Unique ID" + msgstr "唯一的 ID" + + #. FILE_AS is not really a structured field - we use a getter/setter +-#. * so we can generate its value if necessary in the getter +-#: ../addressbook/libebook/e-contact.c:124 ++#. * so we can generate its value if necessary in the getter ++#. Translators: This is an EContact field description, in this case it's a ++#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here. ++#: ../addressbook/libebook-contacts/e-contact.c:125 + msgid "File Under" + msgstr "存档于" + + #. URI of the book to which the contact belongs to +-#: ../addressbook/libebook/e-contact.c:126 +-msgid "Book URI" +-msgstr "地址簿 URI" ++#: ../addressbook/libebook-contacts/e-contact.c:127 ++msgid "Book UID" ++msgstr "书 UID" + + #. Name fields + #. FN isn't really a structured field - we use a getter/setter + #. * so we can set the N property (since evo 1.4 works fine with + #. * vcards that don't even have a N attribute. *sigh*) +-#: ../addressbook/libebook/e-contact.c:132 ++#: ../addressbook/libebook-contacts/e-contact.c:133 + msgid "Full Name" + msgstr "全名" + +-#: ../addressbook/libebook/e-contact.c:133 ++#: ../addressbook/libebook-contacts/e-contact.c:134 + msgid "Given Name" + msgstr "名" + +-#: ../addressbook/libebook/e-contact.c:134 ++#: ../addressbook/libebook-contacts/e-contact.c:135 + msgid "Family Name" + msgstr "姓" + +-#: ../addressbook/libebook/e-contact.c:135 ++#: ../addressbook/libebook-contacts/e-contact.c:136 + msgid "Nickname" + msgstr "昵称" + + #. Email fields +-#: ../addressbook/libebook/e-contact.c:138 ++#: ../addressbook/libebook-contacts/e-contact.c:139 + msgid "Email 1" + msgstr "电子邮件 1" + +-#: ../addressbook/libebook/e-contact.c:139 ++#: ../addressbook/libebook-contacts/e-contact.c:140 + msgid "Email 2" + msgstr "电子邮件 2" + +-#: ../addressbook/libebook/e-contact.c:140 ++#: ../addressbook/libebook-contacts/e-contact.c:141 + msgid "Email 3" + msgstr "电子邮件 3" + +-#: ../addressbook/libebook/e-contact.c:141 ++#: ../addressbook/libebook-contacts/e-contact.c:142 + msgid "Email 4" + msgstr "电子邮件 4" + +-#: ../addressbook/libebook/e-contact.c:143 ++#: ../addressbook/libebook-contacts/e-contact.c:144 + msgid "Mailer" + msgstr "邮件程序" + + #. Address Labels +-#: ../addressbook/libebook/e-contact.c:146 ++#: ../addressbook/libebook-contacts/e-contact.c:147 + msgid "Home Address Label" + msgstr "家庭地址标签" + +-#: ../addressbook/libebook/e-contact.c:147 ++#: ../addressbook/libebook-contacts/e-contact.c:148 + msgid "Work Address Label" + msgstr "工作地址标签" + +-#: ../addressbook/libebook/e-contact.c:148 ++#: ../addressbook/libebook-contacts/e-contact.c:149 + msgid "Other Address Label" + msgstr "其它地址标签" + + #. Phone fields +-#: ../addressbook/libebook/e-contact.c:151 ++#: ../addressbook/libebook-contacts/e-contact.c:152 + msgid "Assistant Phone" + msgstr "助手电话" + +-#: ../addressbook/libebook/e-contact.c:152 ++#: ../addressbook/libebook-contacts/e-contact.c:153 + msgid "Business Phone" + msgstr "商务电话" + +-#: ../addressbook/libebook/e-contact.c:153 ++#: ../addressbook/libebook-contacts/e-contact.c:154 + msgid "Business Phone 2" + msgstr "商务电话 2" + +-#: ../addressbook/libebook/e-contact.c:154 ++#: ../addressbook/libebook-contacts/e-contact.c:155 + msgid "Business Fax" + msgstr "商务传真" + +-#: ../addressbook/libebook/e-contact.c:155 ++#: ../addressbook/libebook-contacts/e-contact.c:156 + msgid "Callback Phone" + msgstr "回拨电话" + +-#: ../addressbook/libebook/e-contact.c:156 ++#: ../addressbook/libebook-contacts/e-contact.c:157 + msgid "Car Phone" + msgstr "车载电话" + +-#: ../addressbook/libebook/e-contact.c:157 ++#: ../addressbook/libebook-contacts/e-contact.c:158 + msgid "Company Phone" + msgstr "公司电话" + +-#: ../addressbook/libebook/e-contact.c:158 ++#: ../addressbook/libebook-contacts/e-contact.c:159 + msgid "Home Phone" + msgstr "家庭电话" + +-#: ../addressbook/libebook/e-contact.c:159 ++#: ../addressbook/libebook-contacts/e-contact.c:160 + msgid "Home Phone 2" + msgstr "家庭电话 2" + +-#: ../addressbook/libebook/e-contact.c:160 ++#: ../addressbook/libebook-contacts/e-contact.c:161 + msgid "Home Fax" + msgstr "家庭传真" + +-#: ../addressbook/libebook/e-contact.c:161 ++#: ../addressbook/libebook-contacts/e-contact.c:162 + msgid "ISDN" + msgstr "ISDN" + +-#: ../addressbook/libebook/e-contact.c:162 ++#: ../addressbook/libebook-contacts/e-contact.c:163 + msgid "Mobile Phone" + msgstr "移动电话" + +-#: ../addressbook/libebook/e-contact.c:163 ++#: ../addressbook/libebook-contacts/e-contact.c:164 + msgid "Other Phone" + msgstr "其它电话" + +-#: ../addressbook/libebook/e-contact.c:164 ++#: ../addressbook/libebook-contacts/e-contact.c:165 + msgid "Other Fax" + msgstr "其它传真" + +-#: ../addressbook/libebook/e-contact.c:165 ++#: ../addressbook/libebook-contacts/e-contact.c:166 + msgid "Pager" + msgstr "寻呼机" + +-#: ../addressbook/libebook/e-contact.c:166 ++#: ../addressbook/libebook-contacts/e-contact.c:167 + msgid "Primary Phone" + msgstr "主要电话" + +-#: ../addressbook/libebook/e-contact.c:167 ++#: ../addressbook/libebook-contacts/e-contact.c:168 + msgid "Radio" + msgstr "收音机" + +-#: ../addressbook/libebook/e-contact.c:168 ++#: ../addressbook/libebook-contacts/e-contact.c:169 + msgid "Telex" + msgstr "电传" + + #. To translators: TTY is Teletypewriter +-#: ../addressbook/libebook/e-contact.c:170 ++#: ../addressbook/libebook-contacts/e-contact.c:171 + msgid "TTY" + msgstr "TTY" + + #. Organizational fields +-#: ../addressbook/libebook/e-contact.c:173 ++#: ../addressbook/libebook-contacts/e-contact.c:174 + msgid "Organization" + msgstr "组织" + +-#: ../addressbook/libebook/e-contact.c:174 ++#: ../addressbook/libebook-contacts/e-contact.c:175 + msgid "Organizational Unit" + msgstr "组织单元" + +-#: ../addressbook/libebook/e-contact.c:175 ++#: ../addressbook/libebook-contacts/e-contact.c:176 + msgid "Office" + msgstr "办公室" + +-#: ../addressbook/libebook/e-contact.c:176 ++#: ../addressbook/libebook-contacts/e-contact.c:177 + msgid "Title" + msgstr "头衔" + +-#: ../addressbook/libebook/e-contact.c:177 ++#: ../addressbook/libebook-contacts/e-contact.c:178 + msgid "Role" + msgstr "角色" + +-#: ../addressbook/libebook/e-contact.c:178 ++#: ../addressbook/libebook-contacts/e-contact.c:179 + msgid "Manager" + msgstr "经理" + +-#: ../addressbook/libebook/e-contact.c:179 ++#: ../addressbook/libebook-contacts/e-contact.c:180 + msgid "Assistant" + msgstr "助手" + + #. Web fields +-#: ../addressbook/libebook/e-contact.c:182 ++#: ../addressbook/libebook-contacts/e-contact.c:183 + msgid "Homepage URL" + msgstr "个人主页 URL" + +-#: ../addressbook/libebook/e-contact.c:183 ++#: ../addressbook/libebook-contacts/e-contact.c:184 + msgid "Weblog URL" + msgstr "网络日记 URL" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:186 +-#: ../libedataserverui/e-categories-dialog.c:88 ++#: ../addressbook/libebook-contacts/e-contact.c:187 + msgid "Categories" + msgstr "类别" + + #. Collaboration fields +-#: ../addressbook/libebook/e-contact.c:189 ++#: ../addressbook/libebook-contacts/e-contact.c:190 + msgid "Calendar URI" + msgstr "日历 URI" + +-#: ../addressbook/libebook/e-contact.c:190 ++#: ../addressbook/libebook-contacts/e-contact.c:191 + msgid "Free/Busy URL" + msgstr "空闲/繁忙 URL" + +-#: ../addressbook/libebook/e-contact.c:191 ++#: ../addressbook/libebook-contacts/e-contact.c:192 + msgid "ICS Calendar" + msgstr "ICS 日历" + +-#: ../addressbook/libebook/e-contact.c:192 ++#: ../addressbook/libebook-contacts/e-contact.c:193 + msgid "Video Conferencing URL" + msgstr "视频会议 URL" + + #. Misc fields +-#: ../addressbook/libebook/e-contact.c:195 ++#: ../addressbook/libebook-contacts/e-contact.c:196 + msgid "Spouse's Name" + msgstr "配偶姓名" + +-#: ../addressbook/libebook/e-contact.c:196 ++#: ../addressbook/libebook-contacts/e-contact.c:197 + msgid "Note" + msgstr "注释" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:199 ++#: ../addressbook/libebook-contacts/e-contact.c:200 + msgid "AIM Home Screen Name 1" + msgstr "AIM 家庭屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:200 ++#: ../addressbook/libebook-contacts/e-contact.c:201 + msgid "AIM Home Screen Name 2" + msgstr "AIM 家庭屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:201 ++#: ../addressbook/libebook-contacts/e-contact.c:202 + msgid "AIM Home Screen Name 3" + msgstr "AIM 家庭屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:202 ++#: ../addressbook/libebook-contacts/e-contact.c:203 + msgid "AIM Work Screen Name 1" + msgstr "AIM 工作屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:203 ++#: ../addressbook/libebook-contacts/e-contact.c:204 + msgid "AIM Work Screen Name 2" + msgstr "AIM 工作屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:204 ++#: ../addressbook/libebook-contacts/e-contact.c:205 + msgid "AIM Work Screen Name 3" + msgstr "AIM 工作屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:205 ++#: ../addressbook/libebook-contacts/e-contact.c:206 + msgid "GroupWise Home Screen Name 1" + msgstr "GroupWise 家庭屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:206 ++#: ../addressbook/libebook-contacts/e-contact.c:207 + msgid "GroupWise Home Screen Name 2" + msgstr "GroupWise 家庭屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:207 ++#: ../addressbook/libebook-contacts/e-contact.c:208 + msgid "GroupWise Home Screen Name 3" + msgstr "GroupWise 家庭屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:208 ++#: ../addressbook/libebook-contacts/e-contact.c:209 + msgid "GroupWise Work Screen Name 1" + msgstr "GroupWise 工作屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:209 ++#: ../addressbook/libebook-contacts/e-contact.c:210 + msgid "GroupWise Work Screen Name 2" + msgstr "GroupWise 工作屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:210 ++#: ../addressbook/libebook-contacts/e-contact.c:211 + msgid "GroupWise Work Screen Name 3" + msgstr "GroupWise 工作屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:211 ++#: ../addressbook/libebook-contacts/e-contact.c:212 + msgid "Jabber Home ID 1" + msgstr "Jabber 家庭 ID 1" + +-#: ../addressbook/libebook/e-contact.c:212 ++#: ../addressbook/libebook-contacts/e-contact.c:213 + msgid "Jabber Home ID 2" + msgstr "Jabber 家庭 ID 2" + +-#: ../addressbook/libebook/e-contact.c:213 ++#: ../addressbook/libebook-contacts/e-contact.c:214 + msgid "Jabber Home ID 3" + msgstr "Jabber 家庭 ID 3" + +-#: ../addressbook/libebook/e-contact.c:214 ++#: ../addressbook/libebook-contacts/e-contact.c:215 + msgid "Jabber Work ID 1" + msgstr "Jabber 工作 ID 1" + +-#: ../addressbook/libebook/e-contact.c:215 ++#: ../addressbook/libebook-contacts/e-contact.c:216 + msgid "Jabber Work ID 2" + msgstr "Jabber 工作 ID 2" + +-#: ../addressbook/libebook/e-contact.c:216 ++#: ../addressbook/libebook-contacts/e-contact.c:217 + msgid "Jabber Work ID 3" + msgstr "Jabber 工作 ID 3" + +-#: ../addressbook/libebook/e-contact.c:217 ++#: ../addressbook/libebook-contacts/e-contact.c:218 + msgid "Yahoo! Home Screen Name 1" + msgstr "Yahoo! 家庭屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:218 ++#: ../addressbook/libebook-contacts/e-contact.c:219 + msgid "Yahoo! Home Screen Name 2" + msgstr "Yahoo! 家庭屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:219 ++#: ../addressbook/libebook-contacts/e-contact.c:220 + msgid "Yahoo! Home Screen Name 3" + msgstr "Yahoo! 家庭屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:220 ++#: ../addressbook/libebook-contacts/e-contact.c:221 + msgid "Yahoo! Work Screen Name 1" + msgstr "Yahoo! 工作屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:221 ++#: ../addressbook/libebook-contacts/e-contact.c:222 + msgid "Yahoo! Work Screen Name 2" + msgstr "Yahoo! 工作屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:222 ++#: ../addressbook/libebook-contacts/e-contact.c:223 + msgid "Yahoo! Work Screen Name 3" + msgstr "Yahoo! 工作屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:223 ++#: ../addressbook/libebook-contacts/e-contact.c:224 + msgid "MSN Home Screen Name 1" + msgstr "MSN 家庭屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:224 ++#: ../addressbook/libebook-contacts/e-contact.c:225 + msgid "MSN Home Screen Name 2" + msgstr "MSN 家庭屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:225 ++#: ../addressbook/libebook-contacts/e-contact.c:226 + msgid "MSN Home Screen Name 3" + msgstr "MSN 家庭屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:226 ++#: ../addressbook/libebook-contacts/e-contact.c:227 + msgid "MSN Work Screen Name 1" + msgstr "MSN 工作屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:227 ++#: ../addressbook/libebook-contacts/e-contact.c:228 + msgid "MSN Work Screen Name 2" + msgstr "MSN 工作屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:228 ++#: ../addressbook/libebook-contacts/e-contact.c:229 + msgid "MSN Work Screen Name 3" + msgstr "MSN 工作屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:229 ++#: ../addressbook/libebook-contacts/e-contact.c:230 + msgid "ICQ Home ID 1" + msgstr "ICQ 家庭 ID 1" + +-#: ../addressbook/libebook/e-contact.c:230 ++#: ../addressbook/libebook-contacts/e-contact.c:231 + msgid "ICQ Home ID 2" + msgstr "ICQ 家庭 ID 2" + +-#: ../addressbook/libebook/e-contact.c:231 ++#: ../addressbook/libebook-contacts/e-contact.c:232 + msgid "ICQ Home ID 3" + msgstr "ICQ 家庭 ID 3" + +-#: ../addressbook/libebook/e-contact.c:232 ++#: ../addressbook/libebook-contacts/e-contact.c:233 + msgid "ICQ Work ID 1" + msgstr "ICQ 工作 ID 1" + +-#: ../addressbook/libebook/e-contact.c:233 ++#: ../addressbook/libebook-contacts/e-contact.c:234 + msgid "ICQ Work ID 2" + msgstr "ICQ 工作 ID 2" + +-#: ../addressbook/libebook/e-contact.c:234 ++#: ../addressbook/libebook-contacts/e-contact.c:235 + msgid "ICQ Work ID 3" + msgstr "ICQ 工作 ID 3" + + #. Last modified time +-#: ../addressbook/libebook/e-contact.c:237 ++#: ../addressbook/libebook-contacts/e-contact.c:238 + msgid "Last Revision" + msgstr "上次修订" + +-#: ../addressbook/libebook/e-contact.c:238 ++#. Translators: This is an EContact field description, in this case it's a ++#. * virtual field, which returns either name of the contact or the organization ++#. * name, recognized by multiple other fields, where the first filled is used. ++#: ../addressbook/libebook-contacts/e-contact.c:242 + msgid "Name or Org" + msgstr "名称或组织" + + #. Address fields +-#: ../addressbook/libebook/e-contact.c:241 ++#: ../addressbook/libebook-contacts/e-contact.c:245 + msgid "Address List" + msgstr "地址列表" + +-#: ../addressbook/libebook/e-contact.c:242 ++#: ../addressbook/libebook-contacts/e-contact.c:246 + msgid "Home Address" + msgstr "家庭地址" + +-#: ../addressbook/libebook/e-contact.c:243 ++#: ../addressbook/libebook-contacts/e-contact.c:247 + msgid "Work Address" + msgstr "办公地址" + +-#: ../addressbook/libebook/e-contact.c:244 ++#: ../addressbook/libebook-contacts/e-contact.c:248 + msgid "Other Address" + msgstr "其它地址" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:247 ++#: ../addressbook/libebook-contacts/e-contact.c:251 + msgid "Category List" + msgstr "类别列表" + + #. Photo/Logo +-#: ../addressbook/libebook/e-contact.c:250 ++#: ../addressbook/libebook-contacts/e-contact.c:254 + msgid "Photo" + msgstr "照片" + +-#: ../addressbook/libebook/e-contact.c:251 ++#: ../addressbook/libebook-contacts/e-contact.c:255 + msgid "Logo" + msgstr "标志" + +-#: ../addressbook/libebook/e-contact.c:253 ++#. Translators: This is an EContact field description, in this case it's a name ++#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2 ++#: ../addressbook/libebook-contacts/e-contact.c:259 + msgid "Name" + msgstr "姓名" + +-#: ../addressbook/libebook/e-contact.c:254 ++#: ../addressbook/libebook-contacts/e-contact.c:260 + msgid "Email List" + msgstr "邮件列表" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:257 ++#: ../addressbook/libebook-contacts/e-contact.c:263 + msgid "AIM Screen Name List" + msgstr "AIM 屏幕名列表" + +-#: ../addressbook/libebook/e-contact.c:258 ++#: ../addressbook/libebook-contacts/e-contact.c:264 + msgid "GroupWise ID List" + msgstr "GroupWise ID 列表" + +-#: ../addressbook/libebook/e-contact.c:259 ++#: ../addressbook/libebook-contacts/e-contact.c:265 + msgid "Jabber ID List" + msgstr "Jabber ID 列表" + +-#: ../addressbook/libebook/e-contact.c:260 ++#: ../addressbook/libebook-contacts/e-contact.c:266 + msgid "Yahoo! Screen Name List" + msgstr "Yahoo! 屏幕名列表" + +-#: ../addressbook/libebook/e-contact.c:261 ++#: ../addressbook/libebook-contacts/e-contact.c:267 + msgid "MSN Screen Name List" + msgstr "MSN 屏幕名列表" + +-#: ../addressbook/libebook/e-contact.c:262 ++#: ../addressbook/libebook-contacts/e-contact.c:268 + msgid "ICQ ID List" + msgstr "ICQ ID 列表" + +-#: ../addressbook/libebook/e-contact.c:264 ++#: ../addressbook/libebook-contacts/e-contact.c:270 + msgid "Wants HTML Mail" + msgstr "想要 HTML 邮件" + +-#: ../addressbook/libebook/e-contact.c:266 ++#. Translators: This is an EContact field description, in this case it's a ++#. * field describing whether it's a Contact list (list of email addresses) or a ++#. * regular contact for one person/organization/... ++#: ../addressbook/libebook-contacts/e-contact.c:275 + msgid "List" + msgstr "列表" + +-#: ../addressbook/libebook/e-contact.c:267 +-msgid "List Show Addresses" ++#. Translators: This is an EContact field description, in this case it's a flag ++#. * used to determine whether when sending to Contact lists the addresses should be ++#. * shown or not to other recipients - basically whether to use BCC field or CC ++#. * message header when sending messages to this Contact list. ++#: ../addressbook/libebook-contacts/e-contact.c:280 ++msgid "List Shows Addresses" + msgstr "列表显示地址" + +-#: ../addressbook/libebook/e-contact.c:269 ++#: ../addressbook/libebook-contacts/e-contact.c:282 + msgid "Birth Date" + msgstr "生日" + +-#: ../addressbook/libebook/e-contact.c:270 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063 ++#: ../addressbook/libebook-contacts/e-contact.c:283 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:875 + msgid "Anniversary" + msgstr "周年纪念日" + + #. Security fields +-#: ../addressbook/libebook/e-contact.c:273 ++#: ../addressbook/libebook-contacts/e-contact.c:286 + msgid "X.509 Certificate" + msgstr "X.509 证书" + +-#: ../addressbook/libebook/e-contact.c:275 ++#: ../addressbook/libebook-contacts/e-contact.c:288 + msgid "Gadu-Gadu Home ID 1" + msgstr "Gadu-Gadu 家庭 ID 1" + +-#: ../addressbook/libebook/e-contact.c:276 ++#: ../addressbook/libebook-contacts/e-contact.c:289 + msgid "Gadu-Gadu Home ID 2" + msgstr "Gadu-Gadu 家庭 ID 2" + +-#: ../addressbook/libebook/e-contact.c:277 ++#: ../addressbook/libebook-contacts/e-contact.c:290 + msgid "Gadu-Gadu Home ID 3" + msgstr "Gadu-Gadu 家庭 ID 3" + +-#: ../addressbook/libebook/e-contact.c:278 ++#: ../addressbook/libebook-contacts/e-contact.c:291 + msgid "Gadu-Gadu Work ID 1" + msgstr "Gadu-Gadu 工作 ID 1" + +-#: ../addressbook/libebook/e-contact.c:279 ++#: ../addressbook/libebook-contacts/e-contact.c:292 + msgid "Gadu-Gadu Work ID 2" + msgstr "Gadu-Gadu 工作 ID 2" + +-#: ../addressbook/libebook/e-contact.c:280 ++#: ../addressbook/libebook-contacts/e-contact.c:293 + msgid "Gadu-Gadu Work ID 3" + msgstr "Gadu-Gadu 工作 ID 3" + +-#: ../addressbook/libebook/e-contact.c:281 ++#: ../addressbook/libebook-contacts/e-contact.c:294 + msgid "Gadu-Gadu ID List" + msgstr "Gadu-Gadu ID 列表" + + #. Geo information +-#: ../addressbook/libebook/e-contact.c:284 ++#: ../addressbook/libebook-contacts/e-contact.c:297 + msgid "Geographic Information" + msgstr "地理信息" + +-#: ../addressbook/libebook/e-contact.c:286 ++#: ../addressbook/libebook-contacts/e-contact.c:299 + msgid "Telephone" + msgstr "电话" + +-#: ../addressbook/libebook/e-contact.c:288 ++#: ../addressbook/libebook-contacts/e-contact.c:301 + msgid "Skype Home Name 1" + msgstr "Skype 家庭屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:289 ++#: ../addressbook/libebook-contacts/e-contact.c:302 + msgid "Skype Home Name 2" + msgstr "Skype 家庭屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:290 ++#: ../addressbook/libebook-contacts/e-contact.c:303 + msgid "Skype Home Name 3" + msgstr "Skype 家庭屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:291 ++#: ../addressbook/libebook-contacts/e-contact.c:304 + msgid "Skype Work Name 1" + msgstr "Skype 工作屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:292 ++#: ../addressbook/libebook-contacts/e-contact.c:305 + msgid "Skype Work Name 2" + msgstr "Skype 工作屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:293 ++#: ../addressbook/libebook-contacts/e-contact.c:306 + msgid "Skype Work Name 3" + msgstr "Skype 工作屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:294 ++#: ../addressbook/libebook-contacts/e-contact.c:307 + msgid "Skype Name List" + msgstr "Skype 屏幕名列表" + +-#: ../addressbook/libebook/e-contact.c:296 ++#: ../addressbook/libebook-contacts/e-contact.c:309 + msgid "SIP address" + msgstr "SIP 地址" + +-#: ../addressbook/libebook/e-contact.c:298 ++#: ../addressbook/libebook-contacts/e-contact.c:311 + msgid "Google Talk Home Name 1" + msgstr "Google Talk 家庭屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:299 ++#: ../addressbook/libebook-contacts/e-contact.c:312 + msgid "Google Talk Home Name 2" + msgstr "Google Talk 家庭屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:300 ++#: ../addressbook/libebook-contacts/e-contact.c:313 + msgid "Google Talk Home Name 3" + msgstr "Google Talk 家庭屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:301 ++#: ../addressbook/libebook-contacts/e-contact.c:314 + msgid "Google Talk Work Name 1" + msgstr "Google Talk 工作屏幕名 1" + +-#: ../addressbook/libebook/e-contact.c:302 ++#: ../addressbook/libebook-contacts/e-contact.c:315 + msgid "Google Talk Work Name 2" + msgstr "Google Talk 工作屏幕名 2" + +-#: ../addressbook/libebook/e-contact.c:303 ++#: ../addressbook/libebook-contacts/e-contact.c:316 + msgid "Google Talk Work Name 3" + msgstr "Google Talk 工作屏幕名 3" + +-#: ../addressbook/libebook/e-contact.c:304 ++#: ../addressbook/libebook-contacts/e-contact.c:317 + msgid "Google Talk Name List" + msgstr "Google Talk 屏幕名列表" + +-#: ../addressbook/libebook/e-contact.c:1597 +-#: ../addressbook/libebook/e-destination.c:878 ++#: ../addressbook/libebook-contacts/e-contact.c:319 ++msgid "Twitter Name List" ++msgstr "Twitter 名称列表" ++ ++#: ../addressbook/libebook-contacts/e-contact.c:1624 ++#: ../addressbook/libebook/e-destination.c:884 + msgid "Unnamed List" + msgstr "未命名的列表" + +-#: ../addressbook/libedata-book/e-book-backend.c:19 +-msgid "Cannot process, book backend is opening" +-msgstr "无法进行，地址簿后端正在打开" ++#: ../addressbook/libebook-contacts/e-phone-number.c:43 ++msgid "The library was built without phone number support." ++msgstr "没有电话号码支持的情况下构建库。" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:45 ++msgid "The phone number parser reported an yet unkown error code." ++msgstr "电话号码解析程序报告一个未知错误代码。" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:47 ++msgid "Not a phone number" ++msgstr "不是电话号码" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:49 ++msgid "Invalid country calling code" ++msgstr "无效呼叫代码" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:51 ++msgid "" ++"Remaining text after the country calling code is too short for a phone " ++"number" ++msgstr "呼叫代码后面的文本对于电话号码来说太短" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:53 ++msgid "Text is too short for a phone number" ++msgstr "对于电话号码来说文本太短" ++ ++#: ../addressbook/libebook-contacts/e-phone-number.c:55 ++msgid "Text is too long for a phone number" ++msgstr "对于电话号码来说文本太长" + +-#: ../addressbook/libedata-book/e-book-backend.c:91 ++#: ../addressbook/libebook/e-book-client.c:643 ++#: ../addressbook/libedata-book/e-book-backend.c:120 + #, c-format + msgid "Unknown book property '%s'" + msgstr "未知的地址簿属性“%s”" + +-#: ../addressbook/libedata-book/e-book-backend.c:108 ++#: ../addressbook/libebook/e-book-client.c:658 + #, c-format + msgid "Cannot change value of book property '%s'" + msgstr "无法更改地址簿属性“%s”的值" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501 +-#: ../camel/camel-db.c:503 ++#: ../addressbook/libebook/e-book-client.c:993 ++#: ../addressbook/libebook/e-book-client.c:1168 ++#: ../calendar/libecal/e-cal-client.c:1515 ++#: ../calendar/libecal/e-cal-client.c:1697 ++#, c-format ++msgid "Unable to connect to '%s': " ++msgstr "无法连接到 '%s'：" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793 ++#, c-format ++msgid "Error introspecting unknown summary field '%s'" ++msgstr "自检未知概述字段 '%s' 出错" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289 ++#: ../camel/camel-db.c:544 + #, c-format + msgid "Insufficient memory" + msgstr "内存不足" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1422 + #, c-format +-msgid "Contact '%s' not found" +-msgstr "未找到联系人 %s" ++msgid "Invalid contact field '%d' specified in summary" ++msgstr "概述中指定的无效联系人字段 '%d'" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1456 ++#, c-format ++msgid "" ++"Contact field '%s' of type '%s' specified in summary, but only boolean, " ++"string and string list field types are supported" ++msgstr "了概述中指定的类型 '%s' 的联系人字段 '%s'，但只支持布尔值、字符串和字符串列表字段类型。" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3686 ++#, c-format ++msgid "" ++"Full search_contacts are not stored in cache. vcards cannot be returned." ++msgstr "缓存中未保存所有 search_contacts。无法返回 vcard。" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3812 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3893 ++#, c-format ++msgid "Query contained unsupported elements" ++msgstr "查询包含不支持的元素" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 ++#, c-format ++msgid "Invalid Query" ++msgstr "无效查询" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3840 ++#, c-format ++msgid "" ++"Full search_contacts are not stored in cache. Hence only summary query is " ++"supported." ++msgstr "缓存中未保存所有 search_contacts。因此只支持概述查询。" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 ++#: ../addressbook/libedata-book/e-data-book.c:669 ++#: ../addressbook/libedata-book/e-data-book.c:809 ++#: ../calendar/libedata-cal/e-data-cal.c:612 ++#: ../calendar/libedata-cal/e-data-cal.c:771 ++#: ../libedataserver/e-client.c:166 ++#, c-format ++msgid "Invalid query" ++msgstr "无效的查询" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3940 ++#, c-format ++msgid "" ++"Full vcards are not stored in cache. Hence only summary query is supported." ++msgstr "缓存中未保存所有 vcards。因此只支持概述查询。" ++ ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4643 ++#, c-format ++msgid "Unable to remove the db file: errno %d" ++msgstr "无法删除 db 文件：errno %d" ++ ++#: ../addressbook/libedata-book/e-book-backend-sync.c:179 ++#: ../calendar/libedata-cal/e-cal-backend-sync.c:182 ++msgid "Clients cannot set backend properties" ++msgstr "客户端无法设定后端首选项" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:206 +-#: ../addressbook/libedata-book/e-data-book.c:219 +-#: ../addressbook/libedata-book/e-data-book.c:733 ++#. Translators: This is a prefix to a detailed error message * ++#: ../addressbook/libedata-book/e-data-book.c:691 ++#: ../calendar/libedata-cal/e-data-cal.c:635 + msgid "Invalid query: " + msgstr "无效的查询：" + +-#: ../addressbook/libedata-book/e-data-book.c:311 +-#: ../calendar/libedata-cal/e-data-cal.c:427 ++#: ../addressbook/libedata-book/e-data-book.c:793 ++#: ../calendar/libedata-cal/e-data-cal.c:752 + msgid "Success" + msgstr "成功" + +-#: ../addressbook/libedata-book/e-data-book.c:312 +-#: ../calendar/libecal/e-cal.c:4564 ../calendar/libedata-cal/e-data-cal.c:428 +-#: ../libedataserver/e-client.c:123 ++#: ../addressbook/libedata-book/e-data-book.c:794 ++#: ../calendar/libecal/e-cal.c:2307 ++#: ../calendar/libedata-cal/e-data-cal.c:753 ++#: ../libedataserver/e-client.c:133 + msgid "Backend is busy" + msgstr "后端繁忙" + +-#: ../addressbook/libedata-book/e-data-book.c:313 +-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:133 ++#: ../addressbook/libedata-book/e-data-book.c:795 ++#: ../calendar/libedata-cal/e-data-cal.c:754 ++#: ../libedataserver/e-client.c:143 + msgid "Repository offline" + msgstr "仓库离线" + +-#: ../addressbook/libedata-book/e-data-book.c:314 +-#: ../calendar/libecal/e-cal.c:4578 ../calendar/libedata-cal/e-data-cal.c:430 +-#: ../libedataserver/e-client.c:137 ++#: ../addressbook/libedata-book/e-data-book.c:796 ++#: ../calendar/libecal/e-cal.c:2321 ++#: ../calendar/libedata-cal/e-data-cal.c:755 ++#: ../libedataserver/e-client.c:150 + msgid "Permission denied" + msgstr "没有权限" + +-#: ../addressbook/libedata-book/e-data-book.c:317 +-#: ../calendar/libedata-cal/e-data-cal.c:435 ++#: ../addressbook/libedata-book/e-data-book.c:799 ++#: ../calendar/libedata-cal/e-data-cal.c:760 + msgid "Authentication Failed" + msgstr "认证失败" + +-#: ../addressbook/libedata-book/e-data-book.c:318 +-#: ../calendar/libedata-cal/e-data-cal.c:436 ++#: ../addressbook/libedata-book/e-data-book.c:800 ++#: ../calendar/libedata-cal/e-data-cal.c:761 + msgid "Authentication Required" + msgstr "需要认证" + +-#: ../addressbook/libedata-book/e-data-book.c:319 +-#: ../calendar/libedata-cal/e-data-cal.c:437 ++#: ../addressbook/libedata-book/e-data-book.c:801 ++#: ../calendar/libedata-cal/e-data-cal.c:762 + msgid "Unsupported field" + msgstr "不支持的字段" + +-#: ../addressbook/libedata-book/e-data-book.c:320 +-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:145 ++#: ../addressbook/libedata-book/e-data-book.c:802 ++#: ../calendar/libedata-cal/e-data-cal.c:764 ++#: ../libedataserver/e-client.c:158 + msgid "Unsupported authentication method" + msgstr "不支持的身份认证方式" + +-#: ../addressbook/libedata-book/e-data-book.c:321 +-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:147 ++#: ../addressbook/libedata-book/e-data-book.c:803 ++#: ../calendar/libedata-cal/e-data-cal.c:765 ++#: ../libedataserver/e-client.c:160 + msgid "TLS not available" + msgstr "TLS 不可用" + +-#: ../addressbook/libedata-book/e-data-book.c:323 ++#: ../addressbook/libedata-book/e-data-book.c:804 ++msgid "Address book does not exist" ++msgstr "地址簿不存在" ++ ++#: ../addressbook/libedata-book/e-data-book.c:805 + msgid "Book removed" + msgstr "地址簿已删除" + +-#: ../addressbook/libedata-book/e-data-book.c:324 +-#: ../calendar/libedata-cal/e-data-cal.c:443 ++#: ../addressbook/libedata-book/e-data-book.c:806 ++#: ../calendar/libedata-cal/e-data-cal.c:768 + msgid "Not available in offline mode" + msgstr "在脱机模式中无法使用" + +-#: ../addressbook/libedata-book/e-data-book.c:325 +-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:149 ++#: ../addressbook/libedata-book/e-data-book.c:807 ++#: ../calendar/libedata-cal/e-data-cal.c:769 ++#: ../libedataserver/e-client.c:162 + msgid "Search size limit exceeded" + msgstr "超过搜索大小限制" + +-#: ../addressbook/libedata-book/e-data-book.c:326 +-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:151 ++#: ../addressbook/libedata-book/e-data-book.c:808 ++#: ../calendar/libedata-cal/e-data-cal.c:770 ++#: ../libedataserver/e-client.c:164 + msgid "Search time limit exceeded" + msgstr "超过搜索时间限制" + +-#: ../addressbook/libedata-book/e-data-book.c:327 +-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:153 +-msgid "Invalid query" +-msgstr "无效的查询" +- +-#: ../addressbook/libedata-book/e-data-book.c:328 +-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:155 ++#: ../addressbook/libedata-book/e-data-book.c:810 ++#: ../calendar/libedata-cal/e-data-cal.c:772 ++#: ../libedataserver/e-client.c:168 + msgid "Query refused" + msgstr "查询被拒绝" + +-#: ../addressbook/libedata-book/e-data-book.c:329 +-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:141 ++#: ../addressbook/libedata-book/e-data-book.c:811 ++#: ../calendar/libedata-cal/e-data-cal.c:773 ++#: ../libedataserver/e-client.c:154 + msgid "Could not cancel" + msgstr "无法取消" + + #. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") }, + #. { OtherError, N_("Other error") }, +-#: ../addressbook/libedata-book/e-data-book.c:331 +-#: ../calendar/libedata-cal/e-data-cal.c:450 ++#: ../addressbook/libedata-book/e-data-book.c:813 ++#: ../calendar/libedata-cal/e-data-cal.c:775 + msgid "Invalid server version" + msgstr "无效的服务器版本" + +-#: ../addressbook/libedata-book/e-data-book.c:333 +-#: ../calendar/libecal/e-cal.c:4562 ../calendar/libedata-cal/e-data-cal.c:451 +-#: ../libedataserver/e-client.c:121 ++#: ../addressbook/libedata-book/e-data-book.c:815 ++#: ../calendar/libecal/e-cal.c:2305 ++#: ../calendar/libedata-cal/e-data-cal.c:776 ++#: ../libedataserver/e-client.c:131 + msgid "Invalid argument" + msgstr "无效参数" + + #. Translators: The string for NOT_SUPPORTED error +-#: ../addressbook/libedata-book/e-data-book.c:335 +-#: ../calendar/libecal/e-cal.c:4601 ../calendar/libedata-cal/e-data-cal.c:453 +-#: ../libedataserver/e-client.c:143 ++#: ../addressbook/libedata-book/e-data-book.c:817 ++#: ../calendar/libecal/e-cal.c:1064 ++#: ../calendar/libecal/e-cal.c:1432 ++#: ../calendar/libecal/e-cal.c:1912 ++#: ../calendar/libecal/e-cal.c:2344 ++#: ../calendar/libedata-cal/e-data-cal.c:778 ++#: ../libedataserver/e-client.c:156 ++#, c-format + msgid "Not supported" + msgstr "不支持" + +-#: ../addressbook/libedata-book/e-data-book.c:336 +-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:161 ++#: ../addressbook/libedata-book/e-data-book.c:818 ++#: ../calendar/libedata-cal/e-data-cal.c:779 ++#: ../libedataserver/e-client.c:174 + msgid "Backend is not opened yet" + msgstr "后端尚未打开" + +-#: ../addressbook/libedata-book/e-data-book.c:344 +-#: ../calendar/libecal/e-cal-client.c:621 +-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:159 ++#: ../addressbook/libedata-book/e-data-book.c:819 ++#: ../libedataserver/e-client.c:176 ++msgid "Object is out of sync" ++msgstr "对象未同步" ++ ++#: ../addressbook/libedata-book/e-data-book.c:827 ++#: ../calendar/libedata-cal/e-data-cal.c:787 ++#: ../libedataserver/e-client.c:172 + msgid "Other error" + msgstr "其他错误" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:551 +-#: ../addressbook/libedata-book/e-data-book.c:943 +-msgid "Cannot get contact: " +-msgstr "无法获取联系人：" +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:576 +-#: ../addressbook/libedata-book/e-data-book.c:601 +-msgid "Empty query: " +-msgstr "空的查询：" +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:626 +-#: ../addressbook/libedata-book/e-data-book.c:1041 +-msgid "Cannot add contact: " +-msgstr "无法添加联系人：" +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:651 +-#: ../addressbook/libedata-book/e-data-book.c:1075 +-msgid "Cannot modify contacts: " +-msgstr "无法修改联系人：" +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:759 +-#: ../calendar/libedata-cal/e-data-cal.c:866 +-msgid "Cannot authenticate user: " +-msgstr "无法认证用户：" +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:830 ++#: ../addressbook/libedata-book/e-data-book.c:1133 + msgid "Cannot open book: " + msgstr "无法打开地址簿：" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:846 +-msgid "Cannot remove book: " +-msgstr "无法删除地址簿：" +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:873 ++#: ../addressbook/libedata-book/e-data-book.c:1217 + msgid "Cannot refresh address book: " + msgstr "无法刷新地址薄：" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:899 +-msgid "Cannot get backend property: " +-msgstr "无法获取后端属性：" +- +-#. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:924 +-#: ../calendar/libedata-cal/e-data-cal.c:1069 +-msgid "Cannot set backend property: " +-msgstr "无法发送后端属性：" ++#: ../addressbook/libedata-book/e-data-book.c:1298 ++msgid "Cannot get contact: " ++msgstr "无法获取联系人：" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:961 ++#: ../addressbook/libedata-book/e-data-book.c:1364 + msgid "Cannot get contact list: " + msgstr "无法获取联系人列表：" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:995 ++#: ../addressbook/libedata-book/e-data-book.c:1456 + msgid "Cannot get contact list uids: " + msgstr "无法获取联系人列表 UID：" + + #. Translators: This is prefix to a detailed error message +-#: ../addressbook/libedata-book/e-data-book.c:1100 ++#: ../addressbook/libedata-book/e-data-book.c:1536 ++msgid "Cannot add contact: " ++msgstr "无法添加联系人：" ++ ++#. Translators: This is prefix to a detailed error message ++#: ../addressbook/libedata-book/e-data-book.c:1599 ++msgid "Cannot modify contacts: " ++msgstr "无法修改联系人：" ++ ++#. Translators: This is prefix to a detailed error message ++#: ../addressbook/libedata-book/e-data-book.c:1640 + msgid "Cannot remove contacts: " + msgstr "无法移除联系人：" + +-#: ../addressbook/libedata-book/e-data-book-factory.c:184 +-#: ../addressbook/libedata-book/e-data-book-factory.c:212 +-#: ../calendar/libedata-cal/e-data-cal-factory.c:229 ++#: ../addressbook/libedata-book/e-data-book-factory.c:94 ++#: ../calendar/libedata-cal/e-data-cal-factory.c:97 ++#, c-format ++msgid "No backend name in source '%s'" ++msgstr "资源 '%s' 中没有后端名称" ++ ++#: ../addressbook/libedata-book/e-data-book-factory.c:185 ++#: ../calendar/libedata-cal/e-data-cal-factory.c:191 ++#, c-format ++msgid "Missing source UID" ++msgstr "缺少源 UID" ++ ++#: ../addressbook/libedata-book/e-data-book-factory.c:196 ++#: ../calendar/libedata-cal/e-data-cal-factory.c:201 + #, c-format +-msgid "Empty URI" +-msgstr "空的 URI" ++msgid "No such source for UID '%s'" ++msgstr "没有 UID '%s' 的源" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:560 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "服务器不可用 (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:590 ++#, c-format ++msgid "Failed to connect to a server using SSL: %s" ++msgstr "使用 SSL 连接到服务器失败：%s" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:601 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "返回了意外的 HTTP 状态代码 %d(%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:620 ++msgid "CalDAV backend is not loaded yet" ++msgstr "尚未载入 CalDAV 后端" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1009 ++msgid "Invalid Redirect URL" ++msgstr "无效重新定向 URL" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2491 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2849 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" + "Error message: %s" +-msgstr "" +-"服务器不可用，日历将以只读模式打开。\n" ++msgstr "服务器不可用，日历将以只读模式打开。\n" + "错误消息：%s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2801 ++#, c-format ++msgid "Cannot create local cache folder '%s'" ++msgstr "无法为文件夹 '%s' 创建本地缓存" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3893 ++msgid "CalDAV does not support bulk additions" ++msgstr "CalDAV 不支持批添加" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3996 ++msgid "CalDAV does not support bulk modifications" ++msgstr "CalDAV 不支持批修改" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4165 ++msgid "CalDAV does not support bulk removals" ++msgstr "CalDAV 不支持批量删除" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4837 + msgid "Calendar doesn't support Free/Busy" + msgstr "日历不支持空闲/繁忙" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:219 +-#: ../libedataserverui/e-client-utils.c:875 +-#, c-format +-msgid "" +-"Enter password for address book %s (user %s)\n" +-"Reason: %s" +-msgstr "" +-"输入地址簿 %s 的密码(用户 %s)\n" +-"原因：%s" +- +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:221 +-#: ../libedataserverui/e-client-utils.c:877 +-#, c-format +-msgid "Enter password for address book %s (user %s)" +-msgstr "输入地址簿 %s 的密码(用户 %s)" ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4846 ++msgid "Schedule outbox url not found" ++msgstr "未找到调度的待发邮件 url" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4945 ++msgid "Unexpected result in schedule-response" ++msgstr "调度回复中的意外结果" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:877 + msgid "Birthday" + msgstr "生日" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:913 + #, c-format + msgid "Birthday: %s" + msgstr "生日：%s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:944 + #, c-format + msgid "Anniversary: %s" + msgstr "周年：%s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:251 ++#: ../calendar/backends/file/e-cal-backend-file.c:243 + msgid "Cannot save calendar data: Malformed URI." + msgstr "无法保存日历数据：URI 格式错误。" + +-#: ../calendar/backends/file/e-cal-backend-file.c:258 +-#: ../calendar/backends/file/e-cal-backend-file.c:264 ++#: ../calendar/backends/file/e-cal-backend-file.c:250 ++#: ../calendar/backends/file/e-cal-backend-file.c:256 + msgid "Cannot save calendar data" + msgstr "无法保存日历数据" + +-#: ../calendar/backends/http/e-cal-backend-http.c:405 ++#: ../calendar/backends/http/e-cal-backend-http.c:477 ++#, c-format ++msgid "Malformed URI: %s" ++msgstr "有缺陷的 URI：%s" ++ ++#: ../calendar/backends/http/e-cal-backend-http.c:568 ++#, c-format + msgid "Redirected to Invalid URI" + msgstr "已重定向到无效 URI" + +-#: ../calendar/backends/http/e-cal-backend-http.c:446 ++#: ../calendar/backends/http/e-cal-backend-http.c:605 ++#, c-format + msgid "Bad file format." + msgstr "无效的文件格式。" + +-#: ../calendar/backends/http/e-cal-backend-http.c:454 ++#: ../calendar/backends/http/e-cal-backend-http.c:615 ++#, c-format + msgid "Not a calendar." + msgstr "不是日历。" + +-#: ../calendar/backends/http/e-cal-backend-http.c:780 +-#: ../calendar/backends/http/e-cal-backend-http.c:781 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:524 ++#: ../calendar/backends/http/e-cal-backend-http.c:926 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:520 + msgid "Could not create cache file" + msgstr "无法创建缓存文件" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:183 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:173 + msgid "Could not retrieve weather data" + msgstr "无法获取天气数据" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:279 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:284 + msgid "Weather: Fog" + msgstr "天气：雾" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:280 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:285 + msgid "Weather: Cloudy Night" + msgstr "天气：多云夜晚" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:281 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:286 + msgid "Weather: Cloudy" + msgstr "天气：多云" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:282 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:287 + msgid "Weather: Overcast" + msgstr "天气：阴天" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:283 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:288 + msgid "Weather: Showers" + msgstr "天气：阵雨" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:284 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:289 + msgid "Weather: Snow" + msgstr "天气：雪" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:285 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:290 + msgid "Weather: Clear Night" + msgstr "天气：晴朗夜晚" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:286 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:291 + msgid "Weather: Sunny" + msgstr "天气：晴" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:287 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:292 + msgid "Weather: Thunderstorms" + msgstr "天气：暴风雨" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:435 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:416 + msgid "Forecast" + msgstr "天气预报" + +-#: ../calendar/libecal/e-cal.c:891 ../libedataserverui/e-book-auth-util.c:204 +-#: ../libedataserverui/e-book-auth-util.c:428 +-#, c-format +-msgid "Enter password for %s (user %s)" +-msgstr "输入 %s 的密码 (用户 %s)" +- +-#. +-#. * This password prompt will be prompted rarely. Since the key that is passed to +-#. * the auth_func corresponds to the parent user. +-#. +-#: ../calendar/libecal/e-cal.c:905 +-#, c-format +-msgid "Enter password for %s to enable proxy for user %s" +-msgstr "输入 %s 的密码，以便为用户 %s 启用代理服务器" +- +-#: ../calendar/libecal/e-cal.c:4566 ++#: ../calendar/libecal/e-cal.c:2309 + msgid "Repository is offline" + msgstr "仓库离线" + +-#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137 ++#: ../calendar/libecal/e-cal.c:2311 ++#: ../calendar/libecal/e-cal-client.c:262 + msgid "No such calendar" + msgstr "没有这样的日历" + +-#: ../calendar/libecal/e-cal.c:4570 ../calendar/libecal/e-cal-client.c:139 +-#: ../calendar/libedata-cal/e-data-cal.c:432 ++#: ../calendar/libecal/e-cal.c:2313 ++#: ../calendar/libecal/e-cal-client.c:264 ++#: ../calendar/libedata-cal/e-data-cal.c:757 + msgid "Object not found" + msgstr "找不到对象" + +-#: ../calendar/libecal/e-cal.c:4572 ../calendar/libecal/e-cal-client.c:141 +-#: ../calendar/libedata-cal/e-data-cal.c:433 ++#: ../calendar/libecal/e-cal.c:2315 ++#: ../calendar/libecal/e-cal-client.c:266 ++#: ../calendar/libedata-cal/e-data-cal.c:758 + msgid "Invalid object" + msgstr "无效对象" + +-#: ../calendar/libecal/e-cal.c:4574 ++#: ../calendar/libecal/e-cal.c:2317 + msgid "URI not loaded" + msgstr "URI 未载入" + +-#: ../calendar/libecal/e-cal.c:4576 ++#: ../calendar/libecal/e-cal.c:2319 + msgid "URI already loaded" + msgstr "URI 已经载入" + +-#: ../calendar/libecal/e-cal.c:4580 ++#: ../calendar/libecal/e-cal.c:2323 + msgid "Unknown User" + msgstr "未知用户" + +-#: ../calendar/libecal/e-cal.c:4582 ../calendar/libecal/e-cal-client.c:145 +-#: ../calendar/libedata-cal/e-data-cal.c:434 ++#: ../calendar/libecal/e-cal.c:2325 ++#: ../calendar/libecal/e-cal-client.c:270 ++#: ../calendar/libedata-cal/e-data-cal.c:759 + msgid "Object ID already exists" + msgstr "对象 ID 已经存在" + +-#: ../calendar/libecal/e-cal.c:4584 ++#: ../calendar/libecal/e-cal.c:2327 + msgid "Protocol not supported" + msgstr "不支持的协议" + +-#: ../calendar/libecal/e-cal.c:4586 ++#: ../calendar/libecal/e-cal.c:2329 + msgid "Operation has been canceled" + msgstr "操作已取消" + +-#: ../calendar/libecal/e-cal.c:4588 ++#: ../calendar/libecal/e-cal.c:2331 + msgid "Could not cancel operation" + msgstr "无法取消操作" + +-#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129 ++#: ../calendar/libecal/e-cal.c:2333 ++#: ../libedataserver/e-client.c:139 + msgid "Authentication failed" + msgstr "认证失败" + +-#: ../calendar/libecal/e-cal.c:4592 +-#: ../camel/providers/smtp/camel-smtp-transport.c:846 +-#: ../libedataserver/e-client.c:131 ++#: ../calendar/libecal/e-cal.c:2335 ++#: ../camel/providers/smtp/camel-smtp-transport.c:915 ++#: ../libedataserver/e-client.c:141 + msgid "Authentication required" + msgstr "必须认证" + +-#: ../calendar/libecal/e-cal.c:4594 ++#: ../calendar/libecal/e-cal.c:2337 + msgid "A D-Bus exception has occurred" + msgstr "发生了一个 D-Bus 异常" + +-#: ../calendar/libecal/e-cal.c:4598 ++#: ../calendar/libecal/e-cal.c:2341 + msgid "No error" + msgstr "无错误" + +-#: ../calendar/libecal/e-cal-client.c:143 +-#: ../calendar/libedata-cal/e-data-cal.c:442 ++#: ../calendar/libecal/e-cal-client.c:268 ++#: ../calendar/libedata-cal/e-data-cal.c:767 + msgid "Unknown user" + msgstr "未知用户" + +-#: ../calendar/libecal/e-cal-client.c:147 +-#: ../calendar/libedata-cal/e-data-cal.c:431 ++#: ../calendar/libecal/e-cal-client.c:272 ++#: ../calendar/libedata-cal/e-data-cal.c:756 + msgid "Invalid range" + msgstr "无效范围" + +-#: ../calendar/libecal/e-cal-client.c:603 +-msgid "Failed to run calendar factory" +-msgstr "运行日历工厂失败" +- +-#: ../calendar/libecal/e-cal-client.c:768 +-msgid "Failed to find system calendar" +-msgstr "找不到系统日历" +- +-#: ../calendar/libecal/e-cal-client.c:807 +-#: ../calendar/libedata-cal/e-data-cal.c:441 +-msgid "Calendar does not exist" +-msgstr "日历不存在" ++#: ../calendar/libecal/e-cal-client.c:920 ++#: ../calendar/libedata-cal/e-cal-backend.c:204 ++#, c-format ++msgid "Unknown calendar property '%s'" ++msgstr "未知的日历属性“%s”" + +-#: ../calendar/libecal/e-cal-client.c:922 +-msgid "Invalid source type" +-msgstr "无效的源类型" ++#: ../calendar/libecal/e-cal-client.c:935 ++#, c-format ++msgid "Cannot change value of calendar property '%s'" ++msgstr "无法更改日历属性的值“%s”" + +-#: ../calendar/libecal/e-cal-component.c:1337 ++#: ../calendar/libecal/e-cal-component.c:1340 + msgid "Untitled appointment" + msgstr "无标题约会" + +-#: ../calendar/libecal/e-cal-recur.c:3981 ++#: ../calendar/libecal/e-cal-recur.c:4036 + msgid "1st" + msgstr "1日" + +-#: ../calendar/libecal/e-cal-recur.c:3982 ++#: ../calendar/libecal/e-cal-recur.c:4037 + msgid "2nd" + msgstr "2日" + +-#: ../calendar/libecal/e-cal-recur.c:3983 ++#: ../calendar/libecal/e-cal-recur.c:4038 + msgid "3rd" + msgstr "3日" + +-#: ../calendar/libecal/e-cal-recur.c:3984 ++#: ../calendar/libecal/e-cal-recur.c:4039 + msgid "4th" + msgstr "4日" + +-#: ../calendar/libecal/e-cal-recur.c:3985 ++#: ../calendar/libecal/e-cal-recur.c:4040 + msgid "5th" + msgstr "5日" + +-#: ../calendar/libecal/e-cal-recur.c:3986 ++#: ../calendar/libecal/e-cal-recur.c:4041 + msgid "6th" + msgstr "6日" + +-#: ../calendar/libecal/e-cal-recur.c:3987 ++#: ../calendar/libecal/e-cal-recur.c:4042 + msgid "7th" + msgstr "7日" + +-#: ../calendar/libecal/e-cal-recur.c:3988 ++#: ../calendar/libecal/e-cal-recur.c:4043 + msgid "8th" + msgstr "8日" + +-#: ../calendar/libecal/e-cal-recur.c:3989 ++#: ../calendar/libecal/e-cal-recur.c:4044 + msgid "9th" + msgstr "9日" + +-#: ../calendar/libecal/e-cal-recur.c:3990 ++#: ../calendar/libecal/e-cal-recur.c:4045 + msgid "10th" + msgstr "10日" + +-#: ../calendar/libecal/e-cal-recur.c:3991 ++#: ../calendar/libecal/e-cal-recur.c:4046 + msgid "11th" + msgstr "11日" + +-#: ../calendar/libecal/e-cal-recur.c:3992 ++#: ../calendar/libecal/e-cal-recur.c:4047 + msgid "12th" + msgstr "12日" + +-#: ../calendar/libecal/e-cal-recur.c:3993 ++#: ../calendar/libecal/e-cal-recur.c:4048 + msgid "13th" + msgstr "13日" + +-#: ../calendar/libecal/e-cal-recur.c:3994 ++#: ../calendar/libecal/e-cal-recur.c:4049 + msgid "14th" + msgstr "14日" + +-#: ../calendar/libecal/e-cal-recur.c:3995 ++#: ../calendar/libecal/e-cal-recur.c:4050 + msgid "15th" + msgstr "15日" + +-#: ../calendar/libecal/e-cal-recur.c:3996 ++#: ../calendar/libecal/e-cal-recur.c:4051 + msgid "16th" + msgstr "16日" + +-#: ../calendar/libecal/e-cal-recur.c:3997 ++#: ../calendar/libecal/e-cal-recur.c:4052 + msgid "17th" + msgstr "17日" + +-#: ../calendar/libecal/e-cal-recur.c:3998 ++#: ../calendar/libecal/e-cal-recur.c:4053 + msgid "18th" + msgstr "18八日" + +-#: ../calendar/libecal/e-cal-recur.c:3999 ++#: ../calendar/libecal/e-cal-recur.c:4054 + msgid "19th" + msgstr "19日" + +-#: ../calendar/libecal/e-cal-recur.c:4000 ++#: ../calendar/libecal/e-cal-recur.c:4055 + msgid "20th" + msgstr "20日" + +-#: ../calendar/libecal/e-cal-recur.c:4001 ++#: ../calendar/libecal/e-cal-recur.c:4056 + msgid "21st" + msgstr "21日" + +-#: ../calendar/libecal/e-cal-recur.c:4002 ++#: ../calendar/libecal/e-cal-recur.c:4057 + msgid "22nd" + msgstr "22日" + +-#: ../calendar/libecal/e-cal-recur.c:4003 ++#: ../calendar/libecal/e-cal-recur.c:4058 + msgid "23rd" + msgstr "23日" + +-#: ../calendar/libecal/e-cal-recur.c:4004 ++#: ../calendar/libecal/e-cal-recur.c:4059 + msgid "24th" + msgstr "24日" + +-#: ../calendar/libecal/e-cal-recur.c:4005 ++#: ../calendar/libecal/e-cal-recur.c:4060 + msgid "25th" + msgstr "25日" + +-#: ../calendar/libecal/e-cal-recur.c:4006 ++#: ../calendar/libecal/e-cal-recur.c:4061 + msgid "26th" + msgstr "26日" + +-#: ../calendar/libecal/e-cal-recur.c:4007 ++#: ../calendar/libecal/e-cal-recur.c:4062 + msgid "27th" + msgstr "27日" + +-#: ../calendar/libecal/e-cal-recur.c:4008 ++#: ../calendar/libecal/e-cal-recur.c:4063 + msgid "28th" + msgstr "28日" + +-#: ../calendar/libecal/e-cal-recur.c:4009 ++#: ../calendar/libecal/e-cal-recur.c:4064 + msgid "29th" + msgstr "29日" + +-#: ../calendar/libecal/e-cal-recur.c:4010 ++#: ../calendar/libecal/e-cal-recur.c:4065 + msgid "30th" + msgstr "30日" + +-#: ../calendar/libecal/e-cal-recur.c:4011 ++#: ../calendar/libecal/e-cal-recur.c:4066 + msgid "31st" + msgstr "31日" + +-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718 ++#: ../calendar/libecal/e-cal-util.c:707 ++#: ../calendar/libecal/e-cal-util.c:734 + msgctxt "Priority" + msgid "High" + msgstr "高" + +-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720 ++#: ../calendar/libecal/e-cal-util.c:709 ++#: ../calendar/libecal/e-cal-util.c:736 + msgctxt "Priority" + msgid "Normal" + msgstr "中" + +-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722 ++#: ../calendar/libecal/e-cal-util.c:711 ++#: ../calendar/libecal/e-cal-util.c:738 + msgctxt "Priority" + msgid "Low" + msgstr "低" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:716 ++#: ../calendar/libecal/e-cal-util.c:732 + msgctxt "Priority" + msgid "Undefined" + msgstr "未定义" + +-#: ../calendar/libedata-cal/e-cal-backend.c:38 +-msgid "Cannot process, calendar backend is opening" +-msgstr "无法进行，日历后端正在打开" +- +-#: ../calendar/libedata-cal/e-cal-backend.c:146 +-#, c-format +-msgid "Unknown calendar property '%s'" +-msgstr "未知的日历属性“%s”" +- +-#: ../calendar/libedata-cal/e-cal-backend.c:163 +-#, c-format +-msgid "Cannot change value of calendar property '%s'" +-msgstr "无法更改日历属性的值“%s”" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:79 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:841 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:956 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1187 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1217 +-#, c-format +-msgid "\"%s\" expects no arguments" +-msgstr "“%s”不需要参数" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:231 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:276 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:315 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1258 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541 + #, c-format + msgid "\"%s\" expects one argument" + msgstr "“%s”需要一个参数" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:128 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:321 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:886 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380 + #, c-format + msgid "\"%s\" expects the first argument to be a string" + msgstr "“%s”需要第一个参数是字符串" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:136 +-#, c-format +-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" +-msgstr "“%s”的第一个参数必须是 ISO 8601 日期/时间字符串" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:178 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:537 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:880 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160 + #, c-format +-msgid "\"%s\" expects two arguments" +-msgstr "“%s”需要两个参数" ++msgid "\"%s\" expects two or three arguments" ++msgstr "“%s”需要两个或三个参数" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:184 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:237 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:282 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:403 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:486 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:543 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1028 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1264 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548 + #, c-format + msgid "\"%s\" expects the first argument to be a time_t" + msgstr "“%s”的第一个参数应该是 time_t" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192 +-#, c-format +-msgid "\"%s\" expects the second argument to be an integer" +-msgstr "“%s”的第二个参数应该是整数" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397 +-#, c-format +-msgid "\"%s\" expects two or three arguments" +-msgstr "“%s”需要两个或三个参数" +- +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:411 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:492 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:552 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1036 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826 + #, c-format + msgid "\"%s\" expects the second argument to be a time_t" + msgstr "“%s”的第一个参数应该是 time_t" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:420 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186 + #, c-format + msgid "\"%s\" expects the third argument to be a string" + msgstr "“%s”需要第三个参数是字符串" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248 + #, c-format + msgid "\"%s\" expects none or two arguments" + msgstr "“%s”需要零个或两个参数" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434 ++#, c-format ++msgid "\"%s\" expects two arguments" ++msgstr "“%s”需要两个参数" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326 ++#, c-format ++msgid "\"%s\" expects no arguments" ++msgstr "“%s”不需要参数" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676 + #, c-format + msgid "\"%s\" expects the second argument to be a string" + msgstr "“%s”的第二个参数应该是字符串" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:924 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707 + #, c-format + msgid "" + "\"%s\" expects the first argument to be either \"any\", \"summary\", or " + "\"description\", or \"location\", or \"attendee\", or \"organizer\", or " + "\"classification\"" + msgstr "" +-"“%s”的第一个参数必须" +-"是“any”、“summary”、“description”、“location”、“attendee”、“organizer”、“classification”之" +-"一" ++"“%s”的第一个参数必须是“any”、“summary”、“description”、“location”、“attendee”、“organizer”、“classification”之一" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 + #, c-format + msgid "\"%s\" expects at least one argument" + msgstr "“%s”至少需要一个参数" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1100 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893 + #, c-format + msgid "" + "\"%s\" expects all arguments to be strings or one and only one argument to " + "be a boolean false (#f)" + msgstr "“%s”的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)" + +-#: ../calendar/libedata-cal/e-data-cal.c:438 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389 ++#, c-format ++msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string" ++msgstr "“%s”的第一个参数必须是 ISO 8601 日期/时间字符串" ++ ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450 ++#, c-format ++msgid "\"%s\" expects the second argument to be an integer" ++msgstr "“%s”的第二个参数应该是整数" ++ ++#: ../calendar/libedata-cal/e-data-cal.c:763 + msgid "Unsupported method" + msgstr "不支持的方式" + ++#: ../calendar/libedata-cal/e-data-cal.c:766 ++msgid "Calendar does not exist" ++msgstr "日历不存在" ++ + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:962 ++#: ../calendar/libedata-cal/e-data-cal.c:1237 + msgid "Cannot open calendar: " + msgstr "无法打开日历：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:987 +-msgid "Cannot remove calendar: " +-msgstr "无法移除日历：" +- +-#. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1014 ++#: ../calendar/libedata-cal/e-data-cal.c:1298 + msgid "Cannot refresh calendar: " + msgstr "无法刷新日历：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1043 ++#: ../calendar/libedata-cal/e-data-cal.c:1337 + msgid "Cannot retrieve backend property: " + msgstr "无法获取后端属性：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1098 ++#: ../calendar/libedata-cal/e-data-cal.c:1395 + msgid "Cannot retrieve calendar object path: " + msgstr "无法获取日历对象的路径：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1128 ++#: ../calendar/libedata-cal/e-data-cal.c:1441 + msgid "Cannot retrieve calendar object list: " + msgstr "无法获取日历对象的列表：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1157 ++#: ../calendar/libedata-cal/e-data-cal.c:1494 + msgid "Cannot retrieve calendar free/busy list: " + msgstr "无法获取日历空闲/繁忙列表：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1188 ++#: ../calendar/libedata-cal/e-data-cal.c:1535 + msgid "Cannot create calendar object: " + msgstr "无法创建日历对象：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1220 ++#: ../calendar/libedata-cal/e-data-cal.c:1604 + msgid "Cannot modify calendar object: " + msgstr "无法修改日历对象：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1254 ++#: ../calendar/libedata-cal/e-data-cal.c:1666 + msgid "Cannot remove calendar object: " + msgstr "无法移除日历对象：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1281 ++#: ../calendar/libedata-cal/e-data-cal.c:1727 + msgid "Cannot receive calendar objects: " + msgstr "无法接收日历对象：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1312 ++#: ../calendar/libedata-cal/e-data-cal.c:1768 + msgid "Cannot send calendar objects: " + msgstr "无法发送日历对象：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1344 ++#: ../calendar/libedata-cal/e-data-cal.c:1828 + msgid "Could not retrieve attachment uris: " + msgstr "无法获取附件 URI：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1372 ++#: ../calendar/libedata-cal/e-data-cal.c:1878 + msgid "Could not discard reminder: " + msgstr "无法取消提醒：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1401 ++#: ../calendar/libedata-cal/e-data-cal.c:1917 + msgid "Could not get calendar view path: " + msgstr "无法获取日历视图路径：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1431 ++#: ../calendar/libedata-cal/e-data-cal.c:1963 + msgid "Could not retrieve calendar time zone: " + msgstr "无法获取日历时区：" + + #. Translators: This is prefix to a detailed error message +-#: ../calendar/libedata-cal/e-data-cal.c:1457 ++#: ../calendar/libedata-cal/e-data-cal.c:2007 + msgid "Could not add calendar time zone: " + msgstr "无法添加日历时区：" + +-#: ../calendar/libedata-cal/e-data-cal-factory.c:199 +-#, c-format +-msgid "Invalid call" +-msgstr "无效调用" +- +-#: ../camel/camel-cipher-context.c:206 ++#: ../camel/camel-cipher-context.c:208 + #, c-format + msgid "Signing is not supported by this cipher" + msgstr "该密码不支持签名" + +-#: ../camel/camel-cipher-context.c:219 ++#: ../camel/camel-cipher-context.c:221 + #, c-format + msgid "Verifying is not supported by this cipher" + msgstr "该密码不支持验证" + +-#: ../camel/camel-cipher-context.c:235 ++#: ../camel/camel-cipher-context.c:237 + #, c-format + msgid "Encryption is not supported by this cipher" + msgstr "该密码不支持加密" + +-#: ../camel/camel-cipher-context.c:249 ++#: ../camel/camel-cipher-context.c:251 + #, c-format + msgid "Decryption is not supported by this cipher" + msgstr "该密码不支持解密" + +-#: ../camel/camel-cipher-context.c:262 ++#: ../camel/camel-cipher-context.c:264 + #, c-format + msgid "You may not import keys with this cipher" + msgstr "您不能用此密码导入密钥" + +-#: ../camel/camel-cipher-context.c:276 ++#: ../camel/camel-cipher-context.c:278 + #, c-format + msgid "You may not export keys with this cipher" + msgstr "您不能用此密码导出密钥" + +-#: ../camel/camel-cipher-context.c:805 ++#: ../camel/camel-cipher-context.c:819 + msgid "Signing message" + msgstr "签名消息" + +-#: ../camel/camel-cipher-context.c:1046 ++#: ../camel/camel-cipher-context.c:1060 + msgid "Encrypting message" + msgstr "加密消息" + +-#: ../camel/camel-cipher-context.c:1173 ++#: ../camel/camel-cipher-context.c:1187 + msgid "Decrypting message" + msgstr "解密消息" + +@@ -1709,74 +1856,76 @@ msgstr "解密消息" + msgid "Unable to create cache path" + msgstr "无法创建缓存路径" + +-#: ../camel/camel-data-cache.c:507 ++#: ../camel/camel-data-cache.c:440 ++msgid "Empty cache file" ++msgstr "清空缓存文件" ++ ++#: ../camel/camel-data-cache.c:509 + #, c-format + msgid "Could not remove cache entry: %s: %s" + msgstr "无法删除缓存条目：%s：%s" + +-#: ../camel/camel-disco-diary.c:201 ++#: ../camel/camel-disco-diary.c:207 + #, c-format + msgid "" + "Could not write log entry: %s\n" + "Further operations on this server will not be replayed when you\n" + "reconnect to the network." +-msgstr "" +-"无法写入日志条目：%s\n" ++msgstr "无法写入日志条目：%s\n" + "当您重新连接到网络时本服务器\n" + "上进一步的操作不会重做。" + +-#: ../camel/camel-disco-diary.c:266 +-#: ../camel/providers/imap/camel-imap-journal.c:309 ++#: ../camel/camel-disco-diary.c:279 + #, c-format + msgid "" + "Could not open '%s':\n" + "%s\n" + "Changes made to this folder will not be resynchronized." +-msgstr "" +-"无法打开“%s”：\n" ++msgstr "无法打开“%s”：\n" + "%s\n" + "对该文件夹的修改不会被重新同步。" + +-#: ../camel/camel-disco-diary.c:310 ++#: ../camel/camel-disco-diary.c:326 + msgid "Resynchronizing with server" + msgstr "重新与服务器同步" + +-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93 ++#: ../camel/camel-disco-folder.c:76 ++#: ../camel/camel-offline-folder.c:93 + msgid "Downloading new messages for offline mode" + msgstr "下载新消息以进行脱机操作" + +-#: ../camel/camel-disco-folder.c:416 ++#: ../camel/camel-disco-folder.c:422 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "准备脱机文件夹“%s”" + +-#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327 ++#: ../camel/camel-disco-folder.c:489 ++#: ../camel/camel-offline-folder.c:336 + msgid "Copy folder content locally for _offline operation" + msgstr "将文件夹内容复制到本地以进行脱机操作(_O)" + +-#: ../camel/camel-disco-store.c:456 +-#: ../camel/providers/imap/camel-imap-store.c:1239 +-#: ../camel/providers/imap/camel-imap-store.c:2028 +-#: ../camel/providers/imap/camel-imap-store.c:2523 +-#: ../camel/providers/imap/camel-imap-store.c:3282 +-#: ../camel/providers/imapx/camel-imapx-folder.c:407 +-#: ../camel/providers/imapx/camel-imapx-folder.c:440 +-#: ../camel/providers/imapx/camel-imapx-folder.c:474 +-#: ../camel/providers/imapx/camel-imapx-folder.c:530 +-#: ../camel/providers/imapx/camel-imapx-folder.c:587 +-#: ../camel/providers/imapx/camel-imapx-folder.c:621 +-#: ../camel/providers/imapx/camel-imapx-folder.c:661 +-#: ../camel/providers/imapx/camel-imapx-folder.c:697 +-#: ../camel/providers/imapx/camel-imapx-store.c:276 +-#: ../camel/providers/imapx/camel-imapx-store.c:1367 +-#: ../camel/providers/imapx/camel-imapx-store.c:1455 +-#: ../camel/providers/imapx/camel-imapx-store.c:1501 +-#: ../camel/providers/pop3/camel-pop3-folder.c:525 +-#: ../camel/providers/pop3/camel-pop3-folder.c:655 +-#: ../camel/providers/pop3/camel-pop3-folder.c:838 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1036 +-#: ../camel/providers/pop3/camel-pop3-store.c:393 +-#: ../camel/providers/pop3/camel-pop3-store.c:805 ++#: ../camel/camel-disco-store.c:475 ++#: ../camel/camel-imapx-folder.c:478 ++#: ../camel/camel-imapx-folder.c:514 ++#: ../camel/camel-imapx-folder.c:553 ++#: ../camel/camel-imapx-folder.c:613 ++#: ../camel/camel-imapx-folder.c:748 ++#: ../camel/camel-imapx-folder.c:933 ++#: ../camel/camel-imapx-folder.c:993 ++#: ../camel/camel-imapx-folder.c:1032 ++#: ../camel/camel-imapx-store.c:368 ++#: ../camel/camel-imapx-store.c:1592 ++#: ../camel/camel-imapx-store.c:1681 ++#: ../camel/camel-imapx-store.c:1730 ++#: ../camel/providers/pop3/camel-pop3-folder.c:555 ++#: ../camel/providers/pop3/camel-pop3-folder.c:705 ++#: ../camel/providers/pop3/camel-pop3-folder.c:940 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1150 ++#: ../camel/providers/pop3/camel-pop3-store.c:291 ++#: ../camel/providers/pop3/camel-pop3-store.c:519 ++#: ../camel/providers/pop3/camel-pop3-store.c:567 ++#: ../camel/providers/pop3/camel-pop3-store.c:652 ++#: ../camel/providers/pop3/camel-pop3-store.c:1052 + #, c-format + msgid "You must be working online to complete this operation" + msgstr "您必须在线工作以便完成该操作" +@@ -1786,310 +1935,626 @@ msgstr "您必须在线工作以便完� + msgid "Canceled" + msgstr "已取消" + +-#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762 ++#: ../camel/camel-filter-driver.c:916 ++#: ../camel/camel-filter-search.c:797 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "创建子进程“%s”失败：%s" + +-#: ../camel/camel-filter-driver.c:943 ++#: ../camel/camel-filter-driver.c:964 + #, c-format + msgid "Invalid message stream received from %s: %s" + msgstr "收到 %s 发来的无效消息流：%s" + +-#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146 ++#: ../camel/camel-filter-driver.c:1171 ++#: ../camel/camel-filter-driver.c:1180 + msgid "Syncing folders" + msgstr "同步文件夹" + +-#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695 ++#: ../camel/camel-filter-driver.c:1278 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "解析过滤规则出错：%s：%s" + +-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706 ++#: ../camel/camel-filter-driver.c:1289 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "执行过滤规则错误：%s：%s" + +-#: ../camel/camel-filter-driver.c:1347 ++#: ../camel/camel-filter-driver.c:1385 + #, c-format + msgid "Unable to open spool folder" + msgstr "无法打开脱机文件夹" + +-#: ../camel/camel-filter-driver.c:1359 ++#: ../camel/camel-filter-driver.c:1397 + #, c-format + msgid "Unable to process spool folder" + msgstr "无法处理脱机文件夹" + +-#: ../camel/camel-filter-driver.c:1377 ++#: ../camel/camel-filter-driver.c:1420 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "获取第%d封信(%d%%)" + +-#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406 ++#: ../camel/camel-filter-driver.c:1429 ++#: ../camel/camel-filter-driver.c:1451 + #, c-format + msgid "Failed on message %d" + msgstr "在第%d封信失败" + +-#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527 ++#: ../camel/camel-filter-driver.c:1470 ++#: ../camel/camel-filter-driver.c:1584 + msgid "Syncing folder" + msgstr "同步文件夹" + +-#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533 ++#: ../camel/camel-filter-driver.c:1475 ++#: ../camel/camel-filter-driver.c:1592 + msgid "Complete" + msgstr "完成" + +-#: ../camel/camel-filter-driver.c:1485 ++#: ../camel/camel-filter-driver.c:1538 + #, c-format + msgid "Getting message %d of %d" + msgstr "获取第%d封信，共%d封" + +-#: ../camel/camel-filter-driver.c:1503 ++#: ../camel/camel-filter-driver.c:1556 + #, c-format + msgid "Failed at message %d of %d" + msgstr "在第%d封信失败，共%d封" + ++#: ../camel/camel-filter-driver.c:1752 ++#: ../camel/camel-filter-driver.c:1786 ++#, c-format ++msgid "Execution of filter '%s' failed: " ++msgstr "执行过滤器 '%s' 失败：" ++ ++#: ../camel/camel-filter-driver.c:1776 ++#, c-format ++msgid "Error parsing filter '%s': %s: %s" ++msgstr "解析过滤器 '%s' 失败：%s：%s" ++ ++#: ../camel/camel-filter-driver.c:1795 ++#, c-format ++msgid "Error executing filter '%s': %s: %s" ++msgstr "执行过滤器 '%s' 失败：%s：%s" ++ + #: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" + msgstr "获取消息失败" + +-#: ../camel/camel-filter-search.c:512 ++#: ../camel/camel-filter-search.c:537 + msgid "Invalid arguments to (system-flag)" + msgstr "(system-flag)参数无效" + +-#: ../camel/camel-filter-search.c:530 ++#: ../camel/camel-filter-search.c:555 + msgid "Invalid arguments to (user-tag)" + msgstr "(user-tag)参数无效" + +-#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948 ++#: ../camel/camel-filter-search.c:1046 ++#: ../camel/camel-filter-search.c:1055 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "执行过滤规则搜索错误：%s：%s" + +-#: ../camel/camel-folder.c:262 ++#: ../camel/camel-folder.c:310 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" + msgstr[0] "在“%s”中学习新的垃圾邮件" + +-#: ../camel/camel-folder.c:302 ++#: ../camel/camel-folder.c:350 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" + msgstr[0] "在“%s”中学习新的有害邮件" + +-#: ../camel/camel-folder.c:350 ++#: ../camel/camel-folder.c:398 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "在“%s”中过滤新消息" + +-#: ../camel/camel-folder.c:918 +-#: ../camel/providers/local/camel-maildir-folder.c:322 ++#: ../camel/camel-folder.c:972 ++#: ../camel/providers/local/camel-maildir-folder.c:321 + msgid "Moving messages" + msgstr "移动消息" + +-#: ../camel/camel-folder.c:921 ++#: ../camel/camel-folder.c:975 + msgid "Copying messages" + msgstr "复制消息" + +-#: ../camel/camel-folder.c:1233 ++#: ../camel/camel-folder.c:1295 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "文件夹“%s”不支持配额信息" + +-#: ../camel/camel-folder.c:3549 ++#: ../camel/camel-folder.c:3528 ++#, c-format ++msgid "Expunging folder '%s'" ++msgstr "删除文件夹 '%s'" ++ ++#: ../camel/camel-folder.c:3760 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "正在获取 %2$s 中的消息“%1$s”" + +-#: ../camel/camel-folder.c:3698 ++#: ../camel/camel-folder.c:3911 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "正在获取“%s”的配额信息" + +-#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479 +-#: ../camel/camel-folder-search.c:664 ++#: ../camel/camel-folder.c:4143 + #, c-format +-msgid "" +-"Cannot parse search expression: %s:\n" +-"%s" +-msgstr "" +-"无法解析搜索表达式：%s：\n" +-"%s" ++msgid "Refreshing folder '%s'" ++msgstr "刷新文件夹 '%s'" + +-#: ../camel/camel-folder-search.c:377 ../camel/camel-folder-search.c:491 +-#: ../camel/camel-folder-search.c:676 +-#, c-format +-msgid "" +-"Error executing search expression: %s:\n" +-"%s" +-msgstr "" +-"执行搜索表达式错误：%s：\n" +-"%s" +- +-#. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:890 ../camel/camel-folder-search.c:933 ++#. Translators: The '%s' is an element type name, part of an expressing language ++#: ../camel/camel-folder-search.c:838 ++#: ../camel/camel-folder-search.c:881 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) 需要一个布尔结果" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:994 ++#: ../camel/camel-folder-search.c:916 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) 不允许在 %s 中使用" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1001 ../camel/camel-folder-search.c:1009 ++#: ../camel/camel-folder-search.c:923 ++#: ../camel/camel-folder-search.c:931 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) 需要一个匹配类型字符串" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1037 ++#: ../camel/camel-folder-search.c:959 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) 需要一个数组结果" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1047 ++#: ../camel/camel-folder-search.c:969 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) 需要文件夹集" + +-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668 +-#: ../camel/camel-gpg-context.c:1327 ++#: ../camel/camel-folder-search.c:1862 ++#: ../camel/camel-folder-search.c:2029 ++#, c-format ++msgid "Cannot parse search expression: %s:\n" ++"%s" ++msgstr "无法解析搜索表达式：%s：\n" ++"%s" ++ ++#: ../camel/camel-folder-search.c:1874 ++#: ../camel/camel-folder-search.c:2041 ++#, c-format ++msgid "Error executing search expression: %s:\n" ++"%s" ++msgstr "执行搜索表达式错误：%s：\n" ++"%s" ++ ++#: ../camel/camel-gpg-context.c:730 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/camel-gpg-context.c:1398 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "执行 gpg 失败：%s" + +-#: ../camel/camel-gpg-context.c:668 +-#: ../camel/providers/smtp/camel-smtp-transport.c:849 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/providers/smtp/camel-smtp-transport.c:918 + msgid "Unknown" + msgstr "未知" + +-#: ../camel/camel-gpg-context.c:733 ++#: ../camel/camel-gpg-context.c:800 + #, c-format +-msgid "" +-"Unexpected GnuPG status message encountered:\n" ++msgid "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" +-msgstr "" +-"遇到了意外的 GnuPG 状态消息：\n" ++msgstr "遇到了意外的 GnuPG 状态消息：\n" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:769 ++#: ../camel/camel-gpg-context.c:836 + #, c-format + msgid "Failed to parse gpg userid hint." + msgstr "解析 gpg userid 提示失败。" + +-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809 ++#: ../camel/camel-gpg-context.c:861 ++#: ../camel/camel-gpg-context.c:876 + #, c-format + msgid "Failed to parse gpg passphrase request." + msgstr "解析 gpg 密码句请求失败。" + +-#: ../camel/camel-gpg-context.c:830 ++#: ../camel/camel-gpg-context.c:897 + #, c-format +-msgid "" +-"You need a PIN to unlock the key for your\n" ++msgid "You need a PIN to unlock the key for your\n" + "SmartCard: \"%s\"" +-msgstr "" +-"您需要一个 PIN 用来解锁您的智能卡：\n" ++msgstr "您需要一个 PIN 用来解锁您的智能卡：\n" + "“%s”" + +-#: ../camel/camel-gpg-context.c:834 ++#: ../camel/camel-gpg-context.c:901 + #, c-format +-msgid "" +-"You need a passphrase to unlock the key for\n" ++msgid "You need a passphrase to unlock the key for\n" + "user: \"%s\"" +-msgstr "" +-"您需要一个密码句用来解锁以下用户：\n" ++msgstr "您需要一个密码句用来解锁以下用户：\n" + "“%s”" + +-#: ../camel/camel-gpg-context.c:840 ++#: ../camel/camel-gpg-context.c:907 + #, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "GnuPG 对“%s”的意外响应" + +-#: ../camel/camel-gpg-context.c:850 ++#: ../camel/camel-gpg-context.c:919 + msgid "" + "Note the encrypted content doesn't contain information about a recipient, " + "thus there will be a password prompt for each of stored private key." +-msgstr "" +-"请注意加密的内容里不包含收件人信息，因此可能会请求输出每个私钥的口令。" ++msgstr "请注意加密的内容里不包含收件人信息，因此可能会请求输出每个私钥的口令。" + +-#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523 ++#: ../camel/camel-gpg-context.c:950 ++#: ../camel/camel-net-utils.c:524 + #: ../camel/camel-tcp-stream-raw.c:268 +-#: ../camel/providers/nntp/camel-nntp-summary.c:382 +-#: ../libedataserver/e-client.c:139 ../libedataserverui/e-book-auth-util.c:227 ++#: ../camel/providers/nntp/camel-nntp-summary.c:402 ++#: ../libedataserver/e-client.c:152 + #, c-format + msgid "Cancelled" + msgstr "已取消" + +-#: ../camel/camel-gpg-context.c:900 ++#: ../camel/camel-gpg-context.c:971 + #, c-format + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "解锁密钥失败：给出了 3 个错误的密码句。" + +-#: ../camel/camel-gpg-context.c:913 ++#: ../camel/camel-gpg-context.c:984 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "来自 GnuPG 的意外应答：%s" + +-#: ../camel/camel-gpg-context.c:1044 ++#: ../camel/camel-gpg-context.c:1115 + #, c-format + msgid "Failed to encrypt: No valid recipients specified." + msgstr "加密失败：没有指定有效的收件人。" + +-#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831 ++#: ../camel/camel-gpg-context.c:1665 ++#: ../camel/camel-smime-context.c:846 + msgid "Could not generate signing data: " + msgstr "无法生成签名数据：" + +-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844 +-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101 +-#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249 ++#: ../camel/camel-gpg-context.c:1714 ++#: ../camel/camel-gpg-context.c:1918 ++#: ../camel/camel-gpg-context.c:2028 ++#: ../camel/camel-gpg-context.c:2179 ++#: ../camel/camel-gpg-context.c:2279 ++#: ../camel/camel-gpg-context.c:2327 + msgid "Failed to execute gpg." + msgstr "执行 gpg 失败。" + +-#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727 +-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755 +-#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971 +-#: ../camel/camel-smime-context.c:980 ++#: ../camel/camel-gpg-context.c:1793 ++#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1809 ++#: ../camel/camel-gpg-context.c:1829 ++#: ../camel/camel-smime-context.c:973 ++#: ../camel/camel-smime-context.c:987 ++#: ../camel/camel-smime-context.c:996 + #, c-format + msgid "Cannot verify message signature: Incorrect message format" + msgstr "无法校验消息签名：消息格式不对" + +-#: ../camel/camel-gpg-context.c:1797 ++#: ../camel/camel-gpg-context.c:1871 + msgid "Cannot verify message signature: " + msgstr "无法校验消息签名：" + +-#: ../camel/camel-gpg-context.c:1920 ++#: ../camel/camel-gpg-context.c:1994 + msgid "Could not generate encrypting data: " + msgstr "无法生成加密数据：" + +-#: ../camel/camel-gpg-context.c:1973 ++#: ../camel/camel-gpg-context.c:2047 + msgid "This is a digitally encrypted message part" + msgstr "这是消息的数字加密部分" + +-#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040 +-#: ../camel/camel-gpg-context.c:2063 ++#: ../camel/camel-gpg-context.c:2105 ++#: ../camel/camel-gpg-context.c:2114 ++#: ../camel/camel-gpg-context.c:2137 + #, c-format + msgid "Cannot decrypt message: Incorrect message format" + msgstr "无法解密消息：消息格式不对" + +-#: ../camel/camel-gpg-context.c:2051 ++#: ../camel/camel-gpg-context.c:2125 + #, c-format + msgid "Failed to decrypt MIME part: protocol error" + msgstr "解密 MIME 部分失败：协议错误" + +-#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268 ++#: ../camel/camel-gpg-context.c:2220 ++#: ../camel/camel-smime-context.c:1287 + msgid "Encrypted content" + msgstr "加密内容" + +-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78 +-msgid "Only reset to beginning is supported with CamelHttpStream" +-msgstr "CamelHttpStream 只支持重设到开始" ++#: ../camel/camel-imapx-folder.c:710 ++#, c-format ++msgid "No quota information available for folder '%s'" ++msgstr "没有文件夹 '%s' 的配额信息可用" ++ ++#: ../camel/camel-imapx-folder.c:809 ++#: ../camel/camel-imapx-folder.c:882 ++#, c-format ++msgid "No destination folder specified" ++msgstr "未指定目的地文件夹" ++ ++#: ../camel/camel-imapx-folder.c:828 ++msgid "Unable to move junk messages" ++msgstr "无法移动批信息" ++ ++#: ../camel/camel-imapx-folder.c:901 ++msgid "Unable to move deleted messages" ++msgstr "无法移动已删除的信息" ++ ++#: ../camel/camel-imapx-folder.c:1119 ++#: ../camel/providers/nntp/camel-nntp-folder.c:794 ++msgid "Apply message _filters to this folder" ++msgstr "对这个文件夹应用消息过滤器(_F)" ++ ++#: ../camel/camel-imapx-folder.c:1228 ++#, c-format ++msgid "Could not create folder summary for %s" ++msgstr "无法为 %s 创建文件夹概要" ++ ++#: ../camel/camel-imapx-folder.c:1236 ++#, c-format ++msgid "Could not create cache for %s: " ++msgstr "无法为 %s 创建缓存：" ++ ++#: ../camel/camel-imapx-server.c:1283 ++msgid "Server disconnected" ++msgstr "服务器断开连接" ++ ++#: ../camel/camel-imapx-server.c:1772 ++msgid "Error writing to cache stream" ++msgstr "写入缓存流出错" ++ ++#: ../camel/camel-imapx-server.c:2441 ++#, c-format ++msgid "Alert from IMAP server %s:\n" ++"%s" ++msgstr "来自 IMAP 服务器 %s 的警告：%s" ++ ++#: ../camel/camel-imapx-server.c:3029 ++#, c-format ++msgid "Not authenticated" ++msgstr "没有验证" ++ ++#: ../camel/camel-imapx-server.c:3107 ++msgid "Error performing IDLE" ++msgstr "执行 IDLE 命令出错" ++ ++#: ../camel/camel-imapx-server.c:3994 ++#, c-format ++msgid "Failed to connect to IMAP server %s in secure mode: %s" ++msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s" ++ ++#: ../camel/camel-imapx-server.c:3995 ++#: ../camel/providers/smtp/camel-smtp-transport.c:203 ++msgid "STARTTLS not supported" ++msgstr "不支持 STARTTLS" ++ ++#: ../camel/camel-imapx-server.c:4034 ++#, c-format ++msgid "Failed to connect to IMAP server %s in secure mode: " ++msgstr "以安全模式连接到 IMAP 服务器 %s 失败：" ++ ++#: ../camel/camel-imapx-server.c:4114 ++#, c-format ++msgid "IMAP server %s does not support %s authentication" ++msgstr "IMAP 服务器 %s 不支持 %s 认证" ++ ++#: ../camel/camel-imapx-server.c:4125 ++#: ../camel/camel-session.c:495 ++#: ../camel/providers/pop3/camel-pop3-store.c:303 ++#: ../camel/providers/pop3/camel-pop3-store.c:737 ++#: ../camel/providers/smtp/camel-smtp-transport.c:509 ++#, c-format ++msgid "No support for %s authentication" ++msgstr "不支持 %s 认证" ++ ++#: ../camel/camel-imapx-server.c:4144 ++#: ../camel/providers/nntp/camel-nntp-store.c:407 ++#: ../camel/providers/nntp/camel-nntp-store.c:595 ++msgid "Cannot authenticate without a username" ++msgstr "无法进行无用户名的认证" ++ ++#: ../camel/camel-imapx-server.c:4153 ++#: ../camel/providers/nntp/camel-nntp-store.c:604 ++#: ../camel/providers/pop3/camel-pop3-store.c:662 ++#: ../camel/providers/pop3/camel-pop3-store.c:682 ++msgid "Authentication password not available" ++msgstr "密码认证不可用" ++ ++#: ../camel/camel-imapx-server.c:4360 ++msgid "Error fetching message" ++msgstr "取回消息出错" ++ ++#: ../camel/camel-imapx-server.c:4410 ++#: ../camel/camel-imapx-server.c:4418 ++msgid "Failed to close the tmp stream" ++msgstr "关闭 tmp 流失败" ++ ++#: ../camel/camel-imapx-server.c:4447 ++msgid "Failed to copy the tmp file" ++msgstr "复制 tmp 文件失败" ++ ++#: ../camel/camel-imapx-server.c:4571 ++msgid "Error copying messages" ++msgstr "复制消息出错" ++ ++#: ../camel/camel-imapx-server.c:4740 ++msgid "Error appending message" ++msgstr "追加消息出错" ++ ++#: ../camel/camel-imapx-server.c:4939 ++msgid "Error fetching message headers" ++msgstr "取回消息头出错" ++ ++#: ../camel/camel-imapx-server.c:5090 ++msgid "Error retrieving message" ++msgstr "收取消息出错" ++ ++#: ../camel/camel-imapx-server.c:5221 ++#: ../camel/camel-imapx-server.c:5449 ++#, c-format ++msgid "Fetching summary information for new messages in '%s'" ++msgstr "为 '%s' 中的新信息添加概述信息" ++ ++#: ../camel/camel-imapx-server.c:5285 ++#, c-format ++msgid "Scanning for changed messages in '%s'" ++msgstr "扫描 '%s' 中更改的信息" ++ ++#: ../camel/camel-imapx-server.c:5338 ++msgid "Error fetching new messages" ++msgstr "取回新消息出错" ++ ++#: ../camel/camel-imapx-server.c:5551 ++msgid "Error while fetching messages" ++msgstr "取回消息出错" ++ ++#: ../camel/camel-imapx-server.c:5559 ++#: ../camel/camel-imapx-server.c:5592 ++#, c-format ++msgid "Fetching summary information for %d message in '%s'" ++msgid_plural "Fetching summary information for %d messages in '%s'" ++msgstr[0] "为 '%s' 中的 %d 信息添加概述信息" ++ ++#: ../camel/camel-imapx-server.c:5728 ++#: ../camel/camel-imapx-server.c:5758 ++msgid "Error refreshing folder" ++msgstr "刷新文件夹出错" ++ ++#: ../camel/camel-imapx-server.c:5882 ++msgid "Error expunging message" ++msgstr "销毁消息出错" ++ ++#: ../camel/camel-imapx-server.c:5993 ++msgid "Error fetching folders" ++msgstr "取回文件夹出错" ++ ++#: ../camel/camel-imapx-server.c:6075 ++msgid "Error subscribing to folder" ++msgstr "订阅文件夹出错" ++ ++#: ../camel/camel-imapx-server.c:6140 ++msgid "Error creating folder" ++msgstr "创建文件夹出错" ++ ++#: ../camel/camel-imapx-server.c:6194 ++msgid "Error deleting folder" ++msgstr "删除文件夹出错" ++ ++#: ../camel/camel-imapx-server.c:6268 ++msgid "Error renaming folder" ++msgstr "重命名文件夹出错" ++ ++#: ../camel/camel-imapx-server.c:6343 ++msgid "Error retrieving quota information" ++msgstr "检索配额信息出错" ++ ++#: ../camel/camel-imapx-server.c:6408 ++msgid "Search failed" ++msgstr "搜索失败" ++ ++#: ../camel/camel-imapx-server.c:6471 ++msgid "Error performing NOOP" ++msgstr "执行 NOOP 出错" ++ ++#: ../camel/camel-imapx-server.c:6580 ++msgid "Error syncing changes" ++msgstr "同步变更出错" ++ ++#: ../camel/camel-imapx-server.c:7385 ++#, c-format ++msgid "Cannot get message with message ID %s: %s" ++msgstr "无法获取消息 ID %s：%s" ++ ++#: ../camel/camel-imapx-server.c:7386 ++msgid "No such message available." ++msgstr "没有该消息。" ++ ++#: ../camel/camel-imapx-server.c:7547 ++#: ../camel/camel-imapx-server.c:7562 ++msgid "Cannot create spool file: " ++msgstr "无法创建脱机文件：" ++ ++#: ../camel/camel-imapx-server.c:8304 ++msgid "IMAP server does not support quotas" ++msgstr "IMAP 服务器不支持配额" ++ ++#: ../camel/camel-imapx-store.c:249 ++#, c-format ++msgid "IMAP server %s" ++msgstr "IMAP 服务器 %s" ++ ++#: ../camel/camel-imapx-store.c:252 ++#, c-format ++msgid "IMAP service for %s on %s" ++msgstr "%2$s 为 %1$s 提供的 IMAP 服务" ++ ++#: ../camel/camel-imapx-store.c:343 ++#: ../camel/providers/nntp/camel-nntp-provider.c:95 ++#: ../camel/providers/pop3/camel-pop3-provider.c:83 ++msgid "Password" ++msgstr "密码" ++ ++#: ../camel/camel-imapx-store.c:345 ++msgid "" ++"This option will connect to the IMAP server using a plaintext password." ++msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。" ++ ++#: ../camel/camel-imapx-store.c:453 ++#, c-format ++msgid "No such folder %s" ++msgstr "没有文件夹 %s" ++ ++#. create a dummy "." parent inbox, use to scan, then put back at the top level ++#: ../camel/camel-imapx-store.c:478 ++#: ../camel/camel-imapx-store.c:968 ++#: ../camel/providers/local/camel-maildir-folder.c:473 ++#: ../camel/providers/local/camel-maildir-store.c:316 ++#: ../camel/providers/local/camel-maildir-store.c:750 ++#: ../camel/providers/local/camel-maildir-store.c:756 ++#: ../camel/providers/local/camel-maildir-store.c:840 ++#: ../camel/providers/local/camel-spool-store.c:393 ++msgid "Inbox" ++msgstr "收件箱" ++ ++#: ../camel/camel-imapx-store.c:1231 ++#, c-format ++msgid "Retrieving folder list for %s" ++msgstr "正在获取“%s”的文件夹列表" ++ ++#: ../camel/camel-imapx-store.c:1614 ++#, c-format ++msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" ++msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”" ++ ++#: ../camel/camel-imapx-store.c:1625 ++#, c-format ++msgid "Unknown parent folder: %s" ++msgstr "未知的父文件夹：%s" ++ ++#: ../camel/camel-imapx-store.c:1635 ++#, c-format ++msgid "The parent folder is not allowed to contain subfolders" ++msgstr "父文件夹不允许含有子文件夹" ++ ++#: ../camel/camel-imapx-stream.c:98 ++#, c-format ++msgid "Source stream returned no data" ++msgstr "源流没返回数据" ++ ++#: ../camel/camel-imapx-stream.c:107 ++#, c-format ++msgid "Source stream unavailable" ++msgstr "源流不可用" + + #: ../camel/camel-lock.c:102 + #, c-format +@@ -2121,7 +2586,8 @@ msgstr "无法创建锁定助手管道� + msgid "Cannot fork locking helper: %s" + msgstr "无法创建锁定助手进程：%s" + +-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239 ++#: ../camel/camel-lock-client.c:211 ++#: ../camel/camel-lock-client.c:239 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" + msgstr "无法锁定“%s”：lock-helper 协议错误" +@@ -2180,7 +2646,8 @@ msgstr "阅读邮件文件错误：%s" + msgid "Error writing mail temp file: %s" + msgstr "写入邮件临时文件错误：%s" + +-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560 ++#: ../camel/camel-movemail.c:493 ++#: ../camel/camel-movemail.c:562 + #, c-format + msgid "Error copying mail temp file: %s" + msgstr "复制邮件临时文件错误：%s" +@@ -2200,44 +2667,54 @@ msgstr "没有可用的签名" + msgid "parse error" + msgstr "解析错误" + +-#: ../camel/camel-net-utils.c:703 ++#: ../camel/camel-net-utils.c:704 + #, c-format + msgid "Resolving: %s" + msgstr "解析：%s" + +-#: ../camel/camel-net-utils.c:726 ++#: ../camel/camel-net-utils.c:727 + msgid "Host lookup failed" + msgstr "主机查阅失败" + +-#: ../camel/camel-net-utils.c:732 ++#: ../camel/camel-net-utils.c:733 + #, c-format +-msgid "Host lookup failed: %s: %s" +-msgstr "主机查阅失败：%s：%s" ++msgid "Host lookup '%s' failed. Check your host name for spelling errors." ++msgstr "主机查询 '%s' 失败。检查您的主机名是否有拼写错误。" + +-#: ../camel/camel-net-utils.c:853 ++#: ../camel/camel-net-utils.c:737 ++#, c-format ++msgid "Host lookup '%s' failed: %s" ++msgstr "主机查询 '%s' 失败：%s" ++ ++#: ../camel/camel-net-utils.c:858 + msgid "Resolving address" + msgstr "解析地址" + +-#: ../camel/camel-net-utils.c:874 ++#: ../camel/camel-net-utils.c:879 + msgid "Name lookup failed" + msgstr "名称查阅失败" + +-#: ../camel/camel-net-utils.c:880 ++#: ../camel/camel-net-utils.c:886 ++msgid "Name lookup failed. Check your host name for spelling errors." ++msgstr "名称查询失败。检查您的主机名是否有拼写错误。" ++ ++#: ../camel/camel-net-utils.c:890 + #, c-format + msgid "Name lookup failed: %s" + msgstr "名称查阅失败：%s" + +-#: ../camel/camel-network-service.c:112 ++#: ../camel/camel-network-service.c:350 + #, c-format +-msgid "Could not connect to %s: " +-msgstr "无法连接到 %s：" ++msgid "Could not connect to '%s:%s': " ++msgstr "无法连接到 '%s：%s'：" + +-#: ../camel/camel-offline-folder.c:206 ++#: ../camel/camel-offline-folder.c:212 + #, c-format + msgid "Syncing messages in folder '%s' to disk" + msgstr "正在将文件夹“%s”中的消息同步到磁盘" + +-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177 ++#: ../camel/camel-offline-journal.c:145 ++#: ../camel/camel-offline-journal.c:177 + #, c-format + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "无法写入文件夹“%s”的离线日记：%s" +@@ -2250,27 +2727,29 @@ msgstr "虚拟文件夹电子邮件提� + msgid "For reading mail as a query of another set of folders" + msgstr "关于将读入邮件作为对另一组文件夹的查询" + +-#: ../camel/camel-provider.c:193 ++#: ../camel/camel-provider.c:263 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." + msgstr "无法载入 %s：本系统不支持模块载入。" + +-#: ../camel/camel-provider.c:202 ++#: ../camel/camel-provider.c:272 + #, c-format + msgid "Could not load %s: %s" + msgstr "无法载入 %s：%s" + +-#: ../camel/camel-provider.c:211 ++#: ../camel/camel-provider.c:281 + #, c-format + msgid "Could not load %s: No initialization code in module." + msgstr "无法载入 %s：模块中没有初始化代码。" + +-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:388 ++#: ../camel/camel-provider.c:429 ++#: ../camel/camel-session.c:407 + #, c-format + msgid "No provider available for protocol '%s'" + msgstr "协议“%s”没有可用的提供者" + + #: ../camel/camel-sasl-anonymous.c:35 ++#: ../camel/providers/nntp/camel-nntp-provider.c:85 + msgid "Anonymous" + msgstr "匿名" + +@@ -2285,29 +2764,23 @@ msgstr "认证失败。" + + #: ../camel/camel-sasl-anonymous.c:81 + #, c-format +-msgid "" +-"Invalid email address trace information:\n" ++msgid "Invalid email address trace information:\n" + "%s" +-msgstr "" +-"无效的电子邮件跟踪信息：\n" ++msgstr "无效的电子邮件跟踪信息：\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:95 + #, c-format +-msgid "" +-"Invalid opaque trace information:\n" ++msgid "Invalid opaque trace information:\n" + "%s" +-msgstr "" +-"无效的诲涩跟踪信息：\n" ++msgstr "无效的诲涩跟踪信息：\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:109 + #, c-format +-msgid "" +-"Invalid trace information:\n" ++msgid "Invalid trace information:\n" + "%s" +-msgstr "" +-"无效的跟踪信息：\n" ++msgstr "无效的跟踪信息：\n" + "%s" + + #: ../camel/camel-sasl-cram-md5.c:46 +@@ -2330,32 +2803,32 @@ msgid "" + "if the server supports it." + msgstr "如果服务器支持的话，该选项将用安全 DIGEST-MD5 密码连接到服务器。" + +-#: ../camel/camel-sasl-digest-md5.c:850 ++#: ../camel/camel-sasl-digest-md5.c:855 + #, c-format + msgid "Server challenge too long (>2048 octets)" + msgstr "服务器质询过长 (>2048 字节)" + +-#: ../camel/camel-sasl-digest-md5.c:861 ++#: ../camel/camel-sasl-digest-md5.c:866 + #, c-format + msgid "Server challenge invalid\n" + msgstr "服务器质询无效\n" + +-#: ../camel/camel-sasl-digest-md5.c:869 ++#: ../camel/camel-sasl-digest-md5.c:874 + #, c-format + msgid "Server challenge contained invalid \"Quality of Protection\" token" + msgstr "服务器质询含有无效的“品质保护”标志" + +-#: ../camel/camel-sasl-digest-md5.c:902 ++#: ../camel/camel-sasl-digest-md5.c:907 + #, c-format + msgid "Server response did not contain authorization data" + msgstr "服务器应答不含有认证数据" + +-#: ../camel/camel-sasl-digest-md5.c:923 ++#: ../camel/camel-sasl-digest-md5.c:928 + #, c-format + msgid "Server response contained incomplete authorization data" + msgstr "服务器应达含有不完整的认证数据" + +-#: ../camel/camel-sasl-digest-md5.c:936 ++#: ../camel/camel-sasl-digest-md5.c:941 + #, c-format + msgid "Server response does not match" + msgstr "服务器应答不匹配" +@@ -2365,7 +2838,8 @@ msgid "GSSAPI" + msgstr "GSSAPI" + + #: ../camel/camel-sasl-gssapi.c:93 +-msgid "This option will connect to the server using Kerberos 5 authentication." ++msgid "" ++"This option will connect to the server using Kerberos 5 authentication." + msgstr "该选项将用 Kerberos 5 认证连接到服务器。" + + #: ../camel/camel-sasl-gssapi.c:134 +@@ -2388,8 +2862,7 @@ msgstr "提供的 target_name 参数包� + msgid "" + "The input_token contains different channel bindings to those specified via " + "the input_chan_bindings parameter." +-msgstr "" +-"input_token 包含的通道绑定与通过 input_chan_bindings 参数指定的通道不同。" ++msgstr "input_token 包含的通道绑定与通过 input_chan_bindings 参数指定的通道不同。" + + #: ../camel/camel-sasl-gssapi.c:151 + msgid "" +@@ -2419,14 +2892,16 @@ msgstr "对证书执行完整性检查� + msgid "The referenced credentials have expired." + msgstr "引用的证书已过期。" + +-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337 +-#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398 +-#: ../camel/providers/smtp/camel-smtp-transport.c:562 ++#: ../camel/camel-sasl-gssapi.c:175 ++#: ../camel/camel-sasl-gssapi.c:340 ++#: ../camel/camel-sasl-gssapi.c:388 ++#: ../camel/camel-sasl-gssapi.c:405 ++#: ../camel/providers/smtp/camel-smtp-transport.c:616 + #, c-format + msgid "Bad authentication response from server." + msgstr "来自服务器的无效认证应答。" + +-#: ../camel/camel-sasl-gssapi.c:410 ++#: ../camel/camel-sasl-gssapi.c:417 + #, c-format + msgid "Unsupported security layer." + msgstr "不支持的安全层。" +@@ -2435,20 +2910,21 @@ msgstr "不支持的安全层。" + msgid "Login" + msgstr "Login" + +-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46 ++#: ../camel/camel-sasl-login.c:42 ++#: ../camel/camel-sasl-plain.c:46 + msgid "This option will connect to the server using a simple password." + msgstr "该选项将以普通密码连接到服务器。" + +-#: ../camel/camel-sasl-login.c:107 ++#: ../camel/camel-sasl-login.c:110 + #, c-format + msgid "Unknown authentication state." + msgstr "未知的认证状态。" + +-#: ../camel/camel-sasl-ntlm.c:47 ++#: ../camel/camel-sasl-ntlm.c:48 + msgid "NTLM / SPA" + msgstr "NTLM / SPA" + +-#: ../camel/camel-sasl-ntlm.c:49 ++#: ../camel/camel-sasl-ntlm.c:50 + msgid "" + "This option will connect to a Windows-based server using NTLM / Secure " + "Password Authentication." +@@ -2470,47 +2946,46 @@ msgstr "该选项将在尝试 SMTP 之� + msgid "POP Source UID" + msgstr "POP 源 UID" + +-#: ../camel/camel-sasl-popb4smtp.c:96 ++#: ../camel/camel-sasl-popb4smtp.c:98 + #, c-format + msgid "POP Before SMTP authentication using an unknown transport" + msgstr "以未知的传输进行 SMTP 认证授权之前的 POP" + +-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118 ++#: ../camel/camel-sasl-popb4smtp.c:110 ++#: ../camel/camel-sasl-popb4smtp.c:119 + #, c-format + msgid "POP Before SMTP authentication attempted with a %s service" + msgstr "试图通过 %s 服务在 SMTP 认证之前进行 POP" + +-#: ../camel/camel-search-private.c:112 ++#: ../camel/camel-search-private.c:116 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "常规表达式编译失败：%s：%s" + +-#: ../camel/camel-session.c:397 ++#: ../camel/camel-session.c:416 + #, c-format + msgid "Invalid GType registered for protocol '%s'" + msgstr "为协议“%s”注册的 GType 无效" + +-#: ../camel/camel-session.c:466 +-#: ../camel/providers/imap/camel-imap-store.c:1143 +-#: ../camel/providers/imapx/camel-imapx-server.c:2946 +-#: ../camel/providers/pop3/camel-pop3-store.c:249 +-#: ../camel/providers/pop3/camel-pop3-store.c:566 +-#: ../camel/providers/smtp/camel-smtp-transport.c:455 +-#, c-format +-msgid "No support for %s authentication" +-msgstr "不支持 %s 认证" +- +-#: ../camel/camel-session.c:481 ++#: ../camel/camel-session.c:510 + #, c-format + msgid "%s authentication failed" + msgstr "%s 认证失败" + +-#: ../camel/camel-session.c:1187 ++#: ../camel/camel-session.c:646 ++msgid "Forwarding messages is not supported" ++msgstr "不支持转发信息" ++ ++#. Translators: The first argument is the account type ++#. * (e.g. "IMAP"), the second is the user name, and the ++#. * third is the host name. ++#: ../camel/camel-session.c:1423 + #, c-format + msgid "Please enter the %s password for %s on host %s." + msgstr "请输入 %2$s@%3$s 的 %1$s 密码" + +-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057 ++#: ../camel/camel-smime-context.c:351 ++#: ../camel/camel-smime-context.c:1074 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "无法找到‘%s’的证书" +@@ -2543,7 +3018,8 @@ msgstr "找不到证书链" + msgid "Cannot add CMS Signing time" + msgstr "无法添加 CMS 签名时间" + +-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454 ++#: ../camel/camel-smime-context.c:439 ++#: ../camel/camel-smime-context.c:454 + #, c-format + msgid "Encryption certificate for '%s' does not exist" + msgstr "“%s”的加密证书不存在" +@@ -2613,15 +3089,18 @@ msgstr "签名中没有签名数据" + msgid "Digests missing from enveloped data" + msgstr "信封数据缺少摘要" + +-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602 ++#: ../camel/camel-smime-context.c:591 ++#: ../camel/camel-smime-context.c:602 + msgid "Cannot calculate digests" + msgstr "无法计算摘要" + +-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613 ++#: ../camel/camel-smime-context.c:609 ++#: ../camel/camel-smime-context.c:613 + msgid "Cannot set message digests" + msgstr "无法设置消息摘要" + +-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628 ++#: ../camel/camel-smime-context.c:623 ++#: ../camel/camel-smime-context.c:628 + msgid "Certificate import failed" + msgstr "证书导入失败" + +@@ -2639,112 +3118,117 @@ msgstr "只有证书的消息，证书� + msgid "Cannot find signature digests" + msgstr "找不到签名摘要" + +-#: ../camel/camel-smime-context.c:661 ++#: ../camel/camel-smime-context.c:662 + #, c-format + msgid "Signer: %s <%s>: %s\n" + msgstr "签名者：%s <%s>：%s\n" + +-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130 ++#: ../camel/camel-smime-context.c:858 ++#: ../camel/camel-smime-context.c:1148 + msgid "Cannot create encoder context" + msgstr "无法创建编码器上下文" + +-#: ../camel/camel-smime-context.c:848 ++#: ../camel/camel-smime-context.c:864 + msgid "Failed to add data to CMS encoder" + msgstr "将数据添加到 CMS 编码器失败" + +-#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147 ++#: ../camel/camel-smime-context.c:869 ++#: ../camel/camel-smime-context.c:1165 + msgid "Failed to encode data" + msgstr "编码数据失败" + +-#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243 ++#: ../camel/camel-smime-context.c:1013 ++#: ../camel/camel-smime-context.c:1262 + msgid "Decoder failed" + msgstr "解码器失败" + +-#: ../camel/camel-smime-context.c:1065 ++#: ../camel/camel-smime-context.c:1082 + msgid "Cannot find common bulk encryption algorithm" + msgstr "找不到公共批量加密算法" + +-#: ../camel/camel-smime-context.c:1073 ++#: ../camel/camel-smime-context.c:1090 + msgid "Cannot allocate slot for encryption bulk key" + msgstr "无法为加密批量密钥分配密钥槽" + +-#: ../camel/camel-smime-context.c:1084 ++#: ../camel/camel-smime-context.c:1101 + msgid "Cannot create CMS Message" + msgstr "无法创建 CMS 消息" + +-#: ../camel/camel-smime-context.c:1090 ++#: ../camel/camel-smime-context.c:1107 + msgid "Cannot create CMS Enveloped data" + msgstr "无法创建 CMS 信封数据" + +-#: ../camel/camel-smime-context.c:1096 ++#: ../camel/camel-smime-context.c:1113 + msgid "Cannot attach CMS Enveloped data" + msgstr "无法附加 CMS 信封数据" + +-#: ../camel/camel-smime-context.c:1102 ++#: ../camel/camel-smime-context.c:1119 + msgid "Cannot attach CMS data object" + msgstr "无法附加 CMS 数据对象" + +-#: ../camel/camel-smime-context.c:1111 ++#: ../camel/camel-smime-context.c:1128 + msgid "Cannot create CMS Recipient information" + msgstr "无法创建 CMS 收件人信息" + +-#: ../camel/camel-smime-context.c:1116 ++#: ../camel/camel-smime-context.c:1133 + msgid "Cannot add CMS Recipient information" + msgstr "无法添加 CMS 收件人信息" + +-#: ../camel/camel-smime-context.c:1141 ++#: ../camel/camel-smime-context.c:1159 + msgid "Failed to add data to encoder" + msgstr "将数据添加到编码器失败" + +-#: ../camel/camel-smime-context.c:1250 ++#: ../camel/camel-smime-context.c:1269 + msgid "S/MIME Decrypt: No encrypted content found" + msgstr "S/MIME 解密：没有找到加密内容" + +-#: ../camel/camel-store.c:1799 ++#: ../camel/camel-store.c:1871 + #, c-format + msgid "Cannot create folder '%s': folder exists" + msgstr "无法创建文件夹“%s”文件夹已存在" + +-#: ../camel/camel-store.c:1842 ++#: ../camel/camel-store.c:1914 + #, c-format + msgid "Opening folder '%s'" + msgstr "打开文件夹“%s”" + +-#: ../camel/camel-store.c:2027 ++#: ../camel/camel-store.c:2099 + #, c-format + msgid "Scanning folders in '%s'" + msgstr "扫描“%s”中的文件夹" + +-#. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049 ++#: ../camel/camel-store.c:2115 ++#: ../camel/camel-store.c:2146 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Trash" + msgstr "回收站" + +-#. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053 ++#: ../camel/camel-store.c:2127 ++#: ../camel/camel-store.c:2162 + #: ../camel/camel-vtrash-folder.c:50 + msgid "Junk" + msgstr "垃圾" + +-#: ../camel/camel-store.c:2501 ++#: ../camel/camel-store.c:2615 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "无法创建文件夹：%s：文件夹已存在" + +-#: ../camel/camel-store.c:2515 ++#: ../camel/camel-store.c:2629 + #, c-format + msgid "Creating folder '%s'" + msgstr "创建文件夹“%s”" + +-#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352 +-#: ../camel/providers/local/camel-maildir-store.c:300 ++#: ../camel/camel-store.c:2747 ++#: ../camel/camel-vee-store.c:416 ++#: ../camel/providers/local/camel-maildir-store.c:315 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "无法删除文件夹：%s：无效操作" + +-#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402 +-#: ../camel/providers/local/camel-maildir-store.c:764 ++#: ../camel/camel-store.c:2890 ++#: ../camel/camel-vee-store.c:466 ++#: ../camel/providers/local/camel-maildir-store.c:839 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "无法重命名文件夹：%s：无效操作" +@@ -2753,223 +3237,166 @@ msgstr "无法重命名文件夹：%s： + msgid "Only reset to beginning is supported with CamelStreamFilter" + msgstr "CamelStreamFilter 只支持重设到开始" + +-#: ../camel/camel-stream-process.c:267 ++#: ../camel/camel-stream-null.c:78 ++msgid "Only reset to beginning is supported with CamelHttpStream" ++msgstr "CamelHttpStream 只支持重设到开始" ++ ++#: ../camel/camel-stream-process.c:275 + #, c-format + msgid "Connection cancelled" + msgstr "连接已取消" + +-#: ../camel/camel-stream-process.c:272 ++#: ../camel/camel-stream-process.c:280 + #, c-format + msgid "Could not connect with command \"%s\": %s" + msgstr "无法使用命令“%s”连接：%s" + +-#: ../camel/camel-tcp-stream-raw.c:303 ++#: ../camel/camel-subscribable.c:397 ++#, c-format ++msgid "Subscribing to folder '%s'" ++msgstr "订阅文件夹 '%s'" ++ ++#: ../camel/camel-subscribable.c:529 ++#, c-format ++msgid "Unsubscribing from folder '%s'" ++msgstr "取消订阅文件夹 '%s'" ++ ++#: ../camel/camel-tcp-stream-raw.c:310 + #, c-format + msgid "NSPR error code %d" + msgstr "NSPR 错误代码 %d" + +-#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651 ++#: ../camel/camel-tcp-stream-raw.c:649 ++#: ../camel/camel-tcp-stream-raw.c:662 + #, c-format + msgid "The proxy host does not support SOCKS4" + msgstr "代理主机不支持 SOCKS4" + +-#: ../camel/camel-tcp-stream-raw.c:662 ++#: ../camel/camel-tcp-stream-raw.c:675 + #, c-format + msgid "The proxy host denied our request: code %d" + msgstr "代理主机拒绝了已方的请求：代码 %d" + +-#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764 ++#: ../camel/camel-tcp-stream-raw.c:773 ++#: ../camel/camel-tcp-stream-raw.c:781 + #, c-format + msgid "The proxy host does not support SOCKS5" + msgstr "代理主机不支持 SOCKS5" + +-#: ../camel/camel-tcp-stream-raw.c:770 ++#: ../camel/camel-tcp-stream-raw.c:789 + #, c-format + msgid "Could not find a suitable authentication type: code 0x%x" + msgstr "无法找到合适的认证类型: 代码 0x%x" + +-#: ../camel/camel-tcp-stream-raw.c:782 ++#: ../camel/camel-tcp-stream-raw.c:801 + msgid "General SOCKS server failure" + msgstr "通用 SOCKS 服务器失败" + +-#: ../camel/camel-tcp-stream-raw.c:783 ++#: ../camel/camel-tcp-stream-raw.c:802 + msgid "SOCKS server's rules do not allow connection" + msgstr "SOCKS 服务器的策略不允许连接" + +-#: ../camel/camel-tcp-stream-raw.c:784 ++#: ../camel/camel-tcp-stream-raw.c:803 + msgid "Network is unreachable from SOCKS server" + msgstr "SOCKS 服务器网络不可及" + +-#: ../camel/camel-tcp-stream-raw.c:785 ++#: ../camel/camel-tcp-stream-raw.c:804 + msgid "Host is unreachable from SOCKS server" + msgstr "SOCKS 服务器主机不可及" + +-#: ../camel/camel-tcp-stream-raw.c:786 ++#: ../camel/camel-tcp-stream-raw.c:805 + msgid "Connection refused" + msgstr "连接被拒绝" + +-#: ../camel/camel-tcp-stream-raw.c:787 ++#: ../camel/camel-tcp-stream-raw.c:806 + msgid "Time-to-live expired" + msgstr "连通时间过期" + +-#: ../camel/camel-tcp-stream-raw.c:788 ++#: ../camel/camel-tcp-stream-raw.c:807 + msgid "Command not supported by SOCKS server" + msgstr "SOCKS 服务器不支持该命令" + +-#: ../camel/camel-tcp-stream-raw.c:789 ++#: ../camel/camel-tcp-stream-raw.c:808 + msgid "Address type not supported by SOCKS server" + msgstr "SOCKS 服务器不支持该地址类型" + +-#: ../camel/camel-tcp-stream-raw.c:790 ++#: ../camel/camel-tcp-stream-raw.c:809 + msgid "Unknown error from SOCKS server" + msgstr "SOCKS 服务器发生未知错误" + +-#: ../camel/camel-tcp-stream-raw.c:823 ++#: ../camel/camel-tcp-stream-raw.c:842 + #, c-format + msgid "Got unknown address type from SOCKS server" + msgstr "从 SOCKS 服务器获取的地址类型未知" + +-#: ../camel/camel-tcp-stream-raw.c:841 ++#: ../camel/camel-tcp-stream-raw.c:860 + #, c-format + msgid "Incomplete reply from SOCKS server" + msgstr "SOCKS 服务器的响应不完整" + +-#: ../camel/camel-tcp-stream-raw.c:861 ++#: ../camel/camel-tcp-stream-raw.c:880 + #, c-format + msgid "Hostname is too long (maximum is 255 characters)" + msgstr "主机名太长 (最长 255 字符)" + + #. SOCKS5 + #. reserved - must be 0 +-#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903 ++#: ../camel/camel-tcp-stream-raw.c:912 ++#: ../camel/camel-tcp-stream-raw.c:922 + #, c-format + msgid "Invalid reply from proxy server" + msgstr "代理服务器的响应无效" + +-#: ../camel/camel-tcp-stream-ssl.c:474 +-#, c-format +-msgid "" +-" Issuer: %s\n" +-" Subject: %s\n" +-" Fingerprint: %s\n" +-" Signature: %s" +-msgstr "" +-" 提交者： %s\n" +-" 主题： %s\n" +-" 指纹： %s\n" +-" 签名： %s" +- +-#: ../camel/camel-tcp-stream-ssl.c:480 +-msgid "GOOD" +-msgstr "好" +- +-#: ../camel/camel-tcp-stream-ssl.c:480 +-msgid "BAD" +-msgstr "坏" +- +-#. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:484 +-#, c-format +-msgid "" +-"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n" +-"\n" +-"Detailed information about the certificate:\n" +-"%s" +-msgstr "" +-"“%s” 的 SSL 证书不受信任。您是否想要接受它？\n" +-"\n" +-"该证书的详细信息：\n" +-"%s" +- +-#: ../camel/camel-tcp-stream-ssl.c:488 +-msgid "_Reject" +-msgstr "拒绝(_R)" +- +-#: ../camel/camel-tcp-stream-ssl.c:489 +-msgid "Accept _Temporarily" +-msgstr "临时接受(_T)" +- +-#: ../camel/camel-tcp-stream-ssl.c:490 +-msgid "_Accept Permanently" +-msgstr "永久接受(_A)" +- +-#: ../camel/camel-tcp-stream-ssl.c:548 +-#, c-format +-msgid "" +-"Certificate problem: %s\n" +-"Issuer: %s" +-msgstr "" +-"证书问题：%s\n" +-"发行者：%s" +- +-#: ../camel/camel-tcp-stream-ssl.c:600 +-#, c-format +-msgid "" +-"Bad certificate domain: %s\n" +-"Issuer: %s" +-msgstr "" +-"无效的证书域名：%s\n" +-"发行者：%s" +- +-#: ../camel/camel-tcp-stream-ssl.c:618 +-#, c-format +-msgid "" +-"Certificate expired: %s\n" +-"Issuer: %s" +-msgstr "" +-"证书过期：%s\n" +-"发行者：%s" +- +-#: ../camel/camel-tcp-stream-ssl.c:635 +-#, c-format +-msgid "" +-"Certificate revocation list expired: %s\n" +-"Issuer: %s" +-msgstr "" +-"证书撤销列表已过期：%s\n" +-"发行者：%s" +- +-#: ../camel/camel-url.c:330 ++#: ../camel/camel-url.c:331 + #, c-format + msgid "Could not parse URL '%s'" + msgstr "无法解析 URL“%s”" + +-#: ../camel/camel-vee-folder.c:651 ++#: ../camel/camel-vee-folder.c:494 + #, c-format +-msgid "Updating %s folder" +-msgstr "更新 %s 文件夹" ++msgid "Updating folder '%s'" ++msgstr "更新文件夹 '%s'" + +-#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482 ++#: ../camel/camel-vee-folder.c:855 ++#: ../camel/camel-vee-folder.c:965 + #, c-format + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "无法将消息移动或复制到虚拟文件夹中" + +-#: ../camel/camel-vee-folder.c:1358 ++#: ../camel/camel-vee-folder.c:888 + #, c-format + msgid "No such message %s in %s" + msgstr "在 %2$s 中没有消息 %1$s" + +-#: ../camel/camel-vee-folder.c:1426 ++#: ../camel/camel-vee-folder.c:941 + #, c-format + msgid "Error storing '%s': " + msgstr "存储“%s”出错：" + ++#: ../camel/camel-vee-folder.c:1171 ++msgid "Automatically _update on change in source folders" ++msgstr "在源文件夹中自动更新更改（_u）" ++ + #. Translators: 'Unmatched' is a folder name under Search folders where are shown + #. * all messages not belonging into any other configured search folder +-#: ../camel/camel-vee-store.c:37 ++#: ../camel/camel-vee-store.c:42 + msgid "Unmatched" + msgstr "无匹配" + +-#: ../camel/camel-vee-store.c:378 ++#: ../camel/camel-vee-store.c:442 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "无法删除文件夹：%s：没有该文件夹" + +-#: ../camel/camel-vee-store.c:412 ++#: ../camel/camel-vee-store.c:476 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "无法重命名文件夹：%s：没有该文件夹" + ++#: ../camel/camel-vee-store.c:538 ++msgid "Enable _Unmatched folder" ++msgstr "启用未匹配的文件夹（_U）" ++ + #: ../camel/camel-vtrash-folder.c:49 + msgid "Cannot copy messages to the Trash folder" + msgstr "无法将消息复制到回收站文件夹" +@@ -2978,622 +3405,167 @@ msgstr "无法将消息复制到回收� + msgid "Cannot copy messages to the Junk folder" + msgstr "无法将消息复制到垃圾邮件文件夹" + +-#: ../camel/providers/imap/camel-imap-command.c:200 +-#: ../camel/providers/imap/camel-imap-command.c:297 +-#, c-format +-msgid "No output stream" +-msgstr "没有输出流" +- +-#: ../camel/providers/imap/camel-imap-command.c:208 +-#: ../camel/providers/imap/camel-imap-command.c:305 +-#, c-format +-msgid "No input stream" +-msgstr "没有输入流" +- +-#: ../camel/providers/imap/camel-imap-command.c:383 +-#, c-format +-msgid "Server unexpectedly disconnected: %s" +-msgstr "服务器意外地中止了连接：%s" +- +-#: ../camel/providers/imap/camel-imap-command.c:416 +-#, c-format +-msgid "" +-"Alert from IMAP server %s@%s in folder %s:\n" +-"%s" +-msgstr "" +-"来自 IMAP 服务器 %s@%s 的提醒(%s 文件夹)：\n" +-"%s" +- +-#: ../camel/providers/imap/camel-imap-command.c:420 +-#, c-format +-msgid "" +-"Alert from IMAP server %s@%s:\n" +-"%s" +-msgstr "" +-"来自 IMAP 服务器 %s@%s 的提醒：\n" +-"%s" +- +-#: ../camel/providers/imap/camel-imap-command.c:502 +-#, c-format +-msgid "Unexpected response from IMAP server: %s" +-msgstr "来自 IMAP 服务器的意外应答：%s" +- +-#: ../camel/providers/imap/camel-imap-command.c:514 +-#, c-format +-msgid "IMAP command failed: %s" +-msgstr "IMAP 命令失败：%s" +- +-#: ../camel/providers/imap/camel-imap-command.c:594 +-#, c-format +-msgid "Server response ended too soon." +-msgstr "服务器应答结束太快。" +- +-#: ../camel/providers/imap/camel-imap-command.c:806 +-#, c-format +-msgid "IMAP server response did not contain %s information" +-msgstr "IMAP 服务器应答不含有 %s 信息" +- +-#: ../camel/providers/imap/camel-imap-command.c:844 +-#, c-format +-msgid "Unexpected OK response from IMAP server: %s" +-msgstr "来自 IMAP 服务器意外的 OK 应答：%s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:348 +-msgid "Always check for _new mail in this folder" +-msgstr "总是检查此文件夹中的新邮件(_N)" +- +-#: ../camel/providers/imap/camel-imap-folder.c:359 +-#: ../camel/providers/imapx/camel-imapx-folder.c:747 +-#: ../camel/providers/nntp/camel-nntp-folder.c:760 +-msgid "Apply message _filters to this folder" +-msgstr "对这个文件夹应用消息过滤器(_F)" +- +-#: ../camel/providers/imap/camel-imap-folder.c:440 +-#, c-format +-msgid "Could not create directory %s: %s" +-msgstr "无法创建目录 %s：%s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:461 +-#, c-format +-msgid "Could not load summary for %s" +-msgstr "无法为 %s 载入概要" +- +-#: ../camel/providers/imap/camel-imap-folder.c:1119 +-#: ../camel/providers/imapx/camel-imapx-server.c:3949 +-#, c-format +-msgid "Scanning for changed messages in %s" +-msgstr "扫描 %s 中更改了的消息" +- +-#: ../camel/providers/imap/camel-imap-folder.c:3478 +-msgid "Unable to retrieve message: " +-msgstr "无法获取消息：" +- +-#: ../camel/providers/imap/camel-imap-folder.c:3515 +-#: ../camel/providers/imapx/camel-imapx-server.c:5509 +-#, c-format +-msgid "Cannot get message with message ID %s: %s" +-msgstr "无法获取消息 ID %s：%s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:3516 +-#: ../camel/providers/imapx/camel-imapx-server.c:5510 +-msgid "No such message available." +-msgstr "没有该消息。" +- +-#: ../camel/providers/imap/camel-imap-folder.c:3591 +-#: ../camel/providers/imap/camel-imap-folder.c:4469 +-#: ../camel/providers/nntp/camel-nntp-folder.c:515 +-#, c-format +-msgid "This message is not currently available" +-msgstr "该消息目前不可用" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4050 +-#: ../camel/providers/imap/camel-imap-folder.c:4133 +-#: ../camel/providers/imapx/camel-imapx-server.c:3901 +-#: ../camel/providers/imapx/camel-imapx-server.c:4081 +-#, c-format +-msgid "Fetching summary information for new messages in %s" +-msgstr "从 %s 中的新消息中获取概要信息" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4267 +-#, c-format +-msgid "Incomplete server response: no information provided for message %d" +-msgstr "不完整的服务器响应：没有为第 %d 封信提供信息" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4277 +-#, c-format +-msgid "Incomplete server response: no UID provided for message %d" +-msgstr "不完整的服务器响应：没有为第 %d 封信提供 UID" +- +-#: ../camel/providers/imap/camel-imap-folder.c:4509 +-#, c-format +-msgid "Could not find message body in FETCH response." +-msgstr "无法在 FETCH 应答中找到信体。" +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:196 +-#: ../camel/providers/imap/camel-imap-message-cache.c:253 +-msgid "Could not open cache directory: " +-msgstr "无法打开缓存目录：" +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:331 +-#, c-format +-msgid "Failed to cache message %s: %s" +-msgstr "缓存消息 %s 失败：%s" +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:397 +-#, c-format +-msgid "Failed to cache message %s: " +-msgstr "缓存消息 %s 失败：" +- +-#: ../camel/providers/imap/camel-imap-message-cache.c:539 +-#, c-format +-msgid "Failed to cache %s: " +-msgstr "缓存 %s 失败：" +- +-#: ../camel/providers/imap/camel-imap-provider.c:40 +-#: ../camel/providers/imapx/camel-imapx-provider.c:40 ++#: ../camel/providers/imapx/camel-imapx-provider.c:38 + msgid "Checking for New Mail" + msgstr "检查新邮件" + +-#: ../camel/providers/imap/camel-imap-provider.c:42 +-#: ../camel/providers/imapx/camel-imapx-provider.c:42 ++#: ../camel/providers/imapx/camel-imapx-provider.c:40 + msgid "C_heck for new messages in all folders" + msgstr "在所有文件夹中检查新消息(_H)" + +-#: ../camel/providers/imap/camel-imap-provider.c:44 +-#: ../camel/providers/imapx/camel-imapx-provider.c:44 ++#: ../camel/providers/imapx/camel-imapx-provider.c:42 + msgid "Ch_eck for new messages in subscribed folders" + msgstr "在订阅的文件夹中检查新消息(_E)" + +-#: ../camel/providers/imap/camel-imap-provider.c:48 +-#: ../camel/providers/imapx/camel-imapx-provider.c:52 +-msgid "Connection to Server" +-msgstr "连接服务器" +- +-#: ../camel/providers/imap/camel-imap-provider.c:50 +-#: ../camel/providers/imapx/camel-imapx-provider.c:54 +-msgid "_Use custom command to connect to server" +-msgstr "使用自定义命令连接到服务器(_U)" ++#: ../camel/providers/imapx/camel-imapx-provider.c:44 ++msgid "Use _Quick Resync if the server supports it" ++msgstr "如果服务器支持则使用快速重新同步(_Q)" + +-#: ../camel/providers/imap/camel-imap-provider.c:52 +-msgid "Co_mmand:" +-msgstr "命令(_M)：" ++#: ../camel/providers/imapx/camel-imapx-provider.c:46 ++msgid "_Listen for server change notifications" ++msgstr "监听服务器变化提醒(_L)" + +-#: ../camel/providers/imap/camel-imap-provider.c:56 +-#: ../camel/providers/imapx/camel-imapx-provider.c:62 ++#: ../camel/providers/imapx/camel-imapx-provider.c:49 + #: ../camel/providers/nntp/camel-nntp-provider.c:46 + msgid "Folders" + msgstr "文件夹" + +-#: ../camel/providers/imap/camel-imap-provider.c:58 +-#: ../camel/providers/imapx/camel-imapx-provider.c:64 ++#: ../camel/providers/imapx/camel-imapx-provider.c:51 + msgid "_Show only subscribed folders" + msgstr "只显示订阅了的文件夹(_S)" + +-#: ../camel/providers/imap/camel-imap-provider.c:60 +-#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++#: ../camel/providers/imapx/camel-imapx-provider.c:54 + msgid "O_verride server-supplied folder namespace" + msgstr "覆盖服务器提供的文件夹命名空间(_V)" + +-#: ../camel/providers/imap/camel-imap-provider.c:62 +-msgid "Names_pace:" +-msgstr "命名空间(_P)：" +- +-#: ../camel/providers/imap/camel-imap-provider.c:64 +-#: ../camel/providers/imapx/camel-imapx-provider.c:72 +-#: ../camel/providers/local/camel-local-provider.c:42 +-#: ../camel/providers/local/camel-local-provider.c:84 +-#: ../camel/providers/local/camel-local-provider.c:105 ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++msgid "Namespace:" ++msgstr "命名空间：" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:59 ++#: ../camel/providers/local/camel-local-provider.c:41 ++#: ../camel/providers/local/camel-local-provider.c:81 ++#: ../camel/providers/local/camel-local-provider.c:101 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Options" + msgstr "选项" + +-#: ../camel/providers/imap/camel-imap-provider.c:66 +-#: ../camel/providers/imapx/camel-imapx-provider.c:74 ++#: ../camel/providers/imapx/camel-imapx-provider.c:61 + #: ../camel/providers/nntp/camel-nntp-provider.c:43 + msgid "Apply _filters to new messages in all folders" + msgstr "对所有文件夹中的新消息应用过滤规则(_F)" + +-#: ../camel/providers/imap/camel-imap-provider.c:68 +-#: ../camel/providers/imapx/camel-imapx-provider.c:76 +-msgid "_Apply filters to new messages in Inbox on this server" +-msgstr "应用过滤规则到此服务器上收件箱中的新消息(_A)" +- +-#: ../camel/providers/imap/camel-imap-provider.c:70 +-#: ../camel/providers/imapx/camel-imapx-provider.c:78 +-msgid "Check new messages for _Junk contents" +-msgstr "检查新消息的垃圾内容(_J)" +- +-#: ../camel/providers/imap/camel-imap-provider.c:72 +-#: ../camel/providers/imapx/camel-imapx-provider.c:80 +-msgid "Only check for Junk messages in the IN_BOX folder" +-msgstr "仅在收件箱中检查垃圾邮件(_B)" +- +-#: ../camel/providers/imap/camel-imap-provider.c:74 +-#: ../camel/providers/imapx/camel-imapx-provider.c:82 +-msgid "Automatically synchroni_ze remote mail locally" +-msgstr "自动将远程邮件同步到本地(_Z)" +- +-#: ../camel/providers/imap/camel-imap-provider.c:80 +-msgid "IMAP default port" +-msgstr "IMAP 默认端口" +- +-#: ../camel/providers/imap/camel-imap-provider.c:81 +-#: ../camel/providers/imapx/camel-imapx-provider.c:89 +-msgid "IMAP over SSL" +-msgstr "IMAP (SSL 加密)" +- +-#: ../camel/providers/imap/camel-imap-provider.c:87 +-msgid "IMAP" +-msgstr "IMAP" +- +-#: ../camel/providers/imap/camel-imap-provider.c:89 +-#: ../camel/providers/imapx/camel-imapx-provider.c:98 +-msgid "For reading and storing mail on IMAP servers." +-msgstr "IMAP 服务器上的邮件的读写。" +- +-#: ../camel/providers/imap/camel-imap-provider.c:107 +-#: ../camel/providers/imapx/camel-imapx-provider.c:118 +-#: ../camel/providers/nntp/camel-nntp-provider.c:84 +-#: ../camel/providers/pop3/camel-pop3-provider.c:82 +-msgid "Password" +-msgstr "密码" +- +-#: ../camel/providers/imap/camel-imap-provider.c:109 +-#: ../camel/providers/imapx/camel-imapx-provider.c:120 +-msgid "This option will connect to the IMAP server using a plaintext password." +-msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。" +- +-#. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imap/camel-imap-store.c:272 +-#: ../camel/providers/imap/camel-imap-store.c:2694 +-#: ../camel/providers/imapx/camel-imapx-store.c:373 +-#: ../camel/providers/imapx/camel-imapx-store.c:844 +-#: ../camel/providers/local/camel-maildir-folder.c:471 +-#: ../camel/providers/local/camel-maildir-store.c:301 +-#: ../camel/providers/local/camel-maildir-store.c:675 +-#: ../camel/providers/local/camel-maildir-store.c:681 +-#: ../camel/providers/local/camel-maildir-store.c:765 +-#: ../camel/providers/local/camel-spool-store.c:387 +-msgid "Inbox" +-msgstr "收件箱" +- +-#: ../camel/providers/imap/camel-imap-store.c:409 +-#: ../camel/providers/imap/camel-imap-store.c:463 +-#: ../camel/providers/imapx/camel-imapx-server.c:2828 +-#, c-format +-msgid "Failed to connect to IMAP server %s in secure mode: %s" +-msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s" +- +-#: ../camel/providers/imap/camel-imap-store.c:410 +-#: ../camel/providers/imapx/camel-imapx-server.c:2829 +-#: ../camel/providers/smtp/camel-smtp-transport.c:196 +-msgid "STARTTLS not supported" +-msgstr "不支持 STARTTLS" +- +-#: ../camel/providers/imap/camel-imap-store.c:435 +-#: ../camel/providers/imapx/camel-imapx-server.c:2868 +-#, c-format +-msgid "Failed to connect to IMAP server %s in secure mode: " +-msgstr "以安全模式连接到 IMAP 服务器 %s 失败：" +- +-#: ../camel/providers/imap/camel-imap-store.c:734 +-#: ../camel/providers/imapx/camel-imapx-server.c:2935 +-#, c-format +-msgid "IMAP server %s does not support %s authentication" +-msgstr "IMAP 服务器 %s 不支持 %s 认证" +- +-#: ../camel/providers/imap/camel-imap-store.c:809 +-#: ../camel/providers/imapx/camel-imapx-store.c:155 +-#, c-format +-msgid "IMAP server %s" +-msgstr "IMAP 服务器 %s" +- +-#: ../camel/providers/imap/camel-imap-store.c:812 +-#: ../camel/providers/imapx/camel-imapx-store.c:158 +-#, c-format +-msgid "IMAP service for %s on %s" +-msgstr "%2$s 为 %1$s 提供的 IMAP 服务" +- +-#: ../camel/providers/imap/camel-imap-store.c:1111 +-#: ../camel/providers/imapx/camel-imapx-server.c:2965 +-#: ../camel/providers/nntp/camel-nntp-store.c:505 +-msgid "Cannot authenticate without a username" +-msgstr "无法进行无用户名的认证" +- +-#: ../camel/providers/imap/camel-imap-store.c:1119 +-#: ../camel/providers/imapx/camel-imapx-server.c:2974 +-#: ../camel/providers/nntp/camel-nntp-store.c:514 +-#: ../camel/providers/pop3/camel-pop3-store.c:491 +-#: ../camel/providers/pop3/camel-pop3-store.c:511 +-msgid "Authentication password not available" +-msgstr "密码认证不可用" +- +-#: ../camel/providers/imap/camel-imap-store.c:2065 +-#: ../camel/providers/imap/camel-imap-store.c:2269 +-#: ../camel/providers/imapx/camel-imapx-store.c:348 +-#, c-format +-msgid "No such folder %s" +-msgstr "没有文件夹 %s" +- +-#: ../camel/providers/imap/camel-imap-store.c:2079 +-#: ../camel/providers/imap/camel-imap-store.c:2538 +-#: ../camel/providers/imapx/camel-imapx-store.c:1388 +-#, c-format +-msgid "" +-"The folder name \"%s\" is invalid because it contains the character \"%c\"" +-msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”" +- +-#: ../camel/providers/imap/camel-imap-store.c:2143 +-#: ../camel/providers/imap/camel-imap-store.c:2602 +-#: ../camel/providers/imapx/camel-imapx-store.c:1409 +-#, c-format +-msgid "The parent folder is not allowed to contain subfolders" +-msgstr "父文件夹不允许含有子文件夹" +- +-#: ../camel/providers/imap/camel-imap-store.c:2196 +-#: ../camel/providers/local/camel-maildir-store.c:268 +-#: ../camel/providers/local/camel-mbox-store.c:421 +-#: ../camel/providers/local/camel-mh-store.c:558 +-#, c-format +-msgid "Cannot create folder '%s': folder exists." +-msgstr "无法创建文件夹“%s”：文件夹已存在。" +- +-#: ../camel/providers/imap/camel-imap-store.c:2551 +-#: ../camel/providers/imapx/camel-imapx-store.c:1399 +-#, c-format +-msgid "Unknown parent folder: %s" +-msgstr "未知的父文件夹：%s" +- +-#: ../camel/providers/imap/camel-imap-store.c:3326 +-#, c-format +-msgid "Server unexpectedly disconnected" +-msgstr "服务器意外断开 " +- +-#: ../camel/providers/imap/camel-imap-store.c:3329 +-msgid "Server unexpectedly disconnected: " +-msgstr "服务器意外断开：" +- +-#: ../camel/providers/imapx/camel-imapx-folder.c:101 +-#, c-format +-msgid "Could not create folder summary for %s" +-msgstr "无法为 %s 创建文件夹概要" +- +-#: ../camel/providers/imapx/camel-imapx-folder.c:109 +-#, c-format +-msgid "Could not create cache for %s: " +-msgstr "无法为 %s 创建缓存：" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:46 +-msgid "Use _Quick Resync if the server supports it" +-msgstr "如果服务器支持则使用快速重新同步(_Q)" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:48 +-msgid "_Listen for server change notifications" +-msgstr "监听服务器变化提醒(_L)" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 +-msgid "Command:" +-msgstr "命令：" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:58 +-msgid "Numbe_r of cached connections to use" +-msgstr "使用的缓存连接的数目(_R)" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:69 +-msgid "Namespace:" +-msgstr "命名空间：" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:88 +-msgid "Default IMAP port" +-msgstr "默认的 IMAP 端口" +- +-#: ../camel/providers/imapx/camel-imapx-provider.c:96 +-msgid "IMAP+" +-msgstr "IMAP+" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:817 +-msgid "Server disconnected" +-msgstr "服务器断开连接" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:1206 +-msgid "Error writing to cache stream: " +-msgstr "写入缓存流错误：" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:1940 +-#, c-format +-msgid "Not authenticated" +-msgstr "没有验证" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:2005 +-msgid "Error performing IDLE" +-msgstr "执行 IDLE 命令出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:3160 +-msgid "Error fetching message" +-msgstr "取回消息出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:3228 +-msgid "Closing tmp stream failed: " +-msgstr "关闭临时流失败：" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:3327 +-msgid "Error copying messages" +-msgstr "复制消息出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:3457 +-msgid "Error appending message" +-msgstr "追加消息出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:3637 +-msgid "Error fetching message headers" +-msgstr "取回消息头出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:3778 +-msgid "Error retrieving message" +-msgstr "收取消息出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:3982 +-msgid "Error fetching new messages" +-msgstr "取回新消息出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:4172 +-msgid "Error while fetching messages" +-msgstr "取回消息出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:4180 +-#: ../camel/providers/imapx/camel-imapx-server.c:4210 +-#, c-format +-msgid "Fetching summary information for %d message in %s" +-msgid_plural "Fetching summary information for %d messages in %s" +-msgstr[0] "从 %2$s 中获取 %1$d 条消息的概要信息" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:4332 +-#: ../camel/providers/imapx/camel-imapx-server.c:4366 +-msgid "Error refreshing folder" +-msgstr "刷新文件夹出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:4455 +-msgid "Error expunging message" +-msgstr "销毁消息出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:4540 +-msgid "Error fetching folders" +-msgstr "取回文件夹出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:4614 +-msgid "Error subscribing to folder" +-msgstr "订阅文件夹出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:4667 +-msgid "Error creating folder" +-msgstr "创建文件夹出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:4712 +-msgid "Error deleting folder" +-msgstr "删除文件夹出错" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:4762 +-msgid "Error renaming folder" +-msgstr "重命名文件夹出错" ++#: ../camel/providers/imapx/camel-imapx-provider.c:63 ++msgid "_Apply filters to new messages in Inbox on this server" ++msgstr "应用过滤规则到此服务器上收件箱中的新消息(_A)" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4813 +-msgid "Error performing NOOP" +-msgstr "执行 NOOP 出错" ++#: ../camel/providers/imapx/camel-imapx-provider.c:65 ++msgid "Check new messages for _Junk contents" ++msgstr "检查新消息的垃圾内容(_J)" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4908 +-msgid "Error syncing changes" +-msgstr "同步变更出错" ++#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++msgid "Only check for Junk messages in the IN_BOX folder" ++msgstr "仅在收件箱中检查垃圾邮件(_B)" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5664 +-#: ../camel/providers/imapx/camel-imapx-server.c:5679 +-msgid "Cannot create spool file: " +-msgstr "无法创建脱机文件：" ++#: ../camel/providers/imapx/camel-imapx-provider.c:69 ++msgid "Automatically synchroni_ze remote mail locally" ++msgstr "自动将远程邮件同步到本地(_Z)" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1076 +-#, c-format +-msgid "Retrieving folder list for %s" +-msgstr "正在获取“%s”的文件夹列表" ++#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++msgid "Default IMAP port" ++msgstr "默认的 IMAP 端口" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1176 +-#: ../camel/providers/nntp/camel-nntp-store.c:1790 +-#, c-format +-msgid "No such folder: %s" +-msgstr "没有文件夹：%s" ++#: ../camel/providers/imapx/camel-imapx-provider.c:76 ++msgid "IMAP over SSL" ++msgstr "IMAP (SSL 加密)" + +-#: ../camel/providers/imapx/camel-imapx-stream.c:70 +-#, c-format +-msgid "Source stream returned no data" +-msgstr "源流没返回数据" ++#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++msgid "IMAP+" ++msgstr "IMAP+" + +-#: ../camel/providers/imapx/camel-imapx-stream.c:79 +-#, c-format +-msgid "Source stream unavailable" +-msgstr "源流不可用" ++#: ../camel/providers/imapx/camel-imapx-provider.c:85 ++msgid "For reading and storing mail on IMAP servers." ++msgstr "IMAP 服务器上的邮件的读写。" + +-#: ../camel/providers/local/camel-local-folder.c:191 ++#: ../camel/providers/local/camel-local-folder.c:194 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:201 +-#: ../camel/providers/local/camel-local-folder.c:210 ++#: ../camel/providers/local/camel-local-folder.c:204 ++#: ../camel/providers/local/camel-local-folder.c:213 + #, c-format + msgid "mailbox: %s (%s)" + msgstr "邮件箱：%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:219 ++#: ../camel/providers/local/camel-local-folder.c:222 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:483 ++#: ../camel/providers/local/camel-local-folder.c:499 + msgid "_Index message body data" + msgstr "索引消息正文(_I)" + +-#: ../camel/providers/local/camel-local-folder.c:712 ++#: ../camel/providers/local/camel-local-folder.c:727 + #, c-format +-msgid "" +-"Cannot get message %s from folder %s\n" ++msgid "Cannot get message %s from folder %s\n" + "%s" +-msgstr "" +-"无法从文件夹 %2$s 获取消息 %1$s\n" ++msgstr "无法从文件夹 %2$s 获取消息 %1$s\n" + "%3$s" + +-#: ../camel/providers/local/camel-local-provider.c:44 ++#: ../camel/providers/local/camel-local-provider.c:43 + msgid "_Use the '.folders' folder summary file (exmh)" + msgstr "使用“.folders”文件夹概览文件(exmh)(_U)" + +-#: ../camel/providers/local/camel-local-provider.c:51 ++#: ../camel/providers/local/camel-local-provider.c:50 + msgid "MH-format mail directories" + msgstr "MH-格式的邮件目录" + +-#: ../camel/providers/local/camel-local-provider.c:52 ++#: ../camel/providers/local/camel-local-provider.c:51 + msgid "For storing local mail in MH-like mail directories." + msgstr "在类似于 MH 的邮件目录中存储本地邮件。" + +-#: ../camel/providers/local/camel-local-provider.c:70 ++#: ../camel/providers/local/camel-local-provider.c:68 + msgid "Local delivery" + msgstr "本地发送" + +-#: ../camel/providers/local/camel-local-provider.c:71 ++#: ../camel/providers/local/camel-local-provider.c:69 + msgid "" + "For retrieving (moving) local mail from standard mbox-formatted spools into " + "folders managed by Evolution." +-msgstr "" +-"对于将本地邮件从标准 mbox 格式脱机文件夹获取(移动)到由 Evolution 管理的文件" +-"夹。" ++msgstr "对于将本地邮件从标准 mbox 格式脱机文件夹获取(移动)到由 Evolution 管理的文件夹。" + +-#: ../camel/providers/local/camel-local-provider.c:86 +-#: ../camel/providers/local/camel-local-provider.c:107 ++#: ../camel/providers/local/camel-local-provider.c:83 ++#: ../camel/providers/local/camel-local-provider.c:103 + msgid "_Apply filters to new messages in Inbox" + msgstr "对收件箱中的新消息应用过滤规则(_A)" + +-#: ../camel/providers/local/camel-local-provider.c:93 ++#: ../camel/providers/local/camel-local-provider.c:90 + msgid "Maildir-format mail directories" + msgstr "Maildir 格式的邮件目录" + +-#: ../camel/providers/local/camel-local-provider.c:94 ++#: ../camel/providers/local/camel-local-provider.c:91 + msgid "For storing local mail in maildir directories." + msgstr "在 maildir 邮件目录中存储本地邮件。" + +-#: ../camel/providers/local/camel-local-provider.c:108 ++#: ../camel/providers/local/camel-local-provider.c:104 + msgid "_Store status headers in Elm/Pine/Mutt format" + msgstr "以 Elm/Pine/Mutt 格式存储状态头(_S)" + +-#: ../camel/providers/local/camel-local-provider.c:115 ++#: ../camel/providers/local/camel-local-provider.c:111 + msgid "Standard Unix mbox spool file" + msgstr "标准 Unix mbox 脱机文件" + +-#: ../camel/providers/local/camel-local-provider.c:116 +-#: ../camel/providers/local/camel-local-provider.c:128 ++#: ../camel/providers/local/camel-local-provider.c:112 ++#: ../camel/providers/local/camel-local-provider.c:126 + msgid "" + "For reading and storing local mail in external standard mbox spool files.\n" + "May also be used to read a tree of Elm, Pine, or Mutt style folders." +-msgstr "" +-"对于读取和存储外部标准 mbox 脱机文件中的本地邮件。\n" ++msgstr "对于读取和存储外部标准 mbox 脱机文件中的本地邮件。\n" + "也可用于读取 Elm、Pine 或 Mutt 风格的文件夹树。" + +-#: ../camel/providers/local/camel-local-provider.c:127 ++#: ../camel/providers/local/camel-local-provider.c:125 + msgid "Standard Unix mbox spool directory" + msgstr "标准 Unix mbox 脱机目录" + +@@ -3602,168 +3574,165 @@ msgstr "标准 Unix mbox 脱机目录" + msgid "Could not rename folder %s to %s: %s" + msgstr "无法将文件夹 %s 改名为 %s：%s" + +-#: ../camel/providers/local/camel-local-store.c:178 ++#: ../camel/providers/local/camel-local-store.c:180 + #, c-format + msgid "Local mail file %s" + msgstr "本地邮件文件 %s" + +-#: ../camel/providers/local/camel-local-store.c:218 +-#: ../camel/providers/local/camel-local-store.c:375 +-#: ../camel/providers/local/camel-maildir-store.c:101 +-#: ../camel/providers/local/camel-mbox-store.c:555 +-#: ../camel/providers/local/camel-spool-store.c:86 ++#: ../camel/providers/local/camel-local-store.c:223 ++#: ../camel/providers/local/camel-local-store.c:383 ++#: ../camel/providers/local/camel-maildir-store.c:117 ++#: ../camel/providers/local/camel-mbox-store.c:581 ++#: ../camel/providers/local/camel-spool-store.c:89 + #, c-format + msgid "Store root %s is not an absolute path" + msgstr "存储根目录 %s 不是绝对路径" + +-#: ../camel/providers/local/camel-local-store.c:227 ++#: ../camel/providers/local/camel-local-store.c:232 + #, c-format + msgid "Store root %s is not a regular directory" + msgstr "存储根目录 %s 不是普通目录" + +-#: ../camel/providers/local/camel-local-store.c:239 +-#: ../camel/providers/local/camel-local-store.c:249 +-#: ../camel/providers/local/camel-local-store.c:388 +-#: ../camel/providers/local/camel-maildir-store.c:134 ++#: ../camel/providers/local/camel-local-store.c:244 ++#: ../camel/providers/local/camel-local-store.c:254 ++#: ../camel/providers/local/camel-local-store.c:396 ++#: ../camel/providers/local/camel-maildir-store.c:145 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "无法获取文件夹：%s：%s" + +-#: ../camel/providers/local/camel-local-store.c:286 ++#: ../camel/providers/local/camel-local-store.c:291 + #, c-format + msgid "Local stores do not have an inbox" + msgstr "本地存储没有收件箱" + +-#: ../camel/providers/local/camel-local-store.c:445 +-#: ../camel/providers/local/camel-mbox-store.c:722 ++#: ../camel/providers/local/camel-local-store.c:456 ++#: ../camel/providers/local/camel-mbox-store.c:748 + #, c-format + msgid "Could not delete folder index file '%s': %s" + msgstr "无法删除文件夹索引文件“%s”：%s" + +-#: ../camel/providers/local/camel-local-store.c:473 +-#: ../camel/providers/local/camel-mbox-store.c:752 ++#: ../camel/providers/local/camel-local-store.c:484 ++#: ../camel/providers/local/camel-mbox-store.c:778 + #, c-format + msgid "Could not delete folder meta file '%s': %s" + msgstr "无法删除文件夹元文件“%s”：%s" + +-#: ../camel/providers/local/camel-local-store.c:581 ++#: ../camel/providers/local/camel-local-store.c:596 + #, c-format + msgid "Could not rename '%s': %s" + msgstr "无法重命名“%s”：%s" + +-#: ../camel/providers/local/camel-local-summary.c:527 ++#: ../camel/providers/local/camel-local-summary.c:567 + #, c-format + msgid "Unable to add message to summary: unknown reason" + msgstr "无法将消息添加到概要中：未知的原因" + + #: ../camel/providers/local/camel-maildir-folder.c:100 +-#: ../camel/providers/local/camel-maildir-folder.c:336 ++#: ../camel/providers/local/camel-maildir-folder.c:335 + #: ../camel/providers/local/camel-mbox-folder.c:117 + #: ../camel/providers/local/camel-mbox-folder.c:329 +-#: ../camel/providers/local/camel-mh-folder.c:160 ++#: ../camel/providers/local/camel-mh-folder.c:159 + msgid "No such message" + msgstr "没有该消息" + +-#: ../camel/providers/local/camel-maildir-folder.c:226 ++#: ../camel/providers/local/camel-maildir-folder.c:225 + #, c-format + msgid "Cannot append message to maildir folder: %s: " + msgstr "无法将消息附加到邮件目录文件夹：%s：" + +-#: ../camel/providers/local/camel-maildir-folder.c:274 +-#: ../camel/providers/local/camel-maildir-folder.c:284 ++#: ../camel/providers/local/camel-maildir-folder.c:273 ++#: ../camel/providers/local/camel-maildir-folder.c:283 + #: ../camel/providers/local/camel-mbox-folder.c:390 +-#: ../camel/providers/local/camel-mh-folder.c:172 +-#: ../camel/providers/local/camel-mh-folder.c:182 ++#: ../camel/providers/local/camel-mh-folder.c:171 ++#: ../camel/providers/local/camel-mh-folder.c:181 + #, c-format + msgid "Cannot get message %s from folder %s: " + msgstr "无法从文件夹 %2$s 获取消息 %1$s：" + +-#: ../camel/providers/local/camel-maildir-folder.c:354 ++#: ../camel/providers/local/camel-maildir-folder.c:353 + #, c-format + msgid "Cannot transfer message to destination folder: %s" + msgstr "无法将消息转移到目标文件夹：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:109 +-#, c-format +-msgid "Cannot create folder: %s: Folder name cannot contain a dot" +-msgstr "无法创建文件夹：%s：文件夹名称不能包含点" +- +-#: ../camel/providers/local/camel-maildir-store.c:119 +-#: ../camel/providers/local/camel-maildir-store.c:782 ++#: ../camel/providers/local/camel-maildir-store.c:125 ++#: ../camel/providers/local/camel-maildir-store.c:848 + #, c-format + msgid "Folder %s already exists" + msgstr "文件夹 %s 已经存在" + +-#: ../camel/providers/local/camel-maildir-store.c:215 +-#: ../camel/providers/local/camel-maildir-store.c:246 +-#: ../camel/providers/local/camel-mbox-store.c:389 ++#: ../camel/providers/local/camel-maildir-store.c:230 ++#: ../camel/providers/local/camel-maildir-store.c:261 + #: ../camel/providers/local/camel-mbox-store.c:403 ++#: ../camel/providers/local/camel-mbox-store.c:424 + #, c-format + msgid "Cannot create folder '%s': %s" + msgstr "无法创建文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:230 +-#: ../camel/providers/local/camel-mbox-store.c:355 +-#: ../camel/providers/local/camel-mh-store.c:516 ++#: ../camel/providers/local/camel-maildir-store.c:245 ++#: ../camel/providers/local/camel-mbox-store.c:369 ++#: ../camel/providers/local/camel-mh-store.c:514 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "无法获取文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:236 +-#: ../camel/providers/local/camel-mbox-store.c:365 +-#: ../camel/providers/local/camel-mh-store.c:525 ++#: ../camel/providers/local/camel-maildir-store.c:251 ++#: ../camel/providers/local/camel-mbox-store.c:379 ++#: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "无法获得文件夹“%s”：文件夹不存在。" + +-#: ../camel/providers/local/camel-maildir-store.c:263 ++#: ../camel/providers/local/camel-maildir-store.c:278 + #, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "无法获取文件夹“%s”：不是 maildir 目录。" + +-#: ../camel/providers/local/camel-maildir-store.c:329 +-#: ../camel/providers/local/camel-maildir-store.c:369 +-#: ../camel/providers/local/camel-mh-store.c:670 ++#: ../camel/providers/local/camel-maildir-store.c:283 ++#: ../camel/providers/local/camel-mbox-store.c:442 ++#: ../camel/providers/local/camel-mh-store.c:556 ++#, c-format ++msgid "Cannot create folder '%s': folder exists." ++msgstr "无法创建文件夹“%s”：文件夹已存在。" ++ ++#: ../camel/providers/local/camel-maildir-store.c:347 ++#: ../camel/providers/local/camel-maildir-store.c:387 ++#: ../camel/providers/local/camel-mh-store.c:674 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "无法删除文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:331 ++#: ../camel/providers/local/camel-maildir-store.c:349 + msgid "not a maildir directory" + msgstr "不是 maildir 目录" + +-#: ../camel/providers/local/camel-maildir-store.c:569 +-#: ../camel/providers/local/camel-maildir-store.c:970 +-#: ../camel/providers/local/camel-spool-store.c:209 +-#: ../camel/providers/local/camel-spool-store.c:228 ++#: ../camel/providers/local/camel-maildir-store.c:628 ++#: ../camel/providers/local/camel-maildir-store.c:1063 ++#: ../camel/providers/local/camel-spool-store.c:212 ++#: ../camel/providers/local/camel-spool-store.c:231 + #, c-format + msgid "Could not scan folder '%s': %s" + msgstr "无法扫描文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:773 +-#, c-format +-msgid "Cannot rename the folder: %s: Folder name cannot contain a dot" +-msgstr "无法重命名文件夹：%s：文件夹名称不能包含点" +- +-#: ../camel/providers/local/camel-maildir-summary.c:416 +-#: ../camel/providers/local/camel-maildir-summary.c:549 ++#: ../camel/providers/local/camel-maildir-summary.c:458 ++#: ../camel/providers/local/camel-maildir-summary.c:591 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "无法打开邮件目录路径：%s：%s" + +-#: ../camel/providers/local/camel-maildir-summary.c:540 ++#: ../camel/providers/local/camel-maildir-summary.c:582 + msgid "Checking folder consistency" + msgstr "检查文件夹一致性" + +-#: ../camel/providers/local/camel-maildir-summary.c:633 ++#: ../camel/providers/local/camel-maildir-summary.c:675 + msgid "Checking for new messages" + msgstr "检查新消息" + +-#: ../camel/providers/local/camel-maildir-summary.c:728 +-#: ../camel/providers/local/camel-mbox-summary.c:418 +-#: ../camel/providers/local/camel-mbox-summary.c:649 +-#: ../camel/providers/local/camel-mbox-summary.c:793 +-#: ../camel/providers/local/camel-spool-summary.c:130 ++#: ../camel/providers/local/camel-maildir-summary.c:770 ++#: ../camel/providers/local/camel-mbox-summary.c:450 ++#: ../camel/providers/local/camel-mbox-summary.c:682 ++#: ../camel/providers/local/camel-mbox-summary.c:830 ++#: ../camel/providers/local/camel-spool-summary.c:141 + msgid "Storing folder" + msgstr "存储文件夹" + +@@ -3782,170 +3751,168 @@ msgid "The folder appears to be irrecove + msgstr "文件夹好像已经被不可恢复地破坏了。" + + #: ../camel/providers/local/camel-mbox-folder.c:439 +-#: ../camel/providers/local/camel-spool-folder.c:70 ++#: ../camel/providers/local/camel-spool-folder.c:69 + #, c-format + msgid "Cannot create folder lock on %s: %s" + msgstr "无法在 %s 创建文件夹锁：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:377 +-#: ../camel/providers/local/camel-mbox-store.c:563 ++#: ../camel/providers/local/camel-mbox-store.c:391 ++#: ../camel/providers/local/camel-mbox-store.c:589 + #, c-format + msgid "Cannot create a folder by this name." + msgstr "无法以此名称创建文件夹。" + +-#: ../camel/providers/local/camel-mbox-store.c:414 ++#: ../camel/providers/local/camel-mbox-store.c:435 + #, c-format + msgid "Cannot get folder '%s': not a regular file." + msgstr "无法获取文件夹“%s”：不是普通文件" + +-#: ../camel/providers/local/camel-mbox-store.c:579 ++#: ../camel/providers/local/camel-mbox-store.c:605 + #, c-format + msgid "Cannot create directory '%s': %s." + msgstr "无法创建目录“%s”：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:591 ++#: ../camel/providers/local/camel-mbox-store.c:617 + #, c-format + msgid "Cannot create folder: %s: %s" + msgstr "无法创建文件夹：%s：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:593 ++#: ../camel/providers/local/camel-mbox-store.c:619 + msgid "Folder already exists" + msgstr "文件夹已经存在" + +-#: ../camel/providers/local/camel-mbox-store.c:633 +-#: ../camel/providers/local/camel-mbox-store.c:646 +-#: ../camel/providers/local/camel-mbox-store.c:675 ++#: ../camel/providers/local/camel-mbox-store.c:659 ++#: ../camel/providers/local/camel-mbox-store.c:672 ++#: ../camel/providers/local/camel-mbox-store.c:701 + #, c-format +-msgid "" +-"Could not delete folder '%s':\n" ++msgid "Could not delete folder '%s':\n" + "%s" +-msgstr "" +-"无法删除文件夹“%s”：\n" ++msgstr "无法删除文件夹“%s”：\n" + "%s" + +-#: ../camel/providers/local/camel-mbox-store.c:656 ++#: ../camel/providers/local/camel-mbox-store.c:682 + #, c-format + msgid "'%s' is not a regular file." + msgstr "“%s”并不是普通文件。" + +-#: ../camel/providers/local/camel-mbox-store.c:665 ++#: ../camel/providers/local/camel-mbox-store.c:691 + #, c-format + msgid "Folder '%s' is not empty. Not deleted." + msgstr "文件夹“%s”非空。没有删除。" + +-#: ../camel/providers/local/camel-mbox-store.c:692 +-#: ../camel/providers/local/camel-mbox-store.c:707 ++#: ../camel/providers/local/camel-mbox-store.c:718 ++#: ../camel/providers/local/camel-mbox-store.c:733 + #, c-format + msgid "Could not delete folder summary file '%s': %s" + msgstr "无法删除文件夹概要文件“%s”：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:789 ++#: ../camel/providers/local/camel-mbox-store.c:815 + #, c-format + msgid "The new folder name is illegal." + msgstr "指定的文件夹名称不合法。" + +-#: ../camel/providers/local/camel-mbox-store.c:805 ++#: ../camel/providers/local/camel-mbox-store.c:831 + #, c-format + msgid "Could not rename '%s': '%s': %s" + msgstr "无法重命名“%s”：“%s”：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:888 ++#: ../camel/providers/local/camel-mbox-store.c:915 + #, c-format + msgid "Could not rename '%s' to %s: %s" + msgstr "无法将“%s”重命名为 %s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:428 ++#: ../camel/providers/local/camel-mbox-summary.c:460 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "无法打开文件夹：%s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:490 ++#: ../camel/providers/local/camel-mbox-summary.c:522 + #, c-format + msgid "Fatal mail parser error near position %s in folder %s" + msgstr "邮件解析发生致命错误，位于 %s (文件夹 %s)" + +-#: ../camel/providers/local/camel-mbox-summary.c:574 ++#: ../camel/providers/local/camel-mbox-summary.c:607 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "无法检查文件夹：%s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:662 +-#: ../camel/providers/local/camel-mbox-summary.c:802 +-#: ../camel/providers/local/camel-spool-summary.c:137 ++#: ../camel/providers/local/camel-mbox-summary.c:695 ++#: ../camel/providers/local/camel-mbox-summary.c:839 ++#: ../camel/providers/local/camel-spool-summary.c:148 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "无法打开文件：%s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:676 +-#: ../camel/providers/local/camel-spool-summary.c:152 ++#: ../camel/providers/local/camel-mbox-summary.c:709 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "无法打开临时邮件箱：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:693 +-#: ../camel/providers/local/camel-mbox-summary.c:918 ++#: ../camel/providers/local/camel-mbox-summary.c:726 ++#: ../camel/providers/local/camel-mbox-summary.c:956 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "无法关闭来源文件夹 %s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:704 ++#: ../camel/providers/local/camel-mbox-summary.c:739 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "无法关闭临时文件夹：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:721 ++#: ../camel/providers/local/camel-mbox-summary.c:758 + #, c-format + msgid "Could not rename folder: %s" + msgstr "无法重命名文件夹：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:816 +-#: ../camel/providers/local/camel-mbox-summary.c:1084 ++#: ../camel/providers/local/camel-mbox-summary.c:853 ++#: ../camel/providers/local/camel-mbox-summary.c:1122 + #, c-format + msgid "Could not store folder: %s" + msgstr "无法存储文件夹：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:855 +-#: ../camel/providers/local/camel-mbox-summary.c:1115 ++#: ../camel/providers/local/camel-mbox-summary.c:892 ++#: ../camel/providers/local/camel-mbox-summary.c:1162 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " + "it.)" + msgstr "MBOX 文件损坏，请修复。(应该有 From 行，但未找到。)" + +-#: ../camel/providers/local/camel-mbox-summary.c:864 +-#: ../camel/providers/local/camel-mbox-summary.c:1124 ++#: ../camel/providers/local/camel-mbox-summary.c:902 ++#: ../camel/providers/local/camel-mbox-summary.c:1174 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "即使同步后，概要和文件夹仍然不匹配" + +-#: ../camel/providers/local/camel-mbox-summary.c:1029 +-#: ../camel/providers/local/camel-spool-summary.c:345 ++#: ../camel/providers/local/camel-mbox-summary.c:1067 ++#: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "未知的错误：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1182 +-#: ../camel/providers/local/camel-mbox-summary.c:1212 ++#: ../camel/providers/local/camel-mbox-summary.c:1232 ++#: ../camel/providers/local/camel-mbox-summary.c:1262 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "写入临时 mailbox 失败：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1201 ++#: ../camel/providers/local/camel-mbox-summary.c:1251 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "写入临时 mailbox 失败：%s：%s" + +-#: ../camel/providers/local/camel-mh-folder.c:119 ++#: ../camel/providers/local/camel-mh-folder.c:118 + #, c-format + msgid "Cannot append message to mh folder: %s: " + msgstr "无法将消息附加到 mh 文件夹：%s：" + +-#: ../camel/providers/local/camel-mh-store.c:535 ++#: ../camel/providers/local/camel-mh-store.c:533 + #, c-format + msgid "Could not create folder '%s': %s" + msgstr "无法创建文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-mh-store.c:551 ++#: ../camel/providers/local/camel-mh-store.c:549 + #, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "无法获取文件夹“%s”：不是目录。" +@@ -3955,142 +3922,141 @@ msgstr "无法获取文件夹“%s”： + msgid "Cannot open MH directory path: %s: %s" + msgstr "无法打开 MH 目录：%s：%s" + +-#: ../camel/providers/local/camel-spool-store.c:94 ++#: ../camel/providers/local/camel-spool-store.c:97 + #, c-format + msgid "Spool '%s' cannot be opened: %s" + msgstr "无法打开脱机文件“%s”：%s" + +-#: ../camel/providers/local/camel-spool-store.c:108 ++#: ../camel/providers/local/camel-spool-store.c:111 + #, c-format + msgid "Spool '%s' is not a regular file or directory" + msgstr "脱机文件“%s”不是普通文件或目录" + +-#: ../camel/providers/local/camel-spool-store.c:416 ++#: ../camel/providers/local/camel-spool-store.c:425 + #, c-format + msgid "Spool mail file %s" + msgstr "脱机邮件文件 %s" + +-#: ../camel/providers/local/camel-spool-store.c:420 ++#: ../camel/providers/local/camel-spool-store.c:429 + #, c-format + msgid "Spool folder tree %s" + msgstr "脱机文件夹树 %s" + +-#: ../camel/providers/local/camel-spool-store.c:423 ++#: ../camel/providers/local/camel-spool-store.c:432 + msgid "Invalid spool" + msgstr "无效的本地文件" + +-#: ../camel/providers/local/camel-spool-store.c:480 ++#: ../camel/providers/local/camel-spool-store.c:492 + #, c-format + msgid "Folder '%s/%s' does not exist." + msgstr "文件夹“%s/%s”不存在。" + +-#: ../camel/providers/local/camel-spool-store.c:493 ++#: ../camel/providers/local/camel-spool-store.c:505 + #, c-format +-msgid "" +-"Could not open folder '%s':\n" ++msgid "Could not open folder '%s':\n" + "%s" +-msgstr "" +-"无法打开文件夹“%s”：\n" ++msgstr "无法打开文件夹“%s”：\n" + "%s" + +-#: ../camel/providers/local/camel-spool-store.c:499 ++#: ../camel/providers/local/camel-spool-store.c:511 + #, c-format + msgid "Folder '%s' does not exist." + msgstr "文件夹“%s”不存在。" + +-#: ../camel/providers/local/camel-spool-store.c:507 ++#: ../camel/providers/local/camel-spool-store.c:519 + #, c-format +-msgid "" +-"Could not create folder '%s':\n" ++msgid "Could not create folder '%s':\n" + "%s" +-msgstr "" +-"无法创建文件夹“%s”：\n" ++msgstr "无法创建文件夹“%s”：\n" + "%s" + +-#: ../camel/providers/local/camel-spool-store.c:520 ++#: ../camel/providers/local/camel-spool-store.c:532 + #, c-format + msgid "'%s' is not a mailbox file." + msgstr "“%s”不是邮件箱文件。" + +-#: ../camel/providers/local/camel-spool-store.c:584 ++#: ../camel/providers/local/camel-spool-store.c:596 + #, c-format + msgid "Store does not support an INBOX" + msgstr "存储并不支持收件箱" + +-#: ../camel/providers/local/camel-spool-store.c:603 ++#: ../camel/providers/local/camel-spool-store.c:615 + #, c-format + msgid "Spool folders cannot be deleted" + msgstr "脱机文件夹无法删除" + +-#: ../camel/providers/local/camel-spool-store.c:618 ++#: ../camel/providers/local/camel-spool-store.c:630 + #, c-format + msgid "Spool folders cannot be renamed" + msgstr "脱机文件夹无法改名" + +-#: ../camel/providers/local/camel-spool-summary.c:168 +-#: ../camel/providers/local/camel-spool-summary.c:180 +-#: ../camel/providers/local/camel-spool-summary.c:192 ++#: ../camel/providers/local/camel-spool-summary.c:179 ++#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:203 + #, c-format + msgid "Could not synchronize temporary folder %s: %s" + msgstr "无法同步临时文件夹 %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:210 ++#: ../camel/providers/local/camel-spool-summary.c:221 + #, c-format + msgid "Could not synchronize spool folder %s: %s" + msgstr "无法同步脱机文件夹 %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:242 +-#: ../camel/providers/local/camel-spool-summary.c:261 +-#: ../camel/providers/local/camel-spool-summary.c:274 ++#: ../camel/providers/local/camel-spool-summary.c:253 ++#: ../camel/providers/local/camel-spool-summary.c:272 ++#: ../camel/providers/local/camel-spool-summary.c:285 + #, c-format + msgid "" + "Could not synchronize spool folder %s: %s\n" + "Folder may be corrupt, copy saved in '%s'" +-msgstr "" +-"无法同步脱机文件夹 %s: %s\n" ++msgstr "无法同步脱机文件夹 %s: %s\n" + "文件夹可能已损坏，副本已存放在 '%s'" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:290 +-#: ../camel/providers/nntp/camel-nntp-folder.c:379 +-#: ../camel/providers/nntp/camel-nntp-folder.c:501 ++#: ../camel/providers/nntp/camel-nntp-folder.c:285 ++#: ../camel/providers/nntp/camel-nntp-folder.c:388 ++#: ../camel/providers/nntp/camel-nntp-folder.c:510 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "内部错误：UID 的格式无效：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:340 +-#: ../camel/providers/nntp/camel-nntp-folder.c:344 +-#: ../camel/providers/pop3/camel-pop3-folder.c:611 +-#: ../camel/providers/pop3/camel-pop3-folder.c:995 ++#: ../camel/providers/nntp/camel-nntp-folder.c:349 ++#: ../camel/providers/nntp/camel-nntp-folder.c:354 ++#: ../camel/providers/pop3/camel-pop3-folder.c:657 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1107 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "无法获取消息 %s：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:351 +-#: ../camel/providers/nntp/camel-nntp-folder.c:526 +-#: ../camel/providers/pop3/camel-pop3-folder.c:549 +-#: ../camel/providers/pop3/camel-pop3-folder.c:601 +-#: ../camel/providers/pop3/camel-pop3-folder.c:620 ++#: ../camel/providers/nntp/camel-nntp-folder.c:361 ++#: ../camel/providers/nntp/camel-nntp-folder.c:536 ++#: ../camel/providers/pop3/camel-pop3-folder.c:582 ++#: ../camel/providers/pop3/camel-pop3-folder.c:647 ++#: ../camel/providers/pop3/camel-pop3-folder.c:666 + #, c-format + msgid "Cannot get message %s: " + msgstr "无法获取消息 %s：" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:585 +-#: ../camel/providers/nntp/camel-nntp-folder.c:591 +-#: ../camel/providers/nntp/camel-nntp-folder.c:638 ++#: ../camel/providers/nntp/camel-nntp-folder.c:525 ++#, c-format ++msgid "This message is not currently available" ++msgstr "该消息目前不可用" ++ ++#: ../camel/providers/nntp/camel-nntp-folder.c:593 ++#: ../camel/providers/nntp/camel-nntp-folder.c:599 + #, c-format + msgid "Posting failed: %s" + msgstr "发表失败：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:633 ++#: ../camel/providers/nntp/camel-nntp-folder.c:664 + msgid "Posting failed: " + msgstr "发表失败：" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:662 ++#: ../camel/providers/nntp/camel-nntp-folder.c:689 + #, c-format + msgid "You cannot post NNTP messages while working offline!" + msgstr "您离线时无法投递 NNTP 消息！" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:682 ++#: ../camel/providers/nntp/camel-nntp-folder.c:709 + #, c-format + msgid "You cannot copy messages from a NNTP folder!" + msgstr "您无法从 NNTP 文件夹复制消息！" +@@ -4100,153 +4066,163 @@ msgid "" + "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" + msgstr "以短格式显示文件夹(如 c.o.linux 而不是 comp.os.linux)(_S)" + +-#: ../camel/providers/nntp/camel-nntp-provider.c:50 ++#: ../camel/providers/nntp/camel-nntp-provider.c:51 + msgid "In the subscription _dialog, show relative folder names" + msgstr "在订阅对话框中显示相对文件夹名称(_D)" + +-#: ../camel/providers/nntp/camel-nntp-provider.c:56 ++#: ../camel/providers/nntp/camel-nntp-provider.c:57 + msgid "Default NNTP port" + msgstr "默认的 NNTP 端口" + +-#: ../camel/providers/nntp/camel-nntp-provider.c:57 ++#: ../camel/providers/nntp/camel-nntp-provider.c:58 + msgid "NNTP over SSL" + msgstr "NNTP (SSL 加密)" + +-#: ../camel/providers/nntp/camel-nntp-provider.c:63 ++#: ../camel/providers/nntp/camel-nntp-provider.c:64 + msgid "USENET news" + msgstr "USENET 新闻" + +-#: ../camel/providers/nntp/camel-nntp-provider.c:65 ++#: ../camel/providers/nntp/camel-nntp-provider.c:66 + msgid "This is a provider for reading from and posting to USENET newsgroups." + msgstr "这是一个读取 USENET 新闻组和向 USENET 新闻组发布邮件的提供者。" + +-#: ../camel/providers/nntp/camel-nntp-provider.c:86 ++#: ../camel/providers/nntp/camel-nntp-provider.c:87 ++msgid "" ++"This option will connect to the NNTP server anonymously, without " ++"authentication." ++msgstr "这个选项可匿名连接到 NNTP 服务器，无需认证。" ++ ++#: ../camel/providers/nntp/camel-nntp-provider.c:97 + msgid "" + "This option will authenticate with the NNTP server using a plaintext " + "password." + msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:285 ++#: ../camel/providers/nntp/camel-nntp-store.c:386 + #, c-format + msgid "Could not read greeting from %s: " + msgstr "无法阅读来自 %s 的欢迎信息：" + +-#: ../camel/providers/nntp/camel-nntp-store.c:297 ++#: ../camel/providers/nntp/camel-nntp-store.c:394 + #, c-format + msgid "NNTP server %s returned error code %d: %s" + msgstr "NNTP 服务器 %s 返回错误码 %d：%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:469 ++#: ../camel/providers/nntp/camel-nntp-store.c:555 + #, c-format + msgid "USENET News via %s" + msgstr "USENET 新闻 %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1072 ++#: ../camel/providers/nntp/camel-nntp-store.c:1218 + #, c-format +-msgid "" +-"Error retrieving newsgroups:\n" ++msgid "Error retrieving newsgroups:\n" + "\n" + "%s" +-msgstr "" +-"收取新闻组出错：\n" ++msgstr "收取新闻组出错：\n" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1165 ++#: ../camel/providers/nntp/camel-nntp-store.c:1319 + #, c-format + msgid "You cannot create a folder in a News store: subscribe instead." + msgstr "您无法在新闻存储中创建文件夹：应该订阅。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1181 ++#: ../camel/providers/nntp/camel-nntp-store.c:1335 + #, c-format + msgid "You cannot rename a folder in a News store." + msgstr "您无法在新闻存储中重命名文件夹。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1204 ++#: ../camel/providers/nntp/camel-nntp-store.c:1358 + #, c-format + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "您无法在新闻存储中删除文件夹：应该退订。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1402 ++#: ../camel/providers/nntp/camel-nntp-store.c:1577 + #, c-format + msgid "" + "You cannot subscribe to this newsgroup:\n" + "\n" + "No such newsgroup. The selected item is a probably a parent folder." +-msgstr "" +-"您无法订阅此新闻组：\n" ++msgstr "您无法订阅此新闻组：\n" + "\n" + "没有这样的新闻组。选中项目可能是父文件夹。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1453 ++#: ../camel/providers/nntp/camel-nntp-store.c:1644 + #, c-format +-msgid "" +-"You cannot unsubscribe to this newsgroup:\n" ++msgid "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" +-msgstr "" +-"您无法订阅此新闻组：\n" ++msgstr "您无法订阅此新闻组：\n" + "\n" + "新闻组不存在！" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1647 ++#: ../camel/providers/nntp/camel-nntp-store.c:2081 + msgid "NNTP Command failed: " + msgstr "NNTP 命令失败：" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1732 ++#: ../camel/providers/nntp/camel-nntp-store.c:2178 + #, c-format + msgid "Not connected." + msgstr "未连接。" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:195 +-#: ../camel/providers/nntp/camel-nntp-summary.c:322 ++#: ../camel/providers/nntp/camel-nntp-store.c:2272 ++#, c-format ++msgid "No such folder: %s" ++msgstr "没有文件夹：%s" ++ ++#: ../camel/providers/nntp/camel-nntp-summary.c:200 ++#: ../camel/providers/nntp/camel-nntp-summary.c:339 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s：正在扫描新消息" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:213 ++#: ../camel/providers/nntp/camel-nntp-summary.c:222 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "来自 xover 的意外服务器应答：%s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:340 ++#: ../camel/providers/nntp/camel-nntp-summary.c:360 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "来自 head 的意外服务器应答：%s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:387 ++#: ../camel/providers/nntp/camel-nntp-summary.c:407 + #, c-format + msgid "Operation failed: %s" + msgstr "操作失败：%s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:447 +-#: ../camel/providers/pop3/camel-pop3-folder.c:517 ++#: ../camel/providers/pop3/camel-pop3-folder.c:468 ++#: ../camel/providers/pop3/camel-pop3-folder.c:547 + #, c-format + msgid "No message with UID %s" + msgstr "没有 UID 为 %s 的消息" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:533 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 + #, c-format + msgid "Retrieving POP message %d" + msgstr "正在获取 POP 消息 %d" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:612 ++#: ../camel/providers/pop3/camel-pop3-folder.c:658 + msgid "Unknown reason" + msgstr "未知原因" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:660 ++#: ../camel/providers/pop3/camel-pop3-folder.c:710 + msgid "Retrieving POP summary" + msgstr "正在获取 POP 概要" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:711 ++#: ../camel/providers/pop3/camel-pop3-folder.c:771 ++#: ../camel/providers/pop3/camel-pop3-folder.c:774 ++#: ../camel/providers/pop3/camel-pop3-folder.c:787 ++#: ../camel/providers/pop3/camel-pop3-folder.c:800 ++#: ../camel/providers/pop3/camel-pop3-folder.c:814 + msgid "Cannot get POP summary: " + msgstr "无法获取 POP 概要：" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:823 ++#: ../camel/providers/pop3/camel-pop3-folder.c:925 + msgid "Expunging old messages" + msgstr "销毁旧消息" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:843 ++#: ../camel/providers/pop3/camel-pop3-folder.c:945 + msgid "Expunging deleted messages" + msgstr "彻底销毁已删除的消息" + +@@ -4258,148 +4234,136 @@ msgstr "消息存储" + msgid "_Leave messages on server" + msgstr "在服务器上保留消息(_L)" + +-#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server +-#: ../camel/providers/pop3/camel-pop3-provider.c:44 ++#. Translators: '%s' is replaced with a widget, where user can ++#. * select how many days can be message left on the server. ++#: ../camel/providers/pop3/camel-pop3-provider.c:45 + #, c-format + msgid "_Delete after %s day(s)" + msgstr "%s 天之后删除(_D)" + +-#: ../camel/providers/pop3/camel-pop3-provider.c:46 ++#: ../camel/providers/pop3/camel-pop3-provider.c:47 + msgid "Delete _expunged from local Inbox" + msgstr "从本地的收件箱中删除已在远端清除的邮件(_E)" + +-#: ../camel/providers/pop3/camel-pop3-provider.c:48 ++#: ../camel/providers/pop3/camel-pop3-provider.c:49 + msgid "Disable _support for all POP3 extensions" + msgstr "禁用所有 POP3 扩展的支持(_S)" + +-#: ../camel/providers/pop3/camel-pop3-provider.c:54 ++#: ../camel/providers/pop3/camel-pop3-provider.c:55 + msgid "Default POP3 port" + msgstr "默认的 POP3 端口" + +-#: ../camel/providers/pop3/camel-pop3-provider.c:55 ++#: ../camel/providers/pop3/camel-pop3-provider.c:56 + msgid "POP3 over SSL" + msgstr "POP3 (SSL 加密)" + +-#: ../camel/providers/pop3/camel-pop3-provider.c:62 ++#: ../camel/providers/pop3/camel-pop3-provider.c:63 + msgid "POP" + msgstr "POP" + +-#: ../camel/providers/pop3/camel-pop3-provider.c:64 ++#: ../camel/providers/pop3/camel-pop3-provider.c:65 + msgid "For connecting to and downloading mail from POP servers." + msgstr "关于连接到 POP 服务器和从 POP 服务器下载邮件。" + +-#: ../camel/providers/pop3/camel-pop3-provider.c:84 ++#: ../camel/providers/pop3/camel-pop3-provider.c:85 + msgid "" + "This option will connect to the POP server using a plaintext password. This " + "is the only option supported by many POP servers." +-msgstr "" +-"该选项使 Evolution 在连接到 POP 服务器时使用明文密码。这是许多 POP 服务器唯一" +-"支持的选项。" ++msgstr "该选项使 Evolution 在连接到 POP 服务器时使用明文密码。这是许多 POP 服务器唯一支持的选项。" + +-#: ../camel/providers/pop3/camel-pop3-provider.c:94 ++#: ../camel/providers/pop3/camel-pop3-provider.c:95 + msgid "" + "This option will connect to the POP server using an encrypted password via " + "the APOP protocol. This may not work for all users even on servers that " + "claim to support it." +-msgstr "" +-"该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功" +-"能的服务器，也不一定能使所有用户工作。" ++msgstr "该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功能的服务器，也不一定能使所有用户工作。" + + #. Translators: This is the separator between an error and an explanation +-#: ../camel/providers/pop3/camel-pop3-store.c:83 ++#: ../camel/providers/pop3/camel-pop3-store.c:99 + msgid ": " + msgstr "：" + +-#: ../camel/providers/pop3/camel-pop3-store.c:136 ++#: ../camel/providers/pop3/camel-pop3-store.c:161 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "从 POP 服务器 %s 读取欢迎词失败" + +-#: ../camel/providers/pop3/camel-pop3-store.c:153 ++#: ../camel/providers/pop3/camel-pop3-store.c:176 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "以安全模式连接到 POP 服务器 %s 失败：%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:154 ++#: ../camel/providers/pop3/camel-pop3-store.c:177 + msgid "STLS not supported by server" + msgstr "服务器不支持 STLS" + +-#. Translators: Last %s is an optional explanation beginning with ": " separator +-#: ../camel/providers/pop3/camel-pop3-store.c:172 ++#. Translators: Last %s is an optional ++#. * explanation beginning with ": " separator. ++#: ../camel/providers/pop3/camel-pop3-store.c:198 + #, c-format + msgid "Failed to connect to POP server %s in secure mode%s" + msgstr "以安全模式连接到 POP 服务器 %s 失败%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:185 ++#: ../camel/providers/pop3/camel-pop3-store.c:211 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: " + msgstr "以安全模式连接到 POP 服务器 %s 失败：" + +-#: ../camel/providers/pop3/camel-pop3-store.c:288 ++#: ../camel/providers/pop3/camel-pop3-store.c:351 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "无法登录到 POP 服务器 %s：SASL 协议错误" + +-#: ../camel/providers/pop3/camel-pop3-store.c:310 ++#: ../camel/providers/pop3/camel-pop3-store.c:373 + #, c-format + msgid "Failed to authenticate on POP server %s: " + msgstr "认证到 POP 服务器 %s 失败：" + +-#: ../camel/providers/pop3/camel-pop3-store.c:359 ++#: ../camel/providers/pop3/camel-pop3-store.c:481 + #, c-format + msgid "POP3 server %s" + msgstr "POP3 服务器 %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:362 ++#: ../camel/providers/pop3/camel-pop3-store.c:484 + #, c-format + msgid "POP3 server for %s on %s" + msgstr "%2$s 为 %1$s 提供的 POP 服务" + +-#: ../camel/providers/pop3/camel-pop3-store.c:525 ++#: ../camel/providers/pop3/camel-pop3-store.c:696 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " + "attack suspected. Please contact your admin." +-msgstr "" +-"无法连接到 POP 服务器 %s：\t接收到非法的 APOP ID。可能是冒名攻击。请联系您的" +-"管理员。" ++msgstr "无法连接到 POP 服务器 %s：\t接收到非法的 APOP ID。可能是冒名攻击。请联系您的管理员。" + +-#: ../camel/providers/pop3/camel-pop3-store.c:577 ++#: ../camel/providers/pop3/camel-pop3-store.c:748 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending password: " +-msgstr "" +-"无法连接到 POP 服务器 %s。\n" ++msgstr "无法连接到 POP 服务器 %s。\n" + "发送密码错误：" + + #. Translators: Last %s is an optional explanation + #. * beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:592 ++#: ../camel/providers/pop3/camel-pop3-store.c:763 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending username%s" +-msgstr "" +-"无法连接到 POP 服务器 %s。\n" ++msgstr "无法连接到 POP 服务器 %s。\n" + "发送用户名错误%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:650 +-#, c-format +-msgid "Could not connect to POP server %s" +-msgstr "无法连接到 POP 服务器 %s" +- +-#: ../camel/providers/pop3/camel-pop3-store.c:678 ++#: ../camel/providers/pop3/camel-pop3-store.c:845 + #, c-format + msgid "No such folder '%s'." + msgstr "没有文件夹“%s”。" + +-#: ../camel/providers/pop3/camel-pop3-store.c:695 ++#: ../camel/providers/pop3/camel-pop3-store.c:862 + #, c-format + msgid "POP3 stores have no folder hierarchy" + msgstr "POP3 的存储没有文件夹结构" + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:36 ++#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1 + msgid "Sendmail" + msgstr "Sendmail" + +@@ -4409,47 +4373,52 @@ msgid "" + "system." + msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:49 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:50 + msgid "sendmail" + msgstr "sendmail" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:51 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:52 + msgid "Mail delivery via the sendmail program" + msgstr "通过 sendmail 程序发送邮件" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:86 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:165 + #, c-format + msgid "Could not parse recipient list" + msgstr "无法解析收件人列表" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:119 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:182 + #, c-format +-msgid "Could not create pipe to sendmail: %s: mail not sent" +-msgstr "无法创建到 sendmail 的管道：%s：邮件未发送" ++msgid "Could not parse arguments" ++msgstr "无法解析参数" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:141 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:213 + #, c-format +-msgid "Could not fork sendmail: %s: mail not sent" +-msgstr "无法创建 sendmail 进程：%s：邮件未发送" ++msgid "Could not create pipe to '%s': %s: mail not sent" ++msgstr "无法创建到 '%s' 的管道：%s：邮件未发送" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:184 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:238 ++#, c-format ++msgid "Could not fork '%s': %s: mail not sent" ++msgstr "无法分支 '%s'：%s：邮件未发送" ++ ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:287 + msgid "Could not send message: " + msgstr "无法发送消息：" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:212 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:317 + #, c-format +-msgid "sendmail exited with signal %s: mail not sent." +-msgstr "sendmail 以信号 %s 退出：邮件未发送。" ++msgid "'%s' exited with signal %s: mail not sent." ++msgstr "'%s' 以信号 %s 退出：邮件未发送。" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:219 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:327 + #, c-format +-msgid "Could not execute %s: mail not sent." +-msgstr "无法执行 %s：邮件未发送。" ++msgid "Could not execute '%s': mail not sent." ++msgstr "无法执行 '%s'：邮件未发送。" + +-#: ../camel/providers/sendmail/camel-sendmail-transport.c:224 ++#: ../camel/providers/sendmail/camel-sendmail-transport.c:332 + #, c-format +-msgid "sendmail exited with status %d: mail not sent." +-msgstr "sendmail 以状态码 %d 退出：邮件未发送。" ++msgid "'%s' exited with status %d: mail not sent." ++msgstr "'%s' 以状态码 %d 退出：邮件未发送。" + + #: ../camel/providers/smtp/camel-smtp-provider.c:42 + msgid "Default SMTP port" +@@ -4471,358 +4440,598 @@ msgstr "SMTP" + msgid "For delivering mail by connecting to a remote mailhub using SMTP." + msgstr "要投递邮件，应该使用 SMTP 连接到远程的邮件交换服务器。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:150 + #: ../camel/providers/smtp/camel-smtp-transport.c:158 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 + msgid "Welcome response error: " + msgstr "欢迎应答错误：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:195 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "以安全模式连接 SMTP 服务器 %s 失败：%s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:204 +-#: ../camel/providers/smtp/camel-smtp-transport.c:217 ++#: ../camel/providers/smtp/camel-smtp-transport.c:211 + #: ../camel/providers/smtp/camel-smtp-transport.c:224 ++#: ../camel/providers/smtp/camel-smtp-transport.c:231 + msgid "STARTTLS command failed: " + msgstr "STARTTLS 命令失败：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:235 ++#: ../camel/providers/smtp/camel-smtp-transport.c:242 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: " + msgstr "以安全模式连接 SMTP 服务器 %s 失败：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:292 ++#: ../camel/providers/smtp/camel-smtp-transport.c:342 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP 服务器 %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:295 ++#: ../camel/providers/smtp/camel-smtp-transport.c:345 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "通过 %s 发送 SMTP 邮件" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:367 ++#: ../camel/providers/smtp/camel-smtp-transport.c:419 + #, c-format + msgid "SMTP server %s does not support %s authentication" + msgstr "SMTP 服务器 %s 不支持 %s 认证。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:446 ++#: ../camel/providers/smtp/camel-smtp-transport.c:500 + #, c-format + msgid "No SASL mechanism was specified" + msgstr "未指定 SASL 机制" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:459 +-msgid "SMTP Authentication" +-msgstr "SMTP 认证" +- +-#: ../camel/providers/smtp/camel-smtp-transport.c:478 +-#: ../camel/providers/smtp/camel-smtp-transport.c:489 +-#: ../camel/providers/smtp/camel-smtp-transport.c:502 ++#: ../camel/providers/smtp/camel-smtp-transport.c:530 ++#: ../camel/providers/smtp/camel-smtp-transport.c:541 ++#: ../camel/providers/smtp/camel-smtp-transport.c:554 + msgid "AUTH command failed: " + msgstr "AUTH 命令失败：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:643 ++#: ../camel/providers/smtp/camel-smtp-transport.c:695 + #, c-format + msgid "Cannot send message: service not connected." + msgstr "无法发送消息：服务未连接。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:650 ++#: ../camel/providers/smtp/camel-smtp-transport.c:702 + #, c-format + msgid "Cannot send message: sender address not valid." + msgstr "无法发送消息：发件人地址不合法。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:654 ++#: ../camel/providers/smtp/camel-smtp-transport.c:706 + msgid "Sending message" + msgstr "发送消息" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:679 ++#: ../camel/providers/smtp/camel-smtp-transport.c:731 + #, c-format + msgid "Cannot send message: no recipients defined." + msgstr "无法发送消息：没有定义收件人。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:692 ++#: ../camel/providers/smtp/camel-smtp-transport.c:744 + #, c-format + msgid "Cannot send message: one or more invalid recipients" + msgstr "无法发送消息：一个或多个非法收件人" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:796 ++#: ../camel/providers/smtp/camel-smtp-transport.c:865 + msgid "Syntax error, command unrecognized" + msgstr "语法错误，无法识别的命令" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:798 ++#: ../camel/providers/smtp/camel-smtp-transport.c:867 + msgid "Syntax error in parameters or arguments" + msgstr "参数语法错误" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:800 ++#: ../camel/providers/smtp/camel-smtp-transport.c:869 + msgid "Command not implemented" + msgstr "命令尚未实现" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:802 ++#: ../camel/providers/smtp/camel-smtp-transport.c:871 + msgid "Command parameter not implemented" + msgstr "命令参数尚未实现" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:804 ++#: ../camel/providers/smtp/camel-smtp-transport.c:873 + msgid "System status, or system help reply" + msgstr "系统状态，或系统求助就绪" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:806 ++#: ../camel/providers/smtp/camel-smtp-transport.c:875 + msgid "Help message" + msgstr "帮助消息" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:808 ++#: ../camel/providers/smtp/camel-smtp-transport.c:877 + msgid "Service ready" + msgstr "服务就绪" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:810 ++#: ../camel/providers/smtp/camel-smtp-transport.c:879 + msgid "Service closing transmission channel" + msgstr "服务正在关闭传输通道" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:812 ++#: ../camel/providers/smtp/camel-smtp-transport.c:881 + msgid "Service not available, closing transmission channel" + msgstr "服务不可用，正在关闭传输通道" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:814 ++#: ../camel/providers/smtp/camel-smtp-transport.c:883 + msgid "Requested mail action okay, completed" + msgstr "邮件动作请求确认，已完成" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:816 ++#: ../camel/providers/smtp/camel-smtp-transport.c:885 + msgid "User not local; will forward to " + msgstr "用户不在本地；将转发到 <转发路径>" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:818 ++#: ../camel/providers/smtp/camel-smtp-transport.c:887 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "邮件动作请求未发生：邮件箱无效" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:820 ++#: ../camel/providers/smtp/camel-smtp-transport.c:889 + msgid "Requested action not taken: mailbox unavailable" + msgstr "动作请求未发生：邮件箱无效" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:822 ++#: ../camel/providers/smtp/camel-smtp-transport.c:891 + msgid "Requested action aborted: error in processing" + msgstr "动作请求已放弃：处理中出错" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:824 ++#: ../camel/providers/smtp/camel-smtp-transport.c:893 + msgid "User not local; please try " + msgstr "用户不在本地；请尝试 <转发路径>" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:826 ++#: ../camel/providers/smtp/camel-smtp-transport.c:895 + msgid "Requested action not taken: insufficient system storage" + msgstr "动作请求未发生：系统存储空间不足" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:828 ++#: ../camel/providers/smtp/camel-smtp-transport.c:897 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "邮件动作请求已放弃：超定额德存储分配" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:830 ++#: ../camel/providers/smtp/camel-smtp-transport.c:899 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "动作请求未发生：不允许的邮件箱名称" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:832 ++#: ../camel/providers/smtp/camel-smtp-transport.c:901 + msgid "Start mail input; end with ." + msgstr "开始输入邮件；以 . 结束" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:834 ++#: ../camel/providers/smtp/camel-smtp-transport.c:903 + msgid "Transaction failed" + msgstr "事务失败" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:838 ++#: ../camel/providers/smtp/camel-smtp-transport.c:907 + msgid "A password transition is needed" + msgstr "必须传输密码" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:840 ++#: ../camel/providers/smtp/camel-smtp-transport.c:909 + msgid "Authentication mechanism is too weak" + msgstr "认证机制太弱" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:842 ++#: ../camel/providers/smtp/camel-smtp-transport.c:911 + msgid "Encryption required for requested authentication mechanism" + msgstr "请求的认证机制必须加密" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:844 ++#: ../camel/providers/smtp/camel-smtp-transport.c:913 + msgid "Temporary authentication failure" + msgstr "临时认证失败" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1095 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1170 + msgid "SMTP Greeting" + msgstr "SMTP 欢迎" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1122 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1139 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1147 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1197 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1219 + msgid "HELO command failed: " + msgstr "HELO 命令失败：%s\\" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1222 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1236 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1245 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1294 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1309 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1319 + msgid "MAIL FROM command failed: " + msgstr "MAIL FROM 命令失败：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1272 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1346 + msgid "RCPT TO command failed: " + msgstr "RSET 命令失败：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1288 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1297 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1363 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1373 + #, c-format + msgid "RCPT TO <%s> failed: " + msgstr "RCPT TO <%s> 失败：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1339 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1349 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1359 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1418 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1437 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1450 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1458 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1416 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1427 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1438 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1497 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1517 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1531 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1540 + msgid "DATA command failed: " + msgstr "DATP 命令失败：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1483 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1497 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1505 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1565 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1580 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1589 + msgid "RSET command failed: " + msgstr "RSET 命令失败：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1530 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1544 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1551 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1614 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1628 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1635 + msgid "QUIT command failed: " + msgstr "QUIT 命令失败：" + +-#: ../libedataserver/e-categories.c:47 ++#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1 ++msgid "Contact UID of a user" ++msgstr "用户的联系人 UID" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1 ++msgid "Birthday and anniversary reminder" ++msgstr "生日和纪念日提醒" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2 ++msgid "Whether to set a reminder for birthdays and anniversaries" ++msgstr "是否为生日或周年纪念日设置提醒" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3 ++msgid "Birthday and anniversary reminder value" ++msgstr "生日和纪念日提醒值" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4 ++msgid "Number of units for determining a birthday or anniversary reminder" ++msgstr "决定生日或周年纪念日提醒的单位数" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5 ++msgid "Birthday and anniversary reminder units" ++msgstr "生日和纪念日提醒单位" ++ ++#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6 ++msgid "" ++"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or " ++"\"days\"" ++msgstr "生日或周年纪念日提醒的单位，可为“分钟”，“小时”或“天”。" ++ ++#: ../libebackend/e-authentication-mediator.c:205 ++#: ../libebackend/e-authentication-mediator.c:216 ++#: ../libebackend/e-authentication-mediator.c:852 ++#: ../libebackend/e-authentication-mediator.c:1185 ++msgid "Bus name vanished (client terminated?)" ++msgstr "总线名称消失（客户端终止？）" ++ ++#: ../libebackend/e-authentication-mediator.c:264 ++msgid "No response from client" ++msgstr "客户端未响应" ++ ++#: ../libebackend/e-authentication-mediator.c:334 ++#: ../libebackend/e-authentication-mediator.c:345 ++#: ../libebackend/e-authentication-mediator.c:846 ++#: ../libebackend/e-authentication-mediator.c:1179 ++msgid "Client cancelled the operation" ++msgstr "客户端取消操作" ++ ++#: ../libebackend/e-authentication-mediator.c:416 ++msgid "Client reports password was rejected" ++msgstr "客户端报告密码被拒绝" ++ ++#: ../libebackend/e-authentication-session.c:543 ++msgid "Add this password to your keyring" ++msgstr "在您的密钥环中添加这个密码" ++ ++#: ../libebackend/e-authentication-session.c:648 ++msgid "Password was incorrect" ++msgstr "密码不正确" ++ ++#: ../libebackend/e-backend.c:428 ++#, c-format ++msgid "%s does not support authentication" ++msgstr "%s 不支持认证" ++ ++#: ../libebackend/e-collection-backend.c:800 ++#, c-format ++msgid "%s does not support creating remote resources" ++msgstr "%s 不支持创建远程资源" ++ ++#: ../libebackend/e-collection-backend.c:859 ++#, c-format ++msgid "%s does not support deleting remote resources" ++msgstr "%s 不支持删除远程资源" ++ ++#: ../libebackend/e-data-factory.c:320 ++#, c-format ++msgid "No backend factory for hash key '%s'" ++msgstr "没有井字键 '%s' 的后端库" ++ ++#: ../libebackend/e-server-side-source.c:134 ++#, c-format ++msgid "Data source is missing a [%s] group" ++msgstr "数据源缺少 [%s] 组" ++ ++#: ../libebackend/e-server-side-source.c:1008 ++#: ../libedataserver/e-source.c:1138 ++#, c-format ++msgid "Data source '%s' does not support creating remote resources" ++msgstr "数据源 '%s' 不支持创建远程资源" ++ ++#: ../libebackend/e-server-side-source.c:1022 ++#, c-format ++msgid "" ++"Data source '%s' has no collection backend to create the remote resource" ++msgstr "数据源 '%s' 没有集合后端以创建远程资源" ++ ++#: ../libebackend/e-server-side-source.c:1050 ++#: ../libedataserver/e-source.c:1251 ++#, c-format ++msgid "Data source '%s' does not support deleting remote resources" ++msgstr "数据源 '%s' 不支持删除远程资源" ++ ++#: ../libebackend/e-server-side-source.c:1064 ++#, c-format ++msgid "" ++"Data source '%s' has no collection backend to delete the remote resource" ++msgstr "数据源 '%s' 没有集合后端以删除远程资源" ++ ++#: ../libebackend/e-server-side-source.c:1095 ++#: ../libedataserver/e-source.c:1347 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990 ++#, c-format ++msgid "Data source '%s' does not support OAuth 2.0 authentication" ++msgstr "数据源 '%s' 不支持 OAuth 2.0 认证" ++ ++#: ../libebackend/e-server-side-source.c:1438 ++#, c-format ++msgid "File must have a '.source' extension" ++msgstr "文件必须有 '.source' 扩展" ++ ++#: ../libebackend/e-source-registry-server.c:523 ++#: ../libedataserver/e-source-registry.c:1882 ++msgid "The user declined to authenticate" ++msgstr "用户拒绝认证" ++ ++#: ../libebackend/e-source-registry-server.c:792 ++#, c-format ++msgid "UID '%s' is already in use" ++msgstr "UID '%s' 正在使用中" ++ ++#: ../libebackend/e-user-prompter-server.c:303 ++#, c-format ++msgid "Extension dialog '%s' not found." ++msgstr "未找到扩展对话 '%s'" ++ ++#: ../libedataserver/e-categories.c:46 + msgctxt "CategoryName" + msgid "Anniversary" + msgstr "周年纪念日" + +-#: ../libedataserver/e-categories.c:48 ++#: ../libedataserver/e-categories.c:47 + msgctxt "CategoryName" + msgid "Birthday" + msgstr "生日" + +-#: ../libedataserver/e-categories.c:49 ++#: ../libedataserver/e-categories.c:48 + msgctxt "CategoryName" + msgid "Business" + msgstr "商务" + +-#: ../libedataserver/e-categories.c:50 ++#: ../libedataserver/e-categories.c:49 + msgctxt "CategoryName" + msgid "Competition" + msgstr "完成" + +-#: ../libedataserver/e-categories.c:51 ++#: ../libedataserver/e-categories.c:50 + msgctxt "CategoryName" + msgid "Favorites" + msgstr "最爱" + +-#: ../libedataserver/e-categories.c:52 ++#: ../libedataserver/e-categories.c:51 + msgctxt "CategoryName" + msgid "Gifts" + msgstr "礼物" + +-#: ../libedataserver/e-categories.c:53 ++#: ../libedataserver/e-categories.c:52 + msgctxt "CategoryName" + msgid "Goals/Objectives" + msgstr "目标" + +-#: ../libedataserver/e-categories.c:54 ++#: ../libedataserver/e-categories.c:53 + msgctxt "CategoryName" + msgid "Holiday" + msgstr "假日" + +-#: ../libedataserver/e-categories.c:55 ++#: ../libedataserver/e-categories.c:54 + msgctxt "CategoryName" + msgid "Holiday Cards" + msgstr "假日卡" + + #. important people (e.g. new business partners) +-#: ../libedataserver/e-categories.c:57 ++#: ../libedataserver/e-categories.c:56 + msgctxt "CategoryName" + msgid "Hot Contacts" + msgstr "亲密联系人" + +-#: ../libedataserver/e-categories.c:58 ++#: ../libedataserver/e-categories.c:57 + msgctxt "CategoryName" + msgid "Ideas" + msgstr "想法" + +-#: ../libedataserver/e-categories.c:59 ++#: ../libedataserver/e-categories.c:58 + msgctxt "CategoryName" + msgid "International" + msgstr "国际" + +-#: ../libedataserver/e-categories.c:60 ++#: ../libedataserver/e-categories.c:59 + msgctxt "CategoryName" + msgid "Key Customer" + msgstr "关键客户" + +-#: ../libedataserver/e-categories.c:61 ++#: ../libedataserver/e-categories.c:60 + msgctxt "CategoryName" + msgid "Miscellaneous" + msgstr "杂类" + +-#: ../libedataserver/e-categories.c:62 ++#: ../libedataserver/e-categories.c:61 + msgctxt "CategoryName" + msgid "Personal" + msgstr "个人" + +-#: ../libedataserver/e-categories.c:63 ++#: ../libedataserver/e-categories.c:62 + msgctxt "CategoryName" + msgid "Phone Calls" + msgstr "通电话" + + #. Translators: "Status" is a category name; it can mean anything user wants to +-#: ../libedataserver/e-categories.c:65 ++#: ../libedataserver/e-categories.c:64 + msgctxt "CategoryName" + msgid "Status" + msgstr "状态" + +-#: ../libedataserver/e-categories.c:66 ++#: ../libedataserver/e-categories.c:65 + msgctxt "CategoryName" + msgid "Strategies" + msgstr "策略" + +-#: ../libedataserver/e-categories.c:67 ++#: ../libedataserver/e-categories.c:66 + msgctxt "CategoryName" + msgid "Suppliers" + msgstr "供应商" + +-#: ../libedataserver/e-categories.c:68 ++#: ../libedataserver/e-categories.c:67 + msgctxt "CategoryName" + msgid "Time & Expenses" + msgstr "时间和花费" + +-#: ../libedataserver/e-categories.c:69 ++#: ../libedataserver/e-categories.c:68 + msgctxt "CategoryName" + msgid "VIP" + msgstr "VIP" + +-#: ../libedataserver/e-categories.c:70 ++#: ../libedataserver/e-categories.c:69 + msgctxt "CategoryName" + msgid "Waiting" + msgstr "等候" + +-#: ../libedataserver/e-client.c:125 ++#: ../libedataserver/e-client.c:135 + msgid "Source not loaded" + msgstr "源尚未加载" + +-#: ../libedataserver/e-client.c:127 ++#: ../libedataserver/e-client.c:137 + msgid "Source already loaded" + msgstr "源已经加载" + +-#: ../libedataserver/e-client.c:135 ++#. Translators: This means that the EClient does not ++#. * support offline mode, or it's not set to by a user, ++#. * thus it is unavailable while user is not connected. ++#: ../libedataserver/e-client.c:148 + msgid "Offline unavailable" + msgstr "离线不可用" + +-#: ../libedataserver/e-client.c:157 ++#: ../libedataserver/e-client.c:170 + msgid "D-Bus error" + msgstr "D-Bus 错误" + ++#: ../libedataserver/e-source-authenticator.c:166 ++msgid "Address book authentication request" ++msgstr "地址簿认证请求" ++ ++#: ../libedataserver/e-source-authenticator.c:171 ++msgid "Calendar authentication request" ++msgstr "日历认证请求" ++ ++#: ../libedataserver/e-source-authenticator.c:175 ++msgid "Mail authentication request" ++msgstr "邮件认证请求" ++ ++#. generic account prompt ++#: ../libedataserver/e-source-authenticator.c:178 ++msgid "Authentication request" ++msgstr "认证请求" ++ ++#: ../libedataserver/e-source-authenticator.c:188 ++#, c-format ++msgid "Please enter the password for address book \"%s\"." ++msgstr "请为地址簿 \"%s\" 输入密码。" ++ ++#: ../libedataserver/e-source-authenticator.c:194 ++#, c-format ++msgid "Please enter the password for calendar \"%s\"." ++msgstr "请为日历 \"%s\" 输入密码。" ++ ++#: ../libedataserver/e-source-authenticator.c:200 ++#, c-format ++msgid "Please enter the password for mail account \"%s\"." ++msgstr "请为邮件帐户 \"%s\" 输入密码。" ++ ++#: ../libedataserver/e-source-authenticator.c:206 ++#, c-format ++msgid "Please enter the password for mail transport \"%s\"." ++msgstr "请为邮件传输 \"%s\" 输入密码。" ++ ++#: ../libedataserver/e-source-authenticator.c:212 ++#, c-format ++msgid "Please enter the password for memo list \"%s\"." ++msgstr "请为备忘录列表 \"%s\" 输入密码。" ++ ++#: ../libedataserver/e-source-authenticator.c:218 ++#, c-format ++msgid "Please enter the password for task list \"%s\"." ++msgstr "请为任务列表 \"%s\" 输入密码。" ++ ++#: ../libedataserver/e-source-authenticator.c:224 ++#, c-format ++msgid "Please enter the password for account \"%s\"." ++msgstr "请为帐户 \"%s\" 输入密码。" ++ ++#: ../libedataserver/e-source.c:627 ++#, c-format ++msgid "Source file is missing a [%s] group" ++msgstr "源文件缺少 [%s] 组" ++ ++#: ../libedataserver/e-source.c:949 ++#, c-format ++msgid "Data source '%s' is not removable" ++msgstr "数据源 '%s' 不能删除" ++ ++#: ../libedataserver/e-source.c:1041 ++#, c-format ++msgid "Data source '%s' is not writable" ++msgstr "数据源 '%s' 不可写入" ++ ++#: ../libedataserver/e-source.c:1559 ++msgid "Unnamed" ++msgstr "未命名" ++ ++#: ../libedataserver/e-source-mail-signature.c:487 ++#, c-format ++msgid "Signature script must be a local file" ++msgstr "签名脚本必须是本地文件" ++ ++#: ../libedataserver/e-source-webdav.c:1529 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by address book '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "由地址簿 '%s' 使用的主机 '%s' SSL 证书不可信。您要接受它吗？" ++ ++#: ../libedataserver/e-source-webdav.c:1538 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " ++"wish to accept it?" ++msgstr "由日历 '%s' 使用的主机 '%s' SSL 证书不可信。您要接受它吗？" ++ ++#: ../libedataserver/e-source-webdav.c:1547 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "由备忘录列表 '%s' 使用的主机 '%s' SSL 证书不可信。您要接受它吗？" ++ ++#: ../libedataserver/e-source-webdav.c:1556 ++#, c-format ++msgid "" ++"SSL certificate for host '%s', used by task list '%s', is not trusted. Do " ++"you wish to accept it?" ++msgstr "由任务列表 '%s' 使用的主机 '%s' SSL 证书不可信。您要接受它吗？" ++ + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944 ++#: ../libedataserver/e-time-utils.c:1663 ++#: ../libedataserver/e-time-utils.c:1962 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%Y-%m-%d %A%p%I:%M:%S" + +@@ -4830,7 +5039,8 @@ msgstr "%Y-%m-%d %A%p%I:%M:%S" + #. * in 24-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935 ++#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1953 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%Y-%m-%d %A %H:%M:%S" + +@@ -4838,7 +5048,8 @@ msgstr "%Y-%m-%d %A %H:%M:%S" + #. * in 12-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940 ++#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1958 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%Y-%m-%d %A%p%I:%M" + +@@ -4846,78 +5057,83 @@ msgstr "%Y-%m-%d %A%p%I:%M" + #. * in 24-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931 ++#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1949 + msgid "%a %m/%d/%Y %H:%M" + msgstr "%Y-%m-%d %A %H:%M" + + #. strptime format of a weekday, a date and a time, + #. * in 12-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1666 ++#: ../libedataserver/e-time-utils.c:1683 + msgid "%a %m/%d/%Y %I %p" + msgstr "%Y-%m-%d %A%p%I" + + #. strptime format of a weekday, a date and a time, + #. * in 24-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1671 ++#: ../libedataserver/e-time-utils.c:1688 + msgid "%a %m/%d/%Y %H" + msgstr "%Y-%m-%d %A %H" + + #. strptime format of a weekday and a date. + #. strftime format of a weekday and a date. +-#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794 +-#: ../libedataserver/e-time-utils.c:1926 ++#: ../libedataserver/e-time-utils.c:1691 ++#: ../libedataserver/e-time-utils.c:1811 ++#: ../libedataserver/e-time-utils.c:1944 + msgid "%a %m/%d/%Y" + msgstr "%Y-%m-%d %A" + + #. strptime format of a date and a time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1681 ++#: ../libedataserver/e-time-utils.c:1698 + msgid "%m/%d/%Y %I:%M:%S %p" + msgstr "%Y-%m-%d%p%I:%M:%S" + + #. strptime format of a date and a time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1685 ++#: ../libedataserver/e-time-utils.c:1702 + msgid "%m/%d/%Y %H:%M:%S" + msgstr "%Y-%m-%d %H:%M:%S" + + #. strptime format of a date and a time, in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1690 ++#: ../libedataserver/e-time-utils.c:1707 + msgid "%m/%d/%Y %I:%M %p" + msgstr "%Y-%m-%d%p%I:%M" + + #. strptime format of a date and a time, in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1695 ++#: ../libedataserver/e-time-utils.c:1712 + msgid "%m/%d/%Y %H:%M" + msgstr "%Y-%m-%d %H:%M" + + #. strptime format of a date and a time, in 12-hour format, + #. * without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1700 ++#: ../libedataserver/e-time-utils.c:1717 + msgid "%m/%d/%Y %I %p" + msgstr "%Y-%m-%d%p%I" + + #. strptime format of a date and a time, in 24-hour format, + #. * without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1705 ++#: ../libedataserver/e-time-utils.c:1722 + msgid "%m/%d/%Y %H" + msgstr "%Y-%m-%d %H" + + #. strptime format of a weekday and a date. + #. This is the preferred date format for the locale. +-#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797 ++#: ../libedataserver/e-time-utils.c:1725 ++#: ../libedataserver/e-time-utils.c:1814 + msgid "%m/%d/%Y" + msgstr "%Y-%m-%d" + + #. strptime format for a time of day, in 12-hour format. + #. strftime format of a time in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988 ++#: ../libedataserver/e-time-utils.c:1885 ++#: ../libedataserver/e-time-utils.c:2006 + msgid "%I:%M:%S %p" + msgstr "%p%I:%M:%S" + + #. strptime format for a time of day, in 24-hour format. + #. strftime format of a time in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980 ++#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1998 + msgid "%H:%M:%S" + msgstr "%H:%M:%S" + +@@ -4925,24 +5141,27 @@ msgstr "%H:%M:%S" + #. * in 12-hour format. + #. strftime format of a time in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985 ++#: ../libedataserver/e-time-utils.c:1894 ++#: ../libedataserver/e-time-utils.c:2003 + msgid "%I:%M %p" + msgstr "%p%I:%M" + + #. strptime format for time of day, without seconds 24-hour format. + #. strftime format of a time in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977 ++#: ../libedataserver/e-time-utils.c:1898 ++#: ../libedataserver/e-time-utils.c:1995 + msgid "%H:%M" + msgstr "%H:%M" + +-#. strptime format for time of day, without seconds 24-hour format, and no colon. +-#: ../libedataserver/e-time-utils.c:1884 ++#. strptime format for time of day, without seconds 24-hour format, ++#. * and no colon. ++#: ../libedataserver/e-time-utils.c:1902 + msgid "%H%M" + msgstr "%H%M" + + #. strptime format for hour and AM/PM, 12-hour format. +-#: ../libedataserver/e-time-utils.c:1888 ++#: ../libedataserver/e-time-utils.c:1906 + msgid "%I %p" + msgstr "%p%I" + +@@ -4954,8 +5173,7 @@ msgstr "代理类型" + msgid "" + "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" " + "means manual proxy." +-msgstr "使用何种类型的代理。0 代表使用系统代理设置、1 代表不使用代理、2 代" +-"表手动设置代理。" ++msgstr "使用何种类型的代理。0 代表使用系统代理设置、1 代表不使用代理、2 代表手动设置代理。" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 + msgid "Whether to use http-proxy" +@@ -4970,7 +5188,6 @@ msgid "Whether proxy server requires aut + msgstr "代理服务器是否需要认证" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6 +-#| msgid "Bad authentication response from server." + msgid "Whether authentication is required to access proxy server." + msgstr "访问代理服务器是否需要认证。" + +@@ -5054,241 +5271,553 @@ msgstr "自动代理配置 URL" + msgid "Where to read automatic proxy configuration from." + msgstr "从何处读取自动代理配置信息。" + +-#: ../libedataserverui/e-book-auth-util.c:96 +-#: ../libedataserverui/e-book-auth-util.c:656 +-msgid "Accessing LDAP Server anonymously" +-msgstr "匿名访问 LDAP 服务器" +- +-#: ../libedataserverui/e-book-auth-util.c:197 +-#: ../libedataserverui/e-book-auth-util.c:423 +-msgid "Failed to authenticate.\n" +-msgstr "身份验证失败。\n" +- +-#: ../libedataserverui/e-categories-editor.c:228 +-msgid "Currently _used categories:" +-msgstr "当前使用的分类(_U)：" +- +-#: ../libedataserverui/e-categories-editor.c:237 +-msgid "_Available Categories:" +-msgstr "可用类别(_A)：" +- +-#: ../libedataserverui/e-categories-selector.c:322 +-msgid "Icon" +-msgstr "图标" +- +-#: ../libedataserverui/e-categories-selector.c:327 +-msgid "Category" +-msgstr "类别" +- +-#: ../libedataserverui/e-category-completion.c:299 ++#: ../modules/gnome-online-accounts/e-goa-password-based.c:132 ++#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365 + #, c-format +-msgid "Create category \"%s\"" +-msgstr "创建分类“%s”" +- +-#: ../libedataserverui/e-category-editor.c:135 +-msgid "Category Icon" +-msgstr "类别图标" +- +-#: ../libedataserverui/e-category-editor.c:139 +-msgid "_No Image" +-msgstr "没有图像(_N)" ++msgid "No such data source for UID '%s'" ++msgstr "没有 UID '%s' 的数据源" + +-#: ../libedataserverui/e-category-editor.c:176 +-msgid "Category _Name" +-msgstr "类别名称(_N)" ++#: ../modules/gnome-online-accounts/e-goa-password-based.c:144 ++#, c-format ++msgid "" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain a password for '%s'" ++msgstr "在 org.gnome.OnlineAccounts 服务找不到对应的帐户以获取 '%s' 的密码。" + +-#: ../libedataserverui/e-category-editor.c:184 +-msgid "Category _Icon" +-msgstr "类别图标(_I)" ++#: ../modules/gnome-online-accounts/e-goa-password-based.c:216 ++#, c-format ++msgid "Invalid password for '%s'" ++msgstr "'%s' 的无效密码" + +-#: ../libedataserverui/e-category-editor.c:224 +-msgid "Category Properties" +-msgstr "类别属性" ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:223 ++#, c-format ++msgid "Code: %u - Unexpected response from server" ++msgstr "代码：%u - 来自服务器的意外回应" + +-#: ../libedataserverui/e-category-editor.c:285 ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:244 + #, c-format +-msgid "" +-"There is already a category '%s' in the configuration. Please use another " +-"name" +-msgstr "配置中已经有类别“%s”了。请使用另外一个名称" ++msgid "Failed to parse autodiscover response XML" ++msgstr "解析 autodiscover 回应 XML 失败" + +-#: ../libedataserverui/e-client-utils.c:856 ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:253 + #, c-format +-msgid "" +-"Enter password for calendar %s (user %s)\n" +-"Reason: %s" +-msgstr "" +-"输入日历 %s 的密码(用户 %s)\n" +-"原因：%s" ++msgid "Failed to find Autodiscover element" ++msgstr "查找 Autodiscover 元素失败" + +-#: ../libedataserverui/e-client-utils.c:858 ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:265 + #, c-format +-msgid "Enter password for calendar %s (user %s)" +-msgstr "输入日历 %s 的密码(用户 %s)" ++msgid "Failed to find Response element" ++msgstr "查找 Response(响应) 元素失败" + +-#: ../libedataserverui/e-client-utils.c:862 ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:277 + #, c-format +-msgid "" +-"Enter password for task list %s (user %s)\n" +-"Reason: %s" +-msgstr "" +-"输入任务列表 %s 的密码(用户 %s)\n" +-"原因：%s" ++msgid "Failed to find Account element" ++msgstr "查找 Account 元素失败" + +-#: ../libedataserverui/e-client-utils.c:864 ++#. TODO: more specific ++#: ../modules/gnome-online-accounts/goaewsclient.c:291 + #, c-format +-msgid "Enter password for task list %s (user %s)" +-msgstr "输入任务列表 %s 的密码(用户 %s)" ++msgid "Failed to find ASUrl and OABUrl in autodiscover response" ++msgstr "无法在 autodiscover 响应中找到 ASUrl 和 OABUrl" + +-#: ../libedataserverui/e-client-utils.c:868 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1271 + #, c-format + msgid "" +-"Enter password for memo list %s (user %s)\n" +-"Reason: %s" +-msgstr "" +-"输入备忘 %s 的密码(用户 %s)\n" +-"原因：%s" ++"Cannot find a corresponding account in the org.gnome.OnlineAccounts service " ++"from which to obtain an access token for '%s'" ++msgstr "在 org.gnome.OnlineAccounts 服务找不到对应的帐户以获取 '%s' 的访问令牌。" + +-#: ../libedataserverui/e-client-utils.c:870 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1298 + #, c-format +-msgid "Enter password for memo list %s (user %s)" +-msgstr "输入备忘 %s 的密码(用户 %s)" ++msgid "Failed to obtain an access token for '%s': " ++msgstr "为 '%s' 获取访问令牌失败：" + +-#: ../libedataserverui/e-client-utils.c:981 +-msgid "Enter Passphrase" +-msgstr "输入口令" ++#: ../modules/google-backend/module-google-backend.c:140 ++#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:200 ++msgid "Calendar" ++msgstr "日历" + +-#: ../libedataserverui/e-client-utils.c:983 +-msgid "Enter Password" +-msgstr "输入密码" +- +-#: ../libedataserverui/e-name-selector-dialog.c:187 +-msgid "Show Contacts" +-msgstr "显示联系人" ++#: ../modules/google-backend/module-google-backend.c:217 ++#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 ++#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 ++msgid "Contacts" ++msgstr "联系人" + +-#: ../libedataserverui/e-name-selector-dialog.c:209 +-msgid "Address B_ook:" +-msgstr "地址簿(_O)：" ++#: ../modules/trust-prompt/certificate-viewer.c:292 ++msgid "Not part of certificate" ++msgstr "不是证书的一部分" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:600 ++msgid "This certificate has been verified for the following uses:" ++msgstr "此证书已经被验证可做如下使用：" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:604 ++#: ../modules/trust-prompt/e-asn1-object.c:387 ++msgid "SSL Client Certificate" ++msgstr "SSL 客户端证书" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:609 ++#: ../modules/trust-prompt/e-asn1-object.c:391 ++msgid "SSL Server Certificate" ++msgstr "SSL 服务器证书" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:614 ++msgid "Email Signer Certificate" ++msgstr "电子邮件签名者证书" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:619 ++msgid "Email Recipient Certificate" ++msgstr "电子邮件收件人证书" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:634 ++msgid "Issued To" ++msgstr "颁发给" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:635 ++#: ../modules/trust-prompt/certificate-viewer.c:641 ++msgid "Common Name (CN)" ++msgstr "通用名(CN)" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:636 ++#: ../modules/trust-prompt/certificate-viewer.c:642 ++msgid "Organization (O)" ++msgstr "机构（O）" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:637 ++#: ../modules/trust-prompt/certificate-viewer.c:643 ++msgid "Organizational Unit (OU)" ++msgstr "机构单位（OU）" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:638 ++#: ../modules/trust-prompt/e-asn1-object.c:134 ++msgid "Serial Number" ++msgstr "序列号" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:640 ++msgid "Issued By" ++msgstr "颁发者" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:645 ++msgid "Validity" ++msgstr "有效性" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:646 ++msgid "Issued On" ++msgstr "发行日期" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:647 ++msgid "Expires On" ++msgstr "到期时间" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:649 ++msgid "Fingerprints" ++msgstr "指纹" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:650 ++msgid "SHA1 Fingerprint" ++msgstr "SHA1 指纹" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:651 ++msgid "MD5 Fingerprint" ++msgstr "MD5 指纹" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:653 ++msgid "General" ++msgstr "常规" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:672 ++msgid "Certificate Hierarchy" ++msgstr "证书层次" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:676 ++msgid "Certificate Fields" ++msgstr "证书字段" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:680 ++msgid "Field Value" ++msgstr "字段值" ++ ++#: ../modules/trust-prompt/certificate-viewer.c:682 ++msgid "Details" ++msgstr "详情" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:95 ++msgid "Version" ++msgstr "版本" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:110 ++msgid "Version 1" ++msgstr "版本 1" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:113 ++msgid "Version 2" ++msgstr "版本 2" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:116 ++msgid "Version 3" ++msgstr "版本 3" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:192 ++msgid "PKCS #1 MD2 With RSA Encryption" ++msgstr "使用 RSA 加密的 PKCS #1 MD2" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:195 ++msgid "PKCS #1 MD5 With RSA Encryption" ++msgstr "使用 RSA 加密的 PKCS #1 MD5" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:198 ++msgid "PKCS #1 SHA-1 With RSA Encryption" ++msgstr "使用 RSA 加密的 PKCS #1 SHA-1" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:201 ++msgid "PKCS #1 SHA-256 With RSA Encryption" ++msgstr "使用 RSA 加密的 PKCS #1 SHA-256" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:204 ++msgid "PKCS #1 SHA-384 With RSA Encryption" ++msgstr "使用 RSA 加密的 PKCS #1 SHA-384" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:207 ++msgid "PKCS #1 SHA-512 With RSA Encryption" ++msgstr "使用 RSA 加密的 PKCS #1 SHA-512" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:234 ++msgid "PKCS #1 RSA Encryption" ++msgstr "使用 RSA 加密的 PKCS #1" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:237 ++msgid "Certificate Key Usage" ++msgstr "证书密钥使用" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:240 ++msgid "Netscape Certificate Type" ++msgstr "Netscape 证书类型" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:243 ++msgid "Certificate Authority Key Identifier" ++msgstr "证书颁发密钥身份" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:255 ++#, c-format ++msgid "Object Identifier (%s)" ++msgstr "对象标识符(%s)" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:306 ++msgid "Algorithm Identifier" ++msgstr "算法标识符" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:314 ++msgid "Algorithm Parameters" ++msgstr "算法参数" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:336 ++msgid "Subject Public Key Info" ++msgstr "主题公钥信息" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:341 ++msgid "Subject Public Key Algorithm" ++msgstr "主题公钥算法" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:356 ++msgid "Subject's Public Key" ++msgstr "主题公钥" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:378 ++#: ../modules/trust-prompt/e-asn1-object.c:428 ++msgid "Error: Unable to process extension" ++msgstr "错误：无法处理扩展" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:395 ++msgid "Email" ++msgstr "电子邮件" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:399 ++#: ../modules/trust-prompt/e-asn1-object.c:411 ++msgid "Object Signer" ++msgstr "对象签名者" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:403 ++msgid "SSL Certificate Authority" ++msgstr "SSL 证书颁发机构" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:407 ++msgid "Email Certificate Authority" ++msgstr "电子邮件证书颁发机构" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:436 ++msgid "Signing" ++msgstr "签名" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:440 ++msgid "Non-repudiation" ++msgstr "不可抵赖" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:444 ++msgid "Key Encipherment" ++msgstr "密钥编码器" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:448 ++msgid "Data Encipherment" ++msgstr "数据编码器" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:452 ++msgid "Key Agreement" ++msgstr "密钥协议" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:456 ++msgid "Certificate Signer" ++msgstr "证书签名者" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:460 ++msgid "CRL Signer" ++msgstr "CRL 签名者" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:509 ++msgid "Critical" ++msgstr "关键" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:511 ++#: ../modules/trust-prompt/e-asn1-object.c:514 ++msgid "Not Critical" ++msgstr "非关键" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:535 ++msgid "Extensions" ++msgstr "扩展" ++ ++#. Translators: This string is used in Certificate ++#. * details for fields like Issuer or Subject, which ++#. * shows the field name on the left and its respective ++#. * value on the right, both as stored in the ++#. * certificate itself. You probably do not need to ++#. * change this string, unless changing the order of ++#. * name and value. As a result example: ++#. * "OU = VeriSign Trust Network" ++#: ../modules/trust-prompt/e-asn1-object.c:615 ++#, c-format ++msgid "%s = %s" ++msgstr "%s = %s" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:658 ++msgid "Certificate" ++msgstr "证书" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:674 ++#: ../modules/trust-prompt/e-asn1-object.c:812 ++msgid "Certificate Signature Algorithm" ++msgstr "证书签名算法" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:683 ++msgid "Issuer" ++msgstr "发行者" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:714 ++msgid "Subject" ++msgstr "主题" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:738 ++msgid "Issuer Unique ID" ++msgstr "发行者唯一 ID" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:757 ++msgid "Subject Unique ID" ++msgstr "主题唯一 ID" ++ ++#: ../modules/trust-prompt/e-asn1-object.c:818 ++msgid "Certificate Signature Value" ++msgstr "证书签名值" ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:201 ++msgid "The signing certificate authority is not known." ++msgstr "证书颁发机构未知。" ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:203 ++msgid "" ++"The certificate does not match the expected identity of the site that it was " ++"retrieved from." ++msgstr "证书与所取自站点的预期身份不符。" ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:205 ++msgid "The certificate's activation time is still in the future." ++msgstr "证书尚未激活。" ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:207 ++msgid "The certificate has expired." ++msgstr "证书已过期。" ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:209 ++msgid "" ++"The certificate has been revoked according to the connection's certificate " ++"revocation list." ++msgstr "根据该连接的证书吊销列表已吊销该证书。" ++ ++#: ../modules/trust-prompt/module-trust-prompt.c:211 ++msgid "The certificate's algorithm is considered insecure." ++msgstr "证书的算法不安全。" ++ ++#: ../modules/trust-prompt/trust-prompt-gtk.c:162 ++msgid "Certificate trust..." ++msgstr "证书信任......" ++ ++#: ../modules/trust-prompt/trust-prompt-gtk.c:163 ++msgid "_View Certificate" ++msgstr "查看证书（_V）" + +-#: ../libedataserverui/e-name-selector-dialog.c:217 +-msgid "Cate_gory:" +-msgstr "类别(_G)：" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:164 ++msgid "_Reject" ++msgstr "拒绝(_R)" + +-#: ../libedataserverui/e-name-selector-dialog.c:235 +-msgid "_Search:" +-msgstr "搜索(_S)：" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:165 ++msgid "Accept _Temporarily" ++msgstr "临时接受(_T)" + +-#: ../libedataserverui/e-name-selector-dialog.c:253 +-#: ../libedataserverui/e-name-selector-dialog.c:1038 +-msgid "Any Category" +-msgstr "任何类别" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:166 ++msgid "_Accept Permanently" ++msgstr "永久接受(_A)" + +-#: ../libedataserverui/e-name-selector-dialog.c:255 +-msgid "Co_ntacts" +-msgstr "联系人(_N)" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:203 ++#, c-format ++msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?" ++msgstr "'%s' 使用的主机 SSL 证书不可信。您要接受它吗？" + +-#: ../libedataserverui/e-name-selector-dialog.c:310 +-msgid "Search" +-msgstr "搜索" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:209 ++msgid "Detailed information about the certificate:" ++msgstr "有关该证书详情：" + +-#: ../libedataserverui/e-name-selector-dialog.c:313 +-msgid "Address Book" +-msgstr "地址簿" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:223 ++msgid "Issuer:" ++msgstr "发布者：" + +-#: ../libedataserverui/e-name-selector-dialog.c:316 +-msgid "Contacts" +-msgstr "联系人" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:224 ++msgid "Subject:" ++msgstr "主题：" + +-#: ../libedataserverui/e-name-selector-dialog.c:433 +-msgid "Select Contacts from Address Book" +-msgstr "从地址簿中选择联系人" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:225 ++msgid "Fingerprint:" ++msgstr "指纹：" + +-#: ../libedataserverui/e-name-selector-dialog.c:781 +-msgid "_Add" +-msgstr "添加(_A)" ++#: ../modules/trust-prompt/trust-prompt-gtk.c:226 ++msgid "Reason:" ++msgstr "原因：" + +-#: ../libedataserverui/e-name-selector-dialog.c:785 +-msgid "_Remove" +-msgstr "删除(_R)" ++#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2 ++msgid "Integrate your calendars" ++msgstr "整合您的日历" + +-#: ../libedataserverui/e-name-selector-dialog.c:957 +-#, c-format +-msgid "Error loading address book: %s" +-msgstr "载入地址簿时出错：%s" ++#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2 ++msgid "Integrate your contacts" ++msgstr "整合您的联系人" + +-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2823 +-#, c-format +-msgid "E_xpand %s Inline" +-msgstr "嵌入式展开 %s(_X)" ++#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257 ++msgid "Signon service did not return a secret" ++msgstr "Signon 服务未返回 secret" + +-#. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2838 +-#, c-format +-msgid "Cop_y %s" +-msgstr "复制 %s(_Y)" ++#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1 ++msgid "Google Calendar" ++msgstr "谷歌日历" + +-#. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2848 +-#, c-format +-msgid "C_ut %s" +-msgstr "剪切 %s(_U)" ++#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1 ++msgid "Google Contacts" ++msgstr "谷歌联系人" + +-#. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2865 +-#, c-format +-msgid "_Edit %s" +-msgstr "编辑 %s(_E)" ++#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1 ++msgid "GMail" ++msgstr "GMail" + +-#: ../libedataserverui/e-name-selector-list.c:524 +-#, c-format +-msgid "_Delete %s" +-msgstr "删除 %s(_D)" ++#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1 ++msgid "Mail" ++msgstr "邮件" + +-#: ../libedataserverui/e-passwords.c:126 +-msgid "Keyring key is unusable: no user or host name" +-msgstr "密钥环不可用：没有用户或主机名" ++#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2 ++msgid "Integrate your mailboxes" ++msgstr "整合您的邮箱" + +-#: ../libedataserverui/e-passwords.c:701 +-#: ../libedataserverui/e-passwords-win32.c:614 +-msgid "You have the Caps Lock key on." +-msgstr "您打开了 Caps Lock。" ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971 ++#, c-format ++msgid "" ++"Cannot find a corresponding account service in the accounts database from " ++"which to obtain an access token for '%s'" ++msgstr "无法在帐户数据库中找到对应帐户服务，该服务中包含 '%s' 的访问令牌。" + +-#: ../libedataserverui/e-passwords.c:821 +-#: ../libedataserverui/e-passwords-win32.c:737 +-msgid "_Remember this passphrase" +-msgstr "记住此密码句(_R)" ++#: ../modules/ubuntu-online-accounts/uoa-utils.c:79 ++#, c-format ++msgid "Expected status 200 when requesting guid, instead got status %d (%s)" ++msgstr "在请求 guid 时应得到状态 200，但却得到了状态 %d (%s)" + +-#: ../libedataserverui/e-passwords.c:822 +-#: ../libedataserverui/e-passwords-win32.c:738 +-msgid "_Remember this passphrase for the remainder of this session" +-msgstr "本次会话记住此密码句(_R)" ++#: ../modules/ubuntu-online-accounts/uoa-utils.c:96 ++msgid "Error parsing response as JSON: " ++msgstr "Error parsing response as JSON: " + +-#: ../libedataserverui/e-passwords.c:827 +-#: ../libedataserverui/e-passwords-win32.c:743 +-msgid "_Remember this password" +-msgstr "记住此密码(_R)" ++#: ../modules/ubuntu-online-accounts/uoa-utils.c:112 ++msgid "Didn't find email member in JSON data" ++msgstr "没有在 JSON 数据中找到电子邮件成员" + +-#: ../libedataserverui/e-passwords.c:828 +-#: ../libedataserverui/e-passwords-win32.c:744 +-msgid "_Remember this password for the remainder of this session" +-msgstr "本次会话记住此密码(_R)" ++#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1 ++msgid "Yahoo! Calendar" ++msgstr "雅虎日历" + +-#. prepare the dialog +-#: ../libedataserverui/e-source-selector-dialog.c:91 +-msgid "Select destination" +-msgstr "选择目的地" ++#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1 ++msgid "Yahoo! Mail" ++msgstr "雅虎邮件" + +-#: ../libedataserverui/e-source-selector-dialog.c:166 +-msgid "_Destination" +-msgstr "目的(_D)" ++#: ../modules/yahoo-backend/module-yahoo-backend.c:227 ++msgid "Tasks" ++msgstr "任务" + +-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48 +-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52 ++#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47 ++#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51 ++#: ../services/evolution-user-prompter/evolution-user-prompter.c:31 + msgid "Keep running after the last client is closed" + msgstr "客户端推出后继续运行" + +-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50 +-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54 ++#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49 ++#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53 + msgid "Wait running until at least one client is connected" + msgstr "等待到至少有一个客户端连接" ++ ++#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1 ++msgid "Birthdays & Anniversaries" ++msgstr "生日和纪念日" ++ ++#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1 ++msgid "CalDAV" ++msgstr "CalDAV" ++ ++#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1 ++msgid "Google" ++msgstr "谷歌" ++ ++#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1 ++msgid "On LDAP Servers" ++msgstr "LDAP 服务器中" ++ ++#: ../services/evolution-source-registry/builtin/local.source.in.h:1 ++#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1 ++msgid "On This Computer" ++msgstr "在此计算机中" ++ ++#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1 ++msgid "Search Folders" ++msgstr "搜索文件夹" ++ ++#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1 ++msgid "Weather" ++msgstr "天气" ++ ++#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1 ++msgid "On The Web" ++msgstr "网上" ++ ++#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1 ++msgid "WebDAV" ++msgstr "WebDAV" ++ ++#: ../services/evolution-user-prompter/prompt-user-gtk.c:122 ++msgid "_Dismiss" ++msgstr "撤销（_D）" +diff -up evolution-data-server-3.8.5/po/zh_TW.po.translations evolution-data-server-3.8.5/po/zh_TW.po +--- evolution-data-server-3.8.5/po/zh_TW.po.translations 2013-03-17 13:46:02.000000000 +0100 ++++ evolution-data-server-3.8.5/po/zh_TW.po 2014-01-13 16:23:40.793630231 +0100 +@@ -5,20 +5,21 @@ + # Craig Jeffares ,2004. + # Chao-Hsiung Liao , 2005. 2008, 2010, 2012. + # Wei-Lun Chao , 2010. ++# ccheng , 2013. #zanata + msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server 3.3.91\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2013-03-06 18:54+0800\n" +-"PO-Revision-Date: 2013-03-05 19:38+0800\n" +-"Last-Translator: Chao-Hsiung Liao \n" ++"PO-Revision-Date: 2013-09-23 01:13-0400\n" ++"Last-Translator: ccheng \n" + "Language-Team: Chinese (traditional)\n" +-"Language: zh_TW\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: zh-TW\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Poedit 1.5.3\n" ++"X-Generator: Zanata 3.1.2\n" + "X-Project-Style: gnome\n" + + #: ../addressbook/backends/file/e-book-backend-file.c:114 +@@ -48,7 +49,7 @@ msgstr "在加入的連絡人中發現� + + #: ../addressbook/backends/file/e-book-backend-file.c:844 + #: ../addressbook/backends/file/e-book-backend-file.c:1038 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2595 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2656 + #, c-format + msgid "Contact '%s' not found" + msgstr "找不到連絡人「%s」" +@@ -75,7 +76,7 @@ msgid "Loading..." + msgstr "載入中…" + + #: ../addressbook/backends/file/e-book-backend-file.c:1250 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4963 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4978 + msgid "Searching..." + msgstr "搜尋中…" + +@@ -85,8 +86,8 @@ msgid "Failed to rename old database fro + msgstr "無法將舊資料庫「%s」重新命名為「%s」： %s" + + #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1222 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4858 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4873 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:338 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 +@@ -94,58 +95,60 @@ msgstr "無法將舊資料庫「%s」重 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:562 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:592 + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 +-#: ../calendar/libecal/e-cal.c:2339 ../calendar/libecal/e-cal-client.c:268 +-#: ../camel/camel-imapx-command.c:596 ../libedataserver/e-client.c:179 ++#: ../calendar/libecal/e-cal.c:2339 ++#: ../calendar/libecal/e-cal-client.c:275 ++#: ../camel/camel-imapx-command.c:609 ++#: ../libedataserver/e-client.c:179 + msgid "Unknown error" + msgstr "不明的錯誤" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:649 ++#: ../addressbook/backends/google/e-book-backend-google.c:679 + msgid "Querying for updated contacts…" + msgstr "查詢更新的連絡人…" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:786 ++#: ../addressbook/backends/google/e-book-backend-google.c:816 + msgid "Querying for updated groups…" + msgstr "查詢更新的群組…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1235 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1653 ++#: ../addressbook/backends/google/e-book-backend-google.c:1265 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:389 + msgid "The backend does not support bulk additions" + msgstr "後端不支援大量增加" + + #. Insert the entry on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1267 ++#: ../addressbook/backends/google/e-book-backend-google.c:1297 + msgid "Creating new contact…" + msgstr "建立新的連絡人…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1358 ++#: ../addressbook/backends/google/e-book-backend-google.c:1388 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:506 + msgid "The backend does not support bulk removals" + msgstr "後端不支援大量移除" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1386 ++#: ../addressbook/backends/google/e-book-backend-google.c:1416 + msgid "Deleting contact…" + msgstr "刪除連絡人…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1640 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2319 ++#: ../addressbook/backends/google/e-book-backend-google.c:1670 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334 + #: ../addressbook/backends/webdav/e-book-backend-webdav.c:567 + msgid "The backend does not support bulk modifications" + msgstr "後端不支援大量修改" + + #. Update the contact on the server asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:1678 ++#: ../addressbook/backends/google/e-book-backend-google.c:1708 + msgid "Modifying contact…" + msgstr "修改連絡人…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1849 ++#: ../addressbook/backends/google/e-book-backend-google.c:1879 + msgid "Loading…" + msgstr "載入中…" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1602 ++#: ../addressbook/backends/google/e-book-google-utils.c:1606 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -154,88 +157,88 @@ msgid "Personal" + msgstr "個人" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1604 ++#: ../addressbook/backends/google/e-book-google-utils.c:1608 + msgid "Friends" + msgstr "朋友" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1606 ++#: ../addressbook/backends/google/e-book-google-utils.c:1610 + msgid "Family" + msgstr "家人" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1608 ++#: ../addressbook/backends/google/e-book-google-utils.c:1612 + msgid "Coworkers" + msgstr "同事" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174 + msgid "Not connected" + msgstr "未連線" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:950 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "無法使用 v3 或 v2 的 binds 來綁定" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1073 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088 + msgid "Reconnecting to LDAP server..." + msgstr "正在重新連接 LDAP 伺服器…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1203 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218 + msgid "Invalid DN syntax" + msgstr "無效的 DN 語法" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1219 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4857 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4872 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP 錯誤 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1737 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Adding contact to LDAP server..." + msgstr "正在新增連絡人至 LDAP 伺服器…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1875 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1890 + msgid "Removing contact from LDAP server..." + msgstr "正在移除 LDAP 伺服器中的連絡人…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2019 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2431 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s：從 ldap_first_entry 傳回 NULL" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2272 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2474 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2489 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s：傳回未處理的類型 %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2341 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2356 + msgid "Modifying contact from LDAP server..." + msgstr "正在修改 LDAP 伺服器中的連絡人…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2703 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2935 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2718 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2950 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s：傳回未處理的搜尋結果類型 %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4806 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4821 + msgid "Receiving LDAP search results..." + msgstr "正在接收 LDAP 搜尋結果…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4985 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5000 + msgid "Error performing search" + msgstr "進行搜尋時發生錯誤" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5108 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "正在下載連絡人 (%d)…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5571 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5654 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "無法擷取 DN 給使用者「%s」" +@@ -770,7 +773,7 @@ msgid "Birth Date" + msgstr "出生日期" + + #: ../addressbook/libebook-contacts/e-contact.c:283 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:960 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:875 + msgid "Anniversary" + msgstr "週年紀念日" + +@@ -880,7 +883,7 @@ msgstr "Google Talk 名稱清單" + msgid "Twitter Name List" + msgstr "Twitter 名稱清單" + +-#: ../addressbook/libebook-contacts/e-contact.c:1683 ++#: ../addressbook/libebook-contacts/e-contact.c:1624 + #: ../addressbook/libebook/e-destination.c:884 + msgid "Unnamed List" + msgstr "未命名的清單" +@@ -903,7 +906,8 @@ msgstr "無效的國家呼叫代碼" + + #: ../addressbook/libebook-contacts/e-phone-number.c:51 + msgid "" +-"Remaining text after the country calling code is too short for a phone number" ++"Remaining text after the country calling code is too short for a phone " ++"number" + msgstr "國碼後的文字太短，不足電話號碼的長度" + + #: ../addressbook/libebook-contacts/e-phone-number.c:53 +@@ -914,91 +918,90 @@ msgstr "文字太短，不符合電話� + msgid "Text is too long for a phone number" + msgstr "文字太長，不符合電話號碼格式" + +-#: ../addressbook/libebook/e-book-client.c:682 ++#: ../addressbook/libebook/e-book-client.c:643 + #: ../addressbook/libedata-book/e-book-backend.c:120 + #, c-format + msgid "Unknown book property '%s'" + msgstr "不明的通訊錄屬性「%s」" + +-#: ../addressbook/libebook/e-book-client.c:697 ++#: ../addressbook/libebook/e-book-client.c:658 + #, c-format + msgid "Cannot change value of book property '%s'" + msgstr "不能改變通訊錄屬性「%s」的數值" + +-#: ../addressbook/libebook/e-book-client.c:1003 +-#: ../addressbook/libebook/e-book-client.c:1176 +-#: ../calendar/libecal/e-cal-client.c:1451 +-#: ../calendar/libecal/e-cal-client.c:1631 ++#: ../addressbook/libebook/e-book-client.c:993 ++#: ../addressbook/libebook/e-book-client.c:1168 ++#: ../calendar/libecal/e-cal-client.c:1515 ++#: ../calendar/libecal/e-cal-client.c:1697 + #, c-format + msgid "Unable to connect to '%s': " + msgstr "無法連線至「%s」：" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:752 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793 + #, c-format + msgid "Error introspecting unknown summary field '%s'" + msgstr "插補不明的摘要欄位「%s」時發生錯誤" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1229 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289 + #: ../camel/camel-db.c:544 + #, c-format + msgid "Insufficient memory" + msgstr "記憶體不足" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1362 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1422 + #, c-format + msgid "Invalid contact field '%d' specified in summary" + msgstr "在摘要中指定了無效的連絡人欄位「%d」" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1396 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1456 + #, c-format + msgid "" + "Contact field '%s' of type '%s' specified in summary, but only boolean, " + "string and string list field types are supported" +-msgstr "" +-"在摘要中指定了類型「%2$s」的連絡人欄位「%1$s」，但是只支援布林值、字串及字串" +-"清單欄位類型" ++msgstr "在摘要中指定了類型「%2$s」的連絡人欄位「%1$s」，但是只支援布林值、字串及字串清單欄位類型" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2583 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3609 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2644 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3686 + #, c-format + msgid "" + "Full search_contacts are not stored in cache. vcards cannot be returned." + msgstr "完整搜尋連絡人未儲存於快取。不能傳回 vcard。" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3735 +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3812 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3893 + #, c-format + msgid "Query contained unsupported elements" + msgstr "查詢包含了不支援的元素" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3739 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3816 + #, c-format + msgid "Invalid Query" + msgstr "無效的查詢" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3763 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3840 + #, c-format + msgid "" + "Full search_contacts are not stored in cache. Hence only summary query is " + "supported." + msgstr "完整搜尋連絡人未儲存於快取。因此只支援摘要查詢。" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3820 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897 + #: ../addressbook/libedata-book/e-data-book.c:669 + #: ../addressbook/libedata-book/e-data-book.c:809 + #: ../calendar/libedata-cal/e-data-cal.c:612 +-#: ../calendar/libedata-cal/e-data-cal.c:771 ../libedataserver/e-client.c:166 ++#: ../calendar/libedata-cal/e-data-cal.c:771 ++#: ../libedataserver/e-client.c:166 + #, c-format + msgid "Invalid query" + msgstr "無效的查詢" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3862 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3940 + #, c-format + msgid "" + "Full vcards are not stored in cache. Hence only summary query is supported." + msgstr "完整 vcard 未儲存於快取。因此只支援摘要查詢。" + +-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4563 ++#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4643 + #, c-format + msgid "Unable to remove the db file: errno %d" + msgstr "無法移除 db 檔案：錯誤 %d" +@@ -1010,7 +1013,6 @@ msgstr "客戶端不能設定後端屬� + + #. Translators: This is prefix to a detailed error message + #. Translators: This is a prefix to a detailed error message * +-#. + #: ../addressbook/libedata-book/e-data-book.c:691 + #: ../calendar/libedata-cal/e-data-cal.c:635 + msgid "Invalid query: " +@@ -1022,18 +1024,21 @@ msgid "Success" + msgstr "成功" + + #: ../addressbook/libedata-book/e-data-book.c:794 +-#: ../calendar/libecal/e-cal.c:2307 ../calendar/libedata-cal/e-data-cal.c:753 ++#: ../calendar/libecal/e-cal.c:2307 ++#: ../calendar/libedata-cal/e-data-cal.c:753 + #: ../libedataserver/e-client.c:133 + msgid "Backend is busy" + msgstr "後端忙碌中" + + #: ../addressbook/libedata-book/e-data-book.c:795 +-#: ../calendar/libedata-cal/e-data-cal.c:754 ../libedataserver/e-client.c:143 ++#: ../calendar/libedata-cal/e-data-cal.c:754 ++#: ../libedataserver/e-client.c:143 + msgid "Repository offline" + msgstr "資料庫離線" + + #: ../addressbook/libedata-book/e-data-book.c:796 +-#: ../calendar/libecal/e-cal.c:2321 ../calendar/libedata-cal/e-data-cal.c:755 ++#: ../calendar/libecal/e-cal.c:2321 ++#: ../calendar/libedata-cal/e-data-cal.c:755 + #: ../libedataserver/e-client.c:150 + msgid "Permission denied" + msgstr "權限不足" +@@ -1054,12 +1059,14 @@ msgid "Unsupported field" + msgstr "不支援的欄位" + + #: ../addressbook/libedata-book/e-data-book.c:802 +-#: ../calendar/libedata-cal/e-data-cal.c:764 ../libedataserver/e-client.c:158 ++#: ../calendar/libedata-cal/e-data-cal.c:764 ++#: ../libedataserver/e-client.c:158 + msgid "Unsupported authentication method" + msgstr "不支援的驗證方法" + + #: ../addressbook/libedata-book/e-data-book.c:803 +-#: ../calendar/libedata-cal/e-data-cal.c:765 ../libedataserver/e-client.c:160 ++#: ../calendar/libedata-cal/e-data-cal.c:765 ++#: ../libedataserver/e-client.c:160 + msgid "TLS not available" + msgstr "無法使用 TLS" + +@@ -1077,22 +1084,26 @@ msgid "Not available in offline mode" + msgstr "無法在離線模式下使用" + + #: ../addressbook/libedata-book/e-data-book.c:807 +-#: ../calendar/libedata-cal/e-data-cal.c:769 ../libedataserver/e-client.c:162 ++#: ../calendar/libedata-cal/e-data-cal.c:769 ++#: ../libedataserver/e-client.c:162 + msgid "Search size limit exceeded" + msgstr "超過搜尋大小限制" + + #: ../addressbook/libedata-book/e-data-book.c:808 +-#: ../calendar/libedata-cal/e-data-cal.c:770 ../libedataserver/e-client.c:164 ++#: ../calendar/libedata-cal/e-data-cal.c:770 ++#: ../libedataserver/e-client.c:164 + msgid "Search time limit exceeded" + msgstr "超過搜尋時間限制" + + #: ../addressbook/libedata-book/e-data-book.c:810 +-#: ../calendar/libedata-cal/e-data-cal.c:772 ../libedataserver/e-client.c:168 ++#: ../calendar/libedata-cal/e-data-cal.c:772 ++#: ../libedataserver/e-client.c:168 + msgid "Query refused" + msgstr "查詢被拒絕" + + #: ../addressbook/libedata-book/e-data-book.c:811 +-#: ../calendar/libedata-cal/e-data-cal.c:773 ../libedataserver/e-client.c:154 ++#: ../calendar/libedata-cal/e-data-cal.c:773 ++#: ../libedataserver/e-client.c:154 + msgid "Could not cancel" + msgstr "無法取消" + +@@ -1104,22 +1115,27 @@ msgid "Invalid server version" + msgstr "無效的伺服器版本" + + #: ../addressbook/libedata-book/e-data-book.c:815 +-#: ../calendar/libecal/e-cal.c:2305 ../calendar/libedata-cal/e-data-cal.c:776 ++#: ../calendar/libecal/e-cal.c:2305 ++#: ../calendar/libedata-cal/e-data-cal.c:776 + #: ../libedataserver/e-client.c:131 + msgid "Invalid argument" + msgstr "無效的參數" + + #. Translators: The string for NOT_SUPPORTED error + #: ../addressbook/libedata-book/e-data-book.c:817 +-#: ../calendar/libecal/e-cal.c:1064 ../calendar/libecal/e-cal.c:1432 +-#: ../calendar/libecal/e-cal.c:1912 ../calendar/libecal/e-cal.c:2344 +-#: ../calendar/libedata-cal/e-data-cal.c:778 ../libedataserver/e-client.c:156 ++#: ../calendar/libecal/e-cal.c:1064 ++#: ../calendar/libecal/e-cal.c:1432 ++#: ../calendar/libecal/e-cal.c:1912 ++#: ../calendar/libecal/e-cal.c:2344 ++#: ../calendar/libedata-cal/e-data-cal.c:778 ++#: ../libedataserver/e-client.c:156 + #, c-format + msgid "Not supported" + msgstr "不支援" + + #: ../addressbook/libedata-book/e-data-book.c:818 +-#: ../calendar/libedata-cal/e-data-cal.c:779 ../libedataserver/e-client.c:174 ++#: ../calendar/libedata-cal/e-data-cal.c:779 ++#: ../libedataserver/e-client.c:174 + msgid "Backend is not opened yet" + msgstr "後端尚未開啟" + +@@ -1129,7 +1145,8 @@ msgid "Object is out of sync" + msgstr "物件沒有同步" + + #: ../addressbook/libedata-book/e-data-book.c:827 +-#: ../calendar/libedata-cal/e-data-cal.c:787 ../libedataserver/e-client.c:172 ++#: ../calendar/libedata-cal/e-data-cal.c:787 ++#: ../libedataserver/e-client.c:172 + msgid "Other error" + msgstr "其他錯誤" + +@@ -1220,8 +1237,7 @@ msgstr "無效的重新導向 URL" + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" + "Error message: %s" +-msgstr "" +-"無法連接伺服器，行事曆會以唯讀模式開啟。\n" ++msgstr "無法連接伺服器，行事曆會以唯讀模式開啟。\n" + "錯誤訊息：%s" + + #: ../calendar/backends/caldav/e-cal-backend-caldav.c:2801 +@@ -1253,16 +1269,16 @@ msgstr "找不到排程的寄件匣 url" + msgid "Unexpected result in schedule-response" + msgstr "在排程-回應中未預期的結果" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:877 + msgid "Birthday" + msgstr "生日" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:998 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:913 + #, c-format + msgid "Birthday: %s" + msgstr "生日：%s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1029 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:944 + #, c-format + msgid "Anniversary: %s" + msgstr "紀念日：%s" +@@ -1297,7 +1313,7 @@ msgid "Not a calendar." + msgstr "並非行事曆。" + + #: ../calendar/backends/http/e-cal-backend-http.c:926 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:514 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:520 + msgid "Could not create cache file" + msgstr "無法建構快取檔案" + +@@ -1305,43 +1321,43 @@ msgstr "無法建構快取檔案" + msgid "Could not retrieve weather data" + msgstr "無法取得天氣資料" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:278 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:284 + msgid "Weather: Fog" + msgstr "天氣：起霧" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:279 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:285 + msgid "Weather: Cloudy Night" + msgstr "天氣：多雲的夜晚" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:280 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:286 + msgid "Weather: Cloudy" + msgstr "天氣：多雲" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:281 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:287 + msgid "Weather: Overcast" + msgstr "天氣：多雲" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:282 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:288 + msgid "Weather: Showers" + msgstr "天氣：陣雨" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:283 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:289 + msgid "Weather: Snow" + msgstr "天氣：下雪" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:284 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:290 + msgid "Weather: Clear Night" + msgstr "天氣：晴朗的夜晚" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:285 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:291 + msgid "Weather: Sunny" + msgstr "天氣：艷陽" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:286 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:292 + msgid "Weather: Thunderstorms" + msgstr "天氣：雷暴" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:410 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:416 + msgid "Forecast" + msgstr "天氣預報" + +@@ -1349,16 +1365,19 @@ msgstr "天氣預報" + msgid "Repository is offline" + msgstr "倉庫已離線" + +-#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:255 ++#: ../calendar/libecal/e-cal.c:2311 ++#: ../calendar/libecal/e-cal-client.c:262 + msgid "No such calendar" + msgstr "無此行事曆" + +-#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:257 ++#: ../calendar/libecal/e-cal.c:2313 ++#: ../calendar/libecal/e-cal-client.c:264 + #: ../calendar/libedata-cal/e-data-cal.c:757 + msgid "Object not found" + msgstr "找不到物件" + +-#: ../calendar/libecal/e-cal.c:2315 ../calendar/libecal/e-cal-client.c:259 ++#: ../calendar/libecal/e-cal.c:2315 ++#: ../calendar/libecal/e-cal-client.c:266 + #: ../calendar/libedata-cal/e-data-cal.c:758 + msgid "Invalid object" + msgstr "無效的物件" +@@ -1375,7 +1394,8 @@ msgstr "URI 已載入" + msgid "Unknown User" + msgstr "不明的使用者" + +-#: ../calendar/libecal/e-cal.c:2325 ../calendar/libecal/e-cal-client.c:263 ++#: ../calendar/libecal/e-cal.c:2325 ++#: ../calendar/libecal/e-cal-client.c:270 + #: ../calendar/libedata-cal/e-data-cal.c:759 + msgid "Object ID already exists" + msgstr "物件 ID 已存在" +@@ -1392,12 +1412,13 @@ msgstr "操作已取消" + msgid "Could not cancel operation" + msgstr "無法取消操作" + +-#: ../calendar/libecal/e-cal.c:2333 ../libedataserver/e-client.c:139 ++#: ../calendar/libecal/e-cal.c:2333 ++#: ../libedataserver/e-client.c:139 + msgid "Authentication failed" + msgstr "驗證失敗" + + #: ../calendar/libecal/e-cal.c:2335 +-#: ../camel/providers/smtp/camel-smtp-transport.c:923 ++#: ../camel/providers/smtp/camel-smtp-transport.c:915 + #: ../libedataserver/e-client.c:141 + msgid "Authentication required" + msgstr "要求驗證" +@@ -1410,23 +1431,23 @@ msgstr "發生 D-Bus 例外" + msgid "No error" + msgstr "沒有錯誤" + +-#: ../calendar/libecal/e-cal-client.c:261 ++#: ../calendar/libecal/e-cal-client.c:268 + #: ../calendar/libedata-cal/e-data-cal.c:767 + msgid "Unknown user" + msgstr "不明的使用者" + +-#: ../calendar/libecal/e-cal-client.c:265 ++#: ../calendar/libecal/e-cal-client.c:272 + #: ../calendar/libedata-cal/e-data-cal.c:756 + msgid "Invalid range" + msgstr "無效的範圍" + +-#: ../calendar/libecal/e-cal-client.c:890 ++#: ../calendar/libecal/e-cal-client.c:920 + #: ../calendar/libedata-cal/e-cal-backend.c:204 + #, c-format + msgid "Unknown calendar property '%s'" + msgstr "不明的行事曆屬性「%s」" + +-#: ../calendar/libecal/e-cal-client.c:905 ++#: ../calendar/libecal/e-cal-client.c:935 + #, c-format + msgid "Cannot change value of calendar property '%s'" + msgstr "不能改變行事曆屬性「%s」的數值" +@@ -1559,17 +1580,20 @@ msgstr "30日" + msgid "31st" + msgstr "31日" + +-#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734 ++#: ../calendar/libecal/e-cal-util.c:707 ++#: ../calendar/libecal/e-cal-util.c:734 + msgctxt "Priority" + msgid "High" + msgstr "高" + +-#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736 ++#: ../calendar/libecal/e-cal-util.c:709 ++#: ../calendar/libecal/e-cal-util.c:736 + msgctxt "Priority" + msgid "Normal" + msgstr "中" + +-#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738 ++#: ../calendar/libecal/e-cal-util.c:711 ++#: ../calendar/libecal/e-cal-util.c:738 + msgctxt "Priority" + msgid "Low" + msgstr "低" +@@ -1662,9 +1686,7 @@ msgid "" + "\"%s\" expects the first argument to be either \"any\", \"summary\", or " + "\"description\", or \"location\", or \"attendee\", or \"organizer\", or " + "\"classification\"" +-msgstr "" +-"「%s」的第一個引數必須為「任何」、「摘要」之一，或「描述」、「位置」、「到會" +-"者」、「召集人」、「分類」其中之一" ++msgstr "「%s」的第一個引數必須為「任何」、「摘要」之一，或「描述」、「位置」、「到會者」、「召集人」、「分類」其中之一" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:878 + #, c-format +@@ -1838,8 +1860,7 @@ msgid "" + "Could not write log entry: %s\n" + "Further operations on this server will not be replayed when you\n" + "reconnect to the network." +-msgstr "" +-"無法寫入紀錄： %s\n" ++msgstr "無法寫入紀錄： %s\n" + "接下來在此伺服器上的操作，在您重新連線到網路時\n" + "將不會重播。" + +@@ -1849,8 +1870,7 @@ msgid "" + "Could not open '%s':\n" + "%s\n" + "Changes made to this folder will not be resynchronized." +-msgstr "" +-"無法開啟「%s」：\n" ++msgstr "無法開啟「%s」：\n" + "%s\n" + "這個資料夾內所做的變更將不會重新同步。" + +@@ -1858,7 +1878,8 @@ msgstr "" + msgid "Resynchronizing with server" + msgstr "與伺服器重新同步" + +-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93 ++#: ../camel/camel-disco-folder.c:76 ++#: ../camel/camel-offline-folder.c:93 + msgid "Downloading new messages for offline mode" + msgstr "正在下載新訊息用於離線模式" + +@@ -1867,23 +1888,33 @@ msgstr "正在下載新訊息用於離� + msgid "Preparing folder '%s' for offline" + msgstr "準備資料夾「%s」供離線使用" + +-#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336 ++#: ../camel/camel-disco-folder.c:489 ++#: ../camel/camel-offline-folder.c:336 + msgid "Copy folder content locally for _offline operation" + msgstr "複製資料夾內容至本地用於離線作業(_O)" + +-#: ../camel/camel-disco-store.c:475 ../camel/camel-imapx-folder.c:478 +-#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553 +-#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748 +-#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993 +-#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:368 +-#: ../camel/camel-imapx-store.c:1573 ../camel/camel-imapx-store.c:1662 +-#: ../camel/camel-imapx-store.c:1711 +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 +-#: ../camel/providers/pop3/camel-pop3-folder.c:677 +-#: ../camel/providers/pop3/camel-pop3-folder.c:906 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1106 +-#: ../camel/providers/pop3/camel-pop3-store.c:472 +-#: ../camel/providers/pop3/camel-pop3-store.c:896 ++#: ../camel/camel-disco-store.c:475 ++#: ../camel/camel-imapx-folder.c:478 ++#: ../camel/camel-imapx-folder.c:514 ++#: ../camel/camel-imapx-folder.c:553 ++#: ../camel/camel-imapx-folder.c:613 ++#: ../camel/camel-imapx-folder.c:748 ++#: ../camel/camel-imapx-folder.c:933 ++#: ../camel/camel-imapx-folder.c:993 ++#: ../camel/camel-imapx-folder.c:1032 ++#: ../camel/camel-imapx-store.c:368 ++#: ../camel/camel-imapx-store.c:1592 ++#: ../camel/camel-imapx-store.c:1681 ++#: ../camel/camel-imapx-store.c:1730 ++#: ../camel/providers/pop3/camel-pop3-folder.c:555 ++#: ../camel/providers/pop3/camel-pop3-folder.c:705 ++#: ../camel/providers/pop3/camel-pop3-folder.c:940 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1150 ++#: ../camel/providers/pop3/camel-pop3-store.c:291 ++#: ../camel/providers/pop3/camel-pop3-store.c:519 ++#: ../camel/providers/pop3/camel-pop3-store.c:567 ++#: ../camel/providers/pop3/camel-pop3-store.c:652 ++#: ../camel/providers/pop3/camel-pop3-store.c:1052 + #, c-format + msgid "You must be working online to complete this operation" + msgstr "您必須於線上工作才能完成此操作" +@@ -1893,7 +1924,8 @@ msgstr "您必須於線上工作才能� + msgid "Canceled" + msgstr "已取消" + +-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797 ++#: ../camel/camel-filter-driver.c:916 ++#: ../camel/camel-filter-search.c:797 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "無法建構子代處理 '%s'：%s" +@@ -1903,69 +1935,74 @@ msgstr "無法建構子代處理 '%s'： + msgid "Invalid message stream received from %s: %s" + msgstr "無法讀取 %s 的歡迎辭： %s" + +-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178 ++#: ../camel/camel-filter-driver.c:1171 ++#: ../camel/camel-filter-driver.c:1180 + msgid "Syncing folders" + msgstr "同步處理資料夾" + +-#: ../camel/camel-filter-driver.c:1276 ++#: ../camel/camel-filter-driver.c:1278 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "分析過濾器發生錯誤： %s: %s" + +-#: ../camel/camel-filter-driver.c:1287 ++#: ../camel/camel-filter-driver.c:1289 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "執行過濾器發生錯誤： %s: %s" + +-#: ../camel/camel-filter-driver.c:1383 ++#: ../camel/camel-filter-driver.c:1385 + #, c-format + msgid "Unable to open spool folder" + msgstr "無法開啟排程器資料夾" + +-#: ../camel/camel-filter-driver.c:1395 ++#: ../camel/camel-filter-driver.c:1397 + #, c-format + msgid "Unable to process spool folder" + msgstr "無法處理排程器資料夾" + +-#: ../camel/camel-filter-driver.c:1415 ++#: ../camel/camel-filter-driver.c:1420 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "接收郵件 %d (%d%%)" + +-#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446 ++#: ../camel/camel-filter-driver.c:1429 ++#: ../camel/camel-filter-driver.c:1451 + #, c-format + msgid "Failed on message %d" + msgstr "在第 %d 封郵件發生錯誤" + +-#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573 ++#: ../camel/camel-filter-driver.c:1470 ++#: ../camel/camel-filter-driver.c:1584 + msgid "Syncing folder" + msgstr "同步處理資料夾" + +-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581 ++#: ../camel/camel-filter-driver.c:1475 ++#: ../camel/camel-filter-driver.c:1592 + msgid "Complete" + msgstr "完成" + +-#: ../camel/camel-filter-driver.c:1529 ++#: ../camel/camel-filter-driver.c:1538 + #, c-format + msgid "Getting message %d of %d" + msgstr "正在接收第 %d / %d 封郵件" + +-#: ../camel/camel-filter-driver.c:1547 ++#: ../camel/camel-filter-driver.c:1556 + #, c-format + msgid "Failed at message %d of %d" + msgstr "在第 %d / %d 封郵件失敗" + +-#: ../camel/camel-filter-driver.c:1741 ../camel/camel-filter-driver.c:1775 ++#: ../camel/camel-filter-driver.c:1752 ++#: ../camel/camel-filter-driver.c:1786 + #, c-format + msgid "Execution of filter '%s' failed: " + msgstr "過濾器「%s」的執行失敗：" + +-#: ../camel/camel-filter-driver.c:1765 ++#: ../camel/camel-filter-driver.c:1776 + #, c-format + msgid "Error parsing filter '%s': %s: %s" + msgstr "分析過濾器「%s」發生錯誤：%s：%s" + +-#: ../camel/camel-filter-driver.c:1784 ++#: ../camel/camel-filter-driver.c:1795 + #, c-format + msgid "Error executing filter '%s': %s: %s" + msgstr "執行過濾器「%s」發生錯誤：%s：%s" +@@ -1982,65 +2019,67 @@ msgstr "無效的參數給 (system-flag) + msgid "Invalid arguments to (user-tag)" + msgstr "無效的參數給 (user-tag)" + +-#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055 ++#: ../camel/camel-filter-search.c:1046 ++#: ../camel/camel-filter-search.c:1055 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "執行過濾器搜尋發生錯誤： %s: %s" + +-#: ../camel/camel-folder.c:272 ++#: ../camel/camel-folder.c:310 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" + msgstr[0] "正在學習「%s」中的新垃圾郵件" + +-#: ../camel/camel-folder.c:312 ++#: ../camel/camel-folder.c:350 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" + msgstr[0] "正在學習「%s」中的 ham 郵件" + +-#: ../camel/camel-folder.c:360 ++#: ../camel/camel-folder.c:398 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "正在過濾「%s」中的新郵件" + +-#: ../camel/camel-folder.c:934 ++#: ../camel/camel-folder.c:972 + #: ../camel/providers/local/camel-maildir-folder.c:321 + msgid "Moving messages" + msgstr "正在移動郵件" + +-#: ../camel/camel-folder.c:937 ++#: ../camel/camel-folder.c:975 + msgid "Copying messages" + msgstr "正在複製郵件" + +-#: ../camel/camel-folder.c:1257 ++#: ../camel/camel-folder.c:1295 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "資料夾「%s」不支援限額資訊" + +-#: ../camel/camel-folder.c:3487 ++#: ../camel/camel-folder.c:3528 + #, c-format + msgid "Expunging folder '%s'" + msgstr "刪除資料夾「%s」" + +-#: ../camel/camel-folder.c:3719 ++#: ../camel/camel-folder.c:3760 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "接收 %2$s 中的郵件「%1$s」" + +-#: ../camel/camel-folder.c:3870 ++#: ../camel/camel-folder.c:3911 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "取得「%s」的用量限額資訊" + +-#: ../camel/camel-folder.c:4102 ++#: ../camel/camel-folder.c:4143 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "重新整理資料夾「%s」" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:838 ../camel/camel-folder-search.c:881 ++#: ../camel/camel-folder-search.c:838 ++#: ../camel/camel-folder-search.c:881 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) 需要單一布林值結果" +@@ -2052,7 +2091,8 @@ msgid "(%s) not allowed inside %s" + msgstr "(%s) 不允許放在 %s 裡面" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:923 ../camel/camel-folder-search.c:931 ++#: ../camel/camel-folder-search.c:923 ++#: ../camel/camel-folder-search.c:931 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) 需要相符類型字串" +@@ -2069,151 +2109,154 @@ msgstr "(%s) 期望陣列結果" + msgid "(%s) requires the folder set" + msgstr "(%s) 需要資料夾設定" + +-#: ../camel/camel-folder-search.c:1862 ../camel/camel-folder-search.c:2029 ++#: ../camel/camel-folder-search.c:1862 ++#: ../camel/camel-folder-search.c:2029 + #, c-format +-msgid "" +-"Cannot parse search expression: %s:\n" ++msgid "Cannot parse search expression: %s:\n" + "%s" +-msgstr "" +-"不能分析搜尋詞句：%s:\n" ++msgstr "不能分析搜尋詞句：%s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1874 ../camel/camel-folder-search.c:2041 ++#: ../camel/camel-folder-search.c:1874 ++#: ../camel/camel-folder-search.c:2041 + #, c-format +-msgid "" +-"Error executing search expression: %s:\n" ++msgid "Error executing search expression: %s:\n" + "%s" +-msgstr "" +-"執行搜尋詞句時發生錯誤：%s:\n" ++msgstr "執行搜尋詞句時發生錯誤：%s:\n" + "%s" + +-#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696 +-#: ../camel/camel-gpg-context.c:1359 ++#: ../camel/camel-gpg-context.c:730 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/camel-gpg-context.c:1398 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "執行 gpg 失敗： %s" + +-#: ../camel/camel-gpg-context.c:696 +-#: ../camel/providers/smtp/camel-smtp-transport.c:926 ++#: ../camel/camel-gpg-context.c:735 ++#: ../camel/providers/smtp/camel-smtp-transport.c:918 + msgid "Unknown" + msgstr "不明" + +-#: ../camel/camel-gpg-context.c:761 ++#: ../camel/camel-gpg-context.c:800 + #, c-format +-msgid "" +-"Unexpected GnuPG status message encountered:\n" ++msgid "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" +-msgstr "" +-"遇到非預期的 GnuPG 狀態訊息：\n" ++msgstr "遇到非預期的 GnuPG 狀態訊息：\n" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:797 ++#: ../camel/camel-gpg-context.c:836 + #, c-format + msgid "Failed to parse gpg userid hint." + msgstr "解析 gpg userid 提示時失敗。" + +-#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837 ++#: ../camel/camel-gpg-context.c:861 ++#: ../camel/camel-gpg-context.c:876 + #, c-format + msgid "Failed to parse gpg passphrase request." + msgstr "解析 gpg 密語要求時失敗。" + +-#: ../camel/camel-gpg-context.c:858 ++#: ../camel/camel-gpg-context.c:897 + #, c-format +-msgid "" +-"You need a PIN to unlock the key for your\n" ++msgid "You need a PIN to unlock the key for your\n" + "SmartCard: \"%s\"" +-msgstr "" +-"需要 PIN 才能為您的智慧卡解鎖：\n" ++msgstr "需要 PIN 才能為您的智慧卡解鎖：\n" + "「%s」" + +-#: ../camel/camel-gpg-context.c:862 ++#: ../camel/camel-gpg-context.c:901 + #, c-format +-msgid "" +-"You need a passphrase to unlock the key for\n" ++msgid "You need a passphrase to unlock the key for\n" + "user: \"%s\"" +-msgstr "" +-"您需要密語才能為此使用者的金鑰解鎖：\n" ++msgstr "您需要密語才能為此使用者的金鑰解鎖：\n" + "「%s」" + +-#: ../camel/camel-gpg-context.c:868 ++#: ../camel/camel-gpg-context.c:907 + #, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "GnuPG 傳回對「%s」未預期的要求" + +-#: ../camel/camel-gpg-context.c:880 ++#: ../camel/camel-gpg-context.c:919 + msgid "" + "Note the encrypted content doesn't contain information about a recipient, " + "thus there will be a password prompt for each of stored private key." +-msgstr "" +-"注意加密的內容不會包含收件者資訊，因此每個儲存的私密金鑰都會提示輸入密碼。" ++msgstr "注意加密的內容不會包含收件者資訊，因此每個儲存的私密金鑰都會提示輸入密碼。" + +-#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523 ++#: ../camel/camel-gpg-context.c:950 ++#: ../camel/camel-net-utils.c:524 + #: ../camel/camel-tcp-stream-raw.c:268 +-#: ../camel/providers/nntp/camel-nntp-summary.c:388 ++#: ../camel/providers/nntp/camel-nntp-summary.c:402 + #: ../libedataserver/e-client.c:152 + #, c-format + msgid "Cancelled" + msgstr "已取消" + +-#: ../camel/camel-gpg-context.c:932 ++#: ../camel/camel-gpg-context.c:971 + #, c-format + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "解鎖私密金鑰時失敗：輸入了 3 次錯誤的密語 。" + +-#: ../camel/camel-gpg-context.c:945 ++#: ../camel/camel-gpg-context.c:984 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "從 GnuPG 傳回意外的回應： %s" + +-#: ../camel/camel-gpg-context.c:1076 ++#: ../camel/camel-gpg-context.c:1115 + #, c-format + msgid "Failed to encrypt: No valid recipients specified." + msgstr "不能加密郵件：沒有提供有效的收件者。" + +-#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846 ++#: ../camel/camel-gpg-context.c:1665 ++#: ../camel/camel-smime-context.c:846 + msgid "Could not generate signing data: " + msgstr "無法產生簽章資料：" + +-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879 +-#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136 +-#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284 ++#: ../camel/camel-gpg-context.c:1714 ++#: ../camel/camel-gpg-context.c:1918 ++#: ../camel/camel-gpg-context.c:2028 ++#: ../camel/camel-gpg-context.c:2179 ++#: ../camel/camel-gpg-context.c:2279 ++#: ../camel/camel-gpg-context.c:2327 + msgid "Failed to execute gpg." + msgstr "執行 gpg 失敗。" + +-#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762 +-#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790 +-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987 ++#: ../camel/camel-gpg-context.c:1793 ++#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1809 ++#: ../camel/camel-gpg-context.c:1829 ++#: ../camel/camel-smime-context.c:973 ++#: ../camel/camel-smime-context.c:987 + #: ../camel/camel-smime-context.c:996 + #, c-format + msgid "Cannot verify message signature: Incorrect message format" + msgstr "不能驗證此郵件的簽章：錯誤的訊息格式" + +-#: ../camel/camel-gpg-context.c:1832 ++#: ../camel/camel-gpg-context.c:1871 + msgid "Cannot verify message signature: " + msgstr "不能驗證此郵件的簽章：" + +-#: ../camel/camel-gpg-context.c:1955 ++#: ../camel/camel-gpg-context.c:1994 + msgid "Could not generate encrypting data: " + msgstr "無法產生加密資料：" + +-#: ../camel/camel-gpg-context.c:2008 ++#: ../camel/camel-gpg-context.c:2047 + msgid "This is a digitally encrypted message part" + msgstr "這是數位化加密訊息部份" + +-#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075 +-#: ../camel/camel-gpg-context.c:2098 ++#: ../camel/camel-gpg-context.c:2105 ++#: ../camel/camel-gpg-context.c:2114 ++#: ../camel/camel-gpg-context.c:2137 + #, c-format + msgid "Cannot decrypt message: Incorrect message format" + msgstr "不能解密此郵件：錯誤的訊息格式" + +-#: ../camel/camel-gpg-context.c:2086 ++#: ../camel/camel-gpg-context.c:2125 + #, c-format + msgid "Failed to decrypt MIME part: protocol error" + msgstr "解密 MIME 組件時失敗：通訊協定錯誤" + +-#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1287 ++#: ../camel/camel-gpg-context.c:2220 ++#: ../camel/camel-smime-context.c:1287 + msgid "Encrypted content" + msgstr "加密內容" + +@@ -2222,7 +2265,8 @@ msgstr "加密內容" + msgid "No quota information available for folder '%s'" + msgstr "資料夾「%s」不支援限額資訊" + +-#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882 ++#: ../camel/camel-imapx-folder.c:809 ++#: ../camel/camel-imapx-folder.c:882 + #, c-format + msgid "No destination folder specified" + msgstr "沒有指定目的地資料夾" +@@ -2235,189 +2279,202 @@ msgstr "無法移動垃圾郵件" + msgid "Unable to move deleted messages" + msgstr "無法移動刪除的郵件" + +-#: ../camel/camel-imapx-folder.c:1115 +-#: ../camel/providers/nntp/camel-nntp-folder.c:738 ++#: ../camel/camel-imapx-folder.c:1119 ++#: ../camel/providers/nntp/camel-nntp-folder.c:794 + msgid "Apply message _filters to this folder" + msgstr "將郵件過濾條件套用到這個資料夾(_F)" + +-#: ../camel/camel-imapx-folder.c:1224 ++#: ../camel/camel-imapx-folder.c:1228 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "無法建立 %s 的資料夾摘要" + +-#: ../camel/camel-imapx-folder.c:1232 ++#: ../camel/camel-imapx-folder.c:1236 + #, c-format + msgid "Could not create cache for %s: " + msgstr "無法建立 %s 的快取：" + +-#: ../camel/camel-imapx-server.c:1279 ++#: ../camel/camel-imapx-server.c:1283 + msgid "Server disconnected" + msgstr "伺服器斷線" + +-#: ../camel/camel-imapx-server.c:1787 ++#: ../camel/camel-imapx-server.c:1772 + msgid "Error writing to cache stream" + msgstr "寫入快取串流時發生錯誤" + +-#: ../camel/camel-imapx-server.c:2995 ++#: ../camel/camel-imapx-server.c:2441 ++#, c-format ++msgid "Alert from IMAP server %s:\n" ++"%s" ++msgstr "來自 IMAP 伺服器 %s 的警示：\n" ++"%s" ++ ++#: ../camel/camel-imapx-server.c:3029 + #, c-format + msgid "Not authenticated" + msgstr "尚未驗證" + +-#: ../camel/camel-imapx-server.c:3073 ++#: ../camel/camel-imapx-server.c:3107 + msgid "Error performing IDLE" + msgstr "進行 IDLE 時發生錯誤" + +-#: ../camel/camel-imapx-server.c:4030 ++#: ../camel/camel-imapx-server.c:3994 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s" + +-#: ../camel/camel-imapx-server.c:4031 +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/camel-imapx-server.c:3995 ++#: ../camel/providers/smtp/camel-smtp-transport.c:203 + msgid "STARTTLS not supported" + msgstr "不支援 STARTTLS" + +-#: ../camel/camel-imapx-server.c:4070 ++#: ../camel/camel-imapx-server.c:4034 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： " + +-#: ../camel/camel-imapx-server.c:4150 ++#: ../camel/camel-imapx-server.c:4114 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP 伺服器 %s 不支援 %s 驗證" + +-#: ../camel/camel-imapx-server.c:4161 ../camel/camel-session.c:495 +-#: ../camel/providers/pop3/camel-pop3-store.c:272 +-#: ../camel/providers/pop3/camel-pop3-store.c:654 +-#: ../camel/providers/smtp/camel-smtp-transport.c:517 ++#: ../camel/camel-imapx-server.c:4125 ++#: ../camel/camel-session.c:495 ++#: ../camel/providers/pop3/camel-pop3-store.c:303 ++#: ../camel/providers/pop3/camel-pop3-store.c:737 ++#: ../camel/providers/smtp/camel-smtp-transport.c:509 + #, c-format + msgid "No support for %s authentication" + msgstr "不支援 %s 驗證" + +-#: ../camel/camel-imapx-server.c:4180 +-#: ../camel/providers/nntp/camel-nntp-store.c:362 +-#: ../camel/providers/nntp/camel-nntp-store.c:562 ++#: ../camel/camel-imapx-server.c:4144 ++#: ../camel/providers/nntp/camel-nntp-store.c:407 ++#: ../camel/providers/nntp/camel-nntp-store.c:595 + msgid "Cannot authenticate without a username" + msgstr "驗證不能沒有使用者名稱" + +-#: ../camel/camel-imapx-server.c:4189 +-#: ../camel/providers/nntp/camel-nntp-store.c:571 +-#: ../camel/providers/pop3/camel-pop3-store.c:579 +-#: ../camel/providers/pop3/camel-pop3-store.c:599 ++#: ../camel/camel-imapx-server.c:4153 ++#: ../camel/providers/nntp/camel-nntp-store.c:604 ++#: ../camel/providers/pop3/camel-pop3-store.c:662 ++#: ../camel/providers/pop3/camel-pop3-store.c:682 + msgid "Authentication password not available" + msgstr "沒有驗證的密碼" + +-#: ../camel/camel-imapx-server.c:4397 ++#: ../camel/camel-imapx-server.c:4360 + msgid "Error fetching message" + msgstr "取回郵件時發生錯誤" + +-#: ../camel/camel-imapx-server.c:4479 +-msgid "Failed to copy the tmp file" +-msgstr "無法複製 tmp 檔案" +- +-#: ../camel/camel-imapx-server.c:4493 ++#: ../camel/camel-imapx-server.c:4410 ++#: ../camel/camel-imapx-server.c:4418 + msgid "Failed to close the tmp stream" + msgstr "無法關閉 tmp 的串流" + +-#: ../camel/camel-imapx-server.c:4614 ++#: ../camel/camel-imapx-server.c:4447 ++msgid "Failed to copy the tmp file" ++msgstr "無法複製 tmp 檔案" ++ ++#: ../camel/camel-imapx-server.c:4571 + msgid "Error copying messages" + msgstr "複製郵件時發生錯誤" + +-#: ../camel/camel-imapx-server.c:4780 ++#: ../camel/camel-imapx-server.c:4740 + msgid "Error appending message" + msgstr "附加郵件時發生錯誤" + +-#: ../camel/camel-imapx-server.c:4979 ++#: ../camel/camel-imapx-server.c:4939 + msgid "Error fetching message headers" + msgstr "取回郵件檔頭時發生錯誤" + +-#: ../camel/camel-imapx-server.c:5130 ++#: ../camel/camel-imapx-server.c:5090 + msgid "Error retrieving message" + msgstr "取回郵件時發生錯誤" + +-#: ../camel/camel-imapx-server.c:5261 ../camel/camel-imapx-server.c:5489 ++#: ../camel/camel-imapx-server.c:5221 ++#: ../camel/camel-imapx-server.c:5449 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "正取得「%s」中新郵件的摘要資訊" + +-#: ../camel/camel-imapx-server.c:5325 ++#: ../camel/camel-imapx-server.c:5285 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "掃描「%s」中變更過的郵件" + +-#: ../camel/camel-imapx-server.c:5378 ++#: ../camel/camel-imapx-server.c:5338 + msgid "Error fetching new messages" + msgstr "取回新郵件時發生錯誤" + +-#: ../camel/camel-imapx-server.c:5591 ++#: ../camel/camel-imapx-server.c:5551 + msgid "Error while fetching messages" + msgstr "當取回郵件時發生錯誤" + +-#: ../camel/camel-imapx-server.c:5599 ../camel/camel-imapx-server.c:5632 ++#: ../camel/camel-imapx-server.c:5559 ++#: ../camel/camel-imapx-server.c:5592 + #, c-format + msgid "Fetching summary information for %d message in '%s'" + msgid_plural "Fetching summary information for %d messages in '%s'" + msgstr[0] "正取得「%2$s」中 %1$d 封郵件的摘要資訊" + +-#: ../camel/camel-imapx-server.c:5768 ../camel/camel-imapx-server.c:5798 ++#: ../camel/camel-imapx-server.c:5728 ++#: ../camel/camel-imapx-server.c:5758 + msgid "Error refreshing folder" + msgstr "重新整理資料夾時發生錯誤" + +-#: ../camel/camel-imapx-server.c:5922 ++#: ../camel/camel-imapx-server.c:5882 + msgid "Error expunging message" + msgstr "清空郵件時發生錯誤" + +-#: ../camel/camel-imapx-server.c:6033 ++#: ../camel/camel-imapx-server.c:5993 + msgid "Error fetching folders" + msgstr "取回資料夾時發生錯誤" + +-#: ../camel/camel-imapx-server.c:6115 ++#: ../camel/camel-imapx-server.c:6075 + msgid "Error subscribing to folder" + msgstr "訂閱到資料夾時發生錯誤" + +-#: ../camel/camel-imapx-server.c:6180 ++#: ../camel/camel-imapx-server.c:6140 + msgid "Error creating folder" + msgstr "建立資料夾時發生錯誤。" + +-#: ../camel/camel-imapx-server.c:6234 ++#: ../camel/camel-imapx-server.c:6194 + msgid "Error deleting folder" + msgstr "刪除資料夾時發生錯誤" + +-#: ../camel/camel-imapx-server.c:6308 ++#: ../camel/camel-imapx-server.c:6268 + msgid "Error renaming folder" + msgstr "重新命名資料夾時發生錯誤" + +-#: ../camel/camel-imapx-server.c:6383 ++#: ../camel/camel-imapx-server.c:6343 + msgid "Error retrieving quota information" + msgstr "取得用量限額資訊時發生錯誤" + +-#: ../camel/camel-imapx-server.c:6448 ++#: ../camel/camel-imapx-server.c:6408 + msgid "Search failed" + msgstr "搜尋失敗" + +-#: ../camel/camel-imapx-server.c:6511 ++#: ../camel/camel-imapx-server.c:6471 + msgid "Error performing NOOP" + msgstr "進行 NOOP 時發生錯誤" + +-#: ../camel/camel-imapx-server.c:6620 ++#: ../camel/camel-imapx-server.c:6580 + msgid "Error syncing changes" + msgstr "同步變更時發生錯誤" + +-#: ../camel/camel-imapx-server.c:7432 ++#: ../camel/camel-imapx-server.c:7385 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "無法取得郵件 ID 為 %s 的郵件： %s" + +-#: ../camel/camel-imapx-server.c:7433 ++#: ../camel/camel-imapx-server.c:7386 + msgid "No such message available." + msgstr "沒有這個郵件。" + +-#: ../camel/camel-imapx-server.c:7591 ../camel/camel-imapx-server.c:7606 ++#: ../camel/camel-imapx-server.c:7547 ++#: ../camel/camel-imapx-server.c:7562 + msgid "Cannot create spool file: " + msgstr "不能建立排程器檔案：" + +-#: ../camel/camel-imapx-server.c:8348 ++#: ../camel/camel-imapx-server.c:8304 + msgid "IMAP server does not support quotas" + msgstr "IMAP 伺服器不支援限額" + +@@ -2438,7 +2495,8 @@ msgid "Password" + msgstr "密碼" + + #: ../camel/camel-imapx-store.c:345 +-msgid "This option will connect to the IMAP server using a plaintext password." ++msgid "" ++"This option will connect to the IMAP server using a plaintext password." + msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。" + + #: ../camel/camel-imapx-store.c:453 +@@ -2447,7 +2505,8 @@ msgid "No such folder %s" + msgstr "沒有這個資料夾 %s" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/camel-imapx-store.c:478 ../camel/camel-imapx-store.c:968 ++#: ../camel/camel-imapx-store.c:478 ++#: ../camel/camel-imapx-store.c:968 + #: ../camel/providers/local/camel-maildir-folder.c:473 + #: ../camel/providers/local/camel-maildir-store.c:316 + #: ../camel/providers/local/camel-maildir-store.c:750 +@@ -2457,23 +2516,22 @@ msgstr "沒有這個資料夾 %s" + msgid "Inbox" + msgstr "收件匣" + +-#: ../camel/camel-imapx-store.c:1212 ++#: ../camel/camel-imapx-store.c:1231 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "取得 %s 的資料夾清單" + +-#: ../camel/camel-imapx-store.c:1595 ++#: ../camel/camel-imapx-store.c:1614 + #, c-format +-msgid "" +-"The folder name \"%s\" is invalid because it contains the character \"%c\"" ++msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "資料夾名稱「%s」無效，因為它包括字元「%c」" + +-#: ../camel/camel-imapx-store.c:1606 ++#: ../camel/camel-imapx-store.c:1625 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "不明的母資料夾： %s" + +-#: ../camel/camel-imapx-store.c:1616 ++#: ../camel/camel-imapx-store.c:1635 + #, c-format + msgid "The parent folder is not allowed to contain subfolders" + msgstr "母資料夾並不允許包含子資料夾" +@@ -2518,7 +2576,8 @@ msgstr "不能建構鎖定 helper 導管 + msgid "Cannot fork locking helper: %s" + msgstr "不能分叉鎖定 helper ： %s" + +-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239 ++#: ../camel/camel-lock-client.c:211 ++#: ../camel/camel-lock-client.c:239 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" + msgstr "無法鎖定「%s」： lock-helper 協定錯誤" +@@ -2577,7 +2636,8 @@ msgstr "讀取郵件檔案時發生錯� + msgid "Error writing mail temp file: %s" + msgstr "寫入郵件暫存檔案時發生錯誤：%s" + +-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562 ++#: ../camel/camel-movemail.c:493 ++#: ../camel/camel-movemail.c:562 + #, c-format + msgid "Error copying mail temp file: %s" + msgstr "複製郵件暫存檔案時發生錯誤：%s" +@@ -2597,38 +2657,38 @@ msgstr "沒有可用的簽章" + msgid "parse error" + msgstr "解析錯誤" + +-#: ../camel/camel-net-utils.c:703 ++#: ../camel/camel-net-utils.c:704 + #, c-format + msgid "Resolving: %s" + msgstr "解析：%s" + +-#: ../camel/camel-net-utils.c:726 ++#: ../camel/camel-net-utils.c:727 + msgid "Host lookup failed" + msgstr "搜尋主機失敗" + +-#: ../camel/camel-net-utils.c:732 ++#: ../camel/camel-net-utils.c:733 + #, c-format + msgid "Host lookup '%s' failed. Check your host name for spelling errors." + msgstr "主機查詢「%s」失敗。請檢查您的主機名稱是否有拼錯字。" + +-#: ../camel/camel-net-utils.c:736 ++#: ../camel/camel-net-utils.c:737 + #, c-format + msgid "Host lookup '%s' failed: %s" + msgstr "查詢主機「%s」失敗：%s" + +-#: ../camel/camel-net-utils.c:857 ++#: ../camel/camel-net-utils.c:858 + msgid "Resolving address" + msgstr "解析位址" + +-#: ../camel/camel-net-utils.c:878 ++#: ../camel/camel-net-utils.c:879 + msgid "Name lookup failed" + msgstr "查詢名稱失敗" + +-#: ../camel/camel-net-utils.c:885 ++#: ../camel/camel-net-utils.c:886 + msgid "Name lookup failed. Check your host name for spelling errors." + msgstr "名稱查詢失敗。請檢查您的主機名稱是否有拼錯字。" + +-#: ../camel/camel-net-utils.c:889 ++#: ../camel/camel-net-utils.c:890 + #, c-format + msgid "Name lookup failed: %s" + msgstr "搜尋名稱失敗： %s" +@@ -2643,7 +2703,8 @@ msgstr "無法連接到「%s：%s」：" + msgid "Syncing messages in folder '%s' to disk" + msgstr "正在將資料夾「%s」中的郵件同步到磁碟" + +-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177 ++#: ../camel/camel-offline-journal.c:145 ++#: ../camel/camel-offline-journal.c:177 + #, c-format + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "不能寫入資料夾「%s」的離線日誌：%s" +@@ -2671,7 +2732,8 @@ msgstr "無法載入 %s：%s" + msgid "Could not load %s: No initialization code in module." + msgstr "無法載入 %s：模組內沒有初始碼。" + +-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:407 ++#: ../camel/camel-provider.c:429 ++#: ../camel/camel-session.c:407 + #, c-format + msgid "No provider available for protocol '%s'" + msgstr "沒有通訊協定「%s」的提供者" +@@ -2692,29 +2754,23 @@ msgstr "驗證失敗。" + + #: ../camel/camel-sasl-anonymous.c:81 + #, c-format +-msgid "" +-"Invalid email address trace information:\n" ++msgid "Invalid email address trace information:\n" + "%s" +-msgstr "" +-"無效的電子郵件地址追蹤資訊：\n" ++msgstr "無效的電子郵件地址追蹤資訊：\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:95 + #, c-format +-msgid "" +-"Invalid opaque trace information:\n" ++msgid "Invalid opaque trace information:\n" + "%s" +-msgstr "" +-"無效的不透明追蹤資訊：\n" ++msgstr "無效的不透明追蹤資訊：\n" + "%s" + + #: ../camel/camel-sasl-anonymous.c:109 + #, c-format +-msgid "" +-"Invalid trace information:\n" ++msgid "Invalid trace information:\n" + "%s" +-msgstr "" +-"無效的追蹤資訊：\n" ++msgstr "無效的追蹤資訊：\n" + "%s" + + #: ../camel/camel-sasl-cram-md5.c:46 +@@ -2725,9 +2781,7 @@ msgstr "CRAM-MD5" + msgid "" + "This option will connect to the server using a secure CRAM-MD5 password, if " + "the server supports it." +-msgstr "" +-"這個選項將會使用 CRAM-MD5 加密的密碼連線至伺服器，若發現該伺服器支援這種服" +-"務。" ++msgstr "這個選項將會使用 CRAM-MD5 加密的密碼連線至伺服器，若發現該伺服器支援這種服務。" + + #: ../camel/camel-sasl-digest-md5.c:59 + msgid "DIGEST-MD5" +@@ -2737,9 +2791,7 @@ msgstr "DIGEST-MD5" + msgid "" + "This option will connect to the server using a secure DIGEST-MD5 password, " + "if the server supports it." +-msgstr "" +-"這個選項將會使用 DIGEST-MD5 加密的密碼連線至伺服器，若發現該伺服器支援這種服" +-"務。" ++msgstr "這個選項將會使用 DIGEST-MD5 加密的密碼連線至伺服器，若發現該伺服器支援這種服務。" + + #: ../camel/camel-sasl-digest-md5.c:855 + #, c-format +@@ -2776,7 +2828,8 @@ msgid "GSSAPI" + msgstr "GSSAPI" + + #: ../camel/camel-sasl-gssapi.c:93 +-msgid "This option will connect to the server using Kerberos 5 authentication." ++msgid "" ++"This option will connect to the server using Kerberos 5 authentication." + msgstr "這個選項將會使用 Kerberos 5 驗證連線至伺服器。" + + #: ../camel/camel-sasl-gssapi.c:134 +@@ -2799,8 +2852,7 @@ msgstr "提供的 target_name 參數包� + msgid "" + "The input_token contains different channel bindings to those specified via " + "the input_chan_bindings parameter." +-msgstr "" +-"input_token 包含不同的通道，透過 input_chan_bindings，連結至這些指定的參數。" ++msgstr "input_token 包含不同的通道，透過 input_chan_bindings，連結至這些指定的參數。" + + #: ../camel/camel-sasl-gssapi.c:151 + msgid "" +@@ -2830,9 +2882,11 @@ msgstr "在證件執行一致性檢查� + msgid "The referenced credentials have expired." + msgstr "參照的證件已經過期。" + +-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340 +-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405 +-#: ../camel/providers/smtp/camel-smtp-transport.c:624 ++#: ../camel/camel-sasl-gssapi.c:175 ++#: ../camel/camel-sasl-gssapi.c:340 ++#: ../camel/camel-sasl-gssapi.c:388 ++#: ../camel/camel-sasl-gssapi.c:405 ++#: ../camel/providers/smtp/camel-smtp-transport.c:616 + #, c-format + msgid "Bad authentication response from server." + msgstr "來自伺服器的不良許可回應。" +@@ -2846,7 +2900,8 @@ msgstr "不支援的類型" + msgid "Login" + msgstr "登入" + +-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46 ++#: ../camel/camel-sasl-login.c:42 ++#: ../camel/camel-sasl-plain.c:46 + msgid "This option will connect to the server using a simple password." + msgstr "這個選項將會使用普通的密碼連線至伺服器。" + +@@ -2855,11 +2910,11 @@ msgstr "這個選項將會使用普通� + msgid "Unknown authentication state." + msgstr "未知的驗証狀況。" + +-#: ../camel/camel-sasl-ntlm.c:47 ++#: ../camel/camel-sasl-ntlm.c:48 + msgid "NTLM / SPA" + msgstr "NTLM / SPA" + +-#: ../camel/camel-sasl-ntlm.c:49 ++#: ../camel/camel-sasl-ntlm.c:50 + msgid "" + "This option will connect to a Windows-based server using NTLM / Secure " + "Password Authentication." +@@ -2886,7 +2941,8 @@ msgstr "POP 來源 UID" + msgid "POP Before SMTP authentication using an unknown transport" + msgstr "POP 先於 SMTP 允許使用未知的傳輸" + +-#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119 ++#: ../camel/camel-sasl-popb4smtp.c:110 ++#: ../camel/camel-sasl-popb4smtp.c:119 + #, c-format + msgid "POP Before SMTP authentication attempted with a %s service" + msgstr "以 %s 服務嘗試 POP 先於 SMTP 驗證" +@@ -2918,7 +2974,8 @@ msgstr "不支援轉寄郵件" + msgid "Please enter the %s password for %s on host %s." + msgstr "請輸入 %2$s 於主機 %3$s 的 %1$s 密碼。" + +-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074 ++#: ../camel/camel-smime-context.c:351 ++#: ../camel/camel-smime-context.c:1074 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "找不到 '%s' 的憑證" +@@ -2951,7 +3008,8 @@ msgstr "找不到憑證鏈" + msgid "Cannot add CMS Signing time" + msgstr "無法新增 CMS SigningTime" + +-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454 ++#: ../camel/camel-smime-context.c:439 ++#: ../camel/camel-smime-context.c:454 + #, c-format + msgid "Encryption certificate for '%s' does not exist" + msgstr "'%s' 的加密憑證不存在" +@@ -3021,15 +3079,18 @@ msgstr "簽章中沒有被簽署的資� + msgid "Digests missing from enveloped data" + msgstr "包裹的資料中遺漏摘要" + +-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602 ++#: ../camel/camel-smime-context.c:591 ++#: ../camel/camel-smime-context.c:602 + msgid "Cannot calculate digests" + msgstr "無法計算摘要" + +-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613 ++#: ../camel/camel-smime-context.c:609 ++#: ../camel/camel-smime-context.c:613 + msgid "Cannot set message digests" + msgstr "無法設定郵件摘要" + +-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628 ++#: ../camel/camel-smime-context.c:623 ++#: ../camel/camel-smime-context.c:628 + msgid "Certificate import failed" + msgstr "憑證匯入失敗" + +@@ -3052,7 +3113,8 @@ msgstr "找不到簽章摘要" + msgid "Signer: %s <%s>: %s\n" + msgstr "簽署者： %s<%s>： %s\n" + +-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148 ++#: ../camel/camel-smime-context.c:858 ++#: ../camel/camel-smime-context.c:1148 + msgid "Cannot create encoder context" + msgstr "無法建構編碼器網路位置" + +@@ -3060,11 +3122,13 @@ msgstr "無法建構編碼器網路位� + msgid "Failed to add data to CMS encoder" + msgstr "無法新增資料至 CMS 編碼器" + +-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165 ++#: ../camel/camel-smime-context.c:869 ++#: ../camel/camel-smime-context.c:1165 + msgid "Failed to encode data" + msgstr "無法編碼資料" + +-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262 ++#: ../camel/camel-smime-context.c:1013 ++#: ../camel/camel-smime-context.c:1262 + msgid "Decoder failed" + msgstr "解碼器失敗" + +@@ -3108,48 +3172,52 @@ msgstr "無法新增資料至編碼器" + msgid "S/MIME Decrypt: No encrypted content found" + msgstr "S/MIME 解密：找不到加密內容" + +-#: ../camel/camel-store.c:1844 ++#: ../camel/camel-store.c:1871 + #, c-format + msgid "Cannot create folder '%s': folder exists" + msgstr "不能建立資料夾「%s」：資料夾已存在" + +-#: ../camel/camel-store.c:1887 ++#: ../camel/camel-store.c:1914 + #, c-format + msgid "Opening folder '%s'" + msgstr "開啟資料夾「%s」" + +-#: ../camel/camel-store.c:2072 ++#: ../camel/camel-store.c:2099 + #, c-format + msgid "Scanning folders in '%s'" + msgstr "掃描「%s」內的資料夾" + +-#: ../camel/camel-store.c:2088 ../camel/camel-store.c:2119 ++#: ../camel/camel-store.c:2115 ++#: ../camel/camel-store.c:2146 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Trash" + msgstr "回收筒" + +-#: ../camel/camel-store.c:2100 ../camel/camel-store.c:2135 ++#: ../camel/camel-store.c:2127 ++#: ../camel/camel-store.c:2162 + #: ../camel/camel-vtrash-folder.c:50 + msgid "Junk" + msgstr "垃圾郵件" + +-#: ../camel/camel-store.c:2588 ++#: ../camel/camel-store.c:2615 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "無法建構資料夾：%s：資料夾已存在" + +-#: ../camel/camel-store.c:2602 ++#: ../camel/camel-store.c:2629 + #, c-format + msgid "Creating folder '%s'" + msgstr "正在建立資料夾「%s」" + +-#: ../camel/camel-store.c:2720 ../camel/camel-vee-store.c:416 ++#: ../camel/camel-store.c:2747 ++#: ../camel/camel-vee-store.c:416 + #: ../camel/providers/local/camel-maildir-store.c:315 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "不能刪除資料夾： %s ：無效的操作" + +-#: ../camel/camel-store.c:2863 ../camel/camel-vee-store.c:466 ++#: ../camel/camel-store.c:2890 ++#: ../camel/camel-vee-store.c:466 + #: ../camel/providers/local/camel-maildir-store.c:839 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" +@@ -3173,12 +3241,12 @@ msgstr "連線已取消" + msgid "Could not connect with command \"%s\": %s" + msgstr "無法以指令「%s」連線： %s" + +-#: ../camel/camel-subscribable.c:386 ++#: ../camel/camel-subscribable.c:397 + #, c-format + msgid "Subscribing to folder '%s'" + msgstr "訂閱到資料夾「%s」" + +-#: ../camel/camel-subscribable.c:518 ++#: ../camel/camel-subscribable.c:529 + #, c-format + msgid "Unsubscribing from folder '%s'" + msgstr "取消訂閱資料夾「%s」" +@@ -3188,7 +3256,8 @@ msgstr "取消訂閱資料夾「%s」" + msgid "NSPR error code %d" + msgstr "NSPR 錯誤代碼 %d" + +-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662 ++#: ../camel/camel-tcp-stream-raw.c:649 ++#: ../camel/camel-tcp-stream-raw.c:662 + #, c-format + msgid "The proxy host does not support SOCKS4" + msgstr "代理伺服器主機不支援 SOCKS4" +@@ -3198,7 +3267,8 @@ msgstr "代理伺服器主機不支援 S + msgid "The proxy host denied our request: code %d" + msgstr "代理伺服器主機拒絕我們的要求：代碼 %d" + +-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781 ++#: ../camel/camel-tcp-stream-raw.c:773 ++#: ../camel/camel-tcp-stream-raw.c:781 + #, c-format + msgid "The proxy host does not support SOCKS5" + msgstr "代理伺服器主機不支援 SOCKS5" +@@ -3261,7 +3331,8 @@ msgstr "主機名稱太長（最多 255 + + #. SOCKS5 + #. reserved - must be 0 +-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922 ++#: ../camel/camel-tcp-stream-raw.c:912 ++#: ../camel/camel-tcp-stream-raw.c:922 + #, c-format + msgid "Invalid reply from proxy server" + msgstr "從代理伺服器傳回無效的回覆" +@@ -3276,7 +3347,8 @@ msgstr "無法解析 URL「%s」" + msgid "Updating folder '%s'" + msgstr "更新資料夾「%s」" + +-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965 ++#: ../camel/camel-vee-folder.c:855 ++#: ../camel/camel-vee-folder.c:965 + #, c-format + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "不能複製或移動郵件到虛擬資料夾中" +@@ -3427,11 +3499,9 @@ msgstr "索引郵件內文資料(_I)" + + #: ../camel/providers/local/camel-local-folder.c:727 + #, c-format +-msgid "" +-"Cannot get message %s from folder %s\n" ++msgid "Cannot get message %s from folder %s\n" + "%s" +-msgstr "" +-"不能從資料夾 %2$s 取得郵件 %1$s \n" ++msgstr "不能從資料夾 %2$s 取得郵件 %1$s \n" + "%3$s" + + #: ../camel/providers/local/camel-local-provider.c:43 +@@ -3454,8 +3524,7 @@ msgstr "本地端寄送" + msgid "" + "For retrieving (moving) local mail from standard mbox-formatted spools into " + "folders managed by Evolution." +-msgstr "" +-"用於自標準 mbox 格式排程器接收（移動）本地端郵件至 Evolution 管理的資料夾。" ++msgstr "用於自標準 mbox 格式排程器接收（移動）本地端郵件至 Evolution 管理的資料夾。" + + #: ../camel/providers/local/camel-local-provider.c:83 + #: ../camel/providers/local/camel-local-provider.c:103 +@@ -3483,8 +3552,7 @@ msgstr "標準 Unix mbox 排程器檔案 + msgid "" + "For reading and storing local mail in external standard mbox spool files.\n" + "May also be used to read a tree of Elm, Pine, or Mutt style folders." +-msgstr "" +-"用於讀取及儲存外部標準 mbox 排程器檔案中的本地端郵件。\n" ++msgstr "用於讀取及儲存外部標準 mbox 排程器檔案中的本地端郵件。\n" + "也可以用來讀 Elm 、 Pine 或 Mutt 形式資料夾的樹狀結構。" + + #: ../camel/providers/local/camel-local-provider.c:125 +@@ -3593,14 +3661,14 @@ msgstr "不能建立資料夾「%s」： + + #: ../camel/providers/local/camel-maildir-store.c:245 + #: ../camel/providers/local/camel-mbox-store.c:369 +-#: ../camel/providers/local/camel-mh-store.c:522 ++#: ../camel/providers/local/camel-mh-store.c:514 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "不能建立資料夾「%s」：%s" + + #: ../camel/providers/local/camel-maildir-store.c:251 + #: ../camel/providers/local/camel-mbox-store.c:379 +-#: ../camel/providers/local/camel-mh-store.c:531 ++#: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "不能取得資料夾「%s」：資料夾不存在。" +@@ -3612,14 +3680,14 @@ msgstr "不能取得資料夾「%s」： + + #: ../camel/providers/local/camel-maildir-store.c:283 + #: ../camel/providers/local/camel-mbox-store.c:442 +-#: ../camel/providers/local/camel-mh-store.c:564 ++#: ../camel/providers/local/camel-mh-store.c:556 + #, c-format + msgid "Cannot create folder '%s': folder exists." + msgstr "不能建立資料夾「%s」：資料夾已存在。" + + #: ../camel/providers/local/camel-maildir-store.c:347 + #: ../camel/providers/local/camel-maildir-store.c:387 +-#: ../camel/providers/local/camel-mh-store.c:682 ++#: ../camel/providers/local/camel-mh-store.c:674 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "無法刪除資料夾「%s」：%s" +@@ -3707,11 +3775,9 @@ msgstr "資料夾已存在" + #: ../camel/providers/local/camel-mbox-store.c:672 + #: ../camel/providers/local/camel-mbox-store.c:701 + #, c-format +-msgid "" +-"Could not delete folder '%s':\n" ++msgid "Could not delete folder '%s':\n" + "%s" +-msgstr "" +-"無法刪除資料夾「%s」：\n" ++msgstr "無法刪除資料夾「%s」：\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:682 +@@ -3831,12 +3897,12 @@ msgstr "寫入暫存郵箱失敗： %s� + msgid "Cannot append message to mh folder: %s: " + msgstr "不能將郵件儲存到 mh 資料夾： %s：" + +-#: ../camel/providers/local/camel-mh-store.c:541 ++#: ../camel/providers/local/camel-mh-store.c:533 + #, c-format + msgid "Could not create folder '%s': %s" + msgstr "無法建立資料夾「%s」：%s" + +-#: ../camel/providers/local/camel-mh-store.c:557 ++#: ../camel/providers/local/camel-mh-store.c:549 + #, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "不能取得資料夾「%s」：不是目錄。" +@@ -3877,11 +3943,9 @@ msgstr "資料夾「%s/%s」不存在。 + + #: ../camel/providers/local/camel-spool-store.c:505 + #, c-format +-msgid "" +-"Could not open folder '%s':\n" ++msgid "Could not open folder '%s':\n" + "%s" +-msgstr "" +-"無法開啟資料夾「%s」：\n" ++msgstr "無法開啟資料夾「%s」：\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:511 +@@ -3891,11 +3955,9 @@ msgstr "資料夾「%s」不存在。" + + #: ../camel/providers/local/camel-spool-store.c:519 + #, c-format +-msgid "" +-"Could not create folder '%s':\n" ++msgid "Could not create folder '%s':\n" + "%s" +-msgstr "" +-"無法建立資料夾「%s」：\n" ++msgstr "無法建立資料夾「%s」：\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:532 +@@ -3937,56 +3999,54 @@ msgstr "無法同步排程資料夾%s： + msgid "" + "Could not synchronize spool folder %s: %s\n" + "Folder may be corrupt, copy saved in '%s'" +-msgstr "" +-"無法同步排程資料夾 %s：%s\n" ++msgstr "無法同步排程資料夾 %s：%s\n" + "資料夾可能損毀，複本儲存於「%s」" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:278 +-#: ../camel/providers/nntp/camel-nntp-folder.c:360 +-#: ../camel/providers/nntp/camel-nntp-folder.c:481 ++#: ../camel/providers/nntp/camel-nntp-folder.c:285 ++#: ../camel/providers/nntp/camel-nntp-folder.c:388 ++#: ../camel/providers/nntp/camel-nntp-folder.c:510 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "內部錯誤：UID 格式無效：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:332 +-#: ../camel/providers/pop3/camel-pop3-folder.c:633 +-#: ../camel/providers/pop3/camel-pop3-folder.c:1065 ++#: ../camel/providers/nntp/camel-nntp-folder.c:349 ++#: ../camel/providers/nntp/camel-nntp-folder.c:354 ++#: ../camel/providers/pop3/camel-pop3-folder.c:657 ++#: ../camel/providers/pop3/camel-pop3-folder.c:1107 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "無法取得郵件 %s： %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:339 +-#: ../camel/providers/nntp/camel-nntp-folder.c:504 +-#: ../camel/providers/pop3/camel-pop3-folder.c:558 +-#: ../camel/providers/pop3/camel-pop3-folder.c:623 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/nntp/camel-nntp-folder.c:361 ++#: ../camel/providers/nntp/camel-nntp-folder.c:536 ++#: ../camel/providers/pop3/camel-pop3-folder.c:582 ++#: ../camel/providers/pop3/camel-pop3-folder.c:647 ++#: ../camel/providers/pop3/camel-pop3-folder.c:666 + #, c-format + msgid "Cannot get message %s: " + msgstr "無法取得郵件 %s：" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:493 ++#: ../camel/providers/nntp/camel-nntp-folder.c:525 + #, c-format + msgid "This message is not currently available" + msgstr "這封郵件目前仍未可用" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:559 +-#: ../camel/providers/nntp/camel-nntp-folder.c:565 +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:593 ++#: ../camel/providers/nntp/camel-nntp-folder.c:599 + #, c-format + msgid "Posting failed: %s" + msgstr "張貼失敗：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:606 ++#: ../camel/providers/nntp/camel-nntp-folder.c:664 + msgid "Posting failed: " + msgstr "張貼失敗：" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:633 ++#: ../camel/providers/nntp/camel-nntp-folder.c:689 + #, c-format + msgid "You cannot post NNTP messages while working offline!" + msgstr "離線工作時無法張貼 NNTP 訊息！" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:653 ++#: ../camel/providers/nntp/camel-nntp-folder.c:709 + #, c-format + msgid "You cannot copy messages from a NNTP folder!" + msgstr "您無法從 NNTP 資料夾複製訊息！" +@@ -4028,136 +4088,131 @@ msgid "" + "password." + msgstr "這個選項將會使用純文字的密碼驗證 NNTP 伺服器。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:333 ++#: ../camel/providers/nntp/camel-nntp-store.c:386 + #, c-format + msgid "Could not read greeting from %s: " + msgstr "無法讀取 %s 的歡迎辭：" + +-#: ../camel/providers/nntp/camel-nntp-store.c:345 ++#: ../camel/providers/nntp/camel-nntp-store.c:394 + #, c-format + msgid "NNTP server %s returned error code %d: %s" + msgstr "NNTP 伺服器 %s 傳回錯誤代碼 %d ： %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:522 ++#: ../camel/providers/nntp/camel-nntp-store.c:555 + #, c-format + msgid "USENET News via %s" + msgstr "經由 %s 的 USENET 新聞" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1123 ++#: ../camel/providers/nntp/camel-nntp-store.c:1218 + #, c-format +-msgid "" +-"Error retrieving newsgroups:\n" ++msgid "Error retrieving newsgroups:\n" + "\n" + "%s" +-msgstr "" +-"取得新聞群組發生錯誤：\n" ++msgstr "取得新聞群組發生錯誤：\n" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1217 ++#: ../camel/providers/nntp/camel-nntp-store.c:1319 + #, c-format + msgid "You cannot create a folder in a News store: subscribe instead." + msgstr "您無法在「新聞」儲存區建構資料夾：改以訂閱。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1233 ++#: ../camel/providers/nntp/camel-nntp-store.c:1335 + #, c-format + msgid "You cannot rename a folder in a News store." + msgstr "您無法在「新聞」儲存區重新命名資料夾。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1256 ++#: ../camel/providers/nntp/camel-nntp-store.c:1358 + #, c-format + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "您無法在「新聞」儲存區移除資料夾：改以取消訂閱。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1455 ++#: ../camel/providers/nntp/camel-nntp-store.c:1577 + #, c-format + msgid "" + "You cannot subscribe to this newsgroup:\n" + "\n" + "No such newsgroup. The selected item is a probably a parent folder." +-msgstr "" +-"您無法訂閱此新聞群組：\n" ++msgstr "您無法訂閱此新聞群組：\n" + "\n" + "沒有類似的新聞群組。選取的項目可能是父代資料夾。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1503 ++#: ../camel/providers/nntp/camel-nntp-store.c:1644 + #, c-format +-msgid "" +-"You cannot unsubscribe to this newsgroup:\n" ++msgid "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" +-msgstr "" +-"您無法取消訂閱此新聞群組：\n" ++msgstr "您無法取消訂閱此新聞群組：\n" + "\n" + "新聞群組不存在！" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1707 ++#: ../camel/providers/nntp/camel-nntp-store.c:2081 + msgid "NNTP Command failed: " + msgstr "NNTP 指令失敗：" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1794 ++#: ../camel/providers/nntp/camel-nntp-store.c:2178 + #, c-format + msgid "Not connected." + msgstr "未連線。" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1856 ++#: ../camel/providers/nntp/camel-nntp-store.c:2272 + #, c-format + msgid "No such folder: %s" + msgstr "沒有這個資料夾： %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:198 +-#: ../camel/providers/nntp/camel-nntp-summary.c:328 ++#: ../camel/providers/nntp/camel-nntp-summary.c:200 ++#: ../camel/providers/nntp/camel-nntp-summary.c:339 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s：掃描新郵件" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:216 ++#: ../camel/providers/nntp/camel-nntp-summary.c:222 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "xover 傳來意外的伺服器回應：%s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:346 ++#: ../camel/providers/nntp/camel-nntp-summary.c:360 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "標題傳來意外的伺服器回應：%s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:393 ++#: ../camel/providers/nntp/camel-nntp-summary.c:407 + #, c-format + msgid "Operation failed: %s" + msgstr "作業失敗： %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:453 +-#: ../camel/providers/pop3/camel-pop3-folder.c:526 ++#: ../camel/providers/pop3/camel-pop3-folder.c:468 ++#: ../camel/providers/pop3/camel-pop3-folder.c:547 + #, c-format + msgid "No message with UID %s" + msgstr "沒有郵件具有這個 UID %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:542 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 + #, c-format + msgid "Retrieving POP message %d" + msgstr "接收 POP 郵件 %d" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:634 ++#: ../camel/providers/pop3/camel-pop3-folder.c:658 + msgid "Unknown reason" + msgstr "不明的原因" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:682 ++#: ../camel/providers/pop3/camel-pop3-folder.c:710 + msgid "Retrieving POP summary" + msgstr "取回 POP 的摘要" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:741 +-#: ../camel/providers/pop3/camel-pop3-folder.c:744 +-#: ../camel/providers/pop3/camel-pop3-folder.c:757 +-#: ../camel/providers/pop3/camel-pop3-folder.c:770 +-#: ../camel/providers/pop3/camel-pop3-folder.c:784 ++#: ../camel/providers/pop3/camel-pop3-folder.c:771 ++#: ../camel/providers/pop3/camel-pop3-folder.c:774 ++#: ../camel/providers/pop3/camel-pop3-folder.c:787 ++#: ../camel/providers/pop3/camel-pop3-folder.c:800 ++#: ../camel/providers/pop3/camel-pop3-folder.c:814 + msgid "Cannot get POP summary: " + msgstr "不能取得 POP 摘要：" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:891 ++#: ../camel/providers/pop3/camel-pop3-folder.c:925 + msgid "Expunging old messages" + msgstr "清空舊的郵件" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:911 ++#: ../camel/providers/pop3/camel-pop3-folder.c:945 + msgid "Expunging deleted messages" + msgstr "清空刪除的郵件" + +@@ -4204,105 +4259,95 @@ msgstr "用於連線到 POP 伺服器並 + msgid "" + "This option will connect to the POP server using a plaintext password. This " + "is the only option supported by many POP servers." +-msgstr "" +-"這個選項將會使用純文字的密碼連線到 POP 伺服器。一般的 POP 伺服器只會支援這種" +-"方式。" ++msgstr "這個選項將會使用純文字的密碼連線到 POP 伺服器。一般的 POP 伺服器只會支援這種方式。" + + #: ../camel/providers/pop3/camel-pop3-provider.c:95 + msgid "" + "This option will connect to the POP server using an encrypted password via " + "the APOP protocol. This may not work for all users even on servers that " + "claim to support it." +-msgstr "" +-"這個選項將會使用加密的密碼經由 APOP 通訊協定連線到 POP 伺服器。不過就算伺服器" +-"聲稱能夠支援，但對於所有使用者來講都未必一定可行。" ++msgstr "這個選項將會使用加密的密碼經由 APOP 通訊協定連線到 POP 伺服器。不過就算伺服器聲稱能夠支援，但對於所有使用者來講都未必一定可行。" + + #. Translators: This is the separator between an error and an explanation +-#: ../camel/providers/pop3/camel-pop3-store.c:89 ++#: ../camel/providers/pop3/camel-pop3-store.c:99 + msgid ": " + msgstr "：" + +-#: ../camel/providers/pop3/camel-pop3-store.c:150 ++#: ../camel/providers/pop3/camel-pop3-store.c:161 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "無法從 POP 伺服器 %s 讀取有效的問候語" + +-#: ../camel/providers/pop3/camel-pop3-store.c:165 ++#: ../camel/providers/pop3/camel-pop3-store.c:176 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "無法以安全模式連線到 POP 伺服器 %s： %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:166 ++#: ../camel/providers/pop3/camel-pop3-store.c:177 + msgid "STLS not supported by server" + msgstr "伺服器不支援 STLS" + + #. Translators: Last %s is an optional + #. * explanation beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:187 ++#: ../camel/providers/pop3/camel-pop3-store.c:198 + #, c-format + msgid "Failed to connect to POP server %s in secure mode%s" + msgstr "無法以安全模式連線到 POP 伺服器 %s%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:200 ++#: ../camel/providers/pop3/camel-pop3-store.c:211 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: " + msgstr "無法以安全模式連線到 POP 伺服器 %s：" + +-#: ../camel/providers/pop3/camel-pop3-store.c:311 ++#: ../camel/providers/pop3/camel-pop3-store.c:351 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "不能登入 POP 伺服器 %s： SASL 通訊協定錯誤" + +-#: ../camel/providers/pop3/camel-pop3-store.c:333 ++#: ../camel/providers/pop3/camel-pop3-store.c:373 + #, c-format + msgid "Failed to authenticate on POP server %s: " + msgstr "無法驗證 POP 伺服器 %s：" + +-#: ../camel/providers/pop3/camel-pop3-store.c:435 ++#: ../camel/providers/pop3/camel-pop3-store.c:481 + #, c-format + msgid "POP3 server %s" + msgstr "POP3 伺服器 %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:438 ++#: ../camel/providers/pop3/camel-pop3-store.c:484 + #, c-format + msgid "POP3 server for %s on %s" + msgstr "%s 在 %s 的 POP3 伺服器" + +-#: ../camel/providers/pop3/camel-pop3-store.c:613 ++#: ../camel/providers/pop3/camel-pop3-store.c:696 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " + "attack suspected. Please contact your admin." +-msgstr "" +-"無法連線至 POP 伺服器 %s：\t收到無效的 APOP ID。推測可能是使用者假冒攻擊。請" +-"聯絡您的系統管理者。" ++msgstr "無法連線至 POP 伺服器 %s：\t收到無效的 APOP ID。推測可能是使用者假冒攻擊。請聯絡您的系統管理者。" + +-#: ../camel/providers/pop3/camel-pop3-store.c:665 ++#: ../camel/providers/pop3/camel-pop3-store.c:748 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending password: " +-msgstr "" +-"無法連線到 POP 伺服器 %s。\n" ++msgstr "無法連線到 POP 伺服器 %s。\n" + "傳送密碼時發生錯誤：" + + #. Translators: Last %s is an optional explanation + #. * beginning with ": " separator. +-#: ../camel/providers/pop3/camel-pop3-store.c:680 ++#: ../camel/providers/pop3/camel-pop3-store.c:763 + #, c-format +-msgid "" +-"Unable to connect to POP server %s.\n" ++msgid "Unable to connect to POP server %s.\n" + "Error sending username%s" +-msgstr "" +-"無法連線 POP 伺服器 %s。\n" ++msgstr "無法連線 POP 伺服器 %s。\n" + "傳送使用者名稱發生錯誤%s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:751 ++#: ../camel/providers/pop3/camel-pop3-store.c:845 + #, c-format + msgid "No such folder '%s'." + msgstr "沒有這個資料夾「%s」。" + +-#: ../camel/providers/pop3/camel-pop3-store.c:768 ++#: ../camel/providers/pop3/camel-pop3-store.c:862 + #, c-format + msgid "POP3 stores have no folder hierarchy" + msgstr "POP3 儲存區沒有資料夾階層" +@@ -4385,218 +4430,218 @@ msgstr "SMTP" + msgid "For delivering mail by connecting to a remote mailhub using SMTP." + msgstr "使用 SMTP 連線到遠端 mailhub 來傳送郵件。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:160 +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:158 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 + msgid "Welcome response error: " + msgstr "迎接的回應錯誤：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:207 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "無法以安全模式連線到 SMTP 伺服器 %s： %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 +-#: ../camel/providers/smtp/camel-smtp-transport.c:229 +-#: ../camel/providers/smtp/camel-smtp-transport.c:236 ++#: ../camel/providers/smtp/camel-smtp-transport.c:211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:224 ++#: ../camel/providers/smtp/camel-smtp-transport.c:231 + msgid "STARTTLS command failed: " + msgstr "STARTTLS 指令失敗：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:247 ++#: ../camel/providers/smtp/camel-smtp-transport.c:242 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: " + msgstr "無法以安全模式連線到 SMTP 伺服器 %s：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:349 ++#: ../camel/providers/smtp/camel-smtp-transport.c:342 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP 伺服器 %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:352 ++#: ../camel/providers/smtp/camel-smtp-transport.c:345 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "經由 %s 傳送 SMTP 郵件" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:426 ++#: ../camel/providers/smtp/camel-smtp-transport.c:419 + #, c-format + msgid "SMTP server %s does not support %s authentication" + msgstr "SMTP 伺服器 %s 不支援 %s 驗證" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:508 ++#: ../camel/providers/smtp/camel-smtp-transport.c:500 + #, c-format + msgid "No SASL mechanism was specified" + msgstr "沒有指定 SASL 機制" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:538 +-#: ../camel/providers/smtp/camel-smtp-transport.c:549 +-#: ../camel/providers/smtp/camel-smtp-transport.c:562 ++#: ../camel/providers/smtp/camel-smtp-transport.c:530 ++#: ../camel/providers/smtp/camel-smtp-transport.c:541 ++#: ../camel/providers/smtp/camel-smtp-transport.c:554 + msgid "AUTH command failed: " + msgstr "AUTH 指令失敗：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:695 + #, c-format + msgid "Cannot send message: service not connected." + msgstr "無法傳送訊息：服務未連線。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:710 ++#: ../camel/providers/smtp/camel-smtp-transport.c:702 + #, c-format + msgid "Cannot send message: sender address not valid." + msgstr "不能傳送郵件：寄件者的地址無效。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:714 ++#: ../camel/providers/smtp/camel-smtp-transport.c:706 + msgid "Sending message" + msgstr "傳送郵件" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:731 + #, c-format + msgid "Cannot send message: no recipients defined." + msgstr "不能傳送郵件：沒有定義收件者。" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:752 ++#: ../camel/providers/smtp/camel-smtp-transport.c:744 + #, c-format + msgid "Cannot send message: one or more invalid recipients" + msgstr "不能傳送郵件：一或多個無效的收件者" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:873 ++#: ../camel/providers/smtp/camel-smtp-transport.c:865 + msgid "Syntax error, command unrecognized" + msgstr "語法錯誤，不認識的指令" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:875 ++#: ../camel/providers/smtp/camel-smtp-transport.c:867 + msgid "Syntax error in parameters or arguments" + msgstr "參數內的語法錯誤" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:877 ++#: ../camel/providers/smtp/camel-smtp-transport.c:869 + msgid "Command not implemented" + msgstr "指令沒有實作" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:879 ++#: ../camel/providers/smtp/camel-smtp-transport.c:871 + msgid "Command parameter not implemented" + msgstr "指令的參數沒有實作" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:881 ++#: ../camel/providers/smtp/camel-smtp-transport.c:873 + msgid "System status, or system help reply" + msgstr "系統狀況，或者是系統的求助說明回應" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:883 ++#: ../camel/providers/smtp/camel-smtp-transport.c:875 + msgid "Help message" + msgstr "求助說明訊息" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:885 ++#: ../camel/providers/smtp/camel-smtp-transport.c:877 + msgid "Service ready" + msgstr "服務已就緒" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:887 ++#: ../camel/providers/smtp/camel-smtp-transport.c:879 + msgid "Service closing transmission channel" + msgstr "此服務將傳輸通道關閉" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:889 ++#: ../camel/providers/smtp/camel-smtp-transport.c:881 + msgid "Service not available, closing transmission channel" + msgstr "此服務仍未可用，傳輸通道關閉" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:891 ++#: ../camel/providers/smtp/camel-smtp-transport.c:883 + msgid "Requested mail action okay, completed" + msgstr " 所要求的郵件動作已成功完成" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:893 ++#: ../camel/providers/smtp/camel-smtp-transport.c:885 + msgid "User not local; will forward to " + msgstr "不是本地端的使用者；將會轉寄至 <轉寄路徑>" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:895 ++#: ../camel/providers/smtp/camel-smtp-transport.c:887 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "所要求的郵件動作無法執行：郵箱仍未可用" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:897 ++#: ../camel/providers/smtp/camel-smtp-transport.c:889 + msgid "Requested action not taken: mailbox unavailable" + msgstr "所要求的動作無法執行：郵箱仍未可用" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:899 ++#: ../camel/providers/smtp/camel-smtp-transport.c:891 + msgid "Requested action aborted: error in processing" + msgstr "所要求的動作已放棄：正在處理時發生錯誤" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:901 ++#: ../camel/providers/smtp/camel-smtp-transport.c:893 + msgid "User not local; please try " + msgstr "不是本地端的使用者；請嘗試使用 <轉寄路徑>" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:903 ++#: ../camel/providers/smtp/camel-smtp-transport.c:895 + msgid "Requested action not taken: insufficient system storage" + msgstr "所要求的動作無法執行：系統的儲存空間不足" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:905 ++#: ../camel/providers/smtp/camel-smtp-transport.c:897 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "所要求的郵件動作已放棄：超出可供儲存空間的限制" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:907 ++#: ../camel/providers/smtp/camel-smtp-transport.c:899 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "所要求的動作已放棄：不允許的郵箱名稱" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:909 ++#: ../camel/providers/smtp/camel-smtp-transport.c:901 + msgid "Start mail input; end with ." + msgstr "請開始輸入郵件的資料；. 結束撰寫郵件" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:911 ++#: ../camel/providers/smtp/camel-smtp-transport.c:903 + msgid "Transaction failed" + msgstr "執行失敗" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:915 ++#: ../camel/providers/smtp/camel-smtp-transport.c:907 + msgid "A password transition is needed" + msgstr "需要密碼傳送" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:917 ++#: ../camel/providers/smtp/camel-smtp-transport.c:909 + msgid "Authentication mechanism is too weak" + msgstr "驗證機制太弱了" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:919 ++#: ../camel/providers/smtp/camel-smtp-transport.c:911 + msgid "Encryption required for requested authentication mechanism" + msgstr "所要求的驗證機制必須加密處理" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:921 ++#: ../camel/providers/smtp/camel-smtp-transport.c:913 + msgid "Temporary authentication failure" + msgstr "臨時驗證失敗" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1170 + msgid "SMTP Greeting" + msgstr "SMTP 迎接" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1205 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1223 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1231 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1197 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1211 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1219 + msgid "HELO command failed: " + msgstr "HELO 指令失敗：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1306 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1321 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1331 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1294 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1309 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1319 + msgid "MAIL FROM command failed: " + msgstr "MAIL FROM 指令失敗：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1358 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1346 + msgid "RCPT TO command failed: " + msgstr "RCPT TO 指令失敗：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1375 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1385 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1363 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1373 + #, c-format + msgid "RCPT TO <%s> failed: " + msgstr "RCPT TO <%s> 失敗：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1428 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1439 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1450 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1509 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1529 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1543 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1552 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1416 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1427 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1438 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1497 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1517 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1531 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1540 + msgid "DATA command failed: " + msgstr "DATA 指令失敗：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1577 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1592 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1601 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1565 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1580 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1589 + msgid "RSET command failed: " + msgstr "RSET 指令失敗：" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1626 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1640 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1647 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1614 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1628 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1635 + msgid "QUIT command failed: " + msgstr "QUIT 指令失敗：" + +@@ -4628,8 +4673,7 @@ msgstr "生日和週年紀念日提醒� + msgid "" + "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or " + "\"days\"" +-msgstr "" +-"生日和週年紀念日提醒的單位，「minutes」(分鐘)、「hours」(小時)或「days」(日)" ++msgstr "生日和週年紀念日提醒的單位，「minutes」(分鐘)、「hours」(小時)或「days」(日)" + + #: ../libebackend/e-authentication-mediator.c:205 + #: ../libebackend/e-authentication-mediator.c:216 +@@ -4653,11 +4697,11 @@ msgstr "客戶端已取消操作" + msgid "Client reports password was rejected" + msgstr "客戶端回報密碼被拒絕" + +-#: ../libebackend/e-authentication-session.c:532 ++#: ../libebackend/e-authentication-session.c:543 + msgid "Add this password to your keyring" + msgstr "將密碼加入您的鑰匙圈" + +-#: ../libebackend/e-authentication-session.c:622 ++#: ../libebackend/e-authentication-session.c:648 + msgid "Password was incorrect" + msgstr "密碼是不正確的" + +@@ -4687,7 +4731,7 @@ msgid "Data source is missing a [%s] gro + msgstr "資料來源缺少 [%s] 群組" + + #: ../libebackend/e-server-side-source.c:1008 +-#: ../libedataserver/e-source.c:1120 ++#: ../libedataserver/e-source.c:1138 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "資料來源「%s」不支援建立遠端資源" +@@ -4699,7 +4743,7 @@ msgid "" + msgstr "資料來源「%s」沒有用來建立遠端資料的收集後端" + + #: ../libebackend/e-server-side-source.c:1050 +-#: ../libedataserver/e-source.c:1227 ++#: ../libedataserver/e-source.c:1251 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "資料來源「%s」不支援刪除遠端資源" +@@ -4711,7 +4755,7 @@ msgid "" + msgstr "資料來源「%s」沒有用來刪除遠端資料的收集後端" + + #: ../libebackend/e-server-side-source.c:1095 +-#: ../libedataserver/e-source.c:1317 ++#: ../libedataserver/e-source.c:1347 + #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" +@@ -4723,7 +4767,7 @@ msgid "File must have a '.source' extens + msgstr "檔案必須以「.source」做為延伸檔名" + + #: ../libebackend/e-source-registry-server.c:523 +-#: ../libedataserver/e-source-registry.c:1594 ++#: ../libedataserver/e-source-registry.c:1882 + msgid "The user declined to authenticate" + msgstr "使用者拒絕驗證" + +@@ -4920,22 +4964,22 @@ msgstr "請輸入工作清單「%s」的 + msgid "Please enter the password for account \"%s\"." + msgstr "請輸入帳號「%s」的密碼 。" + +-#: ../libedataserver/e-source.c:622 ++#: ../libedataserver/e-source.c:627 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "來源檔案缺少 [%s] 群組" + +-#: ../libedataserver/e-source.c:943 ++#: ../libedataserver/e-source.c:949 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "資料來源「%s」無法移除" + +-#: ../libedataserver/e-source.c:1029 ++#: ../libedataserver/e-source.c:1041 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "資料來源「%s」無法寫入" + +-#: ../libedataserver/e-source.c:1523 ++#: ../libedataserver/e-source.c:1559 + msgid "Unnamed" + msgstr "未命名的" + +@@ -4976,7 +5020,8 @@ msgstr "主機「%s」用於工作清單 + #. * in 12-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962 ++#: ../libedataserver/e-time-utils.c:1663 ++#: ../libedataserver/e-time-utils.c:1962 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%Y/%m/%d (%a) %p %I:%M:%S" + +@@ -4984,7 +5029,8 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S" + #. * in 24-hour format. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953 ++#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1953 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%Y/%m/%d (%a) %H:%M:%S" + +@@ -4992,7 +5038,8 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S" + #. * in 12-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 12-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958 ++#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1958 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%a %m/%d/%Y %I:%M %p" + +@@ -5000,7 +5047,8 @@ msgstr "%a %m/%d/%Y %I:%M %p" + #. * in 24-hour format, without seconds. + #. strftime format of a weekday, a date and a + #. * time, in 24-hour format, without seconds. +-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949 ++#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1949 + msgid "%a %m/%d/%Y %H:%M" + msgstr "%a %m/%d/%Y %H:%M" + +@@ -5018,7 +5066,8 @@ msgstr "%a %m/%d/%Y %H" + + #. strptime format of a weekday and a date. + #. strftime format of a weekday and a date. +-#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811 ++#: ../libedataserver/e-time-utils.c:1691 ++#: ../libedataserver/e-time-utils.c:1811 + #: ../libedataserver/e-time-utils.c:1944 + msgid "%a %m/%d/%Y" + msgstr "%Y/%m/%d (%a)" +@@ -5059,19 +5108,22 @@ msgstr "%m/%d/%Y %H" + + #. strptime format of a weekday and a date. + #. This is the preferred date format for the locale. +-#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814 ++#: ../libedataserver/e-time-utils.c:1725 ++#: ../libedataserver/e-time-utils.c:1814 + msgid "%m/%d/%Y" + msgstr "%Y/%m/%d" + + #. strptime format for a time of day, in 12-hour format. + #. strftime format of a time in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006 ++#: ../libedataserver/e-time-utils.c:1885 ++#: ../libedataserver/e-time-utils.c:2006 + msgid "%I:%M:%S %p" + msgstr "%p %I:%M:%S" + + #. strptime format for a time of day, in 24-hour format. + #. strftime format of a time in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998 ++#: ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1998 + msgid "%H:%M:%S" + msgstr "%H:%M:%S" + +@@ -5079,14 +5131,16 @@ msgstr "%H:%M:%S" + #. * in 12-hour format. + #. strftime format of a time in 12-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003 ++#: ../libedataserver/e-time-utils.c:1894 ++#: ../libedataserver/e-time-utils.c:2003 + msgid "%I:%M %p" + msgstr "%p %I:%M" + + #. strptime format for time of day, without seconds 24-hour format. + #. strftime format of a time in 24-hour format, + #. * without seconds. +-#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995 ++#: ../libedataserver/e-time-utils.c:1898 ++#: ../libedataserver/e-time-utils.c:1995 + msgid "%H:%M" + msgstr "%H:%M" + +@@ -5109,9 +5163,7 @@ msgstr "要使用的代理伺服器類� + msgid "" + "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" " + "means manual proxy." +-msgstr "" +-"要使用哪種類型的代理伺服器。「0」表示使用系統值，「1」表示不使用代理伺服器，" +-"「2」表示手動設定代理伺服器。" ++msgstr "要使用哪種類型的代理伺服器。「0」表示使用系統值，「1」表示不使用代理伺服器，「2」表示手動設定代理伺服器。" + + #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 + msgid "Whether to use http-proxy" +@@ -5220,9 +5272,7 @@ msgstr "沒有 UID「%s」的資料來� + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " + "from which to obtain a password for '%s'" +-msgstr "" +-"找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的密碼" +-"的地方" ++msgstr "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的密碼的地方" + + #: ../modules/gnome-online-accounts/e-goa-password-based.c:216 + #, c-format +@@ -5265,16 +5315,14 @@ msgstr "找不到帳號元素" + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "在自動探索回應中找不到 ASUrl 與 OABUrl" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1237 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1271 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " + "from which to obtain an access token for '%s'" +-msgstr "" +-"找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的存取" +-"記號的地方" ++msgstr "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的存取記號的地方" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1264 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1298 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "無法獲得「%s」的存取記號：" +@@ -5763,436 +5811,3 @@ msgstr "WebDAV" + #: ../services/evolution-user-prompter/prompt-user-gtk.c:122 + msgid "_Dismiss" + msgstr "解除(_D)" +- +-#~ msgid "Invalid backend name '%s' in source '%s'" +-#~ msgstr "來源「%2$s」中有無效的後端名稱「%1$s」" +- +-#~ msgid "Failed to run book factory" +-#~ msgstr "無法執行通訊錄工廠" +- +-#~ msgid "Cannot get connection to view" +-#~ msgstr "不能取得要檢視的連線" +- +-#~ msgid "Cannot process, book backend is opening" +-#~ msgstr "不能處理，通訊錄後端程式已開啟" +- +-#~ msgid "Empty query: " +-#~ msgstr "空的查詢：" +- +-#~ msgid "Cannot get backend property: " +-#~ msgstr "不能取得後端屬性：" +- +-#~ msgid "Failed to run calendar factory" +-#~ msgstr "無法執行行事曆工廠" +- +-#~ msgid "Cannot process, calendar backend is opening" +-#~ msgstr "不能處理，行事曆後端已開啟" +- +-#~ msgid "Invalid call" +-#~ msgstr "無效的呼叫" +- +-#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot" +-#~ msgstr "不能建立資料夾：%s：資料夾名稱不能包含「.」" +- +-#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot" +-#~ msgstr "不能重新命名資料夾：%s：資料夾名稱不能包含「.」" +- +-#~ msgid "Failed to build summary for an address book %s" +-#~ msgstr "無法建立通訊錄 %s 的摘要" +- +-#~ msgid "Using Distinguished Name (DN)" +-#~ msgstr "使用辨認的名稱 (DN)" +- +-#~ msgid "Using Email Address" +-#~ msgstr "使用電子郵件地址" +- +-#~ msgid "Cannot remove book: " +-#~ msgstr "不能移除通訊錄：" +- +-#~ msgid "" +-#~ "Failed to connect to a server using SSL. One possible reason is an " +-#~ "invalid certificate being used by the server. If this is expected, like " +-#~ "self-signed certificate being used on the server, then disable " +-#~ "certificate validity tests by selecting 'Ignore invalid SSL certificate' " +-#~ "option in Properties" +-#~ msgstr "" +-#~ "無法使用 SSL 連線到伺服器。一個可能的原因是伺服器使用了無效的憑證。如果是" +-#~ "這樣，像是伺服器使用了自我簽署的憑證，可以在屬性中選擇「忽略無效的 SSL 憑" +-#~ "證」選項來停用憑證效力檢測" +- +-#~ msgid "Cannot create local store" +-#~ msgstr "不能建立本地儲存區" +- +-#~ msgid "Could not create synch slave thread" +-#~ msgstr "無法建立 synch 從屬執行緒" +- +-#~ msgid "Cannot remove calendar: " +-#~ msgstr "不能移除行事曆：" +- +-#~ msgid "" +-#~ " Issuer: %s\n" +-#~ " Subject: %s\n" +-#~ " Fingerprint: %s\n" +-#~ " Signature: %s" +-#~ msgstr "" +-#~ "發照者： %s\n" +-#~ "主旨： %s\n" +-#~ "數位指紋： %s\n" +-#~ "簽章： %s" +- +-#~ msgid "GOOD" +-#~ msgstr "良好" +- +-#~ msgid "BAD" +-#~ msgstr "不良" +- +-#~ msgid "" +-#~ "Certificate problem: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "憑證問題： %s\n" +-#~ "發照者： %s" +- +-#~ msgid "" +-#~ "Bad certificate domain: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "不正確的憑證網域： %s\n" +-#~ "發照者： %s" +- +-#~ msgid "" +-#~ "Certificate expired: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "憑證已逾期： %s\n" +-#~ "發照者： %s" +- +-#~ msgid "" +-#~ "Certificate revocation list expired: %s\n" +-#~ "Issuer: %s" +-#~ msgstr "" +-#~ "憑證撒銷清單已逾期： %s\n" +-#~ "發照者： %s" +- +-#~ msgid "No output stream" +-#~ msgstr "沒有輸出串流" +- +-#~ msgid "No input stream" +-#~ msgstr "沒有輸入串流" +- +-#~ msgid "Server unexpectedly disconnected: %s" +-#~ msgstr "伺服器突然中斷連線： %s" +- +-#~ msgid "" +-#~ "Alert from IMAP server %s@%s in folder %s:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "來自 IMAP 伺服器 %s@%s 資料夾 %s 的警報：\n" +-#~ "%s" +- +-#~ msgid "" +-#~ "Alert from IMAP server %s@%s:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "來自 IMAP 伺服器 %s@%s 的警報：\n" +-#~ "%s" +- +-#~ msgid "Unexpected response from IMAP server: %s" +-#~ msgstr "從 IMAP 伺服器傳回不當的回應： %s" +- +-#~ msgid "IMAP command failed: %s" +-#~ msgstr "IMAP 指令失敗： %s" +- +-#~ msgid "Server response ended too soon." +-#~ msgstr "伺服器太早傳回結束的回應。" +- +-#~ msgid "IMAP server response did not contain %s information" +-#~ msgstr "IMAP 伺服器的回應沒有包含 %s 資訊" +- +-#~ msgid "Unexpected OK response from IMAP server: %s" +-#~ msgstr "從 IMAP 伺服器傳回不當的 OK 回應： %s" +- +-#~ msgid "Always check for _new mail in this folder" +-#~ msgstr "永遠檢查這個資料夾中是否有新郵件(_N)" +- +-#~ msgid "Could not create directory %s: %s" +-#~ msgstr "無法建立目錄 %s：%s" +- +-#~ msgid "Could not load summary for %s" +-#~ msgstr "無法載入 %s 的摘要" +- +-#~ msgid "Scanning for changed messages in %s" +-#~ msgstr "掃描 %s 中變更過的郵件" +- +-#~ msgid "Fetching summary information for new messages in %s" +-#~ msgstr "正取得 %s 中新郵件的摘要資訊" +- +-#~ msgid "Incomplete server response: no information provided for message %d" +-#~ msgstr "不完整的伺服器回應：未提供任何資訊給訊息 %d" +- +-#~ msgid "Incomplete server response: no UID provided for message %d" +-#~ msgstr "不完整的伺服器回應：未提供 UID 給訊息 %d" +- +-#~ msgid "Could not find message body in FETCH response." +-#~ msgstr "在 FETCH 的回應內找不到郵件的內文。" +- +-#~ msgid "Could not open cache directory: " +-#~ msgstr "無法開啟快取目錄：" +- +-#~ msgid "Failed to cache message %s: %s" +-#~ msgstr "快取郵件 %s 失敗： %s" +- +-#~ msgid "Failed to cache message %s: " +-#~ msgstr "快取郵件 %s 失敗：" +- +-#~ msgid "Failed to cache %s: " +-#~ msgstr "快取 %s 失敗：" +- +-#~ msgid "Names_pace:" +-#~ msgstr "命名空間(_P):" +- +-#~ msgid "IMAP default port" +-#~ msgstr "IMAP 預設連接埠" +- +-#~ msgid "IMAP" +-#~ msgstr "IMAP" +- +-#~ msgid "Retrieving list of folders at '%s'" +-#~ msgstr "取回在「%s」的資料夾清單" +- +-#~ msgid "Server unexpectedly disconnected" +-#~ msgstr "伺服器突然中斷連線" +- +-#~ msgid "Server unexpectedly disconnected: " +-#~ msgstr "伺服器突然中斷連線：" +- +-#~ msgid "Could not connect to POP server %s" +-#~ msgstr "無法連線到 POP 伺服器 %s" +- +-#~ msgid "Keyring operation was cancelled" +-#~ msgstr "鑰匙圈操作已取消" +- +-#~ msgid "Currently _used categories:" +-#~ msgstr "目前使用的分類(_U):" +- +-#~ msgid "_Available Categories:" +-#~ msgstr "可用的分類(_A):" +- +-#~ msgid "Icon" +-#~ msgstr "圖示" +- +-#~ msgid "Category" +-#~ msgstr "分類" +- +-#~ msgid "Create category \"%s\"" +-#~ msgstr "建立分類「%s」" +- +-#~ msgid "Category Icon" +-#~ msgstr "分類圖示" +- +-#~ msgid "_No Image" +-#~ msgstr "沒有圖片(_N)" +- +-#~ msgid "Category _Name" +-#~ msgstr "分類名稱(_N)" +- +-#~ msgid "Category _Icon" +-#~ msgstr "分類圖示(_I)" +- +-#~ msgid "Category Properties" +-#~ msgstr "分類屬性" +- +-#~ msgid "" +-#~ "There is already a category '%s' in the configuration. Please use another " +-#~ "name" +-#~ msgstr "在組態中已經有名為「%s」的分類。請使用另外的名稱" +- +-#~ msgid "Show Contacts" +-#~ msgstr "顯示連絡人" +- +-#~ msgid "Address B_ook:" +-#~ msgstr "通訊錄(_O):" +- +-#~ msgid "Cat_egory:" +-#~ msgstr "分類(_E):" +- +-#~ msgid "_Search:" +-#~ msgstr "搜尋(_S):" +- +-#~ msgid "Any Category" +-#~ msgstr "任何分類" +- +-#~ msgid "Co_ntacts" +-#~ msgstr "連絡人(_N)" +- +-#~ msgid "Search" +-#~ msgstr "搜尋" +- +-#~ msgid "Address Book" +-#~ msgstr "通訊錄" +- +-#~ msgid "Select Contacts from Address Book" +-#~ msgstr "從通訊錄選取連絡人" +- +-#~ msgid "_Add" +-#~ msgstr "加入(_A)" +- +-#~ msgid "_Remove" +-#~ msgstr "移除(_R)" +- +-#~ msgid "Error loading address book: %s" +-#~ msgstr "載入通訊錄時發生錯誤：%s" +- +-#~ msgid "E_xpand %s Inline" +-#~ msgstr "展開行內 %s" +- +-#~ msgid "Cop_y %s" +-#~ msgstr "複製(_Y) %s" +- +-#~ msgid "C_ut %s" +-#~ msgstr "剪下(_U) %s" +- +-#~ msgid "_Edit %s" +-#~ msgstr "編輯 %s(_E)" +- +-#~ msgid "_Delete %s" +-#~ msgstr "刪除(_D) %s" +- +-#~ msgid "Keyring key is unusable: no user or host name" +-#~ msgstr "鑰匙圈金鑰無法使用：沒有使用者或主機名稱" +- +-#~ msgid "You have the Caps Lock key on." +-#~ msgstr "您的 Caps Lock 是開啟的。" +- +-#~ msgid "_Remember this passphrase" +-#~ msgstr "記住這個密語(_R)" +- +-#~ msgid "_Remember this passphrase for the remainder of this session" +-#~ msgstr "記住這個用於剩餘的工作階段的密語(_R)" +- +-#~ msgid "_Remember this password" +-#~ msgstr "記住這個密碼(_R)" +- +-#~ msgid "_Remember this password for the remainder of this session" +-#~ msgstr "記住這個用於剩餘的工作階段的密碼(_R)" +- +-#~ msgid "_Destination" +-#~ msgstr "目的端(_D)" +- +-#~ msgid "Select destination" +-#~ msgstr "選取目的地" +- +-#~ msgid "Evolution Source Viewer" +-#~ msgstr "GNOME 來源瀏覽程式" +- +-#~ msgid "Display Name" +-#~ msgstr "顯示名稱" +- +-#~ msgid "Flags" +-#~ msgstr "旗標" +- +-#~ msgid "Identity" +-#~ msgstr "身分" +- +-#~ msgid "Updating %s folder" +-#~ msgstr "更新 %s 資料夾" +- +-#~ msgid "Authenticating with the server…" +-#~ msgstr "與伺服器驗證…" +- +-#~ msgid "%s: there was no source for UID '%s' stored in GConf." +-#~ msgstr "%s：沒有儲存於 GConf 中的 UID「%s」來源。" +- +-#~ msgid "Incorrect uri '%s'" +-#~ msgstr "不正確的 URI「%s」" +- +-#~ msgid "Failed to find system book" +-#~ msgstr "無法尋找系統通訊錄" +- +-#~ msgid "There was no source for UID '%s' stored in a source list." +-#~ msgstr "沒有儲存於來源清單中的 UID「%s」來源。" +- +-#~ msgid "Cannot authenticate user: " +-#~ msgstr "不能驗證使用者：" +- +-#~ msgid "Empty URI" +-#~ msgstr "空的 URI" +- +-#~ msgid "" +-#~ "Enter password for address book %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "輸入通訊錄 %s (使用者 %s) 的密碼 \n" +-#~ "原因：%s" +- +-#~ msgid "Enter password for address book %s (user %s)" +-#~ msgstr "輸入通訊錄 %s (使用者 %s) 的密碼 " +- +-#~ msgid "Enter password for %s (user %s)" +-#~ msgstr "輸入 %s (使用者 %s) 的密碼 " +- +-#~ msgid "Enter password for %s to enable proxy for user %s" +-#~ msgstr "輸入 %s 的密碼以便使用者 %s 能使用代理伺服器" +- +-#~ msgid "Invalid source type" +-#~ msgstr "無效的來源類型" +- +-#~ msgid "Connection to Server" +-#~ msgstr "連線到伺服器" +- +-#~ msgid "_Use custom command to connect to server" +-#~ msgstr "使用自訂指令來連線到伺服器(_U)" +- +-#~ msgid "Co_mmand:" +-#~ msgstr "指令(_M):" +- +-#~ msgid "Command:" +-#~ msgstr "指令：" +- +-#~ msgid "Numbe_r of cached connections to use" +-#~ msgstr "要使用的快取連線數量(_R)" +- +-#~ msgid "Closing tmp stream failed: " +-#~ msgstr "無法關閉 tmp 串流：" +- +-#~ msgid "SMTP Authentication" +-#~ msgstr "SMTP 驗證" +- +-#~ msgid "Accessing LDAP Server anonymously" +-#~ msgstr "正以匿名方式存取 LDAP 伺服器" +- +-#~ msgid "" +-#~ "Enter password for calendar %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "輸入日曆 %s (使用者 %s) 的密碼 \n" +-#~ "原因：%s" +- +-#~ msgid "Enter password for calendar %s (user %s)" +-#~ msgstr "輸入日曆 %s (使用者 %s) 的密碼 " +- +-#~ msgid "" +-#~ "Enter password for task list %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "輸入工作表 %s (使用者 %s) 的密碼 \n" +-#~ "原因：%s" +- +-#~ msgid "Enter password for task list %s (user %s)" +-#~ msgstr "輸入工作表 %s (使用者 %s) 的密碼 " +- +-#~ msgid "" +-#~ "Enter password for memo list %s (user %s)\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "輸入筆記 %s (使用者 %s) 的密碼 \n" +-#~ "原因：%s" +- +-#~ msgid "Enter password for memo list %s (user %s)" +-#~ msgstr "輸入筆記 %s (使用者 %s) 的密碼 " +- +-#~ msgid "Enter Passphrase" +-#~ msgstr "輸入密語" +- +-#~ msgid "Enter Password" +-#~ msgstr "輸入密碼" diff --git a/SOURCES/evolution-data-server-3.8.5-vfolder-update.patch b/SOURCES/evolution-data-server-3.8.5-vfolder-update.patch new file mode 100644 index 0000000..73540d7 --- /dev/null +++ b/SOURCES/evolution-data-server-3.8.5-vfolder-update.patch @@ -0,0 +1,105 @@ +diff -up evolution-data-server-3.8.5/camel/camel-vee-folder.c.vfolder-update evolution-data-server-3.8.5/camel/camel-vee-folder.c +--- evolution-data-server-3.8.5/camel/camel-vee-folder.c.vfolder-update 2013-07-23 13:57:49.000000000 +0200 ++++ evolution-data-server-3.8.5/camel/camel-vee-folder.c 2014-01-23 15:47:41.876982760 +0100 +@@ -1708,6 +1708,30 @@ camel_vee_folder_ignore_next_changed_eve + } + + /** ++ * camel_vee_folder_remove_from_ignore_changed_event: ++ * @vfolder: a #CamelVeeFolder ++ * @subfolder: a #CamelFolder folder ++ * ++ * Make sure the next @subfolder-'s 'changed' event will not be silently ignored. ++ * This is a counter-part function of camel_vee_folder_ignore_next_changed_event(), ++ * when there was expected a change, which did not happen, to take back the previous ++ * ignore event request. ++ * ++ * Since: 3.10.4 ++ **/ ++void ++camel_vee_folder_remove_from_ignore_changed_event (CamelVeeFolder *vfolder, ++ CamelFolder *subfolder) ++{ ++ g_return_if_fail (CAMEL_IS_VEE_FOLDER (vfolder)); ++ g_return_if_fail (subfolder != NULL); ++ ++ g_rec_mutex_lock (&vfolder->priv->changed_lock); ++ g_hash_table_remove (vfolder->priv->ignore_changed, subfolder); ++ g_rec_mutex_unlock (&vfolder->priv->changed_lock); ++} ++ ++/** + * camel_vee_folder_lock: + * @folder: a #CamelVeeFolder + * @lock: lock type to lock +diff -up evolution-data-server-3.8.5/camel/camel-vee-folder.h.vfolder-update evolution-data-server-3.8.5/camel/camel-vee-folder.h +--- evolution-data-server-3.8.5/camel/camel-vee-folder.h.vfolder-update 2013-07-23 13:57:53.000000000 +0200 ++++ evolution-data-server-3.8.5/camel/camel-vee-folder.h 2014-01-23 15:47:41.876982760 +0100 +@@ -141,6 +141,9 @@ const gchar * camel_vee_folder_get_expre + void camel_vee_folder_ignore_next_changed_event + (CamelVeeFolder *vfolder, + CamelFolder *subfolder); ++void camel_vee_folder_remove_from_ignore_changed_event ++ (CamelVeeFolder *vfolder, ++ CamelFolder *subfolder); + + void camel_vee_folder_lock (CamelVeeFolder *folder, + CamelVeeFolderLock lock); +diff -up evolution-data-server-3.8.5/camel/camel-vee-summary.c.vfolder-update evolution-data-server-3.8.5/camel/camel-vee-summary.c +--- evolution-data-server-3.8.5/camel/camel-vee-summary.c.vfolder-update 2013-07-23 13:57:42.000000000 +0200 ++++ evolution-data-server-3.8.5/camel/camel-vee-summary.c 2014-01-23 15:47:41.876982760 +0100 +@@ -191,10 +191,14 @@ vee_info_set_user_flag (CamelMessageInfo + + res = camel_message_info_set_user_flag (rmi, name, value); + +- camel_message_info_free (rmi); ++ if (ignore_changes) { ++ if (res) ++ vee_summary_notify_mi_changed (vf, mi); ++ else ++ camel_vee_folder_remove_from_ignore_changed_event (vf, camel_folder_summary_get_folder (rmi->summary)); ++ } + +- if (ignore_changes) +- vee_summary_notify_mi_changed (vf, mi); ++ camel_message_info_free (rmi); + } + + return res; +@@ -220,10 +224,15 @@ vee_info_set_user_tag (CamelMessageInfo + camel_vee_folder_ignore_next_changed_event (vf, camel_folder_summary_get_folder (rmi->summary)); + + res = camel_message_info_set_user_tag (rmi, name, value); +- camel_message_info_free (rmi); + +- if (ignore_changes) +- vee_summary_notify_mi_changed (vf, mi); ++ if (ignore_changes) { ++ if (res) ++ vee_summary_notify_mi_changed (vf, mi); ++ else ++ camel_vee_folder_remove_from_ignore_changed_event (vf, camel_folder_summary_get_folder (rmi->summary)); ++ } ++ ++ camel_message_info_free (rmi); + } + + return res; +@@ -259,10 +268,14 @@ vee_info_set_flags (CamelMessageInfo *mi + camel_folder_summary_replace_flags (mi->summary, mi); + } + +- camel_message_info_free (rmi); ++ if (ignore_changes) { ++ if (res) ++ vee_summary_notify_mi_changed (vf, mi); ++ else ++ camel_vee_folder_remove_from_ignore_changed_event (vf, camel_folder_summary_get_folder (rmi->summary)); ++ } + +- if (ignore_changes) +- vee_summary_notify_mi_changed (vf, mi); ++ camel_message_info_free (rmi); + } + + /* Do not call parent class' info_set_flags, to not do flood diff --git a/SPECS/evolution-data-server.spec b/SPECS/evolution-data-server.spec index ab7f088..30206de 100644 --- a/SPECS/evolution-data-server.spec +++ b/SPECS/evolution-data-server.spec @@ -28,7 +28,7 @@ Name: evolution-data-server Version: 3.8.5 -Release: 8%{?dist} +Release: 23%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ @@ -53,10 +53,6 @@ Patch03: evolution-data-server-3.8.5-maildir-tmp-autocreate.patch # RH bug #997407 Patch04: evolution-data-server-3.8.5-google-caldav-v2.patch -# Remove CamelIMAPXConnManager. See commit message for justification. -# https://git.gnome.org/browse/evolution-data-server/commit/?id=5484498 -Patch05: evolution-data-server-3.8.5-kill-imapx-conn-manager.patch - # RH bug #1014683 Patch06: evolution-data-server-3.8.5-vcard-param-parsing-too-strict.patch @@ -66,6 +62,45 @@ Patch08: evolution-data-server-3.8.5-imapx-connect-store.patch # RH bug #1027219 Patch09: evolution-data-server-3.8.5-imapx-server-dispose-block.patch +# RH bug #1017164 +Patch10: evolution-data-server-3.8.5-detect-list-errors.patch + +# RH bug #1033005 +Patch11: evolution-data-server-3.8.5-ldap-not-writeable.patch + +# RH bug #1030327 +Patch12: evolution-data-server-3.8.5-translations.patch + +# RH bug #1049960 +Patch13: evolution-data-server-3.8.5-caldav-initialize-backend-crash.patch + +# RH bug #1053465 +Patch14: evolution-data-server-3.8.5-imapx-body-header.patch + +# RH bug #1034384 +Patch15: evolution-data-server-3.8.5-imapx-dont-timeout-on-reads.patch + +# RH bug #1054455 +Patch16: evolution-data-server-3.8.5-imapx-server-side-search.patch + +# RH bug #1055893 +Patch17: evolution-data-server-3.8.5-prefer-gpg2.patch + +# RH bug #1057107 +Patch18: evolution-data-server-3.8.5-vfolder-update.patch + +# RH bug #1057601 +Patch19: evolution-data-server-3.8.5-imapx-message-copy-unread.patch + +# RH bug #867383 +Patch20: evolution-data-server-3.8.5-imapx-message-flags.patch + +# RH bug #1060193 +Patch21: evolution-data-server-3.8.5-maildir-get-folder-use-after-free.patch + +# RH bug #1034384 +Patch22: evolution-data-server-3.8.5-imapx-disconnect-changes.patch + ### Build Dependencies ### BuildRequires: libdb-devel @@ -101,10 +136,7 @@ BuildRequires: openldap-devel >= 2.0.11 %endif %if %{krb5_support} -BuildRequires: krb5-devel -# tweak for krb5 1.2 vs 1.3 -%define krb5dir /usr/kerberos -#define krb5dir `pwd`/krb5-fakeprefix +BuildRequires: krb5-devel >= 1.11 %endif %description @@ -144,14 +176,22 @@ This package contains developer documentation for %{name}. %patch02 -p1 -b .cert-viewer-crash %patch03 -p1 -b .maildir-tmp-autocreate %patch04 -p1 -b .google-caldav-v2 -%patch05 -p1 -b .kill-imapx-conn-manager %patch06 -p1 -b .vcard-param-parsing-too-strict %patch08 -p1 -b .imapx-connect-store %patch09 -p1 -b .imapx-server-dispose-block - -mkdir -p krb5-fakeprefix/include -mkdir -p krb5-fakeprefix/lib -mkdir -p krb5-fakeprefix/%{_lib} +%patch10 -p1 -b .detect-list-errors +%patch11 -p1 -b .ldap-not-writeable +%patch12 -p1 -b .translations +%patch13 -p1 -b .caldav-initialize-backend-crash +%patch14 -p1 -b .imapx-body-header +%patch15 -p1 -b .imapx-dont-timeout-on-reads +%patch16 -p1 -b .imapx-server-side-search +%patch17 -p1 -b .prefer-gpg2 +%patch18 -p1 -b .vfolder-update +%patch19 -p1 -b .imapx-message-copy-unread +%patch20 -p1 -b .imapx-message-flags +%patch21 -p1 -b .maildir-get-folder-use-after-free +%patch22 -p1 -b .imapx-disconnect-changes %build %if %{ldap_support} @@ -181,7 +221,7 @@ fi %endif %if %{krb5_support} -%define krb5_flags --with-krb5=%{krb5dir} +%define krb5_flags --with-krb5 %else %define krb5_flags --without-krb5 %endif @@ -396,6 +436,54 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/gtk-doc/html/libedataserver %changelog +* Mon Apr 07 2014 Milan Crha - 3.8.5-23 +- Add patch for RH bug #1034384 (IMAPx: Disconnect changes) + +* Tue Apr 01 2014 Milan Crha - 3.8.5-22 +- Remove kill-imapx-conn-manager patch (see RH bug #1082649) + +* Mon Feb 03 2014 Milan Crha - 3.8.5-21 +- Update patch for RH bug #1054455 (IMAPx: More server-side searching) + +* Mon Feb 03 2014 Milan Crha - 3.8.5-20 +- Add patch for RH bug #1060193 (maildir: prevent get_folder_sync use-after-free) + +* Thu Jan 30 2014 Milan Crha - 3.8.5-19 +- Add patch for RH bug #867383 (IMAPx: Message flag sync to server failed) + +* Mon Jan 27 2014 Milan Crha - 3.8.5-18 +- Add patch for RH bug #1057601 (IMAPx: Read messages marked unread on copy/move) + +* Fri Jan 24 2014 Daniel Mach - 3.8.5-17 +- Mass rebuild 2014-01-24 + +* Thu Jan 23 2014 Milan Crha - 3.8.5-16 +- Add patch for RH bug #1055893 (Prefer gpg2 over gpg) +- Add patch for RH bug #1057107 (vFolder does not always refresh automatically) + +* Mon Jan 20 2014 Milan Crha - 3.8.5-15 +- Add patch for RH bug #1054455 (IMAPx: More server-side searching) + +* Thu Jan 16 2014 Matthew Barnes - 3.8.5-14 +- Add patch for RH bug #1034384 (IMAPx: Don't timeout on reads) + +* Thu Jan 16 2014 Milan Crha - 3.8.5-13 +- Fix unnecessary compiler warnings (RH bug #1052925) +- Add patch for RH bug #1049960 (Crash in CalDAV's initialize_backend()) +- Add patch for RH bug #1053465 (IMAPx: Handle BODY[HEADER] in FETCH response) + +* Mon Jan 13 2014 Milan Crha - 3.8.5-12 +- Add patch for RH bug #1030327 (Updated translations) + +* Mon Jan 13 2014 Milan Crha - 3.8.5-11 +- Add patch for RH bug #1033005 (Cannot write to LDAP) + +* Fri Dec 27 2013 Daniel Mach - 3.8.5-10 +- Mass rebuild 2013-12-27 + +* Thu Dec 19 2013 Matthew Barnes - 3.8.5-9 +- Add patch for RH bug #1017164 (detect LIST errors). + * Thu Nov 07 2013 Milan Crha - 3.8.5-8 - Add patch for RH bug #1027219 (IMAPx blocks on server's dispose)