diff --git a/evolution-data-server-db-fixes.patch b/evolution-data-server-db-fixes.patch new file mode 100644 index 0000000..92e6154 --- /dev/null +++ b/evolution-data-server-db-fixes.patch @@ -0,0 +1,22 @@ +diff --git a/camel/camel-db.c b/camel/camel-db.c +index b76775c..95a9289 100644 +--- a/camel/camel-db.c ++++ b/camel/camel-db.c +@@ -1088,6 +1088,8 @@ camel_db_get_column_name (const char *raw_name) + return g_strdup ("deleted"); + else if (!g_ascii_strcasecmp (raw_name, "junk")) + return g_strdup ("junk"); ++ else if (!g_ascii_strcasecmp (raw_name, "Answered")) ++ return g_strdup ("replied"); + else if (!g_ascii_strcasecmp (raw_name, "Seen")) + return g_strdup ("read"); + else if (!g_ascii_strcasecmp (raw_name, "user-tag")) +@@ -1096,6 +1098,8 @@ camel_db_get_column_name (const char *raw_name) + return g_strdup ("labels"); + else if (!g_ascii_strcasecmp (raw_name, "Attachments")) + return g_strdup ("attachment"); ++ else if (!g_ascii_strcasecmp (raw_name, "x-camel-mlist")) ++ return g_strdup ("mlist"); + else { + /* Let it crash for all unknown columns for now. + We need to load the messages into memory and search etc. diff --git a/evolution-data-server-show-sexp.patch b/evolution-data-server-show-sexp.patch deleted file mode 100644 index dcf6db4..0000000 --- a/evolution-data-server-show-sexp.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c -index d511b37..b0d409b 100644 ---- a/camel/camel-folder-search.c -+++ b/camel/camel-folder-search.c -@@ -483,7 +483,7 @@ camel_folder_search_search(CamelFolderSearch *search, const char *expr, GPtrArra - /* Sync the db, so that we search the db for changes */ - camel_folder_summary_save_to_db (search->folder->summary, ex); - -- d(printf ("sexp is : [%s]\n", expr)); -+ printf ("sexp is : [%s]\n", expr); - if (g_getenv("SQL_SEARCH_OLD")) - sql_query = camel_sexp_to_sql (expr); - else -@@ -492,7 +492,7 @@ camel_folder_search_search(CamelFolderSearch *search, const char *expr, GPtrArra - tmp = g_strdup_printf ("SELECT uid FROM %s %s %s", tmp1, sql_query ? "WHERE":"", sql_query?sql_query:""); - camel_db_free_sqlized_string (tmp1); - g_free (sql_query); -- d(printf("Equivalent sql %s\n", tmp)); -+ printf("Equivalent sql %s\n", tmp); - - matches = g_ptr_array_new(); - cdb = (CamelDB *) (search->folder->cdb); -@@ -671,7 +671,6 @@ search_match_all(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFold - camel_folder_summary_reload_from_db (search->folder->summary, search->priv->ex); - } - -- e_sexp_term_eval (f, argv [0]); - - for (i=0;ilen;i++) { - const char *uid; diff --git a/evolution-data-server-sql-percents.patch b/evolution-data-server-sql-percents.patch deleted file mode 100644 index 36cb65d..0000000 --- a/evolution-data-server-sql-percents.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c -index b1f2c27..d3e561d 100644 ---- a/camel/camel-search-sql-sexp.c -+++ b/camel/camel-search-sql-sexp.c -@@ -363,7 +363,9 @@ check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data - value = get_db_safe_string (tstr); - g_free (tstr); - } else if (how == CAMEL_SEARCH_MATCH_EXACT) { -- value = get_db_safe_string(argv[i]->value.string); -+ tstr = g_strdup_printf ("%c%s%c", '%', argv[i]->value.string, '%'); -+ value = get_db_safe_string (tstr); -+ g_free (tstr); - } - str = g_strdup_printf("(%s LIKE %s)", headername, value); - g_free(value); diff --git a/evolution-data-server-updates.patch b/evolution-data-server-updates.patch new file mode 100644 index 0000000..e2ce17b --- /dev/null +++ b/evolution-data-server-updates.patch @@ -0,0 +1,34665 @@ +Index: evolution-data-server-2.23.92/ChangeLog +=================================================================== +--- evolution-data-server-2.23.92.orig/ChangeLog ++++ evolution-data-server-2.23.92/ChangeLog +@@ -1,3 +1,13 @@ ++2008-09-14 Matthew Barnes ++ ++ * libedataserver/e-sexp.c (term_eval_and), (term_eval_or): ++ Don't mix declarations and code. ++ ++2008-09-12 Ross Burton ++ ++ * libedataserver/e-data-server-marshal.list: ++ Remove, this isn't used since 2007-04-04. ++ + 2008-09-08 Srinivasa Ragavan + + * NEWS: Evolution Data Server 2.23.92 release. +Index: evolution-data-server-2.23.92/addressbook/ChangeLog +=================================================================== +--- evolution-data-server-2.23.92.orig/addressbook/ChangeLog ++++ evolution-data-server-2.23.92/addressbook/ChangeLog +@@ -1,3 +1,14 @@ ++2008-09-14 Matthew Barnes ++ ++ * backends/webdav/e-book-backend-webdav.c ++ (e_book_backend_webdav_modify_contact), (download_contacts): ++ Don't mix declarations and code. ++ ++2008-09-12 Tor Lillqvist ++ ++ * backends/google/Makefile.am (libebookbackendgoogle_la_LIBADD): ++ Link with libebackend. ++ + 2008-09-08 Milan Crha + + ** Fix for bug #361413 +Index: evolution-data-server-2.23.92/addressbook/backends/google/Makefile.am +=================================================================== +--- evolution-data-server-2.23.92.orig/addressbook/backends/google/Makefile.am ++++ evolution-data-server-2.23.92/addressbook/backends/google/Makefile.am +@@ -29,6 +29,7 @@ libebookbackendgoogle_la_LIBADD = \ + $(top_builddir)/libedataserver/libedataserver-1.2.la \ + $(top_builddir)/servers/google/libgdata/libgdata-1.2.la \ + $(top_builddir)/servers/google/libgdata-google/libgdata-google-1.2.la \ ++ $(top_builddir)/libebackend/libebackend-1.2.la \ + $(SOUP_LIBS) \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + +Index: evolution-data-server-2.23.92/addressbook/backends/webdav/e-book-backend-webdav.c +=================================================================== +--- evolution-data-server-2.23.92.orig/addressbook/backends/webdav/e-book-backend-webdav.c ++++ evolution-data-server-2.23.92/addressbook/backends/webdav/e-book-backend-webdav.c +@@ -376,6 +376,7 @@ e_book_backend_webdav_modify_contact(EBo + EContact *contact = e_contact_new_from_vcard(vcard); + const char *uid; + const char *etag; ++ guint status; + + if (priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL) { + e_data_book_respond_create(book, opid, +@@ -385,7 +386,7 @@ e_book_backend_webdav_modify_contact(EBo + } + + /* modify contact */ +- guint status = upload_contact(webdav, contact); ++ status = upload_contact(webdav, contact); + if (status != 201 && status != 204) { + g_object_unref(contact); + if (status == 401 || status == 407) { +@@ -684,6 +685,7 @@ download_contacts(EBookBackendWebdav *we + const char *uri; + const gchar *etag; + EContact *contact; ++ gchar *complete_uri; + + /* stop downloading if search was aborted */ + if (running != NULL && !e_flag_is_set(running)) +@@ -702,7 +704,6 @@ download_contacts(EBookBackendWebdav *we + continue; + + /* uri might be relative, construct complete one */ +- gchar *complete_uri; + if (uri[0] == '/') { + SoupURI *soup_uri = soup_uri_new(priv->uri); + soup_uri->path = g_strdup(uri); +Index: evolution-data-server-2.23.92/calendar/ChangeLog +=================================================================== +--- evolution-data-server-2.23.92.orig/calendar/ChangeLog ++++ evolution-data-server-2.23.92/calendar/ChangeLog +@@ -1,3 +1,36 @@ ++2008-09-12 Rob Bradford ++ ++ * backends/caldav/e-cal-backend-caldav.c: ++ * backends/file/e-cal-backend-file.c: ++ * backends/google/e-cal-backend-google-utils.c: ++ * backends/google/e-cal-backend-google.c: ++ * backends/http/e-cal-backend-http.c: ++ Remove the inclusion of Bonobo headers (no symbols are used from these ++ headers.) ++ ++2008-09-14 Matthew Barnes ++ ++ * libecal/e-cal-check-timezones.c (e_cal_check_timezones): ++ Don't mix declarations and code. ++ ++2008-09-11 Milan Crha ++ ++ ** Fix for bug #551805 ++ ++ * backends/google/e-cal-backend-google-utils.c: ++ (e_cal_backend_google_utils_create_cache): ++ Create new timeout source only when none set yet. ++ * backends/google/e-cal-backend-google-utils.h: ++ * backends/google/e-cal-backend-google-utils.c: ++ (e_cal_backend_google_utils_update): Honour function prototype. ++ * backends/google/e-cal-backend-google-utils.c: ++ (e_cal_backend_google_utils_connect): Honour return data type. ++ * backends/google/e-cal-backend-google.h: ++ * backends/google/e-cal-backend-google.c: ++ (struct _ECalBackendGooglePrivate), ++ (e_cal_backend_google_set_timeout_id), ++ (e_cal_backend_google_get_timeout_id): Honour return data type. ++ + 2008-09-05 Andre Klapper + + * libedata-cal/e-cal-backend-util.c: +Index: evolution-data-server-2.23.92/calendar/backends/caldav/e-cal-backend-caldav.c +=================================================================== +--- evolution-data-server-2.23.92.orig/calendar/backends/caldav/e-cal-backend-caldav.c ++++ evolution-data-server-2.23.92/calendar/backends/caldav/e-cal-backend-caldav.c +@@ -24,8 +24,6 @@ + #include + #include + #include +-#include +-#include + #include + #include "libedataserver/e-xml-hash-utils.h" + #include +Index: evolution-data-server-2.23.92/calendar/backends/file/e-cal-backend-file.c +=================================================================== +--- evolution-data-server-2.23.92.orig/calendar/backends/file/e-cal-backend-file.c ++++ evolution-data-server-2.23.92/calendar/backends/file/e-cal-backend-file.c +@@ -28,8 +28,6 @@ + #include + #include + #include +-#include +-#include + #include + #include + #include +Index: evolution-data-server-2.23.92/calendar/backends/google/e-cal-backend-google-utils.c +=================================================================== +--- evolution-data-server-2.23.92.orig/calendar/backends/google/e-cal-backend-google-utils.c ++++ evolution-data-server-2.23.92/calendar/backends/google/e-cal-backend-google-utils.c +@@ -31,9 +31,6 @@ + #include + #include + +-#include +-#include +- + #include + #include + #include +@@ -132,7 +129,6 @@ static gpointer + e_cal_backend_google_utils_create_cache (ECalBackendGoogle *cbgo) + { + ESource *source; +- guint timeout_id; + int x; + const gchar *refresh_interval = NULL; + ECalBackendCache *cache; +@@ -152,10 +148,14 @@ e_cal_backend_google_utils_create_cache + else + x = 30; + +- timeout_id = g_timeout_add (x * 60000, +- (GSourceFunc) get_deltas_timeout, +- (gpointer)cbgo); +- e_cal_backend_google_set_timeout_id (cbgo, timeout_id); ++ if (!e_cal_backend_google_get_timeout_id (cbgo)) { ++ guint timeout_id; ++ ++ timeout_id = g_timeout_add (x * 60000, ++ (GSourceFunc) get_deltas_timeout, ++ (gpointer)cbgo); ++ e_cal_backend_google_set_timeout_id (cbgo, timeout_id); ++ } + + return GINT_TO_POINTER (GNOME_Evolution_Calendar_Success); + } +@@ -169,7 +169,7 @@ e_cal_backend_google_utils_create_cache + * + * Return value: TRUE if update is successful FALSE otherwise . + **/ +-gboolean ++gpointer + e_cal_backend_google_utils_update (gpointer handle) + { + ECalBackendGoogle *cbgo; +@@ -187,9 +187,9 @@ e_cal_backend_google_utils_update (gpoin + gboolean needs_to_insert = FALSE; + gchar *uri; + +- if (!handle) { ++ if (!handle || !E_IS_CAL_BACKEND_GOOGLE (handle)) { + g_critical ("\n Invalid handle %s", G_STRLOC); +- return FALSE; ++ return NULL; + } + + g_static_mutex_lock (&updating); +@@ -264,7 +264,7 @@ e_cal_backend_google_utils_update (gpoin + } + + g_static_mutex_unlock (&updating); +- return TRUE; ++ return NULL; + } + + ECalBackendSyncStatus +@@ -283,7 +283,7 @@ e_cal_backend_google_utils_connect (ECal + GError *error = NULL; + GThread *thread; + gchar *username, *password; +- gint timeout_id; ++ guint timeout_id; + gboolean mode_changed; + gchar *uri, *suri; + +Index: evolution-data-server-2.23.92/calendar/backends/google/e-cal-backend-google-utils.h +=================================================================== +--- evolution-data-server-2.23.92.orig/calendar/backends/google/e-cal-backend-google-utils.h ++++ evolution-data-server-2.23.92/calendar/backends/google/e-cal-backend-google-utils.h +@@ -42,7 +42,7 @@ e_go_item_get_entry (EGoItem *item); + EGoItem * + e_go_item_from_cal_component (ECalBackendGoogle *cbgo, ECalComponent *comp); + +-gboolean ++gpointer + e_cal_backend_google_utils_update (gpointer handle); + + GDataEntry * +Index: evolution-data-server-2.23.92/calendar/backends/google/e-cal-backend-google.c +=================================================================== +--- evolution-data-server-2.23.92.orig/calendar/backends/google/e-cal-backend-google.c ++++ evolution-data-server-2.23.92/calendar/backends/google/e-cal-backend-google.c +@@ -31,9 +31,6 @@ + #include + #include + +-#include +-#include +- + #include + #include + +@@ -73,7 +70,7 @@ struct _ECalBackendGooglePrivate { + CalMode mode; + EGoItem *item; + +- gint timeout_id; ++ guint timeout_id; + gchar *username; + gchar *password; + gchar *uri; +@@ -1544,7 +1541,7 @@ e_cal_backend_google_set_entry (ECalBack + * + **/ + void +-e_cal_backend_google_set_timeout_id (ECalBackendGoogle *cbgo,gint timeout_id ) ++e_cal_backend_google_set_timeout_id (ECalBackendGoogle *cbgo, guint timeout_id) + { + ECalBackendGooglePrivate *priv; + priv = cbgo->priv; +@@ -1689,7 +1686,7 @@ e_cal_backend_google_get_entry (ECalBack + * Gets the timeout id. + * + **/ +-gint ++guint + e_cal_backend_google_get_timeout_id (ECalBackendGoogle *cbgo) + { + ECalBackendGooglePrivate *priv; +Index: evolution-data-server-2.23.92/calendar/backends/google/e-cal-backend-google.h +=================================================================== +--- evolution-data-server-2.23.92.orig/calendar/backends/google/e-cal-backend-google.h ++++ evolution-data-server-2.23.92/calendar/backends/google/e-cal-backend-google.h +@@ -73,7 +73,7 @@ gboolean e_cal_backend_google_get_mode_c + gchar * e_cal_backend_google_get_username (ECalBackendGoogle *cbgo); + gchar * e_cal_backend_google_get_password (ECalBackendGoogle *cbgo); + gchar * e_cal_backend_google_get_local_attachments_store (ECalBackendGoogle *cbgo); +-gint e_cal_backend_google_get_timeout_id (ECalBackendGoogle *cbgo); ++guint e_cal_backend_google_get_timeout_id (ECalBackendGoogle *cbgo); + + void e_cal_backend_google_set_entry (ECalBackendGoogle *cbgo, GDataEntry *entry); + void e_cal_backend_google_set_cache (ECalBackendGoogle *cbgo, ECalBackendCache *cache); +@@ -84,7 +84,7 @@ void e_cal_backend_google_set_item (ECal + void e_cal_backend_google_set_mode_changed (ECalBackendGoogle *cbgo, gboolean mode_changed); + void e_cal_backend_google_set_username (ECalBackendGoogle *cbgo, gchar *username); + void e_cal_backend_google_set_password (ECalBackendGoogle *cbgo, gchar *password); +-void e_cal_backend_google_set_timeout_id (ECalBackendGoogle *cbgo,gint timeout_id); ++void e_cal_backend_google_set_timeout_id (ECalBackendGoogle *cbgo, guint timeout_id); + + G_END_DECLS + #endif +Index: evolution-data-server-2.23.92/calendar/backends/http/e-cal-backend-http.c +=================================================================== +--- evolution-data-server-2.23.92.orig/calendar/backends/http/e-cal-backend-http.c ++++ evolution-data-server-2.23.92/calendar/backends/http/e-cal-backend-http.c +@@ -25,8 +25,6 @@ + #include + #include + #include +-#include +-#include + #include + #include "libedataserver/e-xml-hash-utils.h" + #include +Index: evolution-data-server-2.23.92/calendar/libecal/e-cal-check-timezones.c +=================================================================== +--- evolution-data-server-2.23.92.orig/calendar/libecal/e-cal-check-timezones.c ++++ evolution-data-server-2.23.92/calendar/libecal/e-cal-check-timezones.c +@@ -296,10 +296,11 @@ gboolean e_cal_check_timezones(icalcompo + key = + value = NULL; + } else { ++ int counter; ++ + zonestr = ical_strdup(icalcomponent_as_ical_string(subcomp)); + + /* check for collisions with existing timezones */ +- int counter; + for (counter = 0; + counter < 100 /* sanity limit */; + counter++) { +Index: evolution-data-server-2.23.92/camel/ChangeLog +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/ChangeLog ++++ evolution-data-server-2.23.92/camel/ChangeLog +@@ -1,3 +1,88 @@ ++2008-09-15 Srinivasa Ragavan ++ ++ * camel-folder-summary.c (info_set_flags): Fix for counts on junk ++ * camel-vee-folder.c (update_summary), (folder_changed_change_uid): ++ * camel-vtrash-folder.c (vtrash_getv), ++ (camel_vtrash_folder_class_init): ++ ++2008-09-14 Matthew Barnes ++ ++ * camel-db.c (camel_db_count_junk_message_info), ++ (camel_db_count_unread_message_info), ++ (camel_db_count_visible_unread_message_info), ++ (camel_db_count_visible_message_info), ++ (camel_db_count_junk_not_deleted_message_info), ++ (camel_db_count_deleted_message_info), (read_fir_callback): ++ * camel-folder-summary.c (camel_folder_summary_migrate_infos): ++ * camel-search-sql.c (camel_sexp_to_sql): ++ Don't mix declarations and code. ++ ++2008-09-12 Andre Klapper ++ ++ * camel-store.c: Fixing typo. ++ ++2008-09-12 Srinivasa Ragavan ++ ++ * camel/camel-db.c: ++ * camel/camel-db.h: Make CAMEL_DB_DEBUG as ifdef ++ ++2008-09-11 Srinivasa Ragavan ++ ++ * camel/camel-vee-folder.c: Make counts work even better. ++ * camel/camel-vee-summary.c: ++ * camel/camel-vee-summary.h: Do force counts better. ++ ++2008-09-11 Srinivasa Ragavan ++ ++ * camel/camel-vee-folder.c: ++ * camel/camel-vee-summary.c: Refix vfolder counts. ++ ++2008-09-11 Srinivasa Ragavan ++ ++ * camel-vee-folder.c: (folder_changed_change): Fix a deadlock ++ ++2008-09-11 Srinivasa Ragavan ++ ++ * camel-vee-folder.c: (folder_changed_change): Another missed lock. ++ ++2008-09-11 Srinivasa Ragavan ++ ++ * camel-vee-folder.c: (folder_changed_change): A minor crash fixed. ++ ++2008-09-11 Srinivasa Ragavan ++ ++ * camel-vee-folder.c: (folder_changed_change): Missed another deadlock ++ case. ++ ++2008-09-11 Srinivasa Ragavan ++ ++ * camel-vee-folder.c: (folder_changed_change): Don't hold one db lock ++ and acquire folder lock. It dead locks ++ ++2008-09-10 Srinivasa Ragavan ++ ++ * camel/camel-vee-folder.c: Fix vfolders while unloading unmatched ++ search indexes. ++ ++2008-09-10 Srinivasa Ragavan ++ ++ ** Fix for BNC bug #418080 ++ ++ * camel/camel-search-sql-sexp.c: Match contains using %like%. ++ ++2008-09-10 Srinivasa Ragavan ++ ++ * camel/camel-folder-search.c: Fix a bug when sexp is executed ++ unnecessarily. ++ ++2008-09-10 Srinivasa Ragavan ++ ++ * camel/camel-folder-search.c: Make it debuggable. ++ ++2008-09-10 Srinivasa Ragavan ++ ++ * camel/camel-db.c: Add bdata to index. ++ + 2008-09-08 Srinivasa Ragavan + + * camel-vee-folder.c: (vee_sync): Ignore no such table errors, as we +Index: evolution-data-server-2.23.92/camel/camel-db.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-db.c ++++ evolution-data-server-2.23.92/camel/camel-db.c +@@ -23,8 +23,6 @@ + * USA + */ + +-#define CAMEL_DB_DEBUG 0 +- + #include "camel-db.h" + #include "camel-string-utils.h" + +@@ -38,7 +36,7 @@ + + #include "camel-debug.h" + +-#if CAMEL_DB_DEBUG ++#ifdef CAMEL_DB_DEBUG + /* Enable d(x) if you want */ + #define d(x) + /* Yeah it leaks, so fix it while debugging */ +@@ -335,11 +333,11 @@ int + camel_db_count_junk_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex) + { + int ret; ++ char *query; + + if (!cdb) + return -1; + +- char *query; + query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE junk = 1", table_name); + + ret = camel_db_count_message_info (cdb, query, count, ex); +@@ -352,11 +350,11 @@ int + camel_db_count_unread_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex) + { + int ret; ++ char *query; + + if (!cdb) + return -1; + +- char *query; + query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE read = 0", table_name); + + ret = camel_db_count_message_info (cdb, query, count, ex); +@@ -369,11 +367,11 @@ int + camel_db_count_visible_unread_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex) + { + int ret; ++ char *query; + + if (!cdb) + return -1; + +- char *query; + query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE read = 0 AND junk = 0 AND deleted = 0", table_name); + + ret = camel_db_count_message_info (cdb, query, count, ex); +@@ -386,11 +384,11 @@ int + camel_db_count_visible_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex) + { + int ret; ++ char *query; + + if (!cdb) + return -1; + +- char *query; + query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE junk = 0 AND deleted = 0", table_name); + + ret = camel_db_count_message_info (cdb, query, count, ex); +@@ -403,11 +401,11 @@ int + camel_db_count_junk_not_deleted_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex) + { + int ret; ++ char *query; + + if (!cdb) + return -1; + +- char *query ; + query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE junk = 1 AND deleted = 0", table_name); + + ret = camel_db_count_message_info (cdb, query, count, ex); +@@ -420,11 +418,11 @@ int + camel_db_count_deleted_message_info (CamelDB *cdb, const char *table_name, guint32 *count, CamelException *ex) + { + int ret; ++ char *query; + + if (!cdb) + return -1; + +- char *query ; + query = sqlite3_mprintf ("SELECT COUNT (*) FROM %Q WHERE deleted = 1", table_name); + + ret = camel_db_count_message_info (cdb, query, count, ex); +@@ -741,7 +739,7 @@ camel_db_prepare_message_info_table (Cam + + /* FIXME: sqlize folder_name before you create the index */ + safe_index = g_strdup_printf("SINDEX-%s", folder_name); +- table_creation_query = sqlite3_mprintf ("CREATE INDEX IF NOT EXISTS %Q ON %Q (uid, flags, size, dsent, dreceived, subject, mail_from, mail_to, mail_cc, mlist, part, labels, usertags, cinfo)", safe_index, folder_name); ++ table_creation_query = sqlite3_mprintf ("CREATE INDEX IF NOT EXISTS %Q ON %Q (uid, flags, size, dsent, dreceived, subject, mail_from, mail_to, mail_cc, mlist, part, labels, usertags, cinfo, bdata)", safe_index, folder_name); + ret = camel_db_add_to_transaction (cdb, table_creation_query, ex); + g_free (safe_index); + sqlite3_free (table_creation_query); +@@ -828,6 +826,7 @@ static int + read_fir_callback (void * ref, int ncol, char ** cols, char ** name) + { + CamelFIRecord *record = *(CamelFIRecord **) ref; ++ int i; + + d(g_print ("\nread_fir_callback called \n")); + #if 0 +@@ -836,7 +835,6 @@ read_fir_callback (void * ref, int ncol, + /* Just a sequential mapping of struct members to columns is enough I guess. + Needs some checking */ + #else +- int i; + + for (i = 0; i < ncol; ++i) { + if (!strcmp (name [i], "folder_name")) +Index: evolution-data-server-2.23.92/camel/camel-db.h +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-db.h ++++ evolution-data-server-2.23.92/camel/camel-db.h +@@ -16,7 +16,7 @@ struct _CamelDB { + const char *sort_by; + const char *collate; + CamelDBCollate collate_cb; +-#if CAMEL_DB_DEBUG ++#ifdef CAMEL_DB_DEBUG + GTimer *timer; + #endif + }; +Index: evolution-data-server-2.23.92/camel/camel-folder-search.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-folder-search.c ++++ evolution-data-server-2.23.92/camel/camel-folder-search.c +@@ -47,6 +47,7 @@ + #include "camel-search-private.h" + #include "camel-stream-mem.h" + #include "camel-db.h" ++#include "camel-debug.h" + #include "camel-store.h" + #include "camel-vee-folder.h" + #include "camel-string-utils.h" +@@ -55,6 +56,7 @@ + + #define d(x) + #define r(x) ++#define dd(x) if (camel_debug("search")) x + + struct _CamelFolderSearchPrivate { + CamelException *ex; +@@ -483,7 +485,7 @@ camel_folder_search_search(CamelFolderSe + /* Sync the db, so that we search the db for changes */ + camel_folder_summary_save_to_db (search->folder->summary, ex); + +- d(printf ("sexp is : [%s]\n", expr)); ++ dd(printf ("sexp is : [%s]\n", expr)); + if (g_getenv("SQL_SEARCH_OLD")) + sql_query = camel_sexp_to_sql (expr); + else +@@ -492,7 +494,7 @@ camel_folder_search_search(CamelFolderSe + tmp = g_strdup_printf ("SELECT uid FROM %s %s %s", tmp1, sql_query ? "WHERE":"", sql_query?sql_query:""); + camel_db_free_sqlized_string (tmp1); + g_free (sql_query); +- d(printf("Equivalent sql %s\n", tmp)); ++ dd(printf("Equivalent sql %s\n", tmp)); + + matches = g_ptr_array_new(); + cdb = (CamelDB *) (search->folder->cdb); +@@ -671,7 +673,6 @@ search_match_all(struct _ESExp *f, int a + camel_folder_summary_reload_from_db (search->folder->summary, search->priv->ex); + } + +- e_sexp_term_eval (f, argv [0]); + + for (i=0;ilen;i++) { + const char *uid; +Index: evolution-data-server-2.23.92/camel/camel-folder-summary.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-folder-summary.c ++++ evolution-data-server-2.23.92/camel/camel-folder-summary.c +@@ -1147,6 +1147,8 @@ camel_folder_summary_migrate_infos(Camel + + /* now read in each message ... */ + for (i=0;isaved_count;i++) { ++ CamelTag *tag; ++ + mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_load(s, in); + + if (mi == NULL) +@@ -1161,7 +1163,6 @@ camel_folder_summary_migrate_infos(Camel + } + } + +- CamelTag *tag; + info = (CamelMessageInfoBase *)mi; + tag = info->user_tags; + while (tag) { +@@ -4541,8 +4542,13 @@ info_set_flags(CamelMessageInfo *info, g + return FALSE; + + if (mi->summary) { +- if (read) ++ if (read && junk == 0 && !(mi->flags & CAMEL_MESSAGE_JUNK)) + mi->summary->unread_count -= read; ++ else if (junk > 0) ++ mi->summary->unread_count -= (old & CAMEL_MESSAGE_SEEN) ? 0 : 1; ++ else if (junk < 0) ++ mi->summary->unread_count -= (old & CAMEL_MESSAGE_SEEN) ? 0 : -1; ++ + if (deleted) + mi->summary->deleted_count += deleted; + if (junk) +Index: evolution-data-server-2.23.92/camel/camel-search-sql-sexp.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-search-sql-sexp.c ++++ evolution-data-server-2.23.92/camel/camel-search-sql-sexp.c +@@ -363,7 +363,9 @@ check_header (struct _ESExp *f, int argc + value = get_db_safe_string (tstr); + g_free (tstr); + } else if (how == CAMEL_SEARCH_MATCH_EXACT) { +- value = get_db_safe_string(argv[i]->value.string); ++ tstr = g_strdup_printf ("%c%s%c", '%', argv[i]->value.string, '%'); ++ value = get_db_safe_string (tstr); ++ g_free (tstr); + } + str = g_strdup_printf("(%s LIKE %s)", headername, value); + g_free(value); +@@ -708,7 +710,7 @@ int main () + for (i=0; i < G_N_ELEMENTS(txt); i++) { + char *sql = NULL; + printf("Q: %s\n\"%c\"\n", txt[i], 40); +- sql = camel_e_sexp_to_sql (txt[i]); ++ sql = camel_sexp_to_sql_sexp (txt[i]); + printf("A: %s\n\n\n", sql); + g_free (sql); + } +Index: evolution-data-server-2.23.92/camel/camel-search-sql.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-search-sql.c ++++ evolution-data-server-2.23.92/camel/camel-search-sql.c +@@ -266,11 +266,13 @@ camel_sexp_to_sql (const char *txt) + + if (!*elements[i].exact_token) /* Skip match-all */ { + if (g_ascii_strcasecmp (elements[i].token, "match-threads") == 0) { ++ Node *node; ++ + /* remove next node also. We dont support it*/ + g_scanner_get_next_token (scanner); + /* Put a 'or' so that everything comes up. It hardly matter. It is just to start loading + operator */ +- Node *node = g_new0 (Node, 1); ++ node = g_new0 (Node, 1); + + node->token = g_strdup ("or"); + node->exact_token = g_strdup ("or"); +Index: evolution-data-server-2.23.92/camel/camel-store.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-store.c ++++ evolution-data-server-2.23.92/camel/camel-store.c +@@ -253,7 +253,7 @@ construct (CamelService *service, CamelS + if (camel_db_create_folders_table (store->cdb, ex)) + printf ("something went wrong terribly\n"); + else +- printf ("folders table succesfully created \n"); ++ printf ("folders table successfully created \n"); + + if (camel_exception_is_set (ex)) + return; +Index: evolution-data-server-2.23.92/camel/camel-vee-folder.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-vee-folder.c ++++ evolution-data-server-2.23.92/camel/camel-vee-folder.c +@@ -217,14 +217,13 @@ camel_vee_folder_add_folder(CamelVeeFold + + CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock); + +- d(printf("camel_vee_folder_add_folde(%p, %p)\n", vf, sub)); ++ d(printf("camel_vee_folder_add_folder(%s, %s)\n", ((CamelFolder *)vf)->full_name, sub->full_name)); + + cache = camel_folder_summary_cache_size(sub->summary); + if (!cache) { + camel_object_hook_event(sub->summary, "summary_reloaded", summary_reloaded, vf); + g_hash_table_insert(vf->loaded, sub, GINT_TO_POINTER(1)); + } +- + camel_object_hook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc)folder_changed, vf); + camel_object_hook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc)subfolder_deleted, vf); + camel_object_hook_event((CamelObject *)sub, "renamed", (CamelObjectEventHookFunc)folder_renamed, vf); +@@ -538,7 +537,7 @@ summary_header_to_db (CamelFolderSummary + record->time = s->time; + + record->saved_count = s->uids->len; +- if ((s->visible_count) && !g_getenv("FORCE_VFOLDER_COUNT")) { ++ if (!(((CamelVeeSummary *) s)->force_counts) && !g_getenv("FORCE_VFOLDER_COUNT")) { + /* We should be in sync always. so use the count. Don't search.*/ + record->junk_count = s->junk_count; + record->deleted_count = s->deleted_count; +@@ -570,7 +569,6 @@ vee_sync(CamelFolder *folder, gboolean e + CamelVeeFolder *vf = (CamelVeeFolder *)folder; + struct _CamelVeeFolderPrivate *p = _PRIVATE(vf); + GList *node; +- CamelFIRecord * record; + + CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock); + +@@ -621,8 +619,7 @@ static void + vee_expunge (CamelFolder *folder, CamelException *ex) + { + /* Force it to rebuild the counts, when some folders were expunged. */ +- folder->summary->unread_count = 0; +- folder->summary->visible_count = 0; ++ ((CamelVeeSummary *) folder->summary)->force_counts = TRUE; + ((CamelFolderClass *)((CamelObject *)folder)->klass)->sync(folder, TRUE, ex); + } + +@@ -1219,12 +1216,12 @@ vee_rebuild_folder(CamelVeeFolder *vf, C + */ + + static void +-update_summary (CamelVeeMessageInfo *mi, guint32 flags, guint32 oldflags, gboolean add) ++update_summary (CamelVeeMessageInfo *mi, guint32 flags, guint32 oldflags, gboolean add, gboolean use_old) + { + int unread=0, deleted=0, junk=0; + CamelFolderSummary *summary = ((CamelMessageInfo *) mi)->summary; + +- if (!(flags & CAMEL_MESSAGE_SEEN)) ++ if (!(flags & CAMEL_MESSAGE_SEEN) && !(flags & CAMEL_MESSAGE_JUNK)) + unread = 1; + + if (flags & CAMEL_MESSAGE_DELETED) +@@ -1232,10 +1229,11 @@ update_summary (CamelVeeMessageInfo *mi, + + if (flags & CAMEL_MESSAGE_JUNK) + junk = 1; ++ ++ d(printf("folder: %s %d %d: %p:%s\n", summary->folder->full_name, oldflags, add, mi, ((CamelMessageInfo *)mi)->uid)); ++ d(printf("%d %d %d\n%d %d %d\n", !(flags & CAMEL_MESSAGE_SEEN), flags & CAMEL_MESSAGE_DELETED, flags & CAMEL_MESSAGE_JUNK, !(oldflags & CAMEL_MESSAGE_SEEN), oldflags & CAMEL_MESSAGE_DELETED, oldflags & CAMEL_MESSAGE_JUNK)); + +- d(printf("%d %d %d\n%d %d %d\n", !(flags & CAMEL_MESSAGE_SEEN), flags & CAMEL_MESSAGE_DELETED, flags & CAMEL_MESSAGE_JUNK, !(oldflags & CAMEL_MESSAGE_SEEN), flags & CAMEL_MESSAGE_DELETED, flags & CAMEL_MESSAGE_JUNK)); +- +- if (!oldflags) { ++ if (!use_old) { + if (add) { + if (unread) + summary->unread_count += unread; +@@ -1250,30 +1248,40 @@ update_summary (CamelVeeMessageInfo *mi, + summary->visible_count -= junk ? junk : deleted; + + summary->saved_count++; +- } else { ++ } else { ++ oldflags = use_old ? oldflags : flags; ++ unread = deleted = junk = 0; ++ if (!(oldflags & CAMEL_MESSAGE_SEEN) && !(oldflags & CAMEL_MESSAGE_JUNK)) ++ unread -= 1; ++ ++ if (oldflags & CAMEL_MESSAGE_DELETED) ++ deleted -= 1; ++ ++ if (oldflags & CAMEL_MESSAGE_JUNK) ++ junk -= 1; ++ + if (unread) +- summary->unread_count -= unread; ++ summary->unread_count += unread; + if (deleted) +- summary->deleted_count -= deleted; ++ summary->deleted_count += deleted; + if (junk) +- summary->junk_count -= junk; ++ summary->junk_count += junk; + if (junk && !deleted) +- summary->junk_not_deleted_count -= junk; ++ summary->junk_not_deleted_count += junk; + if (!junk && !deleted) + summary->visible_count--; + + summary->saved_count--; + } + } else { +- if (!(oldflags & CAMEL_MESSAGE_SEEN)) ++ if (!(oldflags & CAMEL_MESSAGE_SEEN) && !(oldflags & CAMEL_MESSAGE_JUNK)) + unread -= 1; + +- if (flags & CAMEL_MESSAGE_DELETED) ++ if (oldflags & CAMEL_MESSAGE_DELETED) + deleted -= 1; + +- if (flags & CAMEL_MESSAGE_JUNK) ++ if (oldflags & CAMEL_MESSAGE_JUNK) + junk -= 1; +- + if (unread) + summary->unread_count += unread; + if (deleted) +@@ -1308,7 +1316,7 @@ folder_changed_add_uid(CamelFolder *sub, + camel_db_add_to_vfolder_transaction (folder->parent_store->cdb, folder->full_name, (char *)vuid, NULL); + camel_folder_change_info_add_uid(vf->changes, vuid); + /* old flags and new flags should be same, since we sync all times */ +- update_summary (vinfo, camel_message_info_flags(vinfo), 0, TRUE); ++ update_summary (vinfo, camel_message_info_flags(vinfo), 0, TRUE, FALSE); + if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0 && !CAMEL_IS_VEE_FOLDER(sub) && folder_unmatched != NULL) { + if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, &oldval)) { + n = GPOINTER_TO_INT (oldval); +@@ -1342,7 +1350,7 @@ folder_changed_remove_uid(CamelFolder *s + + vinfo = (CamelVeeMessageInfo *) camel_folder_summary_uid (((CamelFolder *) vf)->summary, vuid); + if (vinfo) { +- update_summary (vinfo, vinfo->old_flags, 0, FALSE); ++ update_summary (vinfo, vinfo->old_flags, 0, FALSE, FALSE); + camel_message_info_free((CamelMessageInfo *)vinfo); + } + camel_folder_change_info_remove_uid(vf->changes, vuid); +@@ -1402,14 +1410,15 @@ folder_changed_change_uid(CamelFolder *s + info = camel_folder_get_message_info(sub, uid); + if (info) { + if (vinfo) { ++ guint32 of = vinfo->old_flags; + camel_folder_change_info_change_uid(vf->changes, vuid); +- update_summary (vinfo, camel_message_info_flags(info), vinfo->old_flags, FALSE /* Doesn't matter */); ++ update_summary (vinfo, camel_message_info_flags(info), of, FALSE /* Doesn't matter */, TRUE); + camel_message_info_free((CamelMessageInfo *)vinfo); + } + + if (uinfo) { + camel_folder_change_info_change_uid(folder_unmatched->changes, vuid); +- update_summary (uinfo, camel_message_info_flags(info), uinfo->old_flags, FALSE /* Doesn't matter */); ++ update_summary (uinfo, camel_message_info_flags(info), uinfo->old_flags, FALSE /* Doesn't matter */, TRUE); + camel_message_info_free((CamelMessageInfo *)uinfo); + } + +@@ -1453,6 +1462,7 @@ folder_changed_change(CamelSession *sess + GHashTable *matches_hash; + CamelVeeFolder *folder_unmatched = vf->parent_vee_store ? vf->parent_vee_store->folder_unmatched : NULL; + GHashTable *unmatched_uids = vf->parent_vee_store ? vf->parent_vee_store->unmatched_uids : NULL; ++ GPtrArray *present = NULL; + + /* Check the folder hasn't beem removed while we weren't watching */ + CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock); +@@ -1505,10 +1515,13 @@ folder_changed_change(CamelSession *sess + + if (changed->len) + matches_changed = camel_folder_search_by_uids(sub, vf->expression, changed, NULL); ++ if (always_changed && always_changed->len) ++ present = camel_folder_search_by_uids(sub, vf->expression, always_changed, NULL); ++ + } + + CAMEL_VEE_FOLDER_LOCK(vf, summary_lock); +- if (matches_changed || matches_added || changes->uid_removed->len) ++ if (matches_changed || matches_added || changes->uid_removed->len||present) + camel_db_begin_transaction (folder->parent_store->cdb, NULL); + + if (folder_unmatched != NULL) +@@ -1560,8 +1573,20 @@ folder_changed_change(CamelSession *sess + + /* Change any newly changed */ + if (always_changed) { +- for (i=0;ilen;i++) +- folder_changed_change_uid(sub, always_changed->pdata[i], hash, vf); ++ GHashTable *ht_present = g_hash_table_new (g_str_hash, g_str_equal); ++ ++ for (i=0;present && ilen;i++) { ++ folder_changed_change_uid(sub, present->pdata[i], hash, vf); ++ g_hash_table_insert (ht_present, present->pdata[i], present->pdata[i]); ++ } ++ ++ for (i=0; ilen; i++) { ++ if (!present || !g_hash_table_lookup(ht_present, always_changed->pdata[i])) { ++ folder_changed_remove_uid(sub, always_changed->pdata[i], hash, FALSE, vf); ++ } ++ } ++ ++ g_hash_table_destroy (ht_present); + g_ptr_array_free(always_changed, TRUE); + } + +@@ -1629,13 +1654,15 @@ folder_changed_change(CamelSession *sess + vf->changes = camel_folder_change_info_new(); + } + +- if (matches_changed || matches_added || changes->uid_removed->len) ++ if (matches_changed || matches_added || changes->uid_removed->len || present) + camel_db_end_transaction (folder->parent_store->cdb, NULL); + CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock); + + /* Cleanup stuff on our folder */ + if (matches_added) + camel_folder_search_free(sub, matches_added); ++ if (present) ++ camel_folder_search_free (sub, present); + + if (matches_changed) + camel_folder_search_free(sub, matches_changed); +@@ -1864,7 +1891,7 @@ folder_load_flags(CamelSession *session, + + camel_vee_folder_hash_folder(sub, hash); + shash = g_strdup_printf("%c%c%c%c%c%c%c%c", hash[0], hash[1], hash[2], hash[3], hash[4], hash[5], hash[6], hash[7]); +- ++ dd(printf("Loading summary of %s to vfolder %s\n", sub->full_name, folder->full_name)); + + /* Get the summary of vfolder */ + array = camel_folder_summary_array (folder->summary); +Index: evolution-data-server-2.23.92/camel/camel-vee-summary.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-vee-summary.c ++++ evolution-data-server-2.23.92/camel/camel-vee-summary.c +@@ -184,8 +184,11 @@ vee_info_set_flags(CamelMessageInfo *mi, + CAMEL_FOLDER_JUNKED, &old_junked, + CAMEL_FOLDER_JUNKED_NOT_DELETED, &old_junked_not_deleted, + CAMEL_FOLDER_UNREAD, &old_unread, NULL); ++ camel_folder_freeze(rmi->summary->folder); + res = camel_message_info_set_flags(rmi, flags, set); + ((CamelVeeMessageInfo *) mi)->old_flags = camel_message_info_flags (rmi); ++ camel_folder_thaw(rmi->summary->folder); ++ + camel_object_get(rmi->summary->folder, NULL, + CAMEL_FOLDER_DELETED, &deleted, + CAMEL_FOLDER_VISIBLE, &visible, +@@ -324,6 +327,7 @@ camel_vee_summary_new(CamelFolder *paren + + s = (CamelVeeSummary *)camel_object_new(camel_vee_summary_get_type()); + s->summary.folder = parent; ++ s->force_counts = FALSE; + + #warning "fix exceptions and note return values" + #warning "if Evo's junk/trash vfolders make it VJunk VTrash instead of .#evolution/Junk-or-whatever" +@@ -378,7 +382,6 @@ camel_vee_summary_add(CamelVeeSummary *s + mi = (CamelVeeMessageInfo *)camel_message_info_new(&s->summary); + mi->summary = summary; + /* We would do lazy loading of flags, when the folders are loaded to memory through folder_reloaded signal */ +- mi->old_flags = 0; + camel_object_ref (summary); + mi->info.uid = (char *) camel_pstring_strdup (vuid); + g_free (vuid); +Index: evolution-data-server-2.23.92/camel/camel-vee-summary.h +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-vee-summary.h ++++ evolution-data-server-2.23.92/camel/camel-vee-summary.h +@@ -48,6 +48,7 @@ struct _CamelVeeMessageInfo { + + struct _CamelVeeSummary { + CamelFolderSummary summary; ++ gboolean force_counts; + }; + + struct _CamelVeeSummaryClass { +Index: evolution-data-server-2.23.92/camel/camel-vtrash-folder.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/camel-vtrash-folder.c ++++ evolution-data-server-2.23.92/camel/camel-vtrash-folder.c +@@ -138,13 +138,17 @@ vtrash_getv(CamelObject *object, CamelEx + /* This is so we can get the values atomically, and also so we can calculate them only once */ + if (unread == -1) { + int j; +- CamelMessageInfo *info; ++ CamelMessageInfoBase *info; ++ CamelVeeMessageInfo *vinfo; + + unread = 0; + count = camel_folder_summary_count(folder->summary); + for (j=0; jsummary, j))) { +- guint32 flags = camel_message_info_flags(info); ++ if ((info = (CamelMessageInfoBase *) camel_folder_summary_index(folder->summary, j))) { ++ guint32 flags; ++ ++ vinfo = (CamelVeeMessageInfo *) info; ++ flags = vinfo->old_flags ? vinfo->old_flags : camel_message_info_flags(info); + + if ((flags & (CAMEL_MESSAGE_SEEN)) == 0) + unread++; +@@ -637,7 +641,7 @@ camel_vtrash_folder_class_init (CamelVTr + camel_vtrash_folder_parent = CAMEL_VEE_FOLDER_CLASS(camel_vee_folder_get_type()); + + /* Not required from here on. We don't count */ +- /* ((CamelObjectClass *)klass)->getv = vtrash_getv; */ ++ ((CamelObjectClass *)klass)->getv = vtrash_getv; + + folder_class->append_message = vtrash_append_message; + folder_class->transfer_messages_to = vtrash_transfer_messages_to; +Index: evolution-data-server-2.23.92/camel/providers/imap/ChangeLog +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/providers/imap/ChangeLog ++++ evolution-data-server-2.23.92/camel/providers/imap/ChangeLog +@@ -1,3 +1,14 @@ ++2008-09-14 Matthew Barnes ++ ++ * camel-imap-folder.c (imap_update_summary): ++ Don't mix declarations and code. ++ ++2008-09-13 Chenthill Palanisamy ++ ++ * camel-imap-journal.h: added rp_in_progress. ++ * camel-imap-folder.c (imap_sync): used to not replay ++ journal if its already in progress. ++ + 2008-09-04 Milan Crha + + ** Fix for bug #547884 +Index: evolution-data-server-2.23.92/camel/providers/imap/camel-imap-folder.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/providers/imap/camel-imap-folder.c ++++ evolution-data-server-2.23.92/camel/providers/imap/camel-imap-folder.c +@@ -278,6 +278,7 @@ camel_imap_folder_new (CamelStore *paren + } + + imap_folder->search = camel_imap_search_new(folder_dir); ++ + camel_offline_journal_replay (imap_folder->journal, ex); + camel_imap_journal_close_folders ((CamelIMAPJournal *)imap_folder->journal); + camel_offline_journal_write (CAMEL_IMAP_FOLDER (folder)->journal, ex); +@@ -1282,6 +1283,7 @@ imap_sync (CamelFolder *folder, gboolean + { + CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store); + CamelImapMessageInfo *info; ++ CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder); + CamelException local_ex; + + GPtrArray *matches, *summary; +@@ -1414,9 +1416,16 @@ imap_sync (CamelFolder *folder, gboolean + if (expunge) + imap_expunge (folder, ex); + +- camel_offline_journal_replay (CAMEL_IMAP_FOLDER (folder)->journal, ex); +- camel_imap_journal_close_folders ((CamelIMAPJournal *) CAMEL_IMAP_FOLDER (folder)->journal); +- camel_offline_journal_write (CAMEL_IMAP_FOLDER (folder)->journal, ex); ++ /* Check if the replay is already in progress as imap_sync would be called while expunge resync */ ++ if (!CAMEL_IMAP_JOURNAL (imap_folder->journal)->rp_in_progress) { ++ CAMEL_IMAP_JOURNAL (imap_folder->journal)->rp_in_progress = TRUE; ++ ++ camel_offline_journal_replay (imap_folder->journal, ex); ++ camel_imap_journal_close_folders ((CamelIMAPJournal *)imap_folder->journal); ++ camel_offline_journal_write (CAMEL_IMAP_FOLDER (folder)->journal, ex); ++ ++ CAMEL_IMAP_JOURNAL (imap_folder->journal)->rp_in_progress = FALSE; ++ } + + g_ptr_array_foreach (summary, (GFunc) camel_pstring_free, NULL); + g_ptr_array_free (summary, TRUE); +@@ -3130,6 +3139,7 @@ imap_update_summary (CamelFolder *folder + char *uid, *resp, *tempuid; + GData *data; + extern int camel_application_is_exiting; ++ int k = 0, ct; + + if (store->server_level >= IMAP_LEVEL_IMAP4REV1) { + if (store->headers == IMAP_FETCH_ALL_HEADERS) +@@ -3188,7 +3198,6 @@ imap_update_summary (CamelFolder *folder + */ + fetch_data = g_ptr_array_new (); + messages = g_ptr_array_new (); +- int k = 0, ct; + ct = exists - seq; + while ((type = camel_imap_command_response (store, &resp, ex)) == + CAMEL_IMAP_RESPONSE_UNTAGGED && !camel_application_is_exiting) { +Index: evolution-data-server-2.23.92/camel/providers/imap/camel-imap-journal.h +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/providers/imap/camel-imap-journal.h ++++ evolution-data-server-2.23.92/camel/providers/imap/camel-imap-journal.h +@@ -70,6 +70,7 @@ struct _CamelIMAPJournal { + + GHashTable *folders; + GHashTable *uidmap; ++ gboolean rp_in_progress; + }; + + struct _CamelIMAPJournalClass { +Index: evolution-data-server-2.23.92/camel/providers/local/ChangeLog +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/providers/local/ChangeLog ++++ evolution-data-server-2.23.92/camel/providers/local/ChangeLog +@@ -1,3 +1,8 @@ ++2008-09-14 Matthew Barnes ++ ++ * camel-local-store.c (camel_local_store_finalize): ++ Don't mix declarations and code. ++ + 2008-08-30 Srinivasa Ragavan + + * camel/providers/local/camel-spool-summary.c: Fixed folder summary +Index: evolution-data-server-2.23.92/camel/providers/local/camel-local-store.c +=================================================================== +--- evolution-data-server-2.23.92.orig/camel/providers/local/camel-local-store.c ++++ evolution-data-server-2.23.92/camel/providers/local/camel-local-store.c +@@ -98,11 +98,11 @@ camel_local_store_class_init (CamelLocal + static void + camel_local_store_finalize (CamelLocalStore *local_store) + { ++ CamelStore *store; ++ + if (local_store->toplevel_dir) + g_free (local_store->toplevel_dir); + +- CamelStore *store; +- + store = ((CamelStore *)local_store); + d(printf ("\n\aLocal Store Finalize \n\a")); + +Index: evolution-data-server-2.23.92/docs/reference/camel/tmpl/camel-vee-summary.sgml +=================================================================== +--- evolution-data-server-2.23.92.orig/docs/reference/camel/tmpl/camel-vee-summary.sgml ++++ evolution-data-server-2.23.92/docs/reference/camel/tmpl/camel-vee-summary.sgml +@@ -23,6 +23,7 @@ CamelVeeSummary + + + @summary: ++@force_counts: + + + +Index: evolution-data-server-2.23.92/libedataserver/e-sexp.c +=================================================================== +--- evolution-data-server-2.23.92.orig/libedataserver/e-sexp.c ++++ evolution-data-server-2.23.92/libedataserver/e-sexp.c +@@ -246,12 +246,13 @@ term_eval_and(struct _ESExp *f, int argc + int type=-1; + int bool = TRUE; + int i; ++ char *oper; + + r(printf("( and\n")); + + r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED); + +- char *oper = "AND"; ++ oper = "AND"; + f->operators = g_slist_prepend (f->operators, oper); + + for (i=0;bool && ioperators = g_slist_prepend (f->operators, oper); + + r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED); +Index: evolution-data-server-2.23.92/po/ar.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/ar.po ++++ evolution-data-server-2.23.92/po/ar.po +@@ -13,7 +13,7 @@ msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server.HEAD.ar\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-08-26 14:44+0100\n" ++"POT-Creation-Date: 2008-09-15 10:34+0100\n" + "PO-Revision-Date: 2008-02-27 11:57+0100\n" + "Last-Translator: Djihed Afifi \n" + "Language-Team: Arabic \n" +@@ -34,13 +34,13 @@ msgstr "يجري التّحميل..." + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4282 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477 + msgid "Searching..." + msgstr "يجري البحث..." + + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4446 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "يجري تحميل المراسَلين (%d)..." +@@ -60,27 +60,27 @@ msgstr "بإستخدام الاسم ال + msgid "Using Email Address" + msgstr "باستخدام عنوان البريد الإلكتروني" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019 + msgid "Reconnecting to LDAP server..." + msgstr "يجري إعادة الاتصال بخادوم LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1613 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617 + msgid "Adding contact to LDAP server..." + msgstr "يجري إضافة مراسَل لخادوم LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1747 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Removing contact from LDAP server..." + msgstr "يجري حذف مراسَل من خادوم LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2058 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064 + msgid "Modifying contact from LDAP server..." + msgstr "يجري تعديل مراسَل في خادوم LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4142 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148 + msgid "Receiving LDAP search results..." + msgstr "يجري استقبال نتائج بحث LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4304 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310 + msgid "Error performing search" + msgstr "خطأ في تنفيذ البحث" + +@@ -696,12 +696,12 @@ msgstr "عيد الميلاد: %s" + msgid "Anniversary: %s" + msgstr "الذكرى السنويّة: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:214 ++#: ../calendar/backends/file/e-cal-backend-file.c:212 + msgid "Cannot save calendar data: Malformed URI." + msgstr "تعذّر حفظ بيانات التقويم: نوان مشوّه." + +-#: ../calendar/backends/file/e-cal-backend-file.c:221 +-#: ../calendar/backends/file/e-cal-backend-file.c:227 ++#: ../calendar/backends/file/e-cal-backend-file.c:219 ++#: ../calendar/backends/file/e-cal-backend-file.c:225 + #, fuzzy + msgid "Cannot save calendar data" + msgstr "تعذّر حفظ بيانات التقويم: نوان مشوّه." +@@ -711,10 +711,10 @@ msgid "Could not create thread for getti + msgstr "لم يمكن صنع خيط عمل لإيجاد الفروق" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:367 +-#: ../calendar/backends/google/e-cal-backend-google.c:1194 ++#: ../calendar/backends/google/e-cal-backend-google.c:1191 + #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053 + #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352 +-#: ../calendar/backends/http/e-cal-backend-http.c:569 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #: ../calendar/backends/weather/e-cal-backend-weather.c:466 + msgid "Could not create cache file" + msgstr "لم أستطع إنشاء ملف ذاكرة مخبئيّة" +@@ -763,15 +763,15 @@ msgstr "عنوان خادوم غير س + msgid "Authentication failed" + msgstr "فشل التحقق" + +-#: ../calendar/backends/http/e-cal-backend-http.c:269 ++#: ../calendar/backends/http/e-cal-backend-http.c:267 + msgid "Redirected to Invalid URI" + msgstr "حوّل لعنوان خاطئ" + +-#: ../calendar/backends/http/e-cal-backend-http.c:290 ++#: ../calendar/backends/http/e-cal-backend-http.c:288 + msgid "Bad file format." + msgstr "تنسيق ملف سيء" + +-#: ../calendar/backends/http/e-cal-backend-http.c:296 ++#: ../calendar/backends/http/e-cal-backend-http.c:294 + msgid "Not a calendar." + msgstr "ليس تقويما." + +@@ -1193,7 +1193,7 @@ msgid "Operation has been canceled" + msgstr "أُلغِيت العمليّة" + + #: ../calendar/libecal/e-cal.c:5080 +-#: ../calendar/libedata-cal/e-cal-backend-util.c:135 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:136 + msgid "Could not cancel operation" + msgstr "تعذّر إلغاء العمليّة" + +@@ -1208,7 +1208,7 @@ msgid "A CORBA exception has occurred" + msgstr "حدث استثناء CORBA" + + #: ../calendar/libecal/e-cal.c:5088 +-#: ../calendar/libedata-cal/e-cal-backend-util.c:138 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:139 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 + #: ../camel/providers/imap/camel-imap-command.c:434 + #: ../camel/providers/imap/camel-imap-store.c:742 +@@ -1218,7 +1218,7 @@ msgstr "حدث استثناء CORBA" + #: ../camel/providers/imap4/camel-imap4-engine.c:1710 + #: ../camel/providers/imap4/camel-imap4-store.c:315 + #: ../camel/providers/imap4/camel-imap4-store.c:823 +-#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + #: ../camel/providers/pop3/camel-pop3-store.c:553 + #: ../camel/providers/pop3/camel-pop3-store.c:560 + #: ../camel/providers/pop3/camel-pop3-store.c:566 +@@ -1353,31 +1353,32 @@ msgstr "لا يوجد دعم لنوع ا + msgid "TLS not available" + msgstr "SSL غير متوفّر" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:125 ++#. Translators: This means "Offline mode unavailable" ++#: ../calendar/libedata-cal/e-cal-backend-util.c:126 + #, fuzzy + msgid "Offline unavailable" + msgstr "SSL غير متوفّر" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:127 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:128 + #, fuzzy + msgid "Search size limit exceeded" + msgstr "تجاوز طول المسار" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:129 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:130 + #, fuzzy + msgid "Search time limit exceeded" + msgstr "تجاوز طول المسار" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:131 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:132 + #, fuzzy + msgid "Invalid query" + msgstr "غرض غير سليم" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:133 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:134 + msgid "Query refused" + msgstr "" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:140 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:141 + #, fuzzy + msgid "Invalid server version" + msgstr "عنوان خادوم غير سليم" +@@ -1431,7 +1432,7 @@ msgstr "تعذّر إنشاء مسار + msgid "Could not remove cache entry: %s: %s" + msgstr "تعذّر إزالة مدخل الذّاكرة المخبّأة: %s: %s" + +-#: ../camel/camel-db.c:107 ++#: ../camel/camel-db.c:102 + msgid "Insufficient memory" + msgstr "" + +@@ -1479,7 +1480,7 @@ msgstr "يجري تحضير المجلّ + #: ../camel/providers/imap/camel-imap-store.c:1002 + #: ../camel/providers/imap/camel-imap-store.c:1810 + #: ../camel/providers/imap/camel-imap-store.c:2226 +-#: ../camel/providers/imap/camel-imap-store.c:2989 ++#: ../camel/providers/imap/camel-imap-store.c:2994 + msgid "You must be working online to complete this operation" + msgstr "يجب أن تكون متّصلًا لإتمام هذه العمليّة" + +@@ -1574,7 +1575,7 @@ msgstr "فشل إنشاء العمليّ + msgid "Error executing filter search: %s: %s" + msgstr "خطأ أثناء تنفيذ بحث المرشِّح: %s: %s" + +-#: ../camel/camel-folder-search.c:332 ../camel/camel-folder-search.c:444 ++#: ../camel/camel-folder-search.c:335 ../camel/camel-folder-search.c:447 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -1583,7 +1584,7 @@ msgstr "" + "لا يمكن تحليل تعبير البحث: %s: \n" + "%s" + +-#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:454 ++#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:457 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -1592,32 +1593,32 @@ msgstr "" + "خطأ أثناء تنفيذ تعبير البحث: %s\n" + "%s" + +-#: ../camel/camel-folder-search.c:643 ../camel/camel-folder-search.c:687 ++#: ../camel/camel-folder-search.c:649 ../camel/camel-folder-search.c:692 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) تحتاج ناتجًا منطقيًا واحدًا" + +-#: ../camel/camel-folder-search.c:740 ++#: ../camel/camel-folder-search.c:745 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) غير مسموحة داخل %s" + +-#: ../camel/camel-folder-search.c:746 ../camel/camel-folder-search.c:753 ++#: ../camel/camel-folder-search.c:751 ../camel/camel-folder-search.c:758 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) تتطلب نصًا مطابق النوع" + +-#: ../camel/camel-folder-search.c:780 ++#: ../camel/camel-folder-search.c:785 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) تتوقع مصفوفة كنتيجة" + +-#: ../camel/camel-folder-search.c:789 ++#: ../camel/camel-folder-search.c:794 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) تتطلب مجموعة المجلدات" + +-#: ../camel/camel-folder-search.c:884 ++#: ../camel/camel-folder-search.c:889 + #, c-format + msgid "Performing query on unknown header: %s" + msgstr "يجري تنفيذ الإستعلام على ترويسة مجهولة: %s" +@@ -2678,7 +2679,7 @@ msgstr "" + msgid "Could not parse URL '%s'" + msgstr "تعذّر تحليل عنوان URL `%s'" + +-#: ../camel/camel-vee-folder.c:586 ++#: ../camel/camel-vee-folder.c:584 + #, fuzzy, c-format + msgid "Error storing '%s': %s" + msgstr "خطأ في تخزين `%s': %s" +@@ -2737,9 +2738,9 @@ msgstr "ليس ثمّة رسالة" + #: ../camel/providers/nntp/camel-nntp-folder.c:232 + #: ../camel/providers/nntp/camel-nntp-folder.c:373 + #: ../camel/providers/pop3/camel-pop3-folder.c:266 +-#: ../camel/providers/pop3/camel-pop3-folder.c:560 +-#: ../camel/providers/pop3/camel-pop3-folder.c:621 +-#: ../camel/providers/pop3/camel-pop3-folder.c:639 ++#: ../camel/providers/pop3/camel-pop3-folder.c:559 ++#: ../camel/providers/pop3/camel-pop3-folder.c:620 ++#: ../camel/providers/pop3/camel-pop3-folder.c:638 + msgid "User canceled" + msgstr "أُلغِيَ المستخدم" + +@@ -2749,11 +2750,11 @@ msgstr "أُلغِيَ المستخدم" + #: ../camel/providers/nntp/camel-nntp-folder.c:149 + #: ../camel/providers/nntp/camel-nntp-folder.c:158 + #: ../camel/providers/nntp/camel-nntp-folder.c:234 +-#: ../camel/providers/pop3/camel-pop3-folder.c:388 +-#: ../camel/providers/pop3/camel-pop3-folder.c:563 +-#: ../camel/providers/pop3/camel-pop3-folder.c:624 +-#: ../camel/providers/pop3/camel-pop3-folder.c:631 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/pop3/camel-pop3-folder.c:386 ++#: ../camel/providers/pop3/camel-pop3-folder.c:562 ++#: ../camel/providers/pop3/camel-pop3-folder.c:623 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 ++#: ../camel/providers/pop3/camel-pop3-folder.c:641 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "لا يمكن جلب الرّسالة %s: %s" +@@ -2785,8 +2786,8 @@ msgstr "مجلّد المهملات مم + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1248 + #: ../camel/providers/groupwise/camel-groupwise-store.c:623 + #: ../camel/providers/groupwise/camel-groupwise-store.c:736 +-#: ../camel/providers/imap/camel-imap-folder.c:3183 +-#: ../camel/providers/imap/camel-imap-folder.c:3260 ++#: ../camel/providers/imap/camel-imap-folder.c:3193 ++#: ../camel/providers/imap/camel-imap-folder.c:3269 + #, c-format + msgid "Fetching summary information for new messages in %s" + msgstr "يجري إحضار معلومات التّلخيص للرّسائل الجديدة في %s" +@@ -3026,12 +3027,12 @@ msgstr "" + #: ../camel/providers/imap/camel-imap-command.c:231 + #: ../camel/providers/imap/camel-imap-command.c:280 + #: ../camel/providers/imap/camel-imap-command.c:494 +-#: ../camel/providers/imap/camel-imap-store.c:3029 ++#: ../camel/providers/imap/camel-imap-store.c:3034 + msgid "Operation cancelled" + msgstr "أُلغيت العملية" + + #: ../camel/providers/imap/camel-imap-command.c:333 +-#: ../camel/providers/imap/camel-imap-store.c:3032 ++#: ../camel/providers/imap/camel-imap-store.c:3037 + #, c-format + msgid "Server unexpectedly disconnected: %s" + msgstr "قطع الخادوم الإتّصال بشكلٍ غير متوقّع: %s" +@@ -3081,56 +3082,56 @@ msgid "Could not create directory %s: %s + msgstr "تعذّر إنشاء الدّليل %s: %s" + + #. Check UIDs and flags of all messages we already know of. +-#: ../camel/providers/imap/camel-imap-folder.c:843 ++#: ../camel/providers/imap/camel-imap-folder.c:844 + #, c-format + msgid "Scanning for changed messages in %s" + msgstr "يجري المسح بحثا عن الرسائل المتغيّرة في %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:1860 ++#: ../camel/providers/imap/camel-imap-folder.c:1869 + #, c-format + msgid "Unexpected response status '%s' after APPEND command" + msgstr "" + +-#: ../camel/providers/imap/camel-imap-folder.c:1875 ++#: ../camel/providers/imap/camel-imap-folder.c:1884 + msgid "No response on continuation after APPEND command" + msgstr "" + +-#: ../camel/providers/imap/camel-imap-folder.c:1917 ++#: ../camel/providers/imap/camel-imap-folder.c:1926 + msgid "Unknown error occurred during APPEND command!" + msgstr "" + +-#: ../camel/providers/imap/camel-imap-folder.c:2729 ++#: ../camel/providers/imap/camel-imap-folder.c:2738 + #, c-format + msgid "Unable to retrieve message: %s" + msgstr "تعذّر جلب الرّسالة: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2770 ++#: ../camel/providers/imap/camel-imap-folder.c:2779 + #, fuzzy, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "لا يمكن جلب الرّسالة %s: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2771 ++#: ../camel/providers/imap/camel-imap-folder.c:2780 + #, fuzzy + msgid "No such message available." + msgstr "ليس ثمّة رسالة" + +-#: ../camel/providers/imap/camel-imap-folder.c:2810 +-#: ../camel/providers/imap/camel-imap-folder.c:3562 ++#: ../camel/providers/imap/camel-imap-folder.c:2819 ++#: ../camel/providers/imap/camel-imap-folder.c:3571 + #: ../camel/providers/nntp/camel-nntp-folder.c:220 + msgid "This message is not currently available" + msgstr "هذه الرّسالة غير متوفّرة حاليًّا" + +-#: ../camel/providers/imap/camel-imap-folder.c:3389 ++#: ../camel/providers/imap/camel-imap-folder.c:3398 + #, c-format + msgid "Incomplete server response: no information provided for message %d" + msgstr "استجابة ناقِصة من الخادوم: لم تزوّد معلومات حول الرسالة %d" + +-#: ../camel/providers/imap/camel-imap-folder.c:3397 ++#: ../camel/providers/imap/camel-imap-folder.c:3406 + #, c-format + msgid "Incomplete server response: no UID provided for message %d" + msgstr "استجابة ناقِصة من الخادوم: لم يزوّد UID للرسالة %d" + +-#: ../camel/providers/imap/camel-imap-folder.c:3600 ++#: ../camel/providers/imap/camel-imap-folder.c:3609 + msgid "Could not find message body in FETCH response." + msgstr "تعذّر إيجاد متن الرّسالة في استجابة FETCH." + +@@ -3529,7 +3530,7 @@ msgid "Cannot get LIST information for ' + msgstr "لا يمكن جلب معلومات LIST لـ `%s' على خادوم IMAP %s: %s" + + #: ../camel/providers/imap4/camel-imap4-store.c:823 +-#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + msgid "Bad command" + msgstr "أمر رديء" + +@@ -3581,35 +3582,37 @@ msgstr "تعذّر إعادة تسمية + msgid "Cannot rename folder '%s' to '%s': Bad command" + msgstr "تعذّر إعادة تسمية المجلّد `%s' إلى `%s': أمر رديء" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1575 ++#. Translators: the first %s is an IMAP4 command, either LSUB or LIST. ++#. * The fourth one is an error message. ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 + #, fuzzy, c-format + msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" + msgstr "لا يمكن جلب معلومات %s للنمط `%s' على خادوم IMAP %s: %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1636 ++#: ../camel/providers/imap4/camel-imap4-store.c:1638 + msgid "Cannot subscribe to IMAP folders in offline mode." + msgstr "لا يمكن التسجيل في مجلّدات IMAP في وضع دون اتصال." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1681 ++#: ../camel/providers/imap4/camel-imap4-store.c:1683 + #, fuzzy, c-format + msgid "Cannot subscribe to folder '%s': Invalid mailbox name" + msgstr "لا يمكن التسجيل في المجلّد `%s': اسم صندوق بريد خاطئ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1686 ++#: ../camel/providers/imap4/camel-imap4-store.c:1688 + #, fuzzy, c-format + msgid "Cannot subscribe to folder '%s': Bad command" + msgstr "لا يمكن التسجيل في المجلّد `%s': أمر رديء" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1708 ++#: ../camel/providers/imap4/camel-imap4-store.c:1710 + msgid "Cannot unsubscribe from IMAP folders in offline mode." + msgstr "لا يمكن إلغاء التسجيل في مجلّدات IMAP في وضع دون اتصال." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1753 ++#: ../camel/providers/imap4/camel-imap4-store.c:1755 + #, fuzzy, c-format + msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" + msgstr "لا يمكن إلغاء التسجيل في المجلّد `%s': اسم صندوق بريد خاطئ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1758 ++#: ../camel/providers/imap4/camel-imap4-store.c:1760 + #, fuzzy, c-format + msgid "Cannot unsubscribe from folder '%s': Bad command" + msgstr "لا يمكن إلغاء التسجيل في المجلّد `%s': أمر رديء" +@@ -3904,7 +3907,7 @@ msgstr "يجري تفقّد رسائل + #: ../camel/providers/local/camel-mbox-summary.c:534 + #: ../camel/providers/local/camel-mbox-summary.c:714 + #: ../camel/providers/local/camel-mbox-summary.c:810 +-#: ../camel/providers/local/camel-spool-summary.c:141 ++#: ../camel/providers/local/camel-spool-summary.c:158 + msgid "Storing folder" + msgstr "يجري خزن المجلّد" + +@@ -4019,13 +4022,13 @@ msgstr "لا يمكن تفقّد الم + + #: ../camel/providers/local/camel-mbox-summary.c:719 + #: ../camel/providers/local/camel-mbox-summary.c:815 +-#: ../camel/providers/local/camel-spool-summary.c:146 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "تعذّر فتح الملف: %s: %s" + + #: ../camel/providers/local/camel-mbox-summary.c:731 +-#: ../camel/providers/local/camel-spool-summary.c:159 ++#: ../camel/providers/local/camel-spool-summary.c:176 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "لا يمكن فتح صندوق البريد المؤقّت: %s" +@@ -4060,7 +4063,7 @@ msgid "Summary and folder mismatch, even + msgstr "عدم تطابق بين الملخّص و المجلّد، حتّى بعد المزامنة" + + #: ../camel/providers/local/camel-mbox-summary.c:1013 +-#: ../camel/providers/local/camel-spool-summary.c:327 ++#: ../camel/providers/local/camel-spool-summary.c:344 + #, c-format + msgid "Unknown error: %s" + msgstr "خطأ مجهول: %s" +@@ -4165,21 +4168,21 @@ msgstr "لا يمكن إعادة تسم + msgid "Spool folders cannot be deleted" + msgstr "لا يسمكن حذف مجلّدات الحوض" + +-#: ../camel/providers/local/camel-spool-summary.c:172 +-#: ../camel/providers/local/camel-spool-summary.c:182 +-#: ../camel/providers/local/camel-spool-summary.c:192 ++#: ../camel/providers/local/camel-spool-summary.c:189 ++#: ../camel/providers/local/camel-spool-summary.c:199 ++#: ../camel/providers/local/camel-spool-summary.c:209 + #, c-format + msgid "Could not sync temporary folder %s: %s" + msgstr "تعذّر مزامنة المجلّد المؤقّت: %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:208 ++#: ../camel/providers/local/camel-spool-summary.c:225 + #, c-format + msgid "Could not sync spool folder %s: %s" + msgstr "تعذّر مزامنة مجلّد الحوض: %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:239 + #: ../camel/providers/local/camel-spool-summary.c:256 +-#: ../camel/providers/local/camel-spool-summary.c:267 ++#: ../camel/providers/local/camel-spool-summary.c:273 ++#: ../camel/providers/local/camel-spool-summary.c:284 + #, fuzzy, c-format + msgid "" + "Could not sync spool folder %s: %s\n" +@@ -4356,19 +4359,19 @@ msgstr "يجري شطب الرّسائل + msgid "Expunging deleted messages" + msgstr "يجري شطب الرّسائل المحذوفة" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 ++#: ../camel/providers/pop3/camel-pop3-folder.c:533 + #, c-format + msgid "No message with UID %s" + msgstr "ليس ثمّة رسالة بـ UID %s" + + #. Sigh, most of the crap in this function is so that the cancel button + #. returns the proper exception code. Sigh. +-#: ../camel/providers/pop3/camel-pop3-folder.c:541 ++#: ../camel/providers/pop3/camel-pop3-folder.c:540 + #, c-format + msgid "Retrieving POP message %d" + msgstr "يجري جلب رسالة POP %d" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:631 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 + msgid "Unknown reason" + msgstr "سبب مجهول" + +@@ -5021,11 +5024,11 @@ msgid "" + "name" + msgstr "الفئة '%s' مو جودة بالفعل في الإعدادات. من فضلك استعمل اسماَ آخر" + +-#: ../libedataserverui/e-categories-dialog.c:462 ++#: ../libedataserverui/e-categories-dialog.c:466 + msgid "Icon" + msgstr "أيقونة" + +-#: ../libedataserverui/e-categories-dialog.c:467 ++#: ../libedataserverui/e-categories-dialog.c:471 + msgid "Category" + msgstr "فئة" + +@@ -5061,19 +5064,19 @@ msgstr "_حرّر" + msgid "categories" + msgstr "فئات" + +-#: ../libedataserverui/e-name-selector-dialog.c:266 ++#: ../libedataserverui/e-name-selector-dialog.c:272 + msgid "Select Contacts from Address Book" + msgstr "انتقي مراسَلين من دفتر العناوين" + +-#: ../libedataserverui/e-name-selector-dialog.c:546 ++#: ../libedataserverui/e-name-selector-dialog.c:559 + msgid "_Add" + msgstr "أ_ضف" + +-#: ../libedataserverui/e-name-selector-dialog.c:571 ++#: ../libedataserverui/e-name-selector-dialog.c:584 + msgid "_Remove" + msgstr "أ_زل" + +-#: ../libedataserverui/e-name-selector-dialog.c:744 ++#: ../libedataserverui/e-name-selector-dialog.c:761 + #: ../libedataserverui/e-name-selector-dialog.glade.h:6 + msgid "Any Category" + msgstr "أى فئة" +@@ -5116,25 +5119,25 @@ msgid "_Search:" + msgstr "ا_بحث:" + + #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2240 ++#: ../libedataserverui/e-name-selector-entry.c:2369 + #, c-format + msgid "E_xpand %s Inline" + msgstr "مدّ_د %s في السياق" + + #. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2255 ++#: ../libedataserverui/e-name-selector-entry.c:2384 + #, c-format + msgid "Cop_y %s" + msgstr "_نسخ %s" + + #. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2265 ++#: ../libedataserverui/e-name-selector-entry.c:2394 + #, c-format + msgid "C_ut %s" + msgstr "ق_صّ %s" + + #. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2282 ++#: ../libedataserverui/e-name-selector-entry.c:2411 + #, c-format + msgid "_Edit %s" + msgstr "_حرّر %s" +Index: evolution-data-server-2.23.92/po/ca.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/ca.po ++++ evolution-data-server-2.23.92/po/ca.po +@@ -12,9 +12,9 @@ msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server 2.2\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-05-24 13:05+0200\n" +-"PO-Revision-Date: 2008-05-24 13:07+0200\n" +-"Last-Translator: David Planella Molas \n" ++"POT-Creation-Date: 2008-09-15 23:00+0200\n" ++"PO-Revision-Date: 2008-09-06 17:33+0200\n" ++"Last-Translator: David Planella \n" + "Language-Team: Catalan \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -31,13 +31,13 @@ msgstr "S'està carregant..." + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4220 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477 + msgid "Searching..." + msgstr "S'està cercant..." + + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4384 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "S'estan descarregant els contactes (%d)..." +@@ -49,35 +49,35 @@ msgstr "S'estan descarregant els contact + msgid "Updating contacts cache (%d)... " + msgstr "S'està actualitzant la memòria cau dels contactes (%d)... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:742 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751 + msgid "Using Distinguished Name (DN)" + msgstr "S'està utilitzant el nom distingit (DN)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754 + msgid "Using Email Address" + msgstr "S'està utilitzant l'adreça electrònica" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1005 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019 + msgid "Reconnecting to LDAP server..." + msgstr "S'està tornant a connectar amb el servidor LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1598 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617 + msgid "Adding contact to LDAP server..." + msgstr "S'està afegint un contacte al servidor LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1732 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Removing contact from LDAP server..." + msgstr "S'està suprimint un contacte del servidor LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2043 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064 + msgid "Modifying contact from LDAP server..." + msgstr "S'està modificant un contacte del servidor LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4087 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148 + msgid "Receiving LDAP search results..." + msgstr "S'estan rebent els resultats de la cerca LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4242 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310 + msgid "Error performing search" + msgstr "S'ha produït un error en realitzar la cerca" + +@@ -96,7 +96,7 @@ msgstr "S'ha produït un error en realit + #: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791 + #: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029 + #: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238 +-#: ../addressbook/libebook/e-book.c:3339 ++#: ../addressbook/libebook/e-book.c:3364 + #, c-format + msgid "\"%s\" on book before \"%s\"" + msgstr "«%s» a la llibreta abans que «%s»" +@@ -125,7 +125,7 @@ msgstr "llibreta ocupada" + #: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277 + #: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619 + #: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818 +-#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3348 ++#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3373 + #, c-format + msgid "CORBA exception making \"%s\" call" + msgstr "S'ha produït una excepció CORBA en fer la crida «%s»" +@@ -150,29 +150,29 @@ msgstr "«%s» a la llibreta després de + msgid "%s: canceled" + msgstr "%s: cancel·lat" + +-#: ../addressbook/libebook/e-book.c:3203 ++#: ../addressbook/libebook/e-book.c:3228 + #, c-format + msgid "%s: Invalid source." + msgstr "%s: font no vàlida." + +-#: ../addressbook/libebook/e-book.c:3211 ../addressbook/libebook/e-book.c:3277 ++#: ../addressbook/libebook/e-book.c:3236 ../addressbook/libebook/e-book.c:3302 + #, c-format + msgid "%s: no factories available for URI `%s'" + msgstr "%s: no hi ha cap fàbrica disponible per a l'URI «%s»" + +-#: ../addressbook/libebook/e-book.c:3223 ++#: ../addressbook/libebook/e-book.c:3248 + #, c-format + msgid "%s: Could not create EBookListener" + msgstr "%s: no s'ha pogut crear l'EBookListener" + +-#: ../addressbook/libebook/e-book.c:3490 ++#: ../addressbook/libebook/e-book.c:3515 + #, c-format + msgid "%s: there was no self contact UID stored in gconf" + msgstr "" + "%s: no hi ha cap identificador d'usuari de contacte propi emmagatzemat al " + "gconf" + +-#: ../addressbook/libebook/e-book.c:3623 ++#: ../addressbook/libebook/e-book.c:3648 + #, c-format + msgid "%s: there was no source for uid `%s' stored in gconf." + msgstr "" +@@ -365,7 +365,7 @@ msgstr "URL del bloc" + + #. Contact categories + #: ../addressbook/libebook/e-contact.c:176 +-#: ../libedataserverui/e-categories-dialog.c:439 ++#: ../libedataserverui/e-categories-dialog.c:426 + msgid "Categories" + msgstr "Categories" + +@@ -678,7 +678,7 @@ msgstr "Informació geogràfica" + msgid "Telephone" + msgstr "Telèfon" + +-#: ../addressbook/libebook/e-contact.c:1493 ++#: ../addressbook/libebook/e-contact.c:1499 + #: ../addressbook/libebook/e-destination.c:761 + msgid "Unnamed List" + msgstr "Llista sense nom" +@@ -698,62 +698,62 @@ msgstr "Aniversari: %s" + msgid "Anniversary: %s" + msgstr "Commemoració: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:213 ++#: ../calendar/backends/file/e-cal-backend-file.c:212 + msgid "Cannot save calendar data: Malformed URI." + msgstr "No s'han pogut desar les dades del calendari: l'URI està mal format." + +-#: ../calendar/backends/file/e-cal-backend-file.c:220 +-#: ../calendar/backends/file/e-cal-backend-file.c:226 +-#, fuzzy ++#: ../calendar/backends/file/e-cal-backend-file.c:219 ++#: ../calendar/backends/file/e-cal-backend-file.c:225 + msgid "Cannot save calendar data" +-msgstr "No s'han pogut desar les dades del calendari: l'URI està mal format." ++msgstr "No s'han pogut desar les dades del calendari" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:335 + msgid "Could not create thread for getting deltas" + msgstr "No s'ha pogut crear el fil per a obtenir les diferències" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:367 +-#: ../calendar/backends/google/e-cal-backend-google.c:1190 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1049 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1348 +-#: ../calendar/backends/http/e-cal-backend-http.c:569 ++#: ../calendar/backends/google/e-cal-backend-google.c:1191 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #: ../calendar/backends/weather/e-cal-backend-weather.c:466 + msgid "Could not create cache file" + msgstr "No s'ha pogut crear el fitxer de memòria cau" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:380 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1061 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065 + msgid "Could not create thread for populating cache" + msgstr "No s'ha pogut crear el fil per a omplir la memòria cau" + + #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1801 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795 + msgid "Reply Requested: by " + msgstr "Resposta sol·licitada: per" + + #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1806 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800 + msgid "Reply Requested: When convenient" + msgstr "Resposta sol·licitada: quan convingui" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:275 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277 + #, c-format + msgid "Loading %s items" + msgstr "S'estan carregant %s elements" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:885 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260 + msgid "Calendar" + msgstr "Calendari" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:943 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947 + msgid "Invalid server URI" + msgstr "L'URI del servidor no és vàlid" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:962 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:971 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1067 +-#: ../calendar/libecal/e-cal.c:5035 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071 ++#: ../calendar/libecal/e-cal.c:5082 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:109 + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1075 + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1107 + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1145 +@@ -764,15 +764,15 @@ msgstr "L'URI del servidor no és vàlid + msgid "Authentication failed" + msgstr "No s'ha pogut autenticar" + +-#: ../calendar/backends/http/e-cal-backend-http.c:269 ++#: ../calendar/backends/http/e-cal-backend-http.c:267 + msgid "Redirected to Invalid URI" +-msgstr "S'ha redirigit a un URI invàlid" ++msgstr "S'ha redirigit a un URI no vàlid" + +-#: ../calendar/backends/http/e-cal-backend-http.c:290 ++#: ../calendar/backends/http/e-cal-backend-http.c:288 + msgid "Bad file format." + msgstr "El format de fitxer és erroni." + +-#: ../calendar/backends/http/e-cal-backend-http.c:296 ++#: ../calendar/backends/http/e-cal-backend-http.c:294 + msgid "Not a calendar." + msgstr "No és un calendari." + +@@ -970,7 +970,7 @@ msgstr "%1.f-%.1fcm de neu\n" + msgid "%.1f-%.1fin snow\n" + msgstr "%1.f-%.1fin de neu\n" + +-#: ../calendar/libecal/e-cal-component.c:1316 ++#: ../calendar/libecal/e-cal-component.c:1322 + msgid "Untitled appointment" + msgstr "Cita sense nom" + +@@ -1098,24 +1098,24 @@ msgstr "30" + msgid "31st" + msgstr "31" + +-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712 ++#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713 + msgid "High" + msgstr "Alt" + +-#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714 ++#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715 + msgid "Normal" + msgstr "Normal" + +-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:716 ++#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717 + msgid "Low" + msgstr "Baix" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:710 ++#: ../calendar/libecal/e-cal-util.c:711 + msgid "Undefined" + msgstr "Sense definir" + +-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:200 ++#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199 + #, c-format + msgid "Enter password for %s (user %s)" + msgstr "Introduïu la contrasenya per a %s (usuari %s)" +@@ -1131,87 +1131,106 @@ msgstr "" + "Introduïu la contrasenya per a %s per a habilitar el servidor intermediari " + "per a l'usuari %s" + +-#: ../calendar/libecal/e-cal.c:5007 ++#: ../calendar/libecal/e-cal.c:5054 + msgid "Invalid argument" +-msgstr "Argument invàlid" ++msgstr "Argument no vàlid" + +-#: ../calendar/libecal/e-cal.c:5009 ++#: ../calendar/libecal/e-cal.c:5056 + msgid "Backend is busy" + msgstr "El rerefons està ocupat" + +-#: ../calendar/libecal/e-cal.c:5011 ++#: ../calendar/libecal/e-cal.c:5058 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:97 + msgid "Repository is offline" + msgstr "El dipòsit està fora de línia" + +-#: ../calendar/libecal/e-cal.c:5013 ++#: ../calendar/libecal/e-cal.c:5060 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:121 + msgid "No such calendar" + msgstr "No existeix aquest calendari" + +-#: ../calendar/libecal/e-cal.c:5015 ../servers/groupwise/e-gw-connection.c:232 ++#: ../calendar/libecal/e-cal.c:5062 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:103 ++#: ../servers/groupwise/e-gw-connection.c:233 + msgid "Object not found" + msgstr "No s'ha trobat l'objecte" + +-#: ../calendar/libecal/e-cal.c:5017 ../servers/groupwise/e-gw-connection.c:226 ++#: ../calendar/libecal/e-cal.c:5064 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:105 ++#: ../servers/groupwise/e-gw-connection.c:227 + msgid "Invalid object" +-msgstr "Objecte invàlid" ++msgstr "Objecte no vàlid" + +-#: ../calendar/libecal/e-cal.c:5019 ++#: ../calendar/libecal/e-cal.c:5066 + msgid "URI not loaded" + msgstr "No s'ha carregat l'URI" + +-#: ../calendar/libecal/e-cal.c:5021 ++#: ../calendar/libecal/e-cal.c:5068 + msgid "URI already loaded" + msgstr "Ja s'ha carregat l'URI" + +-#: ../calendar/libecal/e-cal.c:5023 ++#: ../calendar/libecal/e-cal.c:5070 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:99 + #: ../servers/exchange/storage/e-storage.c:571 + msgid "Permission denied" + msgstr "Permís denegat" + +-#: ../calendar/libecal/e-cal.c:5025 ../servers/groupwise/e-gw-connection.c:234 ++#: ../calendar/libecal/e-cal.c:5072 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:123 ++#: ../servers/groupwise/e-gw-connection.c:235 + msgid "Unknown User" + msgstr "Usuari desconegut" + +-#: ../calendar/libecal/e-cal.c:5027 ++#: ../calendar/libecal/e-cal.c:5074 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:107 + msgid "Object ID already exists" + msgstr "L'id. d'objecte ja existeix" + +-#: ../calendar/libecal/e-cal.c:5029 ++#: ../calendar/libecal/e-cal.c:5076 + msgid "Protocol not supported" + msgstr "El protocol no està implementat" + +-#: ../calendar/libecal/e-cal.c:5031 ++#: ../calendar/libecal/e-cal.c:5078 + msgid "Operation has been canceled" + msgstr "S'ha cancel·lat l'operació" + +-#: ../calendar/libecal/e-cal.c:5033 ++#: ../calendar/libecal/e-cal.c:5080 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:136 + msgid "Could not cancel operation" + msgstr "No s'ha pogut cancel·lar l'operació" + +-#: ../calendar/libecal/e-cal.c:5037 +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 ++#: ../calendar/libecal/e-cal.c:5084 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:111 ++#: ../camel/providers/smtp/camel-smtp-transport.c:218 + msgid "Authentication required" + msgstr "Cal autenticació" + +-#: ../calendar/libecal/e-cal.c:5039 ++#: ../calendar/libecal/e-cal.c:5086 + msgid "A CORBA exception has occurred" + msgstr "S'ha produït una excepció CORBA" + +-#: ../calendar/libecal/e-cal.c:5041 ++#: ../calendar/libecal/e-cal.c:5088 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:139 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 +-#: ../camel/providers/imap/camel-imap-command.c:312 +-#: ../camel/providers/imap/camel-imap-command.c:412 +-#: ../camel/providers/imap/camel-imap-store.c:763 ++#: ../camel/providers/imap/camel-imap-command.c:434 ++#: ../camel/providers/imap/camel-imap-store.c:742 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1570 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1609 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1654 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1710 + #: ../camel/providers/imap4/camel-imap4-store.c:315 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + #: ../camel/providers/pop3/camel-pop3-store.c:553 + #: ../camel/providers/pop3/camel-pop3-store.c:560 + #: ../camel/providers/pop3/camel-pop3-store.c:566 + #: ../servers/exchange/storage/e-storage.c:585 +-#: ../servers/groupwise/e-gw-connection.c:240 ++#: ../servers/groupwise/e-gw-connection.c:241 + msgid "Unknown error" + msgstr "Error desconegut" + +-#: ../calendar/libecal/e-cal.c:5043 ++#: ../calendar/libecal/e-cal.c:5090 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:95 + #: ../servers/exchange/storage/e-storage.c:553 + msgid "No error" + msgstr "Cap error" +@@ -1313,6 +1332,51 @@ msgstr "" + "«%s» espera que tots els arguments siguin cadenes, o un bé un (i només un) " + "argument que sigui fals booleà (#f)" + ++#: ../calendar/libedata-cal/e-cal-backend-util.c:101 ++msgid "Invalid range" ++msgstr "Rang no vàlid" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:113 ++msgid "Unsupported field" ++msgstr "Aquest camp no està implementat" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:115 ++msgid "Unsupported method" ++msgstr "Aquest mètode no està implementat" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:117 ++msgid "Unsupported authentication method" ++msgstr "Aquest mètode d'autenticació no està implementat" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:119 ++msgid "TLS not available" ++msgstr "El TLS no està disponible" ++ ++#. Translators: This means "Offline mode unavailable" ++#: ../calendar/libedata-cal/e-cal-backend-util.c:126 ++msgid "Offline unavailable" ++msgstr "No està disponible fora de línia" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:128 ++msgid "Search size limit exceeded" ++msgstr "S'ha excedit el límit de la mida de la cerca" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:130 ++msgid "Search time limit exceeded" ++msgstr "S'ha excedit el límit de temps de la cerca" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:132 ++msgid "Invalid query" ++msgstr "La sol·licitud no és vàlida" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:134 ++msgid "Query refused" ++msgstr "S'ha rebutjat la sol·licitud" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:141 ++msgid "Invalid server version" ++msgstr "La versió del servidor no és vàlida" ++ + #: ../camel/camel-cipher-context.c:102 + msgid "Signing is not supported by this cipher" + msgstr "Aquest xifratge no pot signar" +@@ -1353,15 +1417,19 @@ msgstr "No podeu importar claus amb aque + msgid "You may not export keys with this cipher" + msgstr "No podeu exportar claus amb aquest xifratge" + +-#: ../camel/camel-data-cache.c:137 ++#: ../camel/camel-data-cache.c:136 + msgid "Unable to create cache path" + msgstr "No s'ha pogut crear el camí a la memòria cau" + +-#: ../camel/camel-data-cache.c:384 ++#: ../camel/camel-data-cache.c:381 + #, c-format + msgid "Could not remove cache entry: %s: %s" + msgstr "No s'ha pogut suprimir l'entrada de la memòria cau: %s. %s" + ++#: ../camel/camel-db.c:102 ++msgid "Insufficient memory" ++msgstr "No hi ha prou memòria" ++ + #: ../camel/camel-disco-diary.c:198 + #, c-format + msgid "" +@@ -1374,7 +1442,8 @@ msgstr "" + "torneu a connectar a la xarxa." + + #: ../camel/camel-disco-diary.c:261 +-#, fuzzy, c-format ++#: ../camel/providers/imap/camel-imap-journal.c:299 ++#, c-format + msgid "" + "Could not open '%s':\n" + "%s\n" +@@ -1396,97 +1465,100 @@ msgstr "Copia el contingut de la carpeta + msgid "Downloading new messages for offline mode" + msgstr "S'estan baixant els missatges nous per treballar fora de línia" + +-#: ../camel/camel-disco-folder.c:468 ++#: ../camel/camel-disco-folder.c:469 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "S'està preparant la carpeta «%s» per treballar fora de línia" + + #: ../camel/camel-disco-store.c:403 +-#: ../camel/providers/imap/camel-imap-store.c:3026 ++#: ../camel/providers/imap/camel-imap-store.c:1002 ++#: ../camel/providers/imap/camel-imap-store.c:1810 ++#: ../camel/providers/imap/camel-imap-store.c:2226 ++#: ../camel/providers/imap/camel-imap-store.c:2994 + msgid "You must be working online to complete this operation" + msgstr "Heu d'estar en línia per a completar aquesta operació" + +-#: ../camel/camel-exception.c:264 ++#: ../camel/camel-exception.c:262 + msgid "No description available" + msgstr "No hi ha cap descripció disponible" + +-#: ../camel/camel-filter-driver.c:786 ++#: ../camel/camel-filter-driver.c:785 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "No s'ha pogut crear el procés fill «%s»: %s" + +-#: ../camel/camel-filter-driver.c:828 ++#: ../camel/camel-filter-driver.c:827 + #, c-format + msgid "Invalid message stream received from %s: %s" +-msgstr "S'ha rebut un flux de missatge invàlid de %s: %s" ++msgstr "S'ha rebut un flux de missatge no vàlid de %s: %s" + +-#: ../camel/camel-filter-driver.c:1017 ../camel/camel-filter-driver.c:1026 ++#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025 + msgid "Syncing folders" + msgstr "S'estan sincronitzant les carpetes" + +-#: ../camel/camel-filter-driver.c:1115 ../camel/camel-filter-driver.c:1495 ++#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1520 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "S'ha produït un error en analitzar el filtre: %s. %s" + +-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1504 ++#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1529 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "S'ha produït un error en executar el filtre: %s. %s" + +-#: ../camel/camel-filter-driver.c:1192 ++#: ../camel/camel-filter-driver.c:1211 + msgid "Unable to open spool folder" + msgstr "No s'ha pogut obrir la carpeta per a cues" + +-#: ../camel/camel-filter-driver.c:1201 ++#: ../camel/camel-filter-driver.c:1220 + msgid "Unable to process spool folder" + msgstr "No s'ha pogut processar la carpeta per a cues" + +-#: ../camel/camel-filter-driver.c:1216 ++#: ../camel/camel-filter-driver.c:1236 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "S'està obtenint el missatge %d (%d%%)" + +-#: ../camel/camel-filter-driver.c:1220 ++#: ../camel/camel-filter-driver.c:1240 + msgid "Cannot open message" + msgstr "No es pot obrir el missatge" + +-#: ../camel/camel-filter-driver.c:1221 ../camel/camel-filter-driver.c:1234 ++#: ../camel/camel-filter-driver.c:1241 ../camel/camel-filter-driver.c:1259 + #, c-format + msgid "Failed on message %d" + msgstr "S'ha produït un error en el missatge %d" + +-#: ../camel/camel-filter-driver.c:1248 ../camel/camel-filter-driver.c:1339 ++#: ../camel/camel-filter-driver.c:1273 ../camel/camel-filter-driver.c:1364 + msgid "Syncing folder" + msgstr "S'està sincronitzant la carpeta" + +-#: ../camel/camel-filter-driver.c:1252 ../camel/camel-filter-driver.c:1344 ++#: ../camel/camel-filter-driver.c:1277 ../camel/camel-filter-driver.c:1369 + msgid "Complete" + msgstr "Acabat" + +-#: ../camel/camel-filter-driver.c:1309 ++#: ../camel/camel-filter-driver.c:1334 + #, c-format + msgid "Getting message %d of %d" + msgstr "S'està obtenint el missatge %d de %d" + +-#: ../camel/camel-filter-driver.c:1324 ++#: ../camel/camel-filter-driver.c:1349 + #, c-format + msgid "Failed at message %d of %d" + msgstr "No s'ha pogut obtenir el missatge %d de %d" + +-#: ../camel/camel-filter-search.c:139 ++#: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" + msgstr "No s'ha pogut obtenir el missatge" + +-#: ../camel/camel-filter-search.c:402 ++#: ../camel/camel-filter-search.c:401 + msgid "Invalid arguments to (system-flag)" + msgstr "Els arguments per a (system-flag) no són vàlids" + +-#: ../camel/camel-filter-search.c:417 ++#: ../camel/camel-filter-search.c:416 + msgid "Invalid arguments to (user-tag)" + msgstr "Els arguments per a (user-tag) no són vàlids" + +-#: ../camel/camel-filter-search.c:582 ++#: ../camel/camel-filter-search.c:581 + #, c-format + msgid "Failed to create create child process '%s': %s" + msgstr "No s'ha pogut crear el procés fill «%s»: %s" +@@ -1497,7 +1569,7 @@ msgstr "No s'ha pogut crear el procés f + msgid "Error executing filter search: %s: %s" + msgstr "S'ha produït un error en executar la cerca de filtres: %s. %s" + +-#: ../camel/camel-folder-search.c:358 ../camel/camel-folder-search.c:480 ++#: ../camel/camel-folder-search.c:335 ../camel/camel-folder-search.c:447 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -1506,7 +1578,7 @@ msgstr "" + "No s'ha pogut analitzar l'expressió de cerca: %s.\n" + "%s" + +-#: ../camel/camel-folder-search.c:368 ../camel/camel-folder-search.c:490 ++#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:457 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -1515,69 +1587,69 @@ msgstr "" + "S'ha produït un error en executar l'expressió de cerca %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:677 ../camel/camel-folder-search.c:712 ++#: ../camel/camel-folder-search.c:649 ../camel/camel-folder-search.c:692 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) necessita un únic resultat booleà" + +-#: ../camel/camel-folder-search.c:765 ++#: ../camel/camel-folder-search.c:745 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) no és permès dins de %s" + +-#: ../camel/camel-folder-search.c:771 ../camel/camel-folder-search.c:778 ++#: ../camel/camel-folder-search.c:751 ../camel/camel-folder-search.c:758 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) necessita una cadena de tipus de concordança" + +-#: ../camel/camel-folder-search.c:805 ++#: ../camel/camel-folder-search.c:785 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) espera un resultat de tipus array (matriu)" + +-#: ../camel/camel-folder-search.c:814 ++#: ../camel/camel-folder-search.c:794 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) espera el conjunt de carpetes" + +-#: ../camel/camel-folder-search.c:909 ++#: ../camel/camel-folder-search.c:889 + #, c-format + msgid "Performing query on unknown header: %s" + msgstr "S'està realitzant una sol·licitud en una capçalera desconeguda: %s" + +-#: ../camel/camel-folder.c:628 ++#: ../camel/camel-folder.c:693 + #, c-format + msgid "Unsupported operation: append message: for %s" + msgstr "L'operació d'afegir un missatge per a %s no està implementada" + +-#: ../camel/camel-folder.c:1250 ++#: ../camel/camel-folder.c:1349 + #, c-format + msgid "Unsupported operation: search by expression: for %s" + msgstr "L'operació de cerca per expressió per a %s no està implementada" + +-#: ../camel/camel-folder.c:1291 ++#: ../camel/camel-folder.c:1390 + #, c-format + msgid "Unsupported operation: search by UIDs: for %s" + msgstr "" + "L'operació de cerca per identificador d'usuari per a %s no està implementada" + +-#: ../camel/camel-folder.c:1407 ++#: ../camel/camel-folder.c:1506 + msgid "Moving messages" + msgstr "S'estan movent els missatges" + +-#: ../camel/camel-folder.c:1407 ++#: ../camel/camel-folder.c:1506 + msgid "Copying messages" + msgstr "S'estan copiant els missatges" + +-#: ../camel/camel-folder.c:1750 ++#: ../camel/camel-folder.c:1852 + msgid "Learning junk" + msgstr "S'està aprenent què és brossa" + +-#: ../camel/camel-folder.c:1767 ++#: ../camel/camel-folder.c:1869 + msgid "Learning non-junk" + msgstr "S'està aprenent què no és brossa" + +-#: ../camel/camel-folder.c:1786 ++#: ../camel/camel-folder.c:1888 + msgid "Filtering new message(s)" + msgstr "S'estan filtrant els missatges nous" + +@@ -1620,7 +1692,7 @@ msgstr "" + "de l'usuari: «%s»" + + #: ../camel/camel-gpg-context.c:837 +-#, fuzzy, c-format ++#, c-format + msgid "Unexpected request from GnuPG for '%s'" + msgstr "Sol·licitud inesperada del GnuPG per a «%s»" + +@@ -1713,15 +1785,9 @@ msgstr "No s'ha pogut analitzar el conti + + #: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875 + #: ../camel/camel-tcp-stream-openssl.c:635 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1570 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1609 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1654 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1710 +-#: ../camel/providers/imap4/camel-imap4-store.c:823 +-#: ../camel/providers/imap4/camel-imap4-store.c:1577 + #: ../camel/providers/imap4/camel-imap4-utils.c:624 +-#: ../camel/providers/smtp/camel-smtp-transport.c:164 +-#: ../camel/providers/smtp/camel-smtp-transport.c:219 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:221 + msgid "Unknown" + msgstr "Es desconeix" + +@@ -1871,37 +1937,37 @@ msgid "Syncing messages in folder '%s' t + msgstr "S'estan sincronitzant els missatges de la carpeta «%s» al disk" + + #: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "No es pot escriure el diari fora de línia per a la carpeta «%s»: %s" + +-#: ../camel/camel-provider.c:62 ++#: ../camel/camel-provider.c:60 + msgid "Virtual folder email provider" + msgstr "Proveïdor de correu de la carpeta virtual" + +-#: ../camel/camel-provider.c:64 ++#: ../camel/camel-provider.c:62 + msgid "For reading mail as a query of another set of folders" + msgstr "Per llegir correu com a consulta d'un altre joc de carpetes" + +-#: ../camel/camel-provider.c:187 ++#: ../camel/camel-provider.c:184 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." + msgstr "" + "No s'ha pogut carregar %s: no es poden carregar mòduls en aquest sistema." + +-#: ../camel/camel-provider.c:196 ++#: ../camel/camel-provider.c:193 + #, c-format + msgid "Could not load %s: %s" + msgstr "No s'ha pogut carregar %s: %s" + +-#: ../camel/camel-provider.c:204 ++#: ../camel/camel-provider.c:201 + #, c-format + msgid "Could not load %s: No initialization code in module." + msgstr "" + "No s'ha pogut carregar %s: el mòdul no conté cap codi d'inicialització." + +-#: ../camel/camel-provider.c:376 ../camel/camel-session.c:177 +-#, fuzzy, c-format ++#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177 ++#, c-format + msgid "No provider available for protocol '%s'" + msgstr "No hi ha cap proveïdor disponible per al protocol «%s»" + +@@ -1979,8 +2045,8 @@ msgstr "El desafiament del servidor no + #: ../camel/camel-sasl-digest-md5.c:860 + msgid "Server challenge contained invalid \"Quality of Protection\" token" + msgstr "" +-"El desafiament del servidor contenia un element «Qualitat de la protecció» " +-"invàlid" ++"El desafiament del servidor contenia un element «Qualitat de la protecció» no " ++"vàlid" + + #: ../camel/camel-sasl-digest-md5.c:890 + msgid "Server response did not contain authorization data" +@@ -2022,7 +2088,7 @@ msgid "" + "of name." + msgstr "" + "El paràmetre target_name proporcionat contenia un tipus de nom no " +-"implementat o invàlid." ++"implementat o no vàlid." + + #: ../camel/camel-sasl-gssapi.c:176 + msgid "" +@@ -2037,8 +2103,8 @@ msgid "" + "The input_token contains an invalid signature, or a signature that could not " + "be verified." + msgstr "" +-"L'input_token conté una signatura invàlida, o bé una signatura que no es pot " +-"verificar." ++"L'input_token conté una signatura no vàlida, o bé una signatura que no es " ++"pot verificar." + + #: ../camel/camel-sasl-gssapi.c:185 + msgid "" +@@ -2067,7 +2133,7 @@ msgstr "Les credencials referenciades ha + #: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253 + #: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304 + #: ../camel/camel-sasl-kerberos4.c:231 +-#: ../camel/providers/imap/camel-imap-store.c:1318 ++#: ../camel/providers/imap/camel-imap-store.c:1272 + msgid "Bad authentication response from server." + msgstr "La resposta d'autenticació del servidor és incorrecta." + +@@ -2145,22 +2211,22 @@ msgstr "POP abans que l'autenticació SM + msgid "POP Before SMTP auth using a non-pop source" + msgstr "POP abans que l'autenticació SMTP en usar un origen no POP" + +-#: ../camel/camel-search-private.c:150 ++#: ../camel/camel-search-private.c:149 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "Ha fallat la compilació de l'expressió regular: %s: %s" + +-#: ../camel/camel-service.c:272 ++#: ../camel/camel-service.c:270 + #, c-format + msgid "URL '%s' needs a username component" + msgstr "L'URL «%s» necessita un component de nom d'usuari" + +-#: ../camel/camel-service.c:276 ++#: ../camel/camel-service.c:274 + #, c-format + msgid "URL '%s' needs a host component" + msgstr "L'URL «%s» necessita un component de màquina remota" + +-#: ../camel/camel-service.c:280 ++#: ../camel/camel-service.c:278 + #, c-format + msgid "URL '%s' needs a path component" + msgstr "L'URL «%s» necessita un component de camí" +@@ -2385,48 +2451,48 @@ msgstr "importació de claus: no impleme + msgid "export keys: unimplemented" + msgstr "exportació claus: no implementat" + +-#: ../camel/camel-store.c:219 ++#: ../camel/camel-store.c:272 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:174 + msgid "Cannot get folder: Invalid operation on this store" + msgstr "" +-"No s'ha pogut obtenir la carpeta. L'operació és invàlida en aquest magatzem" ++"No s'ha pogut obtenir la carpeta. L'operació no és vàlida en aquest magatzem" + +-#: ../camel/camel-store.c:252 +-#, fuzzy, c-format ++#: ../camel/camel-store.c:305 ++#, c-format + msgid "Cannot create folder '%s': folder exists" + msgstr "No s'ha pogut crear la carpeta «%s»: ja existeix" + +-#: ../camel/camel-store.c:316 ++#: ../camel/camel-store.c:369 + msgid "Cannot create folder: Invalid operation on this store" + msgstr "" +-"No s'ha pogut crear la carpeta. L'operació és invàlida en aquest magatzem" ++"No s'ha pogut crear la carpeta. L'operació no és vàlida en aquest magatzem" + +-#: ../camel/camel-store.c:344 ++#: ../camel/camel-store.c:397 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "No s'ha pogut crear la carpeta: %s. La carpeta existeix" + +-#: ../camel/camel-store.c:408 ../camel/camel-vee-store.c:369 +-#: ../camel/providers/local/camel-maildir-store.c:218 ++#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384 ++#: ../camel/providers/local/camel-maildir-store.c:219 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida" + +-#: ../camel/camel-store.c:458 ../camel/camel-vee-store.c:406 +-#: ../camel/providers/local/camel-maildir-store.c:290 ++#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421 ++#: ../camel/providers/local/camel-maildir-store.c:291 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "" + "No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida" + + #. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:799 ../camel/camel-vtrash-folder.c:52 +-#: ../camel/providers/imap/camel-imap-store.c:1078 ++#: ../camel/camel-store.c:856 ../camel/camel-vtrash-folder.c:53 ++#: ../camel/providers/imap/camel-imap-store.c:1060 + msgid "Trash" + msgstr "Paperera" + + #. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:802 ../camel/camel-vtrash-folder.c:54 ++#: ../camel/camel-store.c:859 ../camel/camel-vtrash-folder.c:55 + msgid "Junk" + msgstr "Brossa" + +@@ -2547,7 +2613,7 @@ msgstr "La utilització de les claus no + msgid "Error in application verification" + msgstr "S'ha produït un error en la verificació de l'aplicació" + +-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:879 ++#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880 + #, c-format + msgid "" + "Issuer: %s\n" +@@ -2560,11 +2626,11 @@ msgstr "" + "Empremta: %s\n" + "Signatura: %s" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "GOOD" + msgstr "Correcte" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "BAD" + msgstr "Incorrecte" + +@@ -2588,7 +2654,7 @@ msgstr "" + "Voleu acceptar-lo?" + + #. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:889 ++#: ../camel/camel-tcp-stream-ssl.c:890 + #, c-format + msgid "" + "SSL Certificate check for %s:\n" +@@ -2603,7 +2669,7 @@ msgstr "" + "\n" + "Voleu acceptar-lo?" + +-#: ../camel/camel-tcp-stream-ssl.c:933 ++#: ../camel/camel-tcp-stream-ssl.c:934 + #, c-format + msgid "" + "Certificate problem: %s\n" +@@ -2612,7 +2678,7 @@ msgstr "" + "Hi ha un problema amb el certificat: %s\n" + "Emissor: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:985 ++#: ../camel/camel-tcp-stream-ssl.c:986 + #, c-format + msgid "" + "Bad certificate domain: %s\n" +@@ -2621,7 +2687,7 @@ msgstr "" + "El domini del certificat és incorrecte: %s\n" + "Emissor: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1003 ++#: ../camel/camel-tcp-stream-ssl.c:1004 + #, c-format + msgid "" + "Certificate expired: %s\n" +@@ -2630,7 +2696,7 @@ msgstr "" + "Ha caducat el certificat: %s\n" + "Emissor: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1020 ++#: ../camel/camel-tcp-stream-ssl.c:1021 + #, c-format + msgid "" + "Certificate revocation list expired: %s\n" +@@ -2640,48 +2706,48 @@ msgstr "" + "Emissor: %s" + + #: ../camel/camel-url.c:313 +-#, fuzzy, c-format ++#, c-format + msgid "Could not parse URL '%s'" + msgstr "No s'ha pogut analitzar l'URL «%s»" + +-#: ../camel/camel-vee-folder.c:486 +-#, fuzzy, c-format ++#: ../camel/camel-vee-folder.c:584 ++#, c-format + msgid "Error storing '%s': %s" + msgstr "S'ha produït un error en emmagatzemar «%s»: %s" + +-#: ../camel/camel-vee-folder.c:528 ++#: ../camel/camel-vee-folder.c:638 + #, c-format + msgid "No such message %s in %s" + msgstr "No existeix el missatge %s a %s" + +-#: ../camel/camel-vee-folder.c:653 ../camel/camel-vee-folder.c:659 ++#: ../camel/camel-vee-folder.c:761 ../camel/camel-vee-folder.c:767 + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "No s'han pogut copiar o moure els missatges a la carpeta virtual" + +-#: ../camel/camel-vee-store.c:102 ../camel/camel-vee-store.c:345 ++#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115 ++#: ../camel/camel-vee-store.c:360 + msgid "Unmatched" + msgstr "Sense coincidència" + +-#: ../camel/camel-vee-store.c:392 ++#: ../camel/camel-vee-store.c:407 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "No s'ha pogut suprimir la carpeta: %s: no existeix" + +-#: ../camel/camel-vee-store.c:414 ++#: ../camel/camel-vee-store.c:429 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "No s'ha pogut canviar el nom de la carpeta: %s: no existeix" + +-#: ../camel/camel-vtrash-folder.c:53 ++#: ../camel/camel-vtrash-folder.c:54 + msgid "Cannot copy messages to the Trash folder" + msgstr "No es poden copiar els missatges a la Paperera" + +-#: ../camel/camel-vtrash-folder.c:55 ++#: ../camel/camel-vtrash-folder.c:56 + msgid "Cannot copy messages to the Junk folder" + msgstr "No es poden copiar els missatges a la Brossa" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2486 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #, c-format + msgid "" + "Cannot get message: %s\n" +@@ -2690,57 +2756,56 @@ msgstr "" + "No es pot obtenir el missatge: %s\n" + " %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2486 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #: ../camel/providers/local/camel-maildir-folder.c:251 + #: ../camel/providers/local/camel-mbox-folder.c:348 + #: ../camel/providers/local/camel-mh-folder.c:204 + msgid "No such message" + msgstr "No existeix el missatge" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:130 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:128 + #: ../camel/providers/imap4/camel-imap4-folder.c:812 + #: ../camel/providers/nntp/camel-nntp-folder.c:156 + #: ../camel/providers/nntp/camel-nntp-folder.c:232 +-#: ../camel/providers/nntp/camel-nntp-folder.c:371 ++#: ../camel/providers/nntp/camel-nntp-folder.c:373 + #: ../camel/providers/pop3/camel-pop3-folder.c:266 +-#: ../camel/providers/pop3/camel-pop3-folder.c:560 +-#: ../camel/providers/pop3/camel-pop3-folder.c:621 +-#: ../camel/providers/pop3/camel-pop3-folder.c:639 ++#: ../camel/providers/pop3/camel-pop3-folder.c:559 ++#: ../camel/providers/pop3/camel-pop3-folder.c:620 ++#: ../camel/providers/pop3/camel-pop3-folder.c:638 + msgid "User canceled" + msgstr "Cancel·lat per l'usuari" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:135 + #: ../camel/providers/imap4/camel-imap4-folder.c:817 + #: ../camel/providers/nntp/camel-nntp-folder.c:147 + #: ../camel/providers/nntp/camel-nntp-folder.c:149 + #: ../camel/providers/nntp/camel-nntp-folder.c:158 + #: ../camel/providers/nntp/camel-nntp-folder.c:234 +-#: ../camel/providers/pop3/camel-pop3-folder.c:388 +-#: ../camel/providers/pop3/camel-pop3-folder.c:563 +-#: ../camel/providers/pop3/camel-pop3-folder.c:624 +-#: ../camel/providers/pop3/camel-pop3-folder.c:631 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/pop3/camel-pop3-folder.c:386 ++#: ../camel/providers/pop3/camel-pop3-folder.c:562 ++#: ../camel/providers/pop3/camel-pop3-folder.c:623 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 ++#: ../camel/providers/pop3/camel-pop3-folder.c:641 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "No es pot obtenir el missatge %s: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:154 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:162 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2169 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:152 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:160 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164 + #: ../camel/providers/imap4/camel-imap4-folder.c:835 + msgid "This message is not available in offline mode." + msgstr "Aquest missatge no està disponible en mode fora de línia." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:174 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1702 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1753 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:172 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:179 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747 + msgid "Could not get message" + msgstr "No s'ha pogut obtenir el missatge." + + #: ../camel/providers/groupwise/camel-groupwise-folder.c:818 +-#: ../camel/providers/imap/camel-imap-folder.c:268 ++#: ../camel/providers/imap/camel-imap-folder.c:248 + #, c-format + msgid "Could not load summary for %s" + msgstr "No s'ha pogut carregar el resum per a %s" +@@ -2752,36 +2817,36 @@ msgstr "La carpeta de la Paperera està + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1248 + #: ../camel/providers/groupwise/camel-groupwise-store.c:623 + #: ../camel/providers/groupwise/camel-groupwise-store.c:736 +-#: ../camel/providers/imap/camel-imap-folder.c:2858 +-#: ../camel/providers/imap/camel-imap-folder.c:2932 ++#: ../camel/providers/imap/camel-imap-folder.c:3193 ++#: ../camel/providers/imap/camel-imap-folder.c:3269 + #, c-format + msgid "Fetching summary information for new messages in %s" + msgstr "S'està recollint la informació del resum per als missatges nous a %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2036 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078 +-#, fuzzy, c-format ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073 ++#, c-format + msgid "Cannot append message to folder '%s': %s" + msgstr "No es pot afegir el missatge a la carpeta «%s»: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2066 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061 + #, c-format + msgid "Cannot create message: %s" + msgstr "No es pot crear el missatge: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:284 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:285 + #, c-format + msgid "Cannot get folder container %s" + msgstr "No s'ha pogut obtenir el contenidor de la carpeta %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:348 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:349 + #: ../camel/providers/imap4/camel-imap4-journal.c:319 + msgid "Cannot append message in offline mode: cache unavailable" + msgstr "" + "No es pot afegir el missatge en mode fora de línia: la memòria cau no està " + "disponible" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:364 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:365 + #: ../camel/providers/imap4/camel-imap4-journal.c:335 + #, c-format + msgid "Cannot append message in offline mode: %s" +@@ -2800,7 +2865,7 @@ msgid "C_heck for new messages in all fo + msgstr "Comprova si _hi ha nous missatges a totes les carpetes" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:60 +-#: ../camel/providers/imap/camel-imap-provider.c:66 ++#: ../camel/providers/imap/camel-imap-provider.c:68 + #: ../camel/providers/imap4/camel-imap4-provider.c:52 + #: ../camel/providers/local/camel-local-provider.c:46 + #: ../camel/providers/local/camel-local-provider.c:86 +@@ -2819,7 +2884,7 @@ msgid "Check new messages for J_unk cont + msgstr "Comprova si hi ha correu _brossa al contingut dels missatges nous" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:66 +-#: ../camel/providers/imap/camel-imap-provider.c:72 ++#: ../camel/providers/imap/camel-imap-provider.c:74 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Comprova només si hi ha correu brossa a la bústia d'_entrada" + +@@ -2845,7 +2910,7 @@ msgstr "Per accedir als servidors GroupW + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:106 + #: ../camel/providers/hula/camel-hula-provider.c:95 +-#: ../camel/providers/imap/camel-imap-provider.c:98 ++#: ../camel/providers/imap/camel-imap-provider.c:100 + #: ../camel/providers/imap4/camel-imap4-provider.c:84 + #: ../camel/providers/imapp/camel-imapp-provider.c:67 + #: ../camel/providers/nntp/camel-nntp-provider.c:74 +@@ -2865,7 +2930,7 @@ msgid "Host or user not available in url + msgstr "La màquina o l'usuari no estan disponibles en l'URL" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:206 +-#: ../camel/providers/imap/camel-imap-store.c:1402 ++#: ../camel/providers/imap/camel-imap-store.c:1356 + msgid "You did not enter a password." + msgstr "No heu introduït cap contrasenya." + +@@ -2876,35 +2941,35 @@ msgstr "" + "del servidor" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:532 +-#: ../camel/providers/imap/camel-imap-store.c:1913 +-#: ../camel/providers/imap/camel-imap-store.c:2111 ++#: ../camel/providers/imap/camel-imap-store.c:1846 ++#: ../camel/providers/imap/camel-imap-store.c:2044 + #, c-format + msgid "No such folder %s" + msgstr "No existeix la carpeta %s" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1217 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1219 + msgid "Cannot create GroupWise folders in offline mode." + msgstr "No es poden crear carpetes del GroupWise en mode fora de línia." + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1231 +-#: ../camel/providers/imap/camel-imap-store.c:1988 +-#: ../camel/providers/imap/camel-imap-store.c:2364 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1233 ++#: ../camel/providers/imap/camel-imap-store.c:1921 ++#: ../camel/providers/imap/camel-imap-store.c:2301 + msgid "The parent folder is not allowed to contain subfolders" + msgstr "La carpeta pare no pot contenir subcarpetes" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1307 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328 +-#, fuzzy, c-format ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1309 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1330 ++#, c-format + msgid "Cannot rename Groupwise folder '%s' to '%s'" + msgstr "No s'ha pogut canviar el nom de la carpeta Groupwise «%s» a «%s»" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1360 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:121 + #, c-format + msgid "GroupWise server %s" + msgstr "Servidor Groupwise %s" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1364 + #, c-format + msgid "GroupWise service for %s on %s" + msgstr "Servei Groupwise per a %s a %s" +@@ -2940,35 +3005,35 @@ msgid "Checking for New Mail" + msgstr "Comprovació de correu nou" + + #: ../camel/providers/hula/camel-hula-provider.c:54 +-#: ../camel/providers/imap/camel-imap-provider.c:50 ++#: ../camel/providers/imap/camel-imap-provider.c:52 + msgid "Connection to Server" + msgstr "Connexió al servidor" + + #: ../camel/providers/hula/camel-hula-provider.c:56 +-#: ../camel/providers/imap/camel-imap-provider.c:52 ++#: ../camel/providers/imap/camel-imap-provider.c:54 + msgid "_Use custom command to connect to server" + msgstr "_Usa una ordre personalitzada per a connectar amb el servidor" + + #: ../camel/providers/hula/camel-hula-provider.c:58 +-#: ../camel/providers/imap/camel-imap-provider.c:54 ++#: ../camel/providers/imap/camel-imap-provider.c:56 + msgid "Command:" + msgstr "Ordre:" + + #: ../camel/providers/hula/camel-hula-provider.c:61 +-#: ../camel/providers/imap/camel-imap-provider.c:58 ++#: ../camel/providers/imap/camel-imap-provider.c:60 + #: ../camel/providers/imap4/camel-imap4-provider.c:44 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Carpetes" + + #: ../camel/providers/hula/camel-hula-provider.c:63 +-#: ../camel/providers/imap/camel-imap-provider.c:60 ++#: ../camel/providers/imap/camel-imap-provider.c:62 + #: ../camel/providers/imap4/camel-imap4-provider.c:46 + msgid "_Show only subscribed folders" + msgstr "Mo_stra només les carpetes subscrites" + + #: ../camel/providers/hula/camel-hula-provider.c:65 +-#: ../camel/providers/imap/camel-imap-provider.c:62 ++#: ../camel/providers/imap/camel-imap-provider.c:64 + #: ../camel/providers/imap4/camel-imap4-provider.c:48 + msgid "O_verride server-supplied folder namespace" + msgstr "Ignora l'espai de noms de carpeta proporcionat pel ser_vidor" +@@ -2991,22 +3056,32 @@ msgstr "" + "Amb aquesta opció es connectarà a un servidor Hula mitjançant una " + "contrasenya de text sense xifrar." + +-#: ../camel/providers/imap/camel-imap-command.c:224 +-#: ../camel/providers/imap/camel-imap-command.c:266 +-#: ../camel/providers/imap/camel-imap-command.c:472 +-#: ../camel/providers/imap/camel-imap-store.c:3066 ++#: ../camel/providers/imap/camel-imap-command.c:183 ++#: ../camel/providers/imap/camel-imap-command.c:267 ++msgid "No output stream" ++msgstr "No hi ha cap flux de sortida" ++ ++#: ../camel/providers/imap/camel-imap-command.c:188 ++#: ../camel/providers/imap/camel-imap-command.c:272 ++msgid "No input stream" ++msgstr "No hi ha cap flux d'entrada" ++ ++#: ../camel/providers/imap/camel-imap-command.c:231 ++#: ../camel/providers/imap/camel-imap-command.c:280 ++#: ../camel/providers/imap/camel-imap-command.c:494 ++#: ../camel/providers/imap/camel-imap-store.c:3034 + msgid "Operation cancelled" + msgstr "S'ha cancel·lat l'operació" + +-#: ../camel/providers/imap/camel-imap-command.c:311 +-#: ../camel/providers/imap/camel-imap-store.c:3069 ++#: ../camel/providers/imap/camel-imap-command.c:333 ++#: ../camel/providers/imap/camel-imap-store.c:3037 + #, c-format + msgid "Server unexpectedly disconnected: %s" + msgstr "El servidor s'ha desconnectat inesperadament: %s" + + #. for imap ALERT codes, account user@host + #. we might get a ']' from a BAD response since we +12, but who cares? +-#: ../camel/providers/imap/camel-imap-command.c:332 ++#: ../camel/providers/imap/camel-imap-command.c:354 + #, c-format + msgid "" + "Alert from IMAP server %s@%s:\n" +@@ -3015,26 +3090,26 @@ msgstr "" + "Alerta del servidor IMAP %s@%s:\n" + "%s" + +-#: ../camel/providers/imap/camel-imap-command.c:401 ++#: ../camel/providers/imap/camel-imap-command.c:423 + #, c-format + msgid "Unexpected response from IMAP server: %s" + msgstr "Resposta inesperada del servidor IMAP: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:411 ++#: ../camel/providers/imap/camel-imap-command.c:433 + #, c-format + msgid "IMAP command failed: %s" + msgstr "Ha fallat l'ordre IMAP: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:486 ++#: ../camel/providers/imap/camel-imap-command.c:508 + msgid "Server response ended too soon." + msgstr "La resposta del servidor ha finalitzat massa aviat." + +-#: ../camel/providers/imap/camel-imap-command.c:693 ++#: ../camel/providers/imap/camel-imap-command.c:715 + #, c-format + msgid "IMAP server response did not contain %s information" + msgstr "La resposta del servidor IMAP no contenia la informació %s" + +-#: ../camel/providers/imap/camel-imap-command.c:729 ++#: ../camel/providers/imap/camel-imap-command.c:751 + #, c-format + msgid "Unexpected OK response from IMAP server: %s" + msgstr "Resposta OK inesperada del servidor IMAP: %s" +@@ -3043,155 +3118,172 @@ msgstr "Resposta OK inesperada del servi + msgid "Always check for new mail in this folder" + msgstr "Comprova sempre si hi ha correu nou a aquesta carpeta" + +-#: ../camel/providers/imap/camel-imap-folder.c:249 ++#: ../camel/providers/imap/camel-imap-folder.c:229 + #, c-format + msgid "Could not create directory %s: %s" + msgstr "No s'ha pogut crear el directori %s: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:353 +-msgid "Folder was destroyed and recreated on server." +-msgstr "La carpeta es va destruir i es va tornar a crear al servidor." +- + #. Check UIDs and flags of all messages we already know of. +-#: ../camel/providers/imap/camel-imap-folder.c:839 ++#: ../camel/providers/imap/camel-imap-folder.c:844 + #, c-format + msgid "Scanning for changed messages in %s" + msgstr "S'estan cercant els missatges canviats a %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2446 ++#: ../camel/providers/imap/camel-imap-folder.c:1869 ++#, c-format ++msgid "Unexpected response status '%s' after APPEND command" ++msgstr "" ++"S'ha obtingut un estat de resposta inesperat («%s») després de l'ordre APPEND" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1884 ++msgid "No response on continuation after APPEND command" ++msgstr "" ++"No s'ha obtingut cap resposta en la continuació després de l'ordre APPEND" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1926 ++msgid "Unknown error occurred during APPEND command!" ++msgstr "S'ha produït un error desconegut en executar l'ordre APPEND" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2738 + #, c-format + msgid "Unable to retrieve message: %s" + msgstr "No es pot obtenir el missatge: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2525 +-#: ../camel/providers/imap/camel-imap-folder.c:3226 ++#: ../camel/providers/imap/camel-imap-folder.c:2779 ++#, c-format ++msgid "Cannot get message with message ID %s: %s" ++msgstr "No es pot obtenir el missatge amb l'identificador %s: %s" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2780 ++msgid "No such message available." ++msgstr "No existeix tal missatge." ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2819 ++#: ../camel/providers/imap/camel-imap-folder.c:3571 + #: ../camel/providers/nntp/camel-nntp-folder.c:220 + msgid "This message is not currently available" + msgstr "Aquest missatge no està disponible actualment" + +-#: ../camel/providers/imap/camel-imap-folder.c:3061 ++#: ../camel/providers/imap/camel-imap-folder.c:3398 + #, c-format + msgid "Incomplete server response: no information provided for message %d" + msgstr "" + "Resposta incompleta del servidor: no s'ha proporcionat informació per al " + "missatge %d" + +-#: ../camel/providers/imap/camel-imap-folder.c:3069 ++#: ../camel/providers/imap/camel-imap-folder.c:3406 + #, c-format + msgid "Incomplete server response: no UID provided for message %d" + msgstr "" + "Resposta incompleta del servidor: no s'ha proporcionat l'UID per al missatge " + "%d" + +-#: ../camel/providers/imap/camel-imap-folder.c:3082 +-#, c-format +-msgid "" +-"Unexpected server response: Identical UIDs provided for messages %d and %d" +-msgstr "" +-"Resposta inesperada del servidor: s'han proporcionat UIDs idèntics per als " +-"missatges %d i %d" +- +-#: ../camel/providers/imap/camel-imap-folder.c:3264 ++#: ../camel/providers/imap/camel-imap-folder.c:3609 + msgid "Could not find message body in FETCH response." + msgstr "No s'ha pogut trobar el cos del missatge en la resposta a FETCH." + +-#: ../camel/providers/imap/camel-imap-message-cache.c:161 ++#: ../camel/providers/imap/camel-imap-message-cache.c:160 ++#: ../camel/providers/imap/camel-imap-message-cache.c:220 + #, c-format + msgid "Could not open cache directory: %s" + msgstr "No s'ha pogut obrir el directori de memòria cau: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:267 +-#: ../camel/providers/imap/camel-imap-message-cache.c:324 +-#: ../camel/providers/imap/camel-imap-message-cache.c:355 +-#: ../camel/providers/imap/camel-imap-message-cache.c:387 ++#: ../camel/providers/imap/camel-imap-message-cache.c:307 ++#: ../camel/providers/imap/camel-imap-message-cache.c:364 ++#: ../camel/providers/imap/camel-imap-message-cache.c:395 ++#: ../camel/providers/imap/camel-imap-message-cache.c:427 + #, c-format + msgid "Failed to cache message %s: %s" + msgstr "No s'ha pogut emmagatzemar el missatge %s a la memòria cau: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:438 ++#: ../camel/providers/imap/camel-imap-message-cache.c:478 + #, c-format + msgid "Failed to cache %s: %s" + msgstr "No s'ha pogut emmagatzemar %s a la memòria cau: %s" + +-#: ../camel/providers/imap/camel-imap-provider.c:64 ++#: ../camel/providers/imap/camel-imap-provider.c:48 ++msgid "Ch_eck for new messages in subscribed folders" ++msgstr "Comprova si _hi ha missatges nous a les carpetes subscrites" ++ ++#: ../camel/providers/imap/camel-imap-provider.c:66 + #: ../camel/providers/imap4/camel-imap4-provider.c:50 + msgid "Namespace:" + msgstr "Espai de noms:" + +-#: ../camel/providers/imap/camel-imap-provider.c:68 ++#: ../camel/providers/imap/camel-imap-provider.c:70 + #: ../camel/providers/imap4/camel-imap4-provider.c:54 + msgid "_Apply filters to new messages in INBOX on this server" + msgstr "" + "_Aplica els filtres als missatges nous de la bústia d'entrada d'aquest " + "servidor" + +-#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap/camel-imap-provider.c:72 + msgid "Check new messages for Jun_k contents" + msgstr "Comprova si hi ha brossa al contingut dels missatges _nous" + +-#: ../camel/providers/imap/camel-imap-provider.c:74 ++#: ../camel/providers/imap/camel-imap-provider.c:76 + #: ../camel/providers/imap4/camel-imap4-provider.c:60 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "Sincronit_za localment el correu remot de manera automàtica" + +-#: ../camel/providers/imap/camel-imap-provider.c:81 ++#: ../camel/providers/imap/camel-imap-provider.c:83 + msgid "IMAP" + msgstr "IMAP" + +-#: ../camel/providers/imap/camel-imap-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:85 + msgid "For reading and storing mail on IMAP servers." + msgstr "Per a llegir i emmagatzemar correu en servidors IMAP." + +-#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap/camel-imap-provider.c:102 + #: ../camel/providers/imapp/camel-imapp-provider.c:69 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Amb aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya " + "de text sense xifrar." + +-#: ../camel/providers/imap/camel-imap-store.c:457 ++#: ../camel/providers/imap/camel-imap-store.c:436 + #: ../camel/providers/imap4/camel-imap4-store.c:214 + #, c-format + msgid "IMAP server %s" + msgstr "Servidor d'IMAP %s" + +-#: ../camel/providers/imap/camel-imap-store.c:459 ++#: ../camel/providers/imap/camel-imap-store.c:438 + #: ../camel/providers/imap4/camel-imap4-store.c:216 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "Servei d'IMAP per a %s a %s" + +-#: ../camel/providers/imap/camel-imap-store.c:588 +-#: ../camel/providers/imap/camel-imap-store.c:603 ++#: ../camel/providers/imap/camel-imap-store.c:567 ++#: ../camel/providers/imap/camel-imap-store.c:582 + #: ../camel/providers/imap4/camel-imap4-store.c:251 + #: ../camel/providers/imap4/camel-imap4-store.c:266 + #: ../camel/providers/nntp/camel-nntp-store.c:183 + #: ../camel/providers/nntp/camel-nntp-store.c:198 + #: ../camel/providers/pop3/camel-pop3-store.c:171 + #: ../camel/providers/pop3/camel-pop3-store.c:185 +-#: ../camel/providers/smtp/camel-smtp-transport.c:258 +-#: ../camel/providers/smtp/camel-smtp-transport.c:273 ++#: ../camel/providers/smtp/camel-smtp-transport.c:260 ++#: ../camel/providers/smtp/camel-smtp-transport.c:275 + #, c-format + msgid "Could not connect to %s: %s" + msgstr "No s'ha pogut connectar a %s: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:589 ++#: ../camel/providers/imap/camel-imap-store.c:568 + #: ../camel/providers/imap4/camel-imap4-store.c:252 + #: ../camel/providers/nntp/camel-nntp-store.c:184 + #: ../camel/providers/pop3/camel-pop3-store.c:172 +-#: ../camel/providers/smtp/camel-smtp-transport.c:259 ++#: ../camel/providers/smtp/camel-smtp-transport.c:261 + msgid "SSL unavailable" + msgstr "L'SSL no està disponible" + +-#: ../camel/providers/imap/camel-imap-store.c:600 +-#: ../camel/providers/imap/camel-imap-store.c:882 ++#: ../camel/providers/imap/camel-imap-store.c:579 ++#: ../camel/providers/imap/camel-imap-store.c:861 + msgid "Connection cancelled" + msgstr "S'ha cancel·lat la connexió" + +-#: ../camel/providers/imap/camel-imap-store.c:711 +-#: ../camel/providers/imap/camel-imap-store.c:730 +-#: ../camel/providers/imap/camel-imap-store.c:736 +-#: ../camel/providers/imap/camel-imap-store.c:762 ++#: ../camel/providers/imap/camel-imap-store.c:690 ++#: ../camel/providers/imap/camel-imap-store.c:709 ++#: ../camel/providers/imap/camel-imap-store.c:715 ++#: ../camel/providers/imap/camel-imap-store.c:741 + #: ../camel/providers/imap4/camel-imap4-store.c:314 + #: ../camel/providers/imap4/camel-imap4-store.c:329 + #: ../camel/providers/imap4/camel-imap4-store.c:338 +@@ -3199,67 +3291,67 @@ msgstr "S'ha cancel·lat la connexió" + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:712 +-#: ../camel/providers/smtp/camel-smtp-transport.c:331 ++#: ../camel/providers/imap/camel-imap-store.c:691 ++#: ../camel/providers/smtp/camel-smtp-transport.c:333 + msgid "STARTTLS not supported" + msgstr "No està implementat l'STARTTLS" + +-#: ../camel/providers/imap/camel-imap-store.c:731 ++#: ../camel/providers/imap/camel-imap-store.c:710 + msgid "SSL negotiations failed" + msgstr "S'ha produït un error en la negociació SSL" + +-#: ../camel/providers/imap/camel-imap-store.c:737 ++#: ../camel/providers/imap/camel-imap-store.c:716 + #: ../camel/providers/imap4/camel-imap4-store.c:339 +-#: ../camel/providers/smtp/camel-smtp-transport.c:370 ++#: ../camel/providers/smtp/camel-smtp-transport.c:372 + msgid "SSL is not available in this build" + msgstr "Aquest muntatge no disposa d'SSL" + +-#: ../camel/providers/imap/camel-imap-store.c:885 ++#: ../camel/providers/imap/camel-imap-store.c:864 + #, c-format + msgid "Could not connect with command \"%s\": %s" + msgstr "No s'ha pogut connectar amb l'ordre «%s»: %s" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imap/camel-imap-store.c:1070 +-#: ../camel/providers/imap/camel-imap-store.c:2460 +-#: ../camel/providers/imap4/camel-imap4-store-summary.c:367 ++#: ../camel/providers/imap/camel-imap-store.c:1052 ++#: ../camel/providers/imap/camel-imap-store.c:2397 ++#: ../camel/providers/imap4/camel-imap4-store-summary.c:368 + #: ../camel/providers/imap4/camel-imap4-store.c:1408 + #: ../camel/providers/local/camel-maildir-folder.c:77 +-#: ../camel/providers/local/camel-maildir-store.c:218 +-#: ../camel/providers/local/camel-maildir-store.c:290 +-#: ../camel/providers/local/camel-maildir-store.c:514 +-#: ../camel/providers/local/camel-maildir-store.c:527 ++#: ../camel/providers/local/camel-maildir-store.c:219 ++#: ../camel/providers/local/camel-maildir-store.c:291 ++#: ../camel/providers/local/camel-maildir-store.c:517 ++#: ../camel/providers/local/camel-maildir-store.c:530 + #: ../camel/providers/local/camel-spool-store.c:464 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264 + msgid "Inbox" + msgstr "Bústia d'entrada" + +-#: ../camel/providers/imap/camel-imap-store.c:1072 ++#: ../camel/providers/imap/camel-imap-store.c:1054 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263 + msgid "Drafts" + msgstr "Esborranys" + +-#: ../camel/providers/imap/camel-imap-store.c:1074 ++#: ../camel/providers/imap/camel-imap-store.c:1056 + msgid "Sent" + msgstr "Enviat" + +-#: ../camel/providers/imap/camel-imap-store.c:1076 ++#: ../camel/providers/imap/camel-imap-store.c:1058 + msgid "Templates" + msgstr "Plantilles" + +-#: ../camel/providers/imap/camel-imap-store.c:1349 ++#: ../camel/providers/imap/camel-imap-store.c:1303 + #, c-format + msgid "IMAP server %s does not support requested authentication type %s" + msgstr "" + "El servidor IMAP %s no implementa el tipus d'autenticació sol·licitat (%s)" + +-#: ../camel/providers/imap/camel-imap-store.c:1359 +-#: ../camel/providers/smtp/camel-smtp-transport.c:504 ++#: ../camel/providers/imap/camel-imap-store.c:1313 ++#: ../camel/providers/smtp/camel-smtp-transport.c:507 + #, c-format + msgid "No support for authentication type %s" + msgstr "No està implementat el tipus d'autenticació %s" + +-#: ../camel/providers/imap/camel-imap-store.c:1431 ++#: ../camel/providers/imap/camel-imap-store.c:1385 + #, c-format + msgid "" + "Unable to authenticate to IMAP server.\n" +@@ -3270,23 +3362,23 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/imap/camel-imap-store.c:1925 +-#: ../camel/providers/imap/camel-imap-store.c:2302 ++#: ../camel/providers/imap/camel-imap-store.c:1858 ++#: ../camel/providers/imap/camel-imap-store.c:2239 + #: ../camel/providers/imap4/camel-imap4-store.c:959 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "El nom de carpeta «%s» no és vàlid perquè conté el caràcter «%c»" + +-#: ../camel/providers/imap/camel-imap-store.c:2042 +-#: ../camel/providers/local/camel-maildir-store.c:191 ++#: ../camel/providers/imap/camel-imap-store.c:1975 ++#: ../camel/providers/local/camel-maildir-store.c:192 + #: ../camel/providers/local/camel-mbox-store.c:204 + #: ../camel/providers/local/camel-mh-store.c:249 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot create folder '%s': folder exists." + msgstr "No s'ha pogut crear la carpeta «%s»: ja existeix." + +-#: ../camel/providers/imap/camel-imap-store.c:2313 ++#: ../camel/providers/imap/camel-imap-store.c:2250 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "La carpeta pare és desconeguda: %s" +@@ -3308,25 +3400,24 @@ msgid "Unexpected greeting from IMAP ser + msgstr "Salutació inesperada del servidor IMAP %s." + + #: ../camel/providers/imap4/camel-imap4-engine.c:450 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot select folder '%s': Invalid mailbox name" + msgstr "" + "No s'ha pogut seleccionar la carpeta «%s». El nom de la bústia no és vàlid" + + #: ../camel/providers/imap4/camel-imap4-engine.c:456 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot select folder '%s': Bad command" + msgstr "No s'ha pogut seleccionar la carpeta «%s»: ordre incorrecta" + + #: ../camel/providers/imap4/camel-imap4-engine.c:1433 +-#, fuzzy, c-format ++#, c-format + msgid "Failed to send command to IMAP server %s: %s" +-msgstr "S'ha produït un error en enviar l'ordre al servidor IMAP %s: %s" ++msgstr "Ha fallat l'enviament de l'ordre al servidor IMAP %s: %s" + + #: ../camel/providers/imap4/camel-imap4-engine.c:1435 +-#, fuzzy + msgid "service unavailable" +-msgstr "L'SSL no està disponible" ++msgstr "el servei no està disponible" + + #: ../camel/providers/imap4/camel-imap4-engine.c:1569 + #: ../camel/providers/imap4/camel-imap4-engine.c:1608 +@@ -3337,7 +3428,6 @@ msgid "IMAP4 server %s unexpectedly disc + msgstr "El servidor IMAP4 %s s'ha desconnectat inesperadament: %s" + + #: ../camel/providers/imap4/camel-imap4-folder.c:89 +-#, fuzzy + msgid "" + "Enable extended Mailing-List detection required for some filter and vFolder " + "rules" +@@ -3348,88 +3438,95 @@ msgstr "" + #: ../camel/providers/imap4/camel-imap4-folder.c:90 + msgid "Expire cached messages that haven't been read in X seconds" + msgstr "" ++"Marca els missatges de la memòria cau que no s'hagin llegit en X segons com " ++"a vençuts" + + #: ../camel/providers/imap4/camel-imap4-folder.c:91 + msgid "Expire cached messages older than X seconds" + msgstr "" ++"Marca els missatges de la memòria cau que tinguin més d'X segons com a " ++"vençuts" + + #: ../camel/providers/imap4/camel-imap4-folder.c:423 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot access folder '%s': %s" + msgstr "No es pot accedir la carpeta «%s»: %s" + + #: ../camel/providers/imap4/camel-imap4-folder.c:482 +-#, fuzzy, c-format +-msgid "Cannot sync flags to folder '%s': Unknown" +-msgstr "No s'han pogut sincronitzar els marcadors a la carpeta «%s»: desconegut" ++#, c-format ++msgid "Cannot sync flags to folder '%s': Unknown error" ++msgstr "" ++"No s'han pogut sincronitzar els marcadors a la carpeta «%s»: error desconegut" + + #: ../camel/providers/imap4/camel-imap4-folder.c:488 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot sync flags to folder '%s': Bad command" + msgstr "" + "No s'han pogut sincronitzar els marcadors a la carpeta «%s»: ordre incorrecta" + + #: ../camel/providers/imap4/camel-imap4-folder.c:628 +-#, fuzzy, c-format +-msgid "Cannot expunge folder '%s': Unknown" +-msgstr "No s'ha pogut buidar la carpeta «%s»: desconegut" ++#, c-format ++msgid "Cannot expunge folder '%s': Unknown error" ++msgstr "No s'ha pogut buidar la carpeta «%s»: error desconegut" + + #: ../camel/providers/imap4/camel-imap4-folder.c:633 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot expunge folder '%s': Bad command" + msgstr "No s'ha pogut buidar la carpeta «%s»: ordre incorrecta" + + #: ../camel/providers/imap4/camel-imap4-folder.c:889 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot get message %s from folder '%s': No such message" + msgstr "" +-"No es pot obtenir el missatge %s de la carpeta «%s»: no existeix el missatge" ++"No es pot obtenir el missatge %s de la carpeta «%s»: no existeix tal missatge" + + #: ../camel/providers/imap4/camel-imap4-folder.c:894 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot get message %s from folder '%s': Bad command" + msgstr "No es pot obtenir el missatge %s de la carpeta «%s»: ordre incorrecta" + + #: ../camel/providers/imap4/camel-imap4-folder.c:938 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot append message to folder '%s': Folder is read-only" + msgstr "" + "No es pot afegir el missatge a la carpeta «%s»: la carpeta és de només lectura" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1031 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot append message to folder '%s': Unknown error" + msgstr "No es pot afegir el missatge a la carpeta «%s»: error desconegut" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1061 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot append message to folder '%s': Bad command" + msgstr "No es pot afegir el missatge a la carpeta «%s»: ordre incorrecta" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1181 +-#, fuzzy, c-format +-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown" ++#, c-format ++msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" + msgstr "" +-"No es pot moure el missatge de la carpeta «%s» a la carpeta «%s»: desconegut" ++"No es poden moure els missatges de la carpeta «%s» a la carpeta «%s»: error " ++"desconegut" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1185 +-#, fuzzy, c-format +-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown" ++#, c-format ++msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" + msgstr "" +-"No es pot copiar el missatge de la carpeta «%s» a la carpeta «%s»: desconegut" ++"No es poden copiar els missatges de la carpeta «%s» a la carpeta «%s»: error " ++"desconegut" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1193 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot move messages from folder '%s' to folder '%s': Bad command" + msgstr "" +-"No es pot moure el missatge de la carpeta «%s» a la carpeta «%s»: ordre " ++"No es poden moure els missatges de la carpeta «%s» a la carpeta «%s»: ordre " + "incorrecta" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1197 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command" + msgstr "" +-"No es pot copiar el missatge de la carpeta «%s» a la carpeta «%s»: ordre " ++"No es poden copiar els missatges de la carpeta «%s» a la carpeta «%s»: ordre " + "incorrecta" + + #: ../camel/providers/imap4/camel-imap4-provider.c:56 +@@ -3460,7 +3557,7 @@ msgstr "" + #: ../camel/providers/nntp/camel-nntp-store.c:195 + #: ../camel/providers/nntp/camel-nntp-store.c:214 + #: ../camel/providers/pop3/camel-pop3-store.c:182 +-#: ../camel/providers/smtp/camel-smtp-transport.c:270 ++#: ../camel/providers/smtp/camel-smtp-transport.c:272 + msgid "Connection canceled" + msgstr "S'ha cancel·lat la connexió" + +@@ -3497,33 +3594,34 @@ msgid "Cannot create IMAP folders in off + msgstr "No es poden crear carpetes IMAP en mode fora de línia." + + #: ../camel/providers/imap4/camel-imap4-store.c:740 +-#, fuzzy, c-format +-msgid "Cannot get folder '%s' on IMAP server %s: Unknown" +-msgstr "No s'ha pogut obtenir la carpeta «%s» al servidor IMAP %s: desconegut" ++#, c-format ++msgid "Cannot get folder '%s' on IMAP server %s: Unknown error" ++msgstr "" ++"No s'ha pogut obtenir la carpeta «%s» al servidor IMAP %s: error desconegut" + + #: ../camel/providers/imap4/camel-imap4-store.c:821 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot get LIST information for '%s' on IMAP server %s: %s" + msgstr "No es pot obtenir la informació LIST de «%s» en el servidor IMAP %s: %s" + + #: ../camel/providers/imap4/camel-imap4-store.c:823 +-#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + msgid "Bad command" + msgstr "Ordre incorrecta" + + #: ../camel/providers/imap4/camel-imap4-store.c:902 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot create folder '%s': Invalid mailbox name" + msgstr "" +-"No s'ha pogut crear la carpeta %s: el nom de la bústia de correu no és vàlid" ++"No s'ha pogut crear la carpeta «%s»: el nom de la bústia de correu no és vàlid" + + #: ../camel/providers/imap4/camel-imap4-store.c:907 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot create folder '%s': Bad command" + msgstr "No s'ha pogut crear la carpeta «%s»: ordre incorrecta" + + #: ../camel/providers/imap4/camel-imap4-store.c:1013 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot delete folder '%s': Special folder" + msgstr "No s'ha pogut suprimir la carpeta «%s»: és una carpeta especial" + +@@ -3532,19 +3630,19 @@ msgid "Cannot delete IMAP folders in off + msgstr "No es poden suprimir carpetes IMAP en mode fora de línia." + + #: ../camel/providers/imap4/camel-imap4-store.c:1079 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot delete folder '%s': Invalid mailbox name" + msgstr "" + "No s'ha pogut suprimir la carpeta «%s»: el nom de la bústia de correu no és " + "vàlid" + + #: ../camel/providers/imap4/camel-imap4-store.c:1084 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot delete folder '%s': Bad command" + msgstr "No s'ha pogut suprimir la carpeta «%s»: l'ordre és incorrecta" + + #: ../camel/providers/imap4/camel-imap4-store.c:1104 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot rename folder '%s' to '%s': Special folder" + msgstr "" + "No s'ha pogut canviar el nom de la carpeta «%s» com a «%s»: és una carpeta " +@@ -3555,55 +3653,57 @@ msgid "Cannot rename IMAP folders in off + msgstr "No es pot canviar el nom d'una carpeta IMAP en mode fora de línia." + + #: ../camel/providers/imap4/camel-imap4-store.c:1142 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name" + msgstr "" +-"No s'ha pogut canviar el nom de la carpeta «%s» a «%s». El nom de la bústia no " ++"No s'ha pogut canviar el nom de la carpeta «%s» a «%s»: el nom de la bústia no " + "és vàlid" + + #: ../camel/providers/imap4/camel-imap4-store.c:1147 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot rename folder '%s' to '%s': Bad command" + msgstr "" + "No s'ha pogut canviar el nom de la carpeta «%s» a «%s»: l'ordre és incorrecta" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1575 +-#, fuzzy, c-format ++#. Translators: the first %s is an IMAP4 command, either LSUB or LIST. ++#. * The fourth one is an error message. ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#, c-format + msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" + msgstr "" + "No es pot obtenir informació de %s per al patró «%s» en el servidor IMAP %s: %" + "s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1636 ++#: ../camel/providers/imap4/camel-imap4-store.c:1638 + msgid "Cannot subscribe to IMAP folders in offline mode." + msgstr "No us podeu subscriure a carpetes IMAP en mode fora de línia." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1681 +-#, fuzzy, c-format ++#: ../camel/providers/imap4/camel-imap4-store.c:1683 ++#, c-format + msgid "Cannot subscribe to folder '%s': Invalid mailbox name" + msgstr "" + "No s'ha pogut subscriure's a la carpeta «%s»: el nom de la bústia no és vàlid" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1686 +-#, fuzzy, c-format ++#: ../camel/providers/imap4/camel-imap4-store.c:1688 ++#, c-format + msgid "Cannot subscribe to folder '%s': Bad command" +-msgstr "No s'ha pogut subscriur'se a la carpeta «%s»: ordre incorrecta" ++msgstr "No s'ha pogut subscriure's a la carpeta «%s»: ordre incorrecta" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1708 ++#: ../camel/providers/imap4/camel-imap4-store.c:1710 + msgid "Cannot unsubscribe from IMAP folders in offline mode." + msgstr "" + "No s'ha pogut cancel·lar la subscripció a les carpetes IMAP en mode fora de " + "línia." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1753 +-#, fuzzy, c-format ++#: ../camel/providers/imap4/camel-imap4-store.c:1755 ++#, c-format + msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" + msgstr "" + "No s'ha pogut cancel·lar la subscripció de la carpeta «%s»: el nom de la " + "bústia no és vàlid" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1758 +-#, fuzzy, c-format ++#: ../camel/providers/imap4/camel-imap4-store.c:1760 ++#, c-format + msgid "Cannot unsubscribe from folder '%s': Bad command" + msgstr "" + "No s'ha pogut cancel·lar la subscripció de la carpeta «%s»: ordre incorrecta" +@@ -3672,26 +3772,25 @@ msgid "Index message body data" + msgstr "Indexa les dades del cos dels missatges" + + #. $HOME relative path + protocol string +-#: ../camel/providers/local/camel-local-folder.c:382 ++#: ../camel/providers/local/camel-local-folder.c:390 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + + #. /var/spool/mail relative path + protocol +-#: ../camel/providers/local/camel-local-folder.c:386 +-#: ../camel/providers/local/camel-local-folder.c:389 ++#: ../camel/providers/local/camel-local-folder.c:394 ++#: ../camel/providers/local/camel-local-folder.c:397 + #, c-format + msgid "mailbox:%s (%s)" + msgstr "bústia de correu: %s (%s)" + + #. a full path + protocol +-#: ../camel/providers/local/camel-local-folder.c:393 ++#: ../camel/providers/local/camel-local-folder.c:401 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + + #: ../camel/providers/local/camel-local-provider.c:48 +-#, fuzzy + msgid "_Use the '.folders' folder summary file (exmh)" + msgstr "_Utilitza el fitxer de resum de carpeta «.folders» (exmh)" + +@@ -3751,71 +3850,58 @@ msgstr "" + msgid "Standard Unix mbox spool directory" + msgstr "Directori mbox estàndard per a cues de correu de l'Unix" + +-#: ../camel/providers/local/camel-local-store.c:159 +-#: ../camel/providers/local/camel-local-store.c:270 ++#: ../camel/providers/local/camel-local-store.c:171 ++#: ../camel/providers/local/camel-local-store.c:282 + #: ../camel/providers/local/camel-mbox-store.c:359 + #: ../camel/providers/local/camel-spool-store.c:129 + #, c-format + msgid "Store root %s is not an absolute path" + msgstr "L'arrel del magatzem (%s) no és un camí absolut" + +-#: ../camel/providers/local/camel-local-store.c:166 ++#: ../camel/providers/local/camel-local-store.c:178 + #, c-format + msgid "Store root %s is not a regular directory" + msgstr "L'arrel del magatzem (%s) no és un directori normal" + +-#: ../camel/providers/local/camel-local-store.c:175 +-#: ../camel/providers/local/camel-local-store.c:183 +-#: ../camel/providers/local/camel-local-store.c:281 ++#: ../camel/providers/local/camel-local-store.c:187 ++#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:293 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "No s'ha pogut obtenir la carpeta: %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:207 + msgid "Local stores do not have an inbox" + msgstr "Els magatzems locals no tenen cap bústia d'entrada" + +-#: ../camel/providers/local/camel-local-store.c:241 ++#: ../camel/providers/local/camel-local-store.c:253 + #, c-format + msgid "Local mail file %s" + msgstr "Fitxer de correu local %s" + +-#: ../camel/providers/local/camel-local-store.c:359 ++#: ../camel/providers/local/camel-local-store.c:348 + #, c-format + msgid "Could not rename folder %s to %s: %s" + msgstr "No s'ha pogut canviar el nom de la carpeta %s a %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:427 ++#: ../camel/providers/local/camel-local-store.c:416 + #, c-format + msgid "Could not rename '%s': %s" + msgstr "No s'ha pogut canviar el nom a «%s»: %s" + +-#: ../camel/providers/local/camel-local-store.c:452 +-#: ../camel/providers/local/camel-local-store.c:462 +-#: ../camel/providers/local/camel-mbox-store.c:276 +-#: ../camel/providers/local/camel-mbox-store.c:288 +-#, fuzzy, c-format +-msgid "Could not delete folder summary file '%s': %s" +-msgstr "No s'ha pogut suprimir el fitxer de resum de la carpeta «%s»: %s" +- +-#: ../camel/providers/local/camel-local-store.c:472 ++#: ../camel/providers/local/camel-local-store.c:441 + #: ../camel/providers/local/camel-mbox-store.c:300 +-#, fuzzy, c-format ++#, c-format + msgid "Could not delete folder index file '%s': %s" + msgstr "No s'ha pogut suprimir el fitxer d'índex de carpeta «%s»: %s" + +-#: ../camel/providers/local/camel-local-store.c:495 ++#: ../camel/providers/local/camel-local-store.c:464 + #: ../camel/providers/local/camel-mbox-store.c:324 +-#, fuzzy, c-format ++#, c-format + msgid "Could not delete folder meta file '%s': %s" + msgstr "No s'ha pogut suprimir el metafitxer de la carpeta «%s»: %s" + +-#: ../camel/providers/local/camel-local-summary.c:409 +-#, c-format +-msgid "Could not save summary: %s: %s" +-msgstr "No s'ha pogut desar el resum: %s. %s" +- +-#: ../camel/providers/local/camel-local-summary.c:467 ++#: ../camel/providers/local/camel-local-summary.c:506 + msgid "Unable to add message to summary: unknown reason" + msgstr "No s'ha pogut afegir el missatge al resum: se'n desconeix la raó" + +@@ -3850,70 +3936,70 @@ msgstr "" + msgid "Invalid message contents" + msgstr "El contingut del missatge no és vàlid" + +-#: ../camel/providers/local/camel-maildir-store.c:147 +-#: ../camel/providers/local/camel-maildir-store.c:172 ++#: ../camel/providers/local/camel-maildir-store.c:148 ++#: ../camel/providers/local/camel-maildir-store.c:173 + #: ../camel/providers/local/camel-mbox-store.c:176 + #: ../camel/providers/local/camel-mbox-store.c:188 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot create folder '%s': %s" + msgstr "No s'ha pogut crear la carpeta «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:160 ++#: ../camel/providers/local/camel-maildir-store.c:161 + #: ../camel/providers/local/camel-mbox-store.c:147 + #: ../camel/providers/local/camel-mh-store.c:217 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot get folder '%s': %s" + msgstr "No s'ha pogut obtenir la carpeta «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:164 ++#: ../camel/providers/local/camel-maildir-store.c:165 + #: ../camel/providers/local/camel-mbox-store.c:155 + #: ../camel/providers/local/camel-mh-store.c:224 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "No s'ha pogut obtenir la carpeta «%s»: no existeix." + +-#: ../camel/providers/local/camel-maildir-store.c:188 +-#, fuzzy, c-format ++#: ../camel/providers/local/camel-maildir-store.c:189 ++#, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "No s'ha pogut obtenir la carpeta «%s»: no és un directori maildir." + +-#: ../camel/providers/local/camel-maildir-store.c:233 +-#: ../camel/providers/local/camel-maildir-store.c:271 ++#: ../camel/providers/local/camel-maildir-store.c:234 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mh-store.c:273 +-#, fuzzy, c-format ++#, c-format + msgid "Could not delete folder '%s': %s" + msgstr "No s'ha pogut suprimir la carpeta «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:235 ++#: ../camel/providers/local/camel-maildir-store.c:236 + msgid "not a maildir directory" + msgstr "no és un directori maildir" + +-#: ../camel/providers/local/camel-maildir-store.c:439 ++#: ../camel/providers/local/camel-maildir-store.c:440 + #: ../camel/providers/local/camel-spool-store.c:331 + #: ../camel/providers/local/camel-spool-store.c:345 +-#, fuzzy, c-format ++#, c-format + msgid "Could not scan folder '%s': %s" + msgstr "No s'ha pogut cercar a la carpeta «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:433 +-#: ../camel/providers/local/camel-maildir-summary.c:567 ++#: ../camel/providers/local/camel-maildir-summary.c:434 ++#: ../camel/providers/local/camel-maildir-summary.c:553 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "No s'ha pogut obrir el camí del directori maildir: %s. %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:560 ++#: ../camel/providers/local/camel-maildir-summary.c:546 + msgid "Checking folder consistency" + msgstr "S'està comprovant la consistència de la carpeta" + +-#: ../camel/providers/local/camel-maildir-summary.c:664 ++#: ../camel/providers/local/camel-maildir-summary.c:650 + msgid "Checking for new messages" + msgstr "S'està comprovant si hi ha missatges nous" + +-#: ../camel/providers/local/camel-maildir-summary.c:755 +-#: ../camel/providers/local/camel-mbox-summary.c:436 +-#: ../camel/providers/local/camel-mbox-summary.c:609 +-#: ../camel/providers/local/camel-mbox-summary.c:706 +-#: ../camel/providers/local/camel-spool-summary.c:140 ++#: ../camel/providers/local/camel-maildir-summary.c:736 ++#: ../camel/providers/local/camel-mbox-summary.c:534 ++#: ../camel/providers/local/camel-mbox-summary.c:714 ++#: ../camel/providers/local/camel-mbox-summary.c:810 ++#: ../camel/providers/local/camel-spool-summary.c:158 + msgid "Storing folder" + msgstr "S'està desant la carpeta" + +@@ -3952,14 +4038,14 @@ msgid "Cannot create a folder by this na + msgstr "No s'ha pogut crear una carpeta amb aquest nom." + + #: ../camel/providers/local/camel-mbox-store.c:198 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot get folder '%s': not a regular file." + msgstr "No s'ha pogut obtenir la carpeta «%s»: no és un fitxer normal." + + #: ../camel/providers/local/camel-mbox-store.c:228 + #: ../camel/providers/local/camel-mbox-store.c:239 + #: ../camel/providers/local/camel-mbox-store.c:262 +-#, fuzzy, c-format ++#, c-format + msgid "" + "Could not delete folder '%s':\n" + "%s" +@@ -3968,17 +4054,23 @@ msgstr "" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:247 +-#, fuzzy, c-format ++#, c-format + msgid "'%s' is not a regular file." + msgstr "«%s» no és un fitxer normal." + + #: ../camel/providers/local/camel-mbox-store.c:254 +-#, fuzzy, c-format ++#, c-format + msgid "Folder '%s' is not empty. Not deleted." + msgstr "La carpeta «%s» no és buida. No s'ha suprimit." + ++#: ../camel/providers/local/camel-mbox-store.c:276 ++#: ../camel/providers/local/camel-mbox-store.c:288 ++#, c-format ++msgid "Could not delete folder summary file '%s': %s" ++msgstr "No s'ha pogut suprimir el fitxer de resum de la carpeta «%s»: %s" ++ + #: ../camel/providers/local/camel-mbox-store.c:378 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot create directory '%s': %s." + msgstr "No s'ha pogut crear el directori «%s»: %s." + +@@ -3996,7 +4088,7 @@ msgid "The new folder name is illegal." + msgstr "El nom nou de la carpeta no és vàlid." + + #: ../camel/providers/local/camel-mbox-store.c:498 +-#, fuzzy, c-format ++#, c-format + msgid "Could not rename '%s': '%s': %s" + msgstr "No s'ha pogut canviar el nom a «%s»: «%s»: %s" + +@@ -4005,83 +4097,78 @@ msgstr "No s'ha pogut canviar el nom a + msgid "Could not rename '%s' to %s: %s" + msgstr "No s'ha pogut canviar el nom de «%s» a %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:442 ++#: ../camel/providers/local/camel-mbox-summary.c:540 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "No s'ha pogut obrir la carpeta: %s. %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:490 ++#: ../camel/providers/local/camel-mbox-summary.c:588 + #, c-format + msgid "Fatal mail parser error near position %ld in folder %s" + msgstr "" + "L'analitzador de correu ha generat un error greu a prop de la posició %ld, a " + "la carpeta %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:546 ++#: ../camel/providers/local/camel-mbox-summary.c:651 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "No s'ha pogut comprovar la carpeta: %s. %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:614 +-#: ../camel/providers/local/camel-mbox-summary.c:711 +-#: ../camel/providers/local/camel-spool-summary.c:145 ++#: ../camel/providers/local/camel-mbox-summary.c:719 ++#: ../camel/providers/local/camel-mbox-summary.c:815 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "No s'ha pogut obrir el fitxer: %s. %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:626 +-#: ../camel/providers/local/camel-spool-summary.c:158 ++#: ../camel/providers/local/camel-mbox-summary.c:731 ++#: ../camel/providers/local/camel-spool-summary.c:176 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "No es pot obrir la bústia de correu temporal: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:639 +-#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:744 ++#: ../camel/providers/local/camel-mbox-summary.c:920 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "No s'ha pogut tancar la carpeta font %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:648 ++#: ../camel/providers/local/camel-mbox-summary.c:753 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "No s'ha pogut tancar la carpeta temporal: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:663 ++#: ../camel/providers/local/camel-mbox-summary.c:768 + #, c-format + msgid "Could not rename folder: %s" + msgstr "No s'ha pogut canviar el nom de la carpeta: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:722 +-#: ../camel/providers/local/camel-mbox-summary.c:1046 ++#: ../camel/providers/local/camel-mbox-summary.c:826 ++#: ../camel/providers/local/camel-mbox-summary.c:1050 + #, c-format + msgid "Could not store folder: %s" + msgstr "No s'ha pogut desar la carpeta: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:770 +-#: ../camel/providers/local/camel-mbox-summary.c:799 ++#: ../camel/providers/local/camel-mbox-summary.c:862 ++#: ../camel/providers/local/camel-mbox-summary.c:870 ++#: ../camel/providers/local/camel-mbox-summary.c:1080 + #: ../camel/providers/local/camel-mbox-summary.c:1088 +-#: ../camel/providers/local/camel-mbox-summary.c:1117 +-msgid "Detected a corrupt mbox file or an invalid 'From' header" +-msgstr "S'ha detectat un fitxer mbox malmès o bé una capçalera «De» no vàlida" ++msgid "Summary and folder mismatch, even after a sync" ++msgstr "El resum i la carpeta no coincideixen, tot i la sincronització" + +-#: ../camel/providers/local/camel-mbox-summary.c:935 +-#: ../camel/providers/local/camel-spool-summary.c:326 ++#: ../camel/providers/local/camel-mbox-summary.c:1013 ++#: ../camel/providers/local/camel-spool-summary.c:344 + #, c-format + msgid "Unknown error: %s" + msgstr "Error desconegut: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:971 +-#, c-format +-msgid "Folder %s cannot be opened: %s" +-msgstr "No es pot obrir la carpeta «%s»: %s" +- ++#: ../camel/providers/local/camel-mbox-summary.c:1156 + #: ../camel/providers/local/camel-mbox-summary.c:1182 +-#: ../camel/providers/local/camel-mbox-summary.c:1208 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "S'ha produït un error en escriure a la bústia temporal: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1199 ++#: ../camel/providers/local/camel-mbox-summary.c:1173 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "S'ha produït un error en escriure a la bústia temporal: %s: %s" +@@ -4096,37 +4183,37 @@ msgid "Cannot append message to mh folde + msgstr "No es pot afegir el missatge a la carpeta MH: %s. %s" + + #: ../camel/providers/local/camel-mh-store.c:232 +-#, fuzzy, c-format ++#, c-format + msgid "Could not create folder '%s': %s" + msgstr "No s'ha pogut crear la carpeta «%s»: %s" + + #: ../camel/providers/local/camel-mh-store.c:244 +-#, fuzzy, c-format ++#, c-format + msgid "Cannot get folder '%s': not a directory." + msgstr "No s'ha pogut obtenir la carpeta «%s»: no és un directori." + +-#: ../camel/providers/local/camel-mh-summary.c:246 ++#: ../camel/providers/local/camel-mh-summary.c:248 + #, c-format + msgid "Cannot open MH directory path: %s: %s" + msgstr "No es pot obrir el camí al directori MH: %s. %s" + + #: ../camel/providers/local/camel-spool-store.c:135 +-#, fuzzy, c-format ++#, c-format + msgid "Spool '%s' cannot be opened: %s" + msgstr "No es pot obrir la cua «%s»: %s" + + #: ../camel/providers/local/camel-spool-store.c:147 +-#, fuzzy, c-format ++#, c-format + msgid "Spool '%s' is not a regular file or directory" + msgstr "La cua «%s» no és cap fitxer o directori normal" + + #: ../camel/providers/local/camel-spool-store.c:166 +-#, fuzzy, c-format ++#, c-format + msgid "Folder '%s/%s' does not exist." + msgstr "No existeix la carpeta «%s/%s»." + + #: ../camel/providers/local/camel-spool-store.c:176 +-#, fuzzy, c-format ++#, c-format + msgid "" + "Could not open folder '%s':\n" + "%s" +@@ -4135,12 +4222,12 @@ msgstr "" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:180 +-#, fuzzy, c-format ++#, c-format + msgid "Folder '%s' does not exist." + msgstr "No existeix la carpeta «%s»." + + #: ../camel/providers/local/camel-spool-store.c:185 +-#, fuzzy, c-format ++#, c-format + msgid "" + "Could not create folder '%s':\n" + "%s" +@@ -4149,7 +4236,7 @@ msgstr "" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:193 +-#, fuzzy, c-format ++#, c-format + msgid "'%s' is not a mailbox file." + msgstr "«%s» no és un fitxer de bústia de correu." + +@@ -4175,28 +4262,28 @@ msgstr "No es pot canviar el nom de les + msgid "Spool folders cannot be deleted" + msgstr "No es poden suprimir les carpetes per a cues" + +-#: ../camel/providers/local/camel-spool-summary.c:171 +-#: ../camel/providers/local/camel-spool-summary.c:181 +-#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:189 ++#: ../camel/providers/local/camel-spool-summary.c:199 ++#: ../camel/providers/local/camel-spool-summary.c:209 + #, c-format + msgid "Could not sync temporary folder %s: %s" + msgstr "No s'ha pogut sincronitzar la carpeta temporal %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:207 ++#: ../camel/providers/local/camel-spool-summary.c:225 + #, c-format + msgid "Could not sync spool folder %s: %s" + msgstr "No es pot sincronitzar la carpeta per a cues %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:238 +-#: ../camel/providers/local/camel-spool-summary.c:255 +-#: ../camel/providers/local/camel-spool-summary.c:266 +-#, fuzzy, c-format ++#: ../camel/providers/local/camel-spool-summary.c:256 ++#: ../camel/providers/local/camel-spool-summary.c:273 ++#: ../camel/providers/local/camel-spool-summary.c:284 ++#, c-format + msgid "" + "Could not sync spool folder %s: %s\n" + "Folder may be corrupt, copy saved in '%s'" + msgstr "" + "No es pot sincronitzar la carpeta per a cues %s: %s\n" +-"La carpeta pot estar malmesa. Se n'ha desat una còpia a «%s»" ++"Pot ser que la carpeta estigui malmesa. Se n'ha desat una còpia a «%s»" + + #: ../camel/providers/nntp/camel-nntp-folder.c:176 + #: ../camel/providers/nntp/camel-nntp-folder.c:208 +@@ -4206,19 +4293,19 @@ msgstr "" + "S'ha produït un error intern. El format de l'identificador d'usuari no és " + "vàlid: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:331 +-#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/nntp/camel-nntp-folder.c:330 ++#: ../camel/providers/nntp/camel-nntp-folder.c:333 + #: ../camel/providers/nntp/camel-nntp-folder.c:375 ++#: ../camel/providers/nntp/camel-nntp-folder.c:377 + #, c-format + msgid "Posting failed: %s" + msgstr "S'ha produït un error en publicar: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:393 ++#: ../camel/providers/nntp/camel-nntp-folder.c:395 + msgid "You cannot post NNTP messages while working offline!" + msgstr "S'ha d'estar en línia per a enviar missatges NNTP." + +-#: ../camel/providers/nntp/camel-nntp-folder.c:404 ++#: ../camel/providers/nntp/camel-nntp-folder.c:406 + msgid "You cannot copy messages from a NNTP folder!" + msgstr "No es poden copiar missatges d'una carpeta NNTP." + +@@ -4334,27 +4421,27 @@ msgstr "No connectat." + msgid "No such folder: %s" + msgstr "No existeix la carpeta: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:222 +-#: ../camel/providers/nntp/camel-nntp-summary.c:318 ++#: ../camel/providers/nntp/camel-nntp-summary.c:273 ++#: ../camel/providers/nntp/camel-nntp-summary.c:369 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: s'estan cercant els missatges nous" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:229 ++#: ../camel/providers/nntp/camel-nntp-summary.c:280 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "Resposta inesperada del servidor per a XOVER: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:332 ++#: ../camel/providers/nntp/camel-nntp-summary.c:383 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "Resposta inesperada del servidor per a HEAD: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:372 ++#: ../camel/providers/nntp/camel-nntp-summary.c:423 + msgid "Use cancel" + msgstr "Cancel·la" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:374 ++#: ../camel/providers/nntp/camel-nntp-summary.c:425 + #, c-format + msgid "Operation failed: %s" + msgstr "Ha fallat l'operació: %s" +@@ -4376,19 +4463,19 @@ msgstr "S'estan suprimint els missatges + msgid "Expunging deleted messages" + msgstr "S'estan suprimint els missatges suprimits" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 ++#: ../camel/providers/pop3/camel-pop3-folder.c:533 + #, c-format + msgid "No message with UID %s" + msgstr "No hi ha cap missatge amb l'UID %s" + + #. Sigh, most of the crap in this function is so that the cancel button + #. returns the proper exception code. Sigh. +-#: ../camel/providers/pop3/camel-pop3-folder.c:541 ++#: ../camel/providers/pop3/camel-pop3-folder.c:540 + #, c-format + msgid "Retrieving POP message %d" + msgstr "S'està obtenint el missatge %d" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:631 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 + msgid "Unknown reason" + msgstr "Raó desconeguda" + +@@ -4469,7 +4556,7 @@ msgstr "" + "d'autenticació sol·licitat." + + #: ../camel/providers/pop3/camel-pop3-store.c:419 +-#, fuzzy, c-format ++#, c-format + msgid "SASL '%s' Login failed for POP server %s: %s" + msgstr "Ha fallat l'entrada amb SASL «%s» al servidor POP %s: %s" + +@@ -4515,7 +4602,7 @@ msgstr "" + "S'ha produït un error en enviar el nom d'usuari: %s" + + #: ../camel/providers/pop3/camel-pop3-store.c:663 +-#, fuzzy, c-format ++#, c-format + msgid "No such folder '%s'." + msgstr "No existeix la carpeta «%s»." + +@@ -4578,140 +4665,140 @@ msgid "For delivering mail by connecting + msgstr "" + "Per a lliurar correu connectant-se a una bústia remota fent servir l'SMTP." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:168 + msgid "Syntax error, command unrecognized" + msgstr "Hi ha un error de sintaxi: no es reconeix l'ordre" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:170 + msgid "Syntax error in parameters or arguments" + msgstr "Hi ha un error de sintaxi en els paràmetres o els arguments" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:170 ++#: ../camel/providers/smtp/camel-smtp-transport.c:172 + msgid "Command not implemented" + msgstr "No s'ha implementat l'ordre" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:174 + msgid "Command parameter not implemented" + msgstr "No està implementat el paràmetre de l'ordre" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:174 ++#: ../camel/providers/smtp/camel-smtp-transport.c:176 + msgid "System status, or system help reply" + msgstr "L'estat del sistema o la resposta del sistema d'ajuda" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:176 ++#: ../camel/providers/smtp/camel-smtp-transport.c:178 + msgid "Help message" + msgstr "Missatge d'ajuda" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:180 + msgid "Service ready" + msgstr "El servei està preparat" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:180 ++#: ../camel/providers/smtp/camel-smtp-transport.c:182 + msgid "Service closing transmission channel" + msgstr "El servei està tancant el canal de transmissió" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:184 + msgid "Service not available, closing transmission channel" + msgstr "El servei no està disponible, es tancarà el canal de transmissió" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:184 ++#: ../camel/providers/smtp/camel-smtp-transport.c:186 + msgid "Requested mail action okay, completed" + msgstr "S'ha realitzat correctament l'acció sol·licitada" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:186 ++#: ../camel/providers/smtp/camel-smtp-transport.c:188 + msgid "User not local; will forward to " + msgstr "" + "L'usuari no és local; es reenviarà a (camí de reenviament)" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:188 ++#: ../camel/providers/smtp/camel-smtp-transport.c:190 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "" + "No s'ha realitzat l'acció sol·licitada: no existeix la bústia de correu" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:190 ++#: ../camel/providers/smtp/camel-smtp-transport.c:192 + msgid "Requested action not taken: mailbox unavailable" + msgstr "" + "No s'ha realitzat l'acció sol·licitada: no existeix la bústia de correu" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:192 ++#: ../camel/providers/smtp/camel-smtp-transport.c:194 + msgid "Requested action aborted: error in processing" + msgstr "" + "No s'ha realitzat l'acció sol·licitada: s'ha produït un error durant el " + "processament" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:194 ++#: ../camel/providers/smtp/camel-smtp-transport.c:196 + msgid "User not local; please try " + msgstr "" + "L'usuari no és local; proveu amb el (camí de reenviament)" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:196 ++#: ../camel/providers/smtp/camel-smtp-transport.c:198 + msgid "Requested action not taken: insufficient system storage" + msgstr "" + "No s'ha realitzat l'acció sol·licitada: no hi ha prou espai d'emmagatzemament" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:198 ++#: ../camel/providers/smtp/camel-smtp-transport.c:200 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "" + "S'ha interromput l'acció sol·licitada: s'ha excedit l'emmagatzemament " + "assignat" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:200 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "" + "No s'ha realitzat l'acció sol·licitada: no es pot fer servir aquest nom de " + "bústia de correu" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:204 + msgid "Start mail input; end with ." + msgstr "Inicieu la introducció del correu; finalitzeu-la amb ." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:204 ++#: ../camel/providers/smtp/camel-smtp-transport.c:206 + msgid "Transaction failed" + msgstr "Ha fallat la transacció" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/providers/smtp/camel-smtp-transport.c:210 + msgid "A password transition is needed" + msgstr "Es necessita una transició de la contrasenya" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:210 ++#: ../camel/providers/smtp/camel-smtp-transport.c:212 + msgid "Authentication mechanism is too weak" + msgstr "El mecanisme d'autenticació és massa feble" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:212 ++#: ../camel/providers/smtp/camel-smtp-transport.c:214 + msgid "Encryption required for requested authentication mechanism" + msgstr "El mecanisme d'autenticació sol·licitat precisa xifratge" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:214 ++#: ../camel/providers/smtp/camel-smtp-transport.c:216 + msgid "Temporary authentication failure" + msgstr "S'ha produït una fallada temporal en l'autenticació" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:295 ++#: ../camel/providers/smtp/camel-smtp-transport.c:297 + msgid "Welcome response error" + msgstr "S'ha produït un error en la resposta a la benvinguda" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:330 +-#: ../camel/providers/smtp/camel-smtp-transport.c:363 +-#: ../camel/providers/smtp/camel-smtp-transport.c:369 ++#: ../camel/providers/smtp/camel-smtp-transport.c:332 ++#: ../camel/providers/smtp/camel-smtp-transport.c:365 ++#: ../camel/providers/smtp/camel-smtp-transport.c:371 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "No s'ha pogut connectar al servidor SMTP %s en mode segur: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:341 + #, c-format + msgid "STARTTLS command failed: %s" + msgstr "Ha fallat l'ordre STARTTLS: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:354 ++#: ../camel/providers/smtp/camel-smtp-transport.c:356 + msgid "STARTTLS command failed" + msgstr "Ha fallat l'ordre STARTTLS" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:494 ++#: ../camel/providers/smtp/camel-smtp-transport.c:497 + #, c-format + msgid "SMTP server %s does not support requested authentication type %s." + msgstr "" + "El servidor SMTP %s no implementa el tipus d'autenticació sol·licitat (%s)." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:559 ++#: ../camel/providers/smtp/camel-smtp-transport.c:564 + #, c-format + msgid "" + "Unable to authenticate to SMTP server.\n" +@@ -4722,94 +4809,94 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:683 ++#: ../camel/providers/smtp/camel-smtp-transport.c:697 + #, c-format + msgid "SMTP server %s" + msgstr "Servidor d'SMTP %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:685 ++#: ../camel/providers/smtp/camel-smtp-transport.c:699 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "Lliurament de correu per SMTP mitjançant %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:717 + msgid "Cannot send message: service not connected." + msgstr "No s'ha pogut enviar el missatge: el servei no està connectat." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:709 ++#: ../camel/providers/smtp/camel-smtp-transport.c:723 + msgid "Cannot send message: sender address not valid." + msgstr "No s'ha pogut enviar el missatge: l'adreça del remitent no és vàlida." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:713 ++#: ../camel/providers/smtp/camel-smtp-transport.c:727 + msgid "Sending message" + msgstr "S'està enviant el missatge" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:728 ++#: ../camel/providers/smtp/camel-smtp-transport.c:742 + msgid "Cannot send message: no recipients defined." + msgstr "No s'ha pogut enviar el missatge: no s'ha definit cap destinatari." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:753 + msgid "Cannot send message: one or more invalid recipients" + msgstr "" + "No s'ha pogut enviar el missatge: un o més dels destinataris no són vàlids" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:968 ++#: ../camel/providers/smtp/camel-smtp-transport.c:982 + msgid "SMTP Greeting" + msgstr "Benvinguda de l'SMTP" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:993 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1007 + #, c-format + msgid "HELO command failed: %s" + msgstr "HA fallat l'ordre HELO: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1010 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1024 + msgid "HELO command failed" + msgstr "Ha fallat l'ordre HELO" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1073 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1090 + msgid "SMTP Authentication" + msgstr "Autenticació SMTP" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1079 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1096 + msgid "Error creating SASL authentication object." + msgstr "S'ha produït un error en crear un objecte d'autenticació de SASL." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1096 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1107 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1124 + #, c-format + msgid "AUTH command failed: %s" + msgstr "Ha fallat l'ordre AUTH: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1130 + msgid "AUTH command failed" + msgstr "Ha fallat l'ordre AUTH" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1177 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1200 + msgid "Bad authentication response from server.\n" + msgstr "S'ha rebut una resposta incorrecta en autenticar-se al servidor.\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1227 + #, c-format + msgid "MAIL FROM command failed: %s: mail not sent" + msgstr "Ha fallat l'ordre MAIL FROM: %s: no s'ha enviat el correu" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1219 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1244 + msgid "MAIL FROM command failed" + msgstr "Ha fallat l'ordre MAIL FROM" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1243 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1268 + #, c-format + msgid "RCPT TO command failed: %s: mail not sent" + msgstr "Ha fallat l'ordre RCPT TO: %s: no s'ha enviat el correu" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1262 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1287 + #, c-format + msgid "RCPT TO <%s> failed" + msgstr "Ha fallat l'ordre RCPT TO <%s>" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1301 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1359 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1378 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1327 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1396 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1415 + #, c-format + msgid "DATA command failed: %s: mail not sent" + msgstr "Ha fallat l'ordre DATA: %s: no s'ha enviat el correu" +@@ -4817,26 +4904,26 @@ msgstr "Ha fallat l'ordre DATA: %s: no s + #. we should have gotten instructions on how to use the DATA command: + #. * 354 Enter mail, end with "." on a line by itself + #. +-#: ../camel/providers/smtp/camel-smtp-transport.c:1318 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1394 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1344 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1431 + msgid "DATA command failed" + msgstr "Ha fallat l'ordre DATA" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1417 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1454 + #, c-format + msgid "RSET command failed: %s" + msgstr "Ha fallat l'ordre RSET: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1433 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1470 + msgid "RSET command failed" + msgstr "Ha fallat l'ordre RSET" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1456 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1493 + #, c-format + msgid "QUIT command failed: %s" + msgstr "Ha fallat l'ordre QUIT: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1470 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1507 + msgid "QUIT command failed" + msgstr "Ha fallat l'ordre QUIT" + +@@ -4897,27 +4984,28 @@ msgstr "Personal" + msgid "Phone Calls" + msgstr "Trucades de telèfon" + +-#: ../libedataserver/e-categories.c:60 ++#. Translators: "Status" is a category name; it can mean anything user wants to ++#: ../libedataserver/e-categories.c:61 + msgid "Status" + msgstr "Estat" + +-#: ../libedataserver/e-categories.c:61 ++#: ../libedataserver/e-categories.c:62 + msgid "Strategies" + msgstr "Estratègies" + +-#: ../libedataserver/e-categories.c:62 ++#: ../libedataserver/e-categories.c:63 + msgid "Suppliers" + msgstr "Proveïdors" + +-#: ../libedataserver/e-categories.c:63 ++#: ../libedataserver/e-categories.c:64 + msgid "Time & Expenses" + msgstr "Temps i despeses" + +-#: ../libedataserver/e-categories.c:64 ++#: ../libedataserver/e-categories.c:65 + msgid "VIP" + msgstr "VIP" + +-#: ../libedataserver/e-categories.c:65 ++#: ../libedataserver/e-categories.c:66 + msgid "Waiting" + msgstr "En espera" + +@@ -5049,26 +5137,26 @@ msgstr "%H%M" + msgid "%I %p" + msgstr "%I %p" + +-#: ../libedataserverui/e-book-auth-util.c:89 ++#: ../libedataserverui/e-book-auth-util.c:90 + msgid "Accessing LDAP Server anonymously" + msgstr "S'està accedint al servidor LDAP anònimament" + +-#: ../libedataserverui/e-book-auth-util.c:193 ++#: ../libedataserverui/e-book-auth-util.c:192 + msgid "Failed to authenticate.\n" + msgstr "Ha fallat l'autenticació.\n" + +-#: ../libedataserverui/e-categories-dialog.c:274 ++#: ../libedataserverui/e-categories-dialog.c:261 + #, c-format + msgid "" + "There is already a category '%s' in the configuration. Please use another " + "name" + msgstr "Ja hi ha una categoria «%s» en la configuració. Utilitzeu un altre nom" + +-#: ../libedataserverui/e-categories-dialog.c:475 ++#: ../libedataserverui/e-categories-dialog.c:466 + msgid "Icon" + msgstr "Icona" + +-#: ../libedataserverui/e-categories-dialog.c:480 ++#: ../libedataserverui/e-categories-dialog.c:471 + msgid "Category" + msgstr "Categoria" + +@@ -5104,19 +5192,19 @@ msgstr "_Edita" + msgid "categories" + msgstr "categories" + +-#: ../libedataserverui/e-name-selector-dialog.c:275 ++#: ../libedataserverui/e-name-selector-dialog.c:272 + msgid "Select Contacts from Address Book" + msgstr "Seleccioneu els contactes de la llibreta d'adreces" + +-#: ../libedataserverui/e-name-selector-dialog.c:555 ++#: ../libedataserverui/e-name-selector-dialog.c:559 + msgid "_Add" + msgstr "_Afegeix" + +-#: ../libedataserverui/e-name-selector-dialog.c:580 ++#: ../libedataserverui/e-name-selector-dialog.c:584 + msgid "_Remove" + msgstr "_Suprimeix" + +-#: ../libedataserverui/e-name-selector-dialog.c:753 ++#: ../libedataserverui/e-name-selector-dialog.c:761 + #: ../libedataserverui/e-name-selector-dialog.glade.h:6 + msgid "Any Category" + msgstr "Qualsevol categoria" +@@ -5160,76 +5248,78 @@ msgstr "_Cerca:" + + # FIXME + #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2249 ++#: ../libedataserverui/e-name-selector-entry.c:2369 + #, c-format + msgid "E_xpand %s Inline" + msgstr "E_xpandeix %s al cos" + + #. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2264 ++#: ../libedataserverui/e-name-selector-entry.c:2384 + #, c-format + msgid "Cop_y %s" + msgstr "_Copia %s" + + #. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2274 ++#: ../libedataserverui/e-name-selector-entry.c:2394 + #, c-format + msgid "C_ut %s" + msgstr "Re_talla %s" + + #. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2291 ++#: ../libedataserverui/e-name-selector-entry.c:2411 + #, c-format + msgid "_Edit %s" + msgstr "_Edita %s" + +-#: ../libedataserverui/e-name-selector-list.c:479 ++#: ../libedataserverui/e-name-selector-list.c:466 + #, c-format + msgid "_Delete %s" + msgstr "_Suprimeix %s" + +-#: ../libedataserverui/e-passwords.c:214 ++#: ../libedataserverui/e-passwords.c:218 + #, c-format + msgid "Keyring key is unusable: no user or host name" +-msgstr "La clau de l'anell de claus no és utilitzable: no existeix l'usuari o el nom de la màquina" ++msgstr "" ++"La clau de l'anell de claus no és utilitzable: no existeix l'usuari o el nom " ++"de la màquina" + +-#: ../libedataserverui/e-passwords.c:1044 ++#: ../libedataserverui/e-passwords.c:1055 + msgid "You have the Caps Lock key on." +-msgstr "" ++msgstr "Teniu la tecla de fixació de majúscules activada." + +-#: ../libedataserverui/e-passwords.c:1164 ++#: ../libedataserverui/e-passwords.c:1175 + msgid "_Remember this passphrase" + msgstr "_Recorda aquesta contrasenya" + +-#: ../libedataserverui/e-passwords.c:1165 ++#: ../libedataserverui/e-passwords.c:1176 + msgid "_Remember this passphrase for the remainder of this session" + msgstr "_Recorda aquesta contrasenya fins que acabi aquesta sessió" + +-#: ../libedataserverui/e-passwords.c:1170 ++#: ../libedataserverui/e-passwords.c:1181 + msgid "_Remember this password" + msgstr "_Recorda aquesta contrasenya" + +-#: ../libedataserverui/e-passwords.c:1171 ++#: ../libedataserverui/e-passwords.c:1182 + msgid "_Remember this password for the remainder of this session" + msgstr "_Recorda aquesta contrasenya fins que acabi aquesta sessió" + + #. prepare the dialog +-#: ../libedataserverui/e-source-selector-dialog.c:101 ++#: ../libedataserverui/e-source-selector-dialog.c:95 + msgid "Select destination" + msgstr "Seleccioneu el destí" + +-#: ../libedataserverui/e-source-selector-dialog.c:154 ++#: ../libedataserverui/e-source-selector-dialog.c:148 + msgid "_Destination" + msgstr "_Destí" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1660 +-#: ../servers/exchange/storage/exchange-account.c:971 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1683 ++#: ../servers/exchange/storage/exchange-account.c:953 + #, c-format + msgid "Enter password for %s" + msgstr "Introduïu la contrasenya de %s" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1661 +-#: ../servers/exchange/storage/exchange-account.c:976 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1684 ++#: ../servers/exchange/storage/exchange-account.c:958 + msgid "Enter password" + msgstr "Introduïu la contrasenya" + +@@ -5333,26 +5423,26 @@ msgstr "Aquest operació no està dispon + + #. i18n: This is the title of an "other user's folders" + #. hierarchy. Eg, "John Doe's Folders". +-#: ../servers/exchange/storage/exchange-account.c:662 ++#: ../servers/exchange/storage/exchange-account.c:644 + #, c-format + msgid "%s's Folders" + msgstr "Carpetes de %s" + +-#: ../servers/exchange/storage/exchange-account.c:1277 ++#: ../servers/exchange/storage/exchange-account.c:1259 + msgid "Personal Folders" + msgstr "Carpetes personals" + +-#: ../servers/exchange/storage/exchange-account.c:1292 ++#: ../servers/exchange/storage/exchange-account.c:1274 + msgid "Favorite Public Folders" + msgstr "Carpetes públiques preferides" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1309 ++#: ../servers/exchange/storage/exchange-account.c:1291 + msgid "All Public Folders" + msgstr "Totes les carpetes públiques" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1323 ++#: ../servers/exchange/storage/exchange-account.c:1305 + msgid "Global Address List" + msgstr "Llista d'adreces global" + +@@ -5380,19 +5470,19 @@ msgstr "Elements enviats" + msgid "Tasks" + msgstr "Tasques" + +-#: ../servers/groupwise/e-gw-connection.c:224 ++#: ../servers/groupwise/e-gw-connection.c:225 + msgid "Invalid connection" +-msgstr "Connexió invàlida" ++msgstr "Connexió no vàlida" + +-#: ../servers/groupwise/e-gw-connection.c:228 ++#: ../servers/groupwise/e-gw-connection.c:229 + msgid "Invalid response from server" + msgstr "Resposta inesperada del servidor" + +-#: ../servers/groupwise/e-gw-connection.c:230 ++#: ../servers/groupwise/e-gw-connection.c:231 + msgid "No response from the server" + msgstr "No hi ha resposta del servidor" + +-#: ../servers/groupwise/e-gw-connection.c:236 ++#: ../servers/groupwise/e-gw-connection.c:237 + msgid "Bad parameter" + msgstr "Paràmetre incorrecte" + +@@ -5429,6 +5519,25 @@ msgstr "Informació del color" + msgid "The color to render" + msgstr "El color a renderitzar" + ++#~ msgid "Folder was destroyed and recreated on server." ++#~ msgstr "La carpeta es va destruir i es va tornar a crear al servidor." ++ ++#~ msgid "" ++#~ "Unexpected server response: Identical UIDs provided for messages %d and %d" ++#~ msgstr "" ++#~ "Resposta inesperada del servidor: s'han proporcionat UIDs idèntics per " ++#~ "als missatges %d i %d" ++ ++#~ msgid "Could not save summary: %s: %s" ++#~ msgstr "No s'ha pogut desar el resum: %s. %s" ++ ++#~ msgid "Detected a corrupt mbox file or an invalid 'From' header" ++#~ msgstr "" ++#~ "S'ha detectat un fitxer mbox malmès o bé una capçalera «De» no vàlida" ++ ++#~ msgid "Folder %s cannot be opened: %s" ++#~ msgstr "No es pot obrir la carpeta «%s»: %s" ++ + #~ msgid "Cannot find certificate for `%s'" + #~ msgstr "No s'ha trobat el certificat per a «%s»" + +@@ -5444,9 +5553,6 @@ msgstr "El color a renderitzar" + #~ msgid "%sPlease enter the IMAP password for %s on host %s" + #~ msgstr "%sIntroduïu la contrasenya IMAP per a %s a la màquina %s" + +-#~ msgid "Summary and folder mismatch, even after a sync" +-#~ msgstr "El resum i la carpeta no coincideixen, tot i la sincronització" +- + #~ msgid "Please enter the NNTP password for %s@%s" + #~ msgstr "Introduïu la contrasenya NNTP per a %s@%s" + +Index: evolution-data-server-2.23.92/po/cs.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/cs.po ++++ evolution-data-server-2.23.92/po/cs.po +@@ -1,5 +1,5 @@ + # Czech translation of evolution-data-server. +-# Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2008 the author(s) of evolution-data-server. + # Copyright (C) 2004, 2005 Miloslav Trmac . + # This file is distributed under the same license as the evolution-data-server package. + # Radka Doulíková , 2002. +@@ -12,71 +12,72 @@ msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-02-22 19:30+0100\n" +-"PO-Revision-Date: 2008-02-22 19:29+0100\n" ++"POT-Creation-Date: 2008-09-15 15:51+0200\n" ++"PO-Revision-Date: 2008-09-15 15:50+0200\n" + "Last-Translator: Petr Kovar \n" + "Language-Team: Czech \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:554 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2317 ++#: ../addressbook/backends/file/e-book-backend-file.c:555 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475 + msgid "Loading..." + msgstr "Načítám..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:557 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2276 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2296 ++#: ../addressbook/backends/file/e-book-backend-file.c:558 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4169 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477 + msgid "Searching..." + msgstr "Vyhledávám..." + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2677 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4328 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "Stahuji kontakty (%d)... " + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2832 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3023 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3067 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103 + #, c-format + msgid "Updating contacts cache (%d)... " + msgstr "Aktualizuji keš kontaktů (%d)... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:742 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751 + msgid "Using Distinguished Name (DN)" + msgstr "Pomocí Distinguished Name (DN)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754 + msgid "Using Email Address" + msgstr "Pomocí e-mailové adresy" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1002 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019 + msgid "Reconnecting to LDAP server..." + msgstr "Připojuji se znovu k serveru LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1598 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617 + msgid "Adding contact to LDAP server..." + msgstr "Přidávám kontakt na server LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1726 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Removing contact from LDAP server..." + msgstr "Odstraňuji kontakt ze serveru LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2031 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064 + msgid "Modifying contact from LDAP server..." + msgstr "Upravuji kontakt na serveru LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4040 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148 + msgid "Receiving LDAP search results..." + msgstr "Přijímám výsledky hledání LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4189 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310 + msgid "Error performing search" + msgstr "Chyba při hledání" + +@@ -84,106 +85,107 @@ msgstr "Chyba při hledání" + #. * function names, e.g. + #. * "e_book_add_contact" on book before + #. * "e_book_open +-#: ../addressbook/libebook/e-book.c:254 ../addressbook/libebook/e-book.c:258 +-#: ../addressbook/libebook/e-book.c:470 ../addressbook/libebook/e-book.c:474 +-#: ../addressbook/libebook/e-book.c:615 ../addressbook/libebook/e-book.c:619 +-#: ../addressbook/libebook/e-book.c:708 ../addressbook/libebook/e-book.c:712 +-#: ../addressbook/libebook/e-book.c:1022 ../addressbook/libebook/e-book.c:1027 +-#: ../addressbook/libebook/e-book.c:1214 ../addressbook/libebook/e-book.c:1218 +-#: ../addressbook/libebook/e-book.c:1375 ../addressbook/libebook/e-book.c:1379 +-#: ../addressbook/libebook/e-book.c:1588 ../addressbook/libebook/e-book.c:1592 +-#: ../addressbook/libebook/e-book.c:1829 ../addressbook/libebook/e-book.c:1833 +-#: ../addressbook/libebook/e-book.c:2070 ../addressbook/libebook/e-book.c:2074 +-#: ../addressbook/libebook/e-book.c:2286 ../addressbook/libebook/e-book.c:2290 +-#: ../addressbook/libebook/e-book.c:3425 ++#: ../addressbook/libebook/e-book.c:252 ../addressbook/libebook/e-book.c:256 ++#: ../addressbook/libebook/e-book.c:461 ../addressbook/libebook/e-book.c:465 ++#: ../addressbook/libebook/e-book.c:604 ../addressbook/libebook/e-book.c:608 ++#: ../addressbook/libebook/e-book.c:695 ../addressbook/libebook/e-book.c:699 ++#: ../addressbook/libebook/e-book.c:995 ../addressbook/libebook/e-book.c:1000 ++#: ../addressbook/libebook/e-book.c:1179 ../addressbook/libebook/e-book.c:1183 ++#: ../addressbook/libebook/e-book.c:1338 ../addressbook/libebook/e-book.c:1342 ++#: ../addressbook/libebook/e-book.c:1544 ../addressbook/libebook/e-book.c:1548 ++#: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791 ++#: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029 ++#: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238 ++#: ../addressbook/libebook/e-book.c:3364 + #, c-format + msgid "\"%s\" on book before \"%s\"" + msgstr "\"%s\" na adresáři před \"%s\"" + +-#: ../addressbook/libebook/e-book.c:267 ../addressbook/libebook/e-book.c:483 +-#: ../addressbook/libebook/e-book.c:628 ../addressbook/libebook/e-book.c:721 +-#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1228 +-#: ../addressbook/libebook/e-book.c:1389 ../addressbook/libebook/e-book.c:1601 +-#: ../addressbook/libebook/e-book.c:1842 ../addressbook/libebook/e-book.c:2084 +-#: ../addressbook/libebook/e-book.c:2299 ../addressbook/libebook/e-book.c:2665 +-#: ../addressbook/libebook/e-book.c:2871 ++#: ../addressbook/libebook/e-book.c:265 ../addressbook/libebook/e-book.c:474 ++#: ../addressbook/libebook/e-book.c:617 ../addressbook/libebook/e-book.c:708 ++#: ../addressbook/libebook/e-book.c:1010 ../addressbook/libebook/e-book.c:1193 ++#: ../addressbook/libebook/e-book.c:1352 ../addressbook/libebook/e-book.c:1557 ++#: ../addressbook/libebook/e-book.c:1800 ../addressbook/libebook/e-book.c:2039 ++#: ../addressbook/libebook/e-book.c:2247 ../addressbook/libebook/e-book.c:2593 ++#: ../addressbook/libebook/e-book.c:2792 ++#, c-format + msgid "book busy" + msgstr "adresář se používá" + +-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:304 +-#: ../addressbook/libebook/e-book.c:516 ../addressbook/libebook/e-book.c:520 +-#: ../addressbook/libebook/e-book.c:657 ../addressbook/libebook/e-book.c:661 +-#: ../addressbook/libebook/e-book.c:750 ../addressbook/libebook/e-book.c:754 +-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069 +-#: ../addressbook/libebook/e-book.c:1260 ../addressbook/libebook/e-book.c:1263 +-#: ../addressbook/libebook/e-book.c:1418 ../addressbook/libebook/e-book.c:1422 +-#: ../addressbook/libebook/e-book.c:1637 ../addressbook/libebook/e-book.c:1641 +-#: ../addressbook/libebook/e-book.c:1889 ../addressbook/libebook/e-book.c:1893 +-#: ../addressbook/libebook/e-book.c:2116 ../addressbook/libebook/e-book.c:2120 +-#: ../addressbook/libebook/e-book.c:2327 ../addressbook/libebook/e-book.c:2331 +-#: ../addressbook/libebook/e-book.c:2606 ../addressbook/libebook/e-book.c:2693 +-#: ../addressbook/libebook/e-book.c:2697 ../addressbook/libebook/e-book.c:2899 +-#: ../addressbook/libebook/e-book.c:2903 ../addressbook/libebook/e-book.c:3434 ++#: ../addressbook/libebook/e-book.c:296 ../addressbook/libebook/e-book.c:300 ++#: ../addressbook/libebook/e-book.c:505 ../addressbook/libebook/e-book.c:509 ++#: ../addressbook/libebook/e-book.c:644 ../addressbook/libebook/e-book.c:648 ++#: ../addressbook/libebook/e-book.c:735 ../addressbook/libebook/e-book.c:739 ++#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1040 ++#: ../addressbook/libebook/e-book.c:1223 ../addressbook/libebook/e-book.c:1226 ++#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1383 ++#: ../addressbook/libebook/e-book.c:1593 ../addressbook/libebook/e-book.c:1597 ++#: ../addressbook/libebook/e-book.c:1847 ../addressbook/libebook/e-book.c:1851 ++#: ../addressbook/libebook/e-book.c:2069 ../addressbook/libebook/e-book.c:2073 ++#: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277 ++#: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619 ++#: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818 ++#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3373 + #, c-format + msgid "CORBA exception making \"%s\" call" + msgstr "Výjimka CORBA při volání \"%s\"" + +-#: ../addressbook/libebook/e-book.c:2587 ++#: ../addressbook/libebook/e-book.c:2523 + #, c-format + msgid "%s: there is no current operation" + msgstr "%s: není žádná aktuální operace" + +-#: ../addressbook/libebook/e-book.c:2622 ++#: ../addressbook/libebook/e-book.c:2552 + #, c-format + msgid "%s: could not cancel" + msgstr "%s: nemohu zrušit" + +-#: ../addressbook/libebook/e-book.c:2651 ../addressbook/libebook/e-book.c:2655 ++#: ../addressbook/libebook/e-book.c:2579 ../addressbook/libebook/e-book.c:2583 + #, c-format + msgid "\"%s\" on book after \"%s\"" + msgstr "\"%s\" na adresáři po \"%s\"" + +-#: ../addressbook/libebook/e-book.c:2721 ++#: ../addressbook/libebook/e-book.c:2647 + #, c-format + msgid "%s: canceled" + msgstr "%s: zrušeno" + +-#: ../addressbook/libebook/e-book.c:3289 ++#: ../addressbook/libebook/e-book.c:3228 + #, c-format + msgid "%s: Invalid source." + msgstr "%s: Neplatný zdroj." + +-#: ../addressbook/libebook/e-book.c:3297 ../addressbook/libebook/e-book.c:3363 ++#: ../addressbook/libebook/e-book.c:3236 ../addressbook/libebook/e-book.c:3302 + #, c-format + msgid "%s: no factories available for URI `%s'" + msgstr "%s: pro uri `%s' nejsou dostupné generátory" + +-#: ../addressbook/libebook/e-book.c:3309 ++#: ../addressbook/libebook/e-book.c:3248 + #, c-format + msgid "%s: Could not create EBookListener" + msgstr "%s: Nemohu vytvořit EBookListener" + +-#: ../addressbook/libebook/e-book.c:3576 ++#: ../addressbook/libebook/e-book.c:3515 + #, c-format + msgid "%s: there was no self contact UID stored in gconf" + msgstr "%s: v gconf nebylo uloženo uid kontaktu sama sebe" + +-#: ../addressbook/libebook/e-book.c:3709 ++#: ../addressbook/libebook/e-book.c:3648 + #, c-format + msgid "%s: there was no source for uid `%s' stored in gconf." + msgstr "%s: v gconf nebyl uložen zdroj pro uid `%s'." + + #. Dummy row as EContactField starts from 1 +-#: ../addressbook/libebook/e-contact.c:114 ++#: ../addressbook/libebook/e-contact.c:113 + msgid "Unique ID" + msgstr "Jedinečné ID" + +-#: ../addressbook/libebook/e-contact.c:115 ++#: ../addressbook/libebook/e-contact.c:114 + msgid "File Under" + msgstr "Uložit jako" + + #. URI of the book to which the contact belongs to +-#: ../addressbook/libebook/e-contact.c:117 ++#: ../addressbook/libebook/e-contact.c:116 + msgid "Book URI" + msgstr "URI adresáře" + +@@ -191,535 +193,540 @@ msgstr "URI adresáře" + #. 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:123 ++#: ../addressbook/libebook/e-contact.c:122 + msgid "Full Name" + msgstr "Celé jméno" + +-#: ../addressbook/libebook/e-contact.c:124 ++#: ../addressbook/libebook/e-contact.c:123 + msgid "Given Name" + msgstr "Křestní jméno" + +-#: ../addressbook/libebook/e-contact.c:125 ++#: ../addressbook/libebook/e-contact.c:124 + msgid "Family Name" + msgstr "Příjmení" + +-#: ../addressbook/libebook/e-contact.c:126 ++#: ../addressbook/libebook/e-contact.c:125 + msgid "Nickname" + msgstr "Přezdívka" + + #. Email fields +-#: ../addressbook/libebook/e-contact.c:129 ++#: ../addressbook/libebook/e-contact.c:128 + msgid "Email 1" + msgstr "1. e-mail" + +-#: ../addressbook/libebook/e-contact.c:130 ++#: ../addressbook/libebook/e-contact.c:129 + msgid "Email 2" + msgstr "2. e-mail" + +-#: ../addressbook/libebook/e-contact.c:131 ++#: ../addressbook/libebook/e-contact.c:130 + msgid "Email 3" + msgstr "3. e-mail" + +-#: ../addressbook/libebook/e-contact.c:132 ++#: ../addressbook/libebook/e-contact.c:131 + msgid "Email 4" + msgstr "4. e-mail" + +-#: ../addressbook/libebook/e-contact.c:134 ++#: ../addressbook/libebook/e-contact.c:133 + msgid "Mailer" + msgstr "Program pro elektronickou poštu" + + #. Address Labels +-#: ../addressbook/libebook/e-contact.c:137 ++#: ../addressbook/libebook/e-contact.c:136 + msgid "Home Address Label" + msgstr "Popisek adresy domů" + +-#: ../addressbook/libebook/e-contact.c:138 ++#: ../addressbook/libebook/e-contact.c:137 + msgid "Work Address Label" + msgstr "Popisek adresy do práce" + +-#: ../addressbook/libebook/e-contact.c:139 ++#: ../addressbook/libebook/e-contact.c:138 + msgid "Other Address Label" + msgstr "Popisek další adresy" + + #. Phone fields +-#: ../addressbook/libebook/e-contact.c:142 ++#: ../addressbook/libebook/e-contact.c:141 + msgid "Assistant Phone" + msgstr "Telefon asistenta" + +-#: ../addressbook/libebook/e-contact.c:143 ++#: ../addressbook/libebook/e-contact.c:142 + msgid "Business Phone" + msgstr "Telefon do práce" + +-#: ../addressbook/libebook/e-contact.c:144 ++#: ../addressbook/libebook/e-contact.c:143 + msgid "Business Phone 2" + msgstr "2. telefon do práce" + +-#: ../addressbook/libebook/e-contact.c:145 ++#: ../addressbook/libebook/e-contact.c:144 + msgid "Business Fax" + msgstr "Fax do práce" + +-#: ../addressbook/libebook/e-contact.c:146 ++#: ../addressbook/libebook/e-contact.c:145 + msgid "Callback Phone" + msgstr "Telefon pro zpětný dotaz" + +-#: ../addressbook/libebook/e-contact.c:147 ++#: ../addressbook/libebook/e-contact.c:146 + msgid "Car Phone" + msgstr "Telefon do auta" + +-#: ../addressbook/libebook/e-contact.c:148 ++#: ../addressbook/libebook/e-contact.c:147 + msgid "Company Phone" + msgstr "Firemní telefon" + +-#: ../addressbook/libebook/e-contact.c:149 ++#: ../addressbook/libebook/e-contact.c:148 + msgid "Home Phone" + msgstr "Telefon domů" + +-#: ../addressbook/libebook/e-contact.c:150 ++#: ../addressbook/libebook/e-contact.c:149 + msgid "Home Phone 2" + msgstr "2. telefon domů" + +-#: ../addressbook/libebook/e-contact.c:151 ++#: ../addressbook/libebook/e-contact.c:150 + msgid "Home Fax" + msgstr "Fax domů" + +-#: ../addressbook/libebook/e-contact.c:152 ++#: ../addressbook/libebook/e-contact.c:151 + msgid "ISDN" + msgstr "ISDN" + +-#: ../addressbook/libebook/e-contact.c:153 ++#: ../addressbook/libebook/e-contact.c:152 + msgid "Mobile Phone" + msgstr "Mobilní telefon" + +-#: ../addressbook/libebook/e-contact.c:154 ++#: ../addressbook/libebook/e-contact.c:153 + msgid "Other Phone" + msgstr "Další telefon" + +-#: ../addressbook/libebook/e-contact.c:155 ++#: ../addressbook/libebook/e-contact.c:154 + msgid "Other Fax" + msgstr "Další fax" + +-#: ../addressbook/libebook/e-contact.c:156 ++#: ../addressbook/libebook/e-contact.c:155 + msgid "Pager" + msgstr "Pager" + +-#: ../addressbook/libebook/e-contact.c:157 ++#: ../addressbook/libebook/e-contact.c:156 + msgid "Primary Phone" + msgstr "Primární telefon" + +-#: ../addressbook/libebook/e-contact.c:158 ++#: ../addressbook/libebook/e-contact.c:157 + msgid "Radio" + msgstr "Rádio" + +-#: ../addressbook/libebook/e-contact.c:159 ++#: ../addressbook/libebook/e-contact.c:158 + msgid "Telex" + msgstr "Telex" + + #. To translators: TTY is Teletypewriter +-#: ../addressbook/libebook/e-contact.c:161 ++#: ../addressbook/libebook/e-contact.c:160 + msgid "TTY" + msgstr "TTY" + + #. Organizational fields +-#: ../addressbook/libebook/e-contact.c:164 ++#: ../addressbook/libebook/e-contact.c:163 + msgid "Organization" + msgstr "Organizace" + +-#: ../addressbook/libebook/e-contact.c:165 ++#: ../addressbook/libebook/e-contact.c:164 + msgid "Organizational Unit" + msgstr "Organizační jednotka" + +-#: ../addressbook/libebook/e-contact.c:166 ++#: ../addressbook/libebook/e-contact.c:165 + msgid "Office" + msgstr "Kancelář" + +-#: ../addressbook/libebook/e-contact.c:167 ++#: ../addressbook/libebook/e-contact.c:166 + msgid "Title" + msgstr "Titul" + +-#: ../addressbook/libebook/e-contact.c:168 ++#: ../addressbook/libebook/e-contact.c:167 + msgid "Role" + msgstr "Funkce" + +-#: ../addressbook/libebook/e-contact.c:169 ++#: ../addressbook/libebook/e-contact.c:168 + msgid "Manager" + msgstr "Vedoucí" + +-#: ../addressbook/libebook/e-contact.c:170 ++#: ../addressbook/libebook/e-contact.c:169 + msgid "Assistant" + msgstr "Asistent" + + #. Web fields +-#: ../addressbook/libebook/e-contact.c:173 ++#: ../addressbook/libebook/e-contact.c:172 + msgid "Homepage URL" + msgstr "URL domovské stránky" + +-#: ../addressbook/libebook/e-contact.c:174 ++#: ../addressbook/libebook/e-contact.c:173 + msgid "Weblog URL" + msgstr "URL weblogu" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:177 +-#: ../libedataserverui/e-categories-dialog.c:439 ++#: ../addressbook/libebook/e-contact.c:176 ++#: ../libedataserverui/e-categories-dialog.c:426 + msgid "Categories" + msgstr "Kategorie" + + #. Collaboration fields +-#: ../addressbook/libebook/e-contact.c:180 ++#: ../addressbook/libebook/e-contact.c:179 + msgid "Calendar URI" + msgstr "URI kalendáře" + +-#: ../addressbook/libebook/e-contact.c:181 ++#: ../addressbook/libebook/e-contact.c:180 + msgid "Free/Busy URL" + msgstr "URL volno/zaneprázdněn" + +-#: ../addressbook/libebook/e-contact.c:182 ++#: ../addressbook/libebook/e-contact.c:181 + msgid "ICS Calendar" + msgstr "Kalendář ICS" + +-#: ../addressbook/libebook/e-contact.c:183 ++#: ../addressbook/libebook/e-contact.c:182 + msgid "Video Conferencing URL" + msgstr "URL pro videokonference" + + #. Misc fields +-#: ../addressbook/libebook/e-contact.c:186 ++#: ../addressbook/libebook/e-contact.c:185 + msgid "Spouse's Name" +-msgstr "Partner/-ka" ++msgstr "Jméno partnera/ky" + +-#: ../addressbook/libebook/e-contact.c:187 ++#: ../addressbook/libebook/e-contact.c:186 + msgid "Note" + msgstr "Poznámka" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:190 ++#: ../addressbook/libebook/e-contact.c:189 + msgid "AIM Home Screen Name 1" + msgstr "Přezdívka AIM doma 1" + +-#: ../addressbook/libebook/e-contact.c:191 ++#: ../addressbook/libebook/e-contact.c:190 + msgid "AIM Home Screen Name 2" + msgstr "Přezdívka AIM doma 2" + +-#: ../addressbook/libebook/e-contact.c:192 ++#: ../addressbook/libebook/e-contact.c:191 + msgid "AIM Home Screen Name 3" + msgstr "Přezdívka AIM doma 3" + +-#: ../addressbook/libebook/e-contact.c:193 ++#: ../addressbook/libebook/e-contact.c:192 + msgid "AIM Work Screen Name 1" + msgstr "Přezdívka AIM v práci 1" + +-#: ../addressbook/libebook/e-contact.c:194 ++#: ../addressbook/libebook/e-contact.c:193 + msgid "AIM Work Screen Name 2" + msgstr "Přezdívka AIM v práci 2" + +-#: ../addressbook/libebook/e-contact.c:195 ++#: ../addressbook/libebook/e-contact.c:194 + msgid "AIM Work Screen Name 3" + msgstr "Přezdívka AIM v práci 3" + +-#: ../addressbook/libebook/e-contact.c:196 ++#: ../addressbook/libebook/e-contact.c:195 + msgid "GroupWise Home Screen Name 1" + msgstr "Přezdívka GroupWise doma 1" + +-#: ../addressbook/libebook/e-contact.c:197 ++#: ../addressbook/libebook/e-contact.c:196 + msgid "GroupWise Home Screen Name 2" + msgstr "Přezdívka GroupWise doma 2" + +-#: ../addressbook/libebook/e-contact.c:198 ++#: ../addressbook/libebook/e-contact.c:197 + msgid "GroupWise Home Screen Name 3" + msgstr "Přezdívka GroupWise doma 3" + +-#: ../addressbook/libebook/e-contact.c:199 ++#: ../addressbook/libebook/e-contact.c:198 + msgid "GroupWise Work Screen Name 1" + msgstr "Přezdívka GroupWise v práci 1" + +-#: ../addressbook/libebook/e-contact.c:200 ++#: ../addressbook/libebook/e-contact.c:199 + msgid "GroupWise Work Screen Name 2" + msgstr "Přezdívka GroupWise v práci 2" + +-#: ../addressbook/libebook/e-contact.c:201 ++#: ../addressbook/libebook/e-contact.c:200 + msgid "GroupWise Work Screen Name 3" + msgstr "Přezdívka GroupWise v práci 3" + +-#: ../addressbook/libebook/e-contact.c:202 ++#: ../addressbook/libebook/e-contact.c:201 + msgid "Jabber Home Id 1" + msgstr "ID Jabberu doma 1" + +-#: ../addressbook/libebook/e-contact.c:203 ++#: ../addressbook/libebook/e-contact.c:202 + msgid "Jabber Home Id 2" + msgstr "ID Jabberu doma 2" + +-#: ../addressbook/libebook/e-contact.c:204 ++#: ../addressbook/libebook/e-contact.c:203 + msgid "Jabber Home Id 3" + msgstr "ID Jabberu doma 3" + +-#: ../addressbook/libebook/e-contact.c:205 ++#: ../addressbook/libebook/e-contact.c:204 + msgid "Jabber Work Id 1" + msgstr "ID Jabberu v práci 1" + +-#: ../addressbook/libebook/e-contact.c:206 ++#: ../addressbook/libebook/e-contact.c:205 + msgid "Jabber Work Id 2" + msgstr "ID Jabberu v práci 2" + +-#: ../addressbook/libebook/e-contact.c:207 ++#: ../addressbook/libebook/e-contact.c:206 + msgid "Jabber Work Id 3" + msgstr "ID Jabberu v práci 3" + +-#: ../addressbook/libebook/e-contact.c:208 ++#: ../addressbook/libebook/e-contact.c:207 + msgid "Yahoo! Home Screen Name 1" + msgstr "Přezdívka Yahoo! doma 1" + +-#: ../addressbook/libebook/e-contact.c:209 ++#: ../addressbook/libebook/e-contact.c:208 + msgid "Yahoo! Home Screen Name 2" + msgstr "Přezdívka Yahoo! doma 2" + +-#: ../addressbook/libebook/e-contact.c:210 ++#: ../addressbook/libebook/e-contact.c:209 + msgid "Yahoo! Home Screen Name 3" + msgstr "Přezdívka Yahoo! doma 3" + +-#: ../addressbook/libebook/e-contact.c:211 ++#: ../addressbook/libebook/e-contact.c:210 + msgid "Yahoo! Work Screen Name 1" + msgstr "Přezdívka Yahoo! v práci 1" + +-#: ../addressbook/libebook/e-contact.c:212 ++#: ../addressbook/libebook/e-contact.c:211 + msgid "Yahoo! Work Screen Name 2" + msgstr "Přezdívka Yahoo! v práci 2" + +-#: ../addressbook/libebook/e-contact.c:213 ++#: ../addressbook/libebook/e-contact.c:212 + msgid "Yahoo! Work Screen Name 3" + msgstr "Přezdívka Yahoo! v práci 3" + +-#: ../addressbook/libebook/e-contact.c:214 ++#: ../addressbook/libebook/e-contact.c:213 + msgid "MSN Home Screen Name 1" + msgstr "Přezdívka MSN doma 1" + +-#: ../addressbook/libebook/e-contact.c:215 ++#: ../addressbook/libebook/e-contact.c:214 + msgid "MSN Home Screen Name 2" + msgstr "Přezdívka MSN doma 2" + +-#: ../addressbook/libebook/e-contact.c:216 ++#: ../addressbook/libebook/e-contact.c:215 + msgid "MSN Home Screen Name 3" + msgstr "Přezdívka MSN doma 3" + +-#: ../addressbook/libebook/e-contact.c:217 ++#: ../addressbook/libebook/e-contact.c:216 + msgid "MSN Work Screen Name 1" + msgstr "Přezdívka MSN v práci 1" + +-#: ../addressbook/libebook/e-contact.c:218 ++#: ../addressbook/libebook/e-contact.c:217 + msgid "MSN Work Screen Name 2" + msgstr "Přezdívka MSN v práci 2" + +-#: ../addressbook/libebook/e-contact.c:219 ++#: ../addressbook/libebook/e-contact.c:218 + msgid "MSN Work Screen Name 3" + msgstr "Přezdívka MSN v práci 3" + +-#: ../addressbook/libebook/e-contact.c:220 ++#: ../addressbook/libebook/e-contact.c:219 + msgid "ICQ Home Id 1" + msgstr "ICQ ID doma 1" + +-#: ../addressbook/libebook/e-contact.c:221 ++#: ../addressbook/libebook/e-contact.c:220 + msgid "ICQ Home Id 2" + msgstr "ICQ ID doma 2" + +-#: ../addressbook/libebook/e-contact.c:222 ++#: ../addressbook/libebook/e-contact.c:221 + msgid "ICQ Home Id 3" + msgstr "ICQ ID doma 3" + +-#: ../addressbook/libebook/e-contact.c:223 ++#: ../addressbook/libebook/e-contact.c:222 + msgid "ICQ Work Id 1" + msgstr "ICQ ID v práci 1" + +-#: ../addressbook/libebook/e-contact.c:224 ++#: ../addressbook/libebook/e-contact.c:223 + msgid "ICQ Work Id 2" + msgstr "ICQ ID v práci 2" + +-#: ../addressbook/libebook/e-contact.c:225 ++#: ../addressbook/libebook/e-contact.c:224 + msgid "ICQ Work Id 3" + msgstr "ICQ ID v práci 3" + + #. Last modified time +-#: ../addressbook/libebook/e-contact.c:228 ++#: ../addressbook/libebook/e-contact.c:227 + msgid "Last Revision" + msgstr "Poslední revize" + +-#: ../addressbook/libebook/e-contact.c:229 ++#: ../addressbook/libebook/e-contact.c:228 + msgid "Name or Org" + msgstr "Jméno nebo organizace" + + #. Address fields +-#: ../addressbook/libebook/e-contact.c:232 ++#: ../addressbook/libebook/e-contact.c:231 + msgid "Address List" + msgstr "Seznam adres" + +-#: ../addressbook/libebook/e-contact.c:233 ++#: ../addressbook/libebook/e-contact.c:232 + msgid "Home Address" + msgstr "Adresa domů" + +-#: ../addressbook/libebook/e-contact.c:234 ++#: ../addressbook/libebook/e-contact.c:233 + msgid "Work Address" + msgstr "Adresa do práce" + +-#: ../addressbook/libebook/e-contact.c:235 ++#: ../addressbook/libebook/e-contact.c:234 + msgid "Other Address" + msgstr "Další adresa" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:238 ++#: ../addressbook/libebook/e-contact.c:237 + msgid "Category List" + msgstr "Seznam kategorií" + + #. Photo/Logo +-#: ../addressbook/libebook/e-contact.c:241 ++#: ../addressbook/libebook/e-contact.c:240 + msgid "Photo" + msgstr "Fotografie" + +-#: ../addressbook/libebook/e-contact.c:242 ++#: ../addressbook/libebook/e-contact.c:241 + msgid "Logo" + msgstr "Logo" + +-#: ../addressbook/libebook/e-contact.c:244 ++#: ../addressbook/libebook/e-contact.c:243 + msgid "Name" + msgstr "Jméno" + +-#: ../addressbook/libebook/e-contact.c:245 ++#: ../addressbook/libebook/e-contact.c:244 + msgid "Email List" + msgstr "Seznam e-mailů" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:248 ++#: ../addressbook/libebook/e-contact.c:247 + msgid "AIM Screen Name List" + msgstr "Seznam přezdívek AIM" + +-#: ../addressbook/libebook/e-contact.c:249 ++#: ../addressbook/libebook/e-contact.c:248 + msgid "GroupWise Id List" + msgstr "Seznam Id GroupWise" + +-#: ../addressbook/libebook/e-contact.c:250 ++#: ../addressbook/libebook/e-contact.c:249 + msgid "Jabber Id List" + msgstr "Seznam Id Jabberu" + +-#: ../addressbook/libebook/e-contact.c:251 ++#: ../addressbook/libebook/e-contact.c:250 + msgid "Yahoo! Screen Name List" + msgstr "Seznam přezdívek Yahoo!" + +-#: ../addressbook/libebook/e-contact.c:252 ++#: ../addressbook/libebook/e-contact.c:251 + msgid "MSN Screen Name List" + msgstr "Seznam přezdívek MSN" + +-#: ../addressbook/libebook/e-contact.c:253 ++#: ../addressbook/libebook/e-contact.c:252 + msgid "ICQ Id List" + msgstr "Seznam ICQ Id" + +-#: ../addressbook/libebook/e-contact.c:255 ++#: ../addressbook/libebook/e-contact.c:254 + msgid "Wants HTML Mail" + msgstr "Chce poštu v HTML" + +-#: ../addressbook/libebook/e-contact.c:257 ++#: ../addressbook/libebook/e-contact.c:256 + msgid "List" + msgstr "Seznam" + +-#: ../addressbook/libebook/e-contact.c:258 ++#: ../addressbook/libebook/e-contact.c:257 + msgid "List Show Addresses" + msgstr "Seznam zobrazených adres" + +-#: ../addressbook/libebook/e-contact.c:260 ++#: ../addressbook/libebook/e-contact.c:259 + msgid "Birth Date" + msgstr "Narozeniny" + +-#: ../addressbook/libebook/e-contact.c:261 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:462 ++#: ../addressbook/libebook/e-contact.c:260 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461 + #: ../libedataserver/e-categories.c:43 + msgid "Anniversary" + msgstr "Výročí" + + #. Security fields +-#: ../addressbook/libebook/e-contact.c:264 ++#: ../addressbook/libebook/e-contact.c:263 + msgid "X.509 Certificate" + msgstr "Certifikát X.509" + +-#: ../addressbook/libebook/e-contact.c:266 ++#: ../addressbook/libebook/e-contact.c:265 + msgid "Gadu-Gadu Home Id 1" + msgstr "ID Gadu-Gadu doma 1" + +-#: ../addressbook/libebook/e-contact.c:267 ++#: ../addressbook/libebook/e-contact.c:266 + msgid "Gadu-Gadu Home Id 2" + msgstr "ID Gadu-Gadu doma 2" + +-#: ../addressbook/libebook/e-contact.c:268 ++#: ../addressbook/libebook/e-contact.c:267 + msgid "Gadu-Gadu Home Id 3" + msgstr "ID Gadu-Gadu doma 3" + +-#: ../addressbook/libebook/e-contact.c:269 ++#: ../addressbook/libebook/e-contact.c:268 + msgid "Gadu-Gadu Work Id 1" + msgstr "ID Gadu-Gadu v práci 1" + +-#: ../addressbook/libebook/e-contact.c:270 ++#: ../addressbook/libebook/e-contact.c:269 + msgid "Gadu-Gadu Work Id 2" + msgstr "ID Gadu-Gadu v práci 2" + +-#: ../addressbook/libebook/e-contact.c:271 ++#: ../addressbook/libebook/e-contact.c:270 + msgid "Gadu-Gadu Work Id 3" + msgstr "ID Gadu-Gadu v práci 3" + +-#: ../addressbook/libebook/e-contact.c:272 ++#: ../addressbook/libebook/e-contact.c:271 + msgid "Gadu-Gadu Id List" + msgstr "Seznam Gadu-Gadu ID" + + #. Geo information +-#: ../addressbook/libebook/e-contact.c:275 ++#: ../addressbook/libebook/e-contact.c:274 + msgid "Geographic Information" + msgstr "Geografické informace" + +-#: ../addressbook/libebook/e-contact.c:277 ++#: ../addressbook/libebook/e-contact.c:276 + msgid "Telephone" + msgstr "Telefon" + +-#: ../addressbook/libebook/e-contact.c:1494 ++#: ../addressbook/libebook/e-contact.c:1499 + #: ../addressbook/libebook/e-destination.c:761 + msgid "Unnamed List" + msgstr "Nepojmenovaný seznam" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:464 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463 + #: ../libedataserver/e-categories.c:44 + msgid "Birthday" + msgstr "Narozeniny" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:490 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489 + #, c-format + msgid "Birthday: %s" + msgstr "Narozeniny: %s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:514 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513 + #, c-format + msgid "Anniversary: %s" + msgstr "Výročí: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:203 ++#: ../calendar/backends/file/e-cal-backend-file.c:212 + msgid "Cannot save calendar data: Malformed URI." + msgstr "Nelze uložit data kalendáře: Chybné URI." + ++#: ../calendar/backends/file/e-cal-backend-file.c:219 ++#: ../calendar/backends/file/e-cal-backend-file.c:225 ++msgid "Cannot save calendar data" ++msgstr "Nelze uložit data kalendáře" ++ + #: ../calendar/backends/google/e-cal-backend-google-utils.c:335 + msgid "Could not create thread for getting deltas" + msgstr "Nemohu vytvořit thread pro získání změn" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:367 +-#: ../calendar/backends/google/e-cal-backend-google.c:1175 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1039 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1338 +-#: ../calendar/backends/http/e-cal-backend-http.c:569 ++#: ../calendar/backends/google/e-cal-backend-google.c:1191 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #: ../calendar/backends/weather/e-cal-backend-weather.c:466 + msgid "Could not create cache file" + msgstr "Nemohu vytvořit soubor pro cache" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:380 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1051 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065 + msgid "Could not create thread for populating cache" + msgstr "Nemohu vytvořit thread pro naplnění cache" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1028 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1784 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795 + msgid "Reply Requested: by " + msgstr "Požadována odpověď: do " + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1033 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1789 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800 + msgid "Reply Requested: When convenient" + msgstr "Požadována odpověď: Podle možností" + +@@ -728,22 +735,23 @@ msgstr "Požadována odpověď: Podle mo + msgid "Loading %s items" + msgstr "Načítám %s položek" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:875 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260 + msgid "Calendar" + msgstr "Kalendář" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:933 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947 + msgid "Invalid server URI" + msgstr "Neplatné URI serveru" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:952 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:961 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1057 +-#: ../calendar/libecal/e-cal.c:5031 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1069 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1101 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1139 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071 ++#: ../calendar/libecal/e-cal.c:5082 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:109 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145 + #: ../camel/providers/groupwise/camel-groupwise-store.c:594 + #: ../camel/providers/groupwise/camel-groupwise-store.c:746 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:157 +@@ -751,15 +759,15 @@ msgstr "Neplatné URI serveru" + msgid "Authentication failed" + msgstr "Autentizace selhala" + +-#: ../calendar/backends/http/e-cal-backend-http.c:269 ++#: ../calendar/backends/http/e-cal-backend-http.c:267 + msgid "Redirected to Invalid URI" + msgstr "Přesměrováno na neplatné URI" + +-#: ../calendar/backends/http/e-cal-backend-http.c:290 ++#: ../calendar/backends/http/e-cal-backend-http.c:288 + msgid "Bad file format." + msgstr "Špatný formát souboru." + +-#: ../calendar/backends/http/e-cal-backend-http.c:296 ++#: ../calendar/backends/http/e-cal-backend-http.c:294 + msgid "Not a calendar." + msgstr "Není to kalendář." + +@@ -956,7 +964,7 @@ msgstr "%.1f-%.1fcm sněhu\n" + msgid "%.1f-%.1fin snow\n" + msgstr "%.1f-%.1f\" sněhu\n" + +-#: ../calendar/libecal/e-cal-component.c:1315 ++#: ../calendar/libecal/e-cal-component.c:1322 + msgid "Untitled appointment" + msgstr "Nepojmenovaná událost" + +@@ -1084,24 +1092,24 @@ msgstr "30." + msgid "31st" + msgstr "31." + +-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712 ++#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713 + msgid "High" + msgstr "Vysoká" + +-#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714 ++#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715 + msgid "Normal" + msgstr "Normální" + +-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:716 ++#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717 + msgid "Low" + msgstr "Nízká" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:710 ++#: ../calendar/libecal/e-cal-util.c:711 + msgid "Undefined" + msgstr "Nedefinováno" + +-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:200 ++#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199 + #, c-format + msgid "Enter password for %s (user %s)" + msgstr "Zadejte heslo pro %s (uživatel %s)" +@@ -1115,87 +1123,106 @@ msgstr "Zadejte heslo pro %s (uživatel + msgid "Enter password for %s to enable proxy for user %s" + msgstr "Zadejte heslo %s k povolení proxy pro uživatele %s" + +-#: ../calendar/libecal/e-cal.c:5003 ++#: ../calendar/libecal/e-cal.c:5054 + msgid "Invalid argument" + msgstr "Neplatný argument" + +-#: ../calendar/libecal/e-cal.c:5005 ++#: ../calendar/libecal/e-cal.c:5056 + msgid "Backend is busy" + msgstr "Backend pracuje" + +-#: ../calendar/libecal/e-cal.c:5007 ++#: ../calendar/libecal/e-cal.c:5058 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:97 + msgid "Repository is offline" + msgstr "Sklad je odpojen" + +-#: ../calendar/libecal/e-cal.c:5009 ++#: ../calendar/libecal/e-cal.c:5060 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:121 + msgid "No such calendar" + msgstr "Takový kalendář neexistuje" + +-#: ../calendar/libecal/e-cal.c:5011 ../servers/groupwise/e-gw-connection.c:199 ++#: ../calendar/libecal/e-cal.c:5062 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:103 ++#: ../servers/groupwise/e-gw-connection.c:233 + msgid "Object not found" + msgstr "Objekt nenalezen" + +-#: ../calendar/libecal/e-cal.c:5013 ../servers/groupwise/e-gw-connection.c:193 ++#: ../calendar/libecal/e-cal.c:5064 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:105 ++#: ../servers/groupwise/e-gw-connection.c:227 + msgid "Invalid object" + msgstr "Neplatný objekt" + +-#: ../calendar/libecal/e-cal.c:5015 ++#: ../calendar/libecal/e-cal.c:5066 + msgid "URI not loaded" + msgstr "URI nebylo načteno" + +-#: ../calendar/libecal/e-cal.c:5017 ++#: ../calendar/libecal/e-cal.c:5068 + msgid "URI already loaded" + msgstr "URI již bylo načteno" + +-#: ../calendar/libecal/e-cal.c:5019 ++#: ../calendar/libecal/e-cal.c:5070 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:99 + #: ../servers/exchange/storage/e-storage.c:571 + msgid "Permission denied" + msgstr "Přístup odepřen" + +-#: ../calendar/libecal/e-cal.c:5021 ../servers/groupwise/e-gw-connection.c:201 ++#: ../calendar/libecal/e-cal.c:5072 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:123 ++#: ../servers/groupwise/e-gw-connection.c:235 + msgid "Unknown User" + msgstr "Neznámý uživatel" + +-#: ../calendar/libecal/e-cal.c:5023 ++#: ../calendar/libecal/e-cal.c:5074 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:107 + msgid "Object ID already exists" + msgstr "ID objektu již existuje" + +-#: ../calendar/libecal/e-cal.c:5025 ++#: ../calendar/libecal/e-cal.c:5076 + msgid "Protocol not supported" + msgstr "Protokol není podporován" + +-#: ../calendar/libecal/e-cal.c:5027 ++#: ../calendar/libecal/e-cal.c:5078 + msgid "Operation has been canceled" + msgstr "Operace byla zrušena" + +-#: ../calendar/libecal/e-cal.c:5029 ++#: ../calendar/libecal/e-cal.c:5080 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:136 + msgid "Could not cancel operation" + msgstr "Nemohu zrušit operaci" + +-#: ../calendar/libecal/e-cal.c:5033 +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 ++#: ../calendar/libecal/e-cal.c:5084 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:111 ++#: ../camel/providers/smtp/camel-smtp-transport.c:218 + msgid "Authentication required" + msgstr "Je vyžadována autentizace" + +-#: ../calendar/libecal/e-cal.c:5035 ++#: ../calendar/libecal/e-cal.c:5086 + msgid "A CORBA exception has occurred" + msgstr "Došlo k výjimce CORBA" + +-#: ../calendar/libecal/e-cal.c:5037 ++#: ../calendar/libecal/e-cal.c:5088 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:139 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 +-#: ../camel/providers/imap/camel-imap-command.c:312 +-#: ../camel/providers/imap/camel-imap-command.c:412 +-#: ../camel/providers/imap/camel-imap-store.c:762 +-#: ../camel/providers/imap4/camel-imap4-store.c:313 +-#: ../camel/providers/pop3/camel-pop3-store.c:559 ++#: ../camel/providers/imap/camel-imap-command.c:434 ++#: ../camel/providers/imap/camel-imap-store.c:742 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1570 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1609 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1654 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1710 ++#: ../camel/providers/imap4/camel-imap4-store.c:315 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 ++#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/providers/pop3/camel-pop3-store.c:560 + #: ../camel/providers/pop3/camel-pop3-store.c:566 +-#: ../camel/providers/pop3/camel-pop3-store.c:572 + #: ../servers/exchange/storage/e-storage.c:585 +-#: ../servers/groupwise/e-gw-connection.c:207 ++#: ../servers/groupwise/e-gw-connection.c:241 + msgid "Unknown error" + msgstr "Neznámá chyba" + +-#: ../calendar/libecal/e-cal.c:5039 ++#: ../calendar/libecal/e-cal.c:5090 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:95 + #: ../servers/exchange/storage/e-storage.c:553 + msgid "No error" + msgstr "Žádná chyba" +@@ -1295,6 +1322,51 @@ msgstr "" + "\"%s\" očekává jako všechny parametry řetězce nebo právě jeden parametr " + "boolean false (#f)" + ++#: ../calendar/libedata-cal/e-cal-backend-util.c:101 ++msgid "Invalid range" ++msgstr "Neplatný interval" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:113 ++msgid "Unsupported field" ++msgstr "Nepodporované pole" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:115 ++msgid "Unsupported method" ++msgstr "Nepodporovaná metoda" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:117 ++msgid "Unsupported authentication method" ++msgstr "Nepodporovaná metoda autentizace" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:119 ++msgid "TLS not available" ++msgstr "TLS není k dispozici" ++ ++#. Translators: This means "Offline mode unavailable" ++#: ../calendar/libedata-cal/e-cal-backend-util.c:126 ++msgid "Offline unavailable" ++msgstr "Offline není k dispozici" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:128 ++msgid "Search size limit exceeded" ++msgstr "Překročena velikost hledání" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:130 ++msgid "Search time limit exceeded" ++msgstr "Překročen časový limit hledání" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:132 ++msgid "Invalid query" ++msgstr "Neplatný dotaz" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:134 ++msgid "Query refused" ++msgstr "Dotaz odmítnut" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:141 ++msgid "Invalid server version" ++msgstr "Neplatná verze serveru" ++ + #: ../camel/camel-cipher-context.c:102 + msgid "Signing is not supported by this cipher" + msgstr "Digitální podpis není podporován touto šifrou" +@@ -1335,15 +1407,19 @@ msgstr "Nemůžete importovat klíče s + msgid "You may not export keys with this cipher" + msgstr "Nemůžete exportovat klíče s touto šifrou" + +-#: ../camel/camel-data-cache.c:137 ++#: ../camel/camel-data-cache.c:136 + msgid "Unable to create cache path" + msgstr "Nemohu vytvořit cestu cache" + +-#: ../camel/camel-data-cache.c:384 ++#: ../camel/camel-data-cache.c:381 + #, c-format + msgid "Could not remove cache entry: %s: %s" + msgstr "Nemohu odstranit položku cache: %s: %s" + ++#: ../camel/camel-db.c:102 ++msgid "Insufficient memory" ++msgstr "Nedostatečná paměť" ++ + #: ../camel/camel-disco-diary.c:198 + #, c-format + msgid "" +@@ -1356,13 +1432,14 @@ msgstr "" + "připojení k síti nezopakují." + + #: ../camel/camel-disco-diary.c:261 ++#: ../camel/providers/imap/camel-imap-journal.c:299 + #, c-format + msgid "" +-"Could not open `%s':\n" ++"Could not open '%s':\n" + "%s\n" + "Changes made to this folder will not be resynchronized." + msgstr "" +-"Nemohu otevřít `%s':\n" ++"Nelze otevřít '%s':\n" + "%s\n" + "Změny provedené v této složce nebudou sesynchronizovány." + +@@ -1378,97 +1455,100 @@ msgstr "Zkopírovat obsah složky lokál + msgid "Downloading new messages for offline mode" + msgstr "Stahuji nové zprávy pro režim odpojení" + +-#: ../camel/camel-disco-folder.c:468 ++#: ../camel/camel-disco-folder.c:469 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "Připravuji složku '%s' pro práci při odpojení" + + #: ../camel/camel-disco-store.c:403 +-#: ../camel/providers/imap/camel-imap-store.c:3018 ++#: ../camel/providers/imap/camel-imap-store.c:1002 ++#: ../camel/providers/imap/camel-imap-store.c:1810 ++#: ../camel/providers/imap/camel-imap-store.c:2226 ++#: ../camel/providers/imap/camel-imap-store.c:2994 + msgid "You must be working online to complete this operation" + msgstr "Pro dokončení této operace musíte pracovat on-line" + +-#: ../camel/camel-exception.c:264 ++#: ../camel/camel-exception.c:262 + msgid "No description available" + msgstr "Žádný popis není k dispozici" + +-#: ../camel/camel-filter-driver.c:786 ++#: ../camel/camel-filter-driver.c:785 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "Nemohu vytvořit proces potomka '%s': %s" + +-#: ../camel/camel-filter-driver.c:828 ++#: ../camel/camel-filter-driver.c:827 + #, c-format + msgid "Invalid message stream received from %s: %s" + msgstr "Přijat neplatný proud zprávy od %s: %s" + +-#: ../camel/camel-filter-driver.c:1017 ../camel/camel-filter-driver.c:1026 ++#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025 + msgid "Syncing folders" + msgstr "Synchronizuji složky" + +-#: ../camel/camel-filter-driver.c:1115 ../camel/camel-filter-driver.c:1495 ++#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1520 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "Chyba při zpracování filtru: %s: %s" + +-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1504 ++#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1529 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "Chyba při spuštění filtru: %s: %s" + +-#: ../camel/camel-filter-driver.c:1192 ++#: ../camel/camel-filter-driver.c:1211 + msgid "Unable to open spool folder" + msgstr "Nemohu otevřít složku fronty" + +-#: ../camel/camel-filter-driver.c:1201 ++#: ../camel/camel-filter-driver.c:1220 + msgid "Unable to process spool folder" + msgstr "Nemohu zpracovat složku fronty" + +-#: ../camel/camel-filter-driver.c:1216 ++#: ../camel/camel-filter-driver.c:1236 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "Stahuji zprávu %d (%d%%)" + +-#: ../camel/camel-filter-driver.c:1220 ++#: ../camel/camel-filter-driver.c:1240 + msgid "Cannot open message" + msgstr "Nemohu otevřít zprávu" + +-#: ../camel/camel-filter-driver.c:1221 ../camel/camel-filter-driver.c:1234 ++#: ../camel/camel-filter-driver.c:1241 ../camel/camel-filter-driver.c:1259 + #, c-format + msgid "Failed on message %d" + msgstr "Nemohu stáhnout zprávu %d" + +-#: ../camel/camel-filter-driver.c:1248 ../camel/camel-filter-driver.c:1339 ++#: ../camel/camel-filter-driver.c:1273 ../camel/camel-filter-driver.c:1364 + msgid "Syncing folder" + msgstr "Synchronizuji složku" + +-#: ../camel/camel-filter-driver.c:1252 ../camel/camel-filter-driver.c:1344 ++#: ../camel/camel-filter-driver.c:1277 ../camel/camel-filter-driver.c:1369 + msgid "Complete" + msgstr "Dokončeno" + +-#: ../camel/camel-filter-driver.c:1309 ++#: ../camel/camel-filter-driver.c:1334 + #, c-format + msgid "Getting message %d of %d" + msgstr "Stahuji zprávu %d z %d" + +-#: ../camel/camel-filter-driver.c:1324 ++#: ../camel/camel-filter-driver.c:1349 + #, c-format + msgid "Failed at message %d of %d" + msgstr "Chyba při zprávě %d z %d" + +-#: ../camel/camel-filter-search.c:139 ++#: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" + msgstr "Nemohu stáhnout zprávu" + +-#: ../camel/camel-filter-search.c:402 ++#: ../camel/camel-filter-search.c:401 + msgid "Invalid arguments to (system-flag)" + msgstr "Neplatné parametry pro (system-flag)" + +-#: ../camel/camel-filter-search.c:417 ++#: ../camel/camel-filter-search.c:416 + msgid "Invalid arguments to (user-tag)" + msgstr "Neplatné parametry pro (user-tag)" + +-#: ../camel/camel-filter-search.c:582 ++#: ../camel/camel-filter-search.c:581 + #, c-format + msgid "Failed to create create child process '%s': %s" + msgstr "Nemohu vytvořit proces potomka '%s': %s" +@@ -1479,7 +1559,7 @@ msgstr "Nemohu vytvořit proces potomka + msgid "Error executing filter search: %s: %s" + msgstr "Chyba při spuštění vyhledávání filtru: %s: %s" + +-#: ../camel/camel-folder-search.c:358 ../camel/camel-folder-search.c:480 ++#: ../camel/camel-folder-search.c:335 ../camel/camel-folder-search.c:447 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -1488,7 +1568,7 @@ msgstr "" + "Nemohu zpracovat vyhledávací výraz: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:368 ../camel/camel-folder-search.c:490 ++#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:457 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -1497,72 +1577,72 @@ msgstr "" + "Chyba při provádění vyhledávacího výrazu: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:677 ../camel/camel-folder-search.c:712 ++#: ../camel/camel-folder-search.c:649 ../camel/camel-folder-search.c:692 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) vyžaduje jeden výsledek typu bool" + +-#: ../camel/camel-folder-search.c:765 ++#: ../camel/camel-folder-search.c:745 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) není povoleno uvnitř %s" + +-#: ../camel/camel-folder-search.c:771 ../camel/camel-folder-search.c:778 ++#: ../camel/camel-folder-search.c:751 ../camel/camel-folder-search.c:758 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) vyžaduje řetězec s typem porovnávání" + +-#: ../camel/camel-folder-search.c:805 ++#: ../camel/camel-folder-search.c:785 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) očekává jako výsledek pole" + +-#: ../camel/camel-folder-search.c:814 ++#: ../camel/camel-folder-search.c:794 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) vyžaduje nastavenou složku" + +-#: ../camel/camel-folder-search.c:909 ++#: ../camel/camel-folder-search.c:889 + #, c-format + msgid "Performing query on unknown header: %s" + msgstr "Vykonání otázky na neznámé hlavičce: %s" + +-#: ../camel/camel-folder.c:618 ++#: ../camel/camel-folder.c:693 + #, c-format + msgid "Unsupported operation: append message: for %s" + msgstr "Nepodporovaná operace: přidat zprávu: pro %s" + +-#: ../camel/camel-folder.c:1240 ++#: ../camel/camel-folder.c:1349 + #, c-format + msgid "Unsupported operation: search by expression: for %s" + msgstr "Nepodporovaná operace: hledání výrazem: %s" + +-#: ../camel/camel-folder.c:1281 ++#: ../camel/camel-folder.c:1390 + #, c-format + msgid "Unsupported operation: search by UIDs: for %s" + msgstr "Nepodporovaná operace: hledání pomocí uid: pro %s" + +-#: ../camel/camel-folder.c:1397 ++#: ../camel/camel-folder.c:1506 + msgid "Moving messages" + msgstr "Přesunuji zprávy" + +-#: ../camel/camel-folder.c:1397 ++#: ../camel/camel-folder.c:1506 + msgid "Copying messages" + msgstr "Kopíruji zprávy" + +-#: ../camel/camel-folder.c:1651 ++#: ../camel/camel-folder.c:1852 + msgid "Learning junk" + msgstr "Učení se nevyžádané poště" + +-#: ../camel/camel-folder.c:1668 ++#: ../camel/camel-folder.c:1869 + msgid "Learning non-junk" + msgstr "Učení se tomu, co není nevyžádanou poštou" + +-#: ../camel/camel-folder.c:1687 ++#: ../camel/camel-folder.c:1888 + msgid "Filtering new message(s)" + msgstr "Filtruji nové zprávy" + +-#: ../camel/camel-gpg-context.c:754 ++#: ../camel/camel-gpg-context.c:755 + #, c-format + msgid "" + "Unexpected GnuPG status message encountered:\n" +@@ -1573,15 +1653,15 @@ msgstr "" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:769 ++#: ../camel/camel-gpg-context.c:770 + msgid "Failed to parse gpg userid hint." + msgstr "Nemohu zpracovat nápovědy gpg userid." + +-#: ../camel/camel-gpg-context.c:793 ../camel/camel-gpg-context.c:807 ++#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808 + msgid "Failed to parse gpg passphrase request." + msgstr "Nemohu zpracovat požadavek hesla gpg." + +-#: ../camel/camel-gpg-context.c:827 ++#: ../camel/camel-gpg-context.c:828 + #, c-format + msgid "" + "You need a PIN to unlock the key for your\n" +@@ -1590,7 +1670,7 @@ msgstr "" + "Potřebujete PIN k odemčení klíče své\n" + "SmartCard: \"%s\"" + +-#: ../camel/camel-gpg-context.c:831 ++#: ../camel/camel-gpg-context.c:832 + #, c-format + msgid "" + "You need a passphrase to unlock the key for\n" +@@ -1599,101 +1679,95 @@ msgstr "" + "Potřebujete heslo k odemčení klíče\n" + "uživatele: \"%s\"" + +-#: ../camel/camel-gpg-context.c:836 ++#: ../camel/camel-gpg-context.c:837 + #, c-format +-msgid "Unexpected request from GnuPG for `%s'" +-msgstr "Neočekávaná odpověď od GnuPG pro '%s'" ++msgid "Unexpected request from GnuPG for '%s'" ++msgstr "Neočekávaný požadavek od GnuPG pro '%s'" + +-#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:1066 ++#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068 + #: ../camel/providers/nntp/camel-nntp-store.c:1281 + msgid "Canceled." + msgstr "Zrušeno." + +-#: ../camel/camel-gpg-context.c:875 ++#: ../camel/camel-gpg-context.c:876 + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "Nemohu odemknout tajný klíč. Byla zadána tři chybná hesla." + +-#: ../camel/camel-gpg-context.c:883 ++#: ../camel/camel-gpg-context.c:884 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "Neočekávaná odpověď od GnuPG: %s" + +-#: ../camel/camel-gpg-context.c:936 ++#: ../camel/camel-gpg-context.c:937 + msgid "Failed to encrypt: No valid recipients specified." + msgstr "Nemohu zašifrovat zprávu: Nejsou určeni platní příjemci." + + #. always called on an i/o error +-#: ../camel/camel-gpg-context.c:1204 ../camel/camel-gpg-context.c:1332 +-#: ../camel/camel-gpg-context.c:1826 ../camel/camel-gpg-context.c:1871 ++#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1334 ++#: ../camel/camel-gpg-context.c:1829 ../camel/camel-gpg-context.c:1874 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "Nemohu spustit gpg: %s" + +-#: ../camel/camel-gpg-context.c:1300 ../camel/camel-smime-context.c:392 ++#: ../camel/camel-gpg-context.c:1302 ../camel/camel-smime-context.c:392 + #, c-format + msgid "Could not generate signing data: %s" + msgstr "Nemohu vygenerovat data podpisu: %s" + +-#: ../camel/camel-gpg-context.c:1347 ../camel/camel-gpg-context.c:1531 +-#: ../camel/camel-gpg-context.c:1616 ../camel/camel-gpg-context.c:1631 +-#: ../camel/camel-gpg-context.c:1748 ../camel/camel-gpg-context.c:1763 +-#: ../camel/camel-gpg-context.c:1842 ../camel/camel-gpg-context.c:1887 ++#: ../camel/camel-gpg-context.c:1349 ../camel/camel-gpg-context.c:1534 ++#: ../camel/camel-gpg-context.c:1619 ../camel/camel-gpg-context.c:1634 ++#: ../camel/camel-gpg-context.c:1750 ../camel/camel-gpg-context.c:1765 ++#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1890 + msgid "Failed to execute gpg." + msgstr "Nemohu spustit gpg." + +-#: ../camel/camel-gpg-context.c:1366 ++#: ../camel/camel-gpg-context.c:1368 + msgid "This is a digitally signed message part" + msgstr "Toto je digitálně podepsaná část zprávy" + +-#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457 +-#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1479 ++#: ../camel/camel-gpg-context.c:1453 ../camel/camel-gpg-context.c:1459 ++#: ../camel/camel-gpg-context.c:1465 ../camel/camel-gpg-context.c:1480 + #: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706 + #: ../camel/camel-smime-context.c:713 + msgid "Cannot verify message signature: Incorrect message format" + msgstr "Nemohu ověřit podpis zprávy: Nesprávný formát zprávy" + +-#: ../camel/camel-gpg-context.c:1516 ++#: ../camel/camel-gpg-context.c:1519 + #, c-format + msgid "Cannot verify message signature: could not create temp file: %s" + msgstr "Nemohu ověřit podpis zprávy: nemohu vytvořit dočasný soubor: %s" + +-#: ../camel/camel-gpg-context.c:1599 ++#: ../camel/camel-gpg-context.c:1602 + #, c-format + msgid "Could not generate encrypting data: %s" + msgstr "Nemohu vygenerovat data šifrování: %s" + +-#: ../camel/camel-gpg-context.c:1649 ++#: ../camel/camel-gpg-context.c:1652 + msgid "This is a digitally encrypted message part" + msgstr "Toto je digitálně šifrovaná část zprávy" + +-#: ../camel/camel-gpg-context.c:1702 ../camel/camel-gpg-context.c:1710 +-#: ../camel/camel-gpg-context.c:1730 ++#: ../camel/camel-gpg-context.c:1705 ../camel/camel-gpg-context.c:1713 ++#: ../camel/camel-gpg-context.c:1732 + msgid "Cannot decrypt message: Incorrect message format" + msgstr "Nemohu dešifrovat zprávu: Nesprávný formát zprávy" + +-#: ../camel/camel-gpg-context.c:1719 ++#: ../camel/camel-gpg-context.c:1722 + msgid "Failed to decrypt MIME part: protocol error" + msgstr "Nemohu dešifrovat část MIME: chyba protokolu" + +-#: ../camel/camel-gpg-context.c:1784 ../camel/camel-smime-context.c:969 ++#: ../camel/camel-gpg-context.c:1787 ../camel/camel-smime-context.c:969 + msgid "Encrypted content" + msgstr "Šifrovaný obsah" + +-#: ../camel/camel-gpg-context.c:1803 ++#: ../camel/camel-gpg-context.c:1806 + msgid "Unable to parse message content" + msgstr "Nemohu zpracovat obsah zprávy" + +-#: ../camel/camel-gpg-context.c:1827 ../camel/camel-gpg-context.c:1872 ++#: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875 + #: ../camel/camel-tcp-stream-openssl.c:635 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1548 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1587 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1632 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1688 +-#: ../camel/providers/imap4/camel-imap4-store.c:820 +-#: ../camel/providers/imap4/camel-imap4-store.c:1495 +-#: ../camel/providers/imap4/camel-imap4-utils.c:557 +-#: ../camel/providers/smtp/camel-smtp-transport.c:164 +-#: ../camel/providers/smtp/camel-smtp-transport.c:219 ++#: ../camel/providers/imap4/camel-imap4-utils.c:624 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:221 + msgid "Unknown" + msgstr "Neznámá" + +@@ -1791,44 +1865,44 @@ msgstr "Chyba při zápisu pošty do do + msgid "Error copying mail temp file: %s" + msgstr "Chyba při kopírovaní dočasného souboru pošty: %s" + +-#: ../camel/camel-multipart-signed.c:595 ++#: ../camel/camel-multipart-signed.c:593 + msgid "parse error" + msgstr "chyba ve zpracování" + +-#: ../camel/camel-net-utils.c:506 ../camel/camel-net-utils.c:668 +-#: ../camel/camel-net-utils.c:800 +-#: ../camel/providers/pop3/camel-pop3-store.c:449 +-#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667 ++#: ../camel/camel-net-utils.c:799 ++#: ../camel/providers/pop3/camel-pop3-store.c:447 ++#: ../camel/providers/pop3/camel-pop3-store.c:547 + msgid "Canceled" + msgstr "Zrušeno" + +-#: ../camel/camel-net-utils.c:525 ++#: ../camel/camel-net-utils.c:524 + msgid "cannot create thread" + msgstr "nemohu vytvořit vlákno" + +-#: ../camel/camel-net-utils.c:672 ++#: ../camel/camel-net-utils.c:671 + #, c-format + msgid "Resolving: %s" + msgstr "Hledám: %s" + +-#: ../camel/camel-net-utils.c:694 ++#: ../camel/camel-net-utils.c:693 + msgid "Host lookup failed" + msgstr "Nemohu najít počítač" + +-#: ../camel/camel-net-utils.c:696 ++#: ../camel/camel-net-utils.c:695 + #, c-format + msgid "Host lookup failed: %s: %s" + msgstr "Nemohu najít počítač: %s: %s" + +-#: ../camel/camel-net-utils.c:804 ++#: ../camel/camel-net-utils.c:803 + msgid "Resolving address" + msgstr "Vyhledávám adresu" + +-#: ../camel/camel-net-utils.c:824 ++#: ../camel/camel-net-utils.c:823 + msgid "Name lookup failed" + msgstr "Vyhledávání jména selhalo" + +-#: ../camel/camel-net-utils.c:827 ++#: ../camel/camel-net-utils.c:826 + #, c-format + msgid "Name lookup failed: %s" + msgstr "Vyhledávání jména selhalo: %s" +@@ -1840,36 +1914,36 @@ msgstr "Synchronizuji zprávy ve složce + + #: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187 + #, c-format +-msgid "Cannot write offline journal for folder `%s': %s" +-msgstr "Nemohu zapsat offline záznam o složce `%s': %s" ++msgid "Cannot write offline journal for folder '%s': %s" ++msgstr "Nelze zapsat offline deník o složce '%s': %s" + +-#: ../camel/camel-provider.c:62 ++#: ../camel/camel-provider.c:60 + msgid "Virtual folder email provider" + msgstr "Poskytovatel pošty pro virtuální složky" + +-#: ../camel/camel-provider.c:64 ++#: ../camel/camel-provider.c:62 + msgid "For reading mail as a query of another set of folders" + msgstr "Pro čtení pošty jako otázky na jinou množinu složek" + +-#: ../camel/camel-provider.c:187 ++#: ../camel/camel-provider.c:184 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." + msgstr "Nemohu načíst %s: Načítání modulů není v tomto systému podporováno." + +-#: ../camel/camel-provider.c:196 ++#: ../camel/camel-provider.c:193 + #, c-format + msgid "Could not load %s: %s" + msgstr "Nemohu načíst %s: %s" + +-#: ../camel/camel-provider.c:204 ++#: ../camel/camel-provider.c:201 + #, c-format + msgid "Could not load %s: No initialization code in module." + msgstr "Nemohu %s: V modulu není inicializační kód." + +-#: ../camel/camel-provider.c:376 ../camel/camel-session.c:177 ++#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177 + #, c-format +-msgid "No provider available for protocol `%s'" +-msgstr "Pro protokol `%s' není k dispozici poskytovatel" ++msgid "No provider available for protocol '%s'" ++msgstr "Pro protokol '%s' není k dispozici poskytovatel" + + #: ../camel/camel-sasl-anonymous.c:37 + msgid "Anonymous" +@@ -1910,11 +1984,11 @@ msgstr "" + "Neplatná informace krokování:\n" + "%s" + +-#: ../camel/camel-sasl-cram-md5.c:40 ++#: ../camel/camel-sasl-cram-md5.c:38 + msgid "CRAM-MD5" + msgstr "CRAM-MD5" + +-#: ../camel/camel-sasl-cram-md5.c:42 ++#: ../camel/camel-sasl-cram-md5.c:40 + msgid "" + "This option will connect to the server using a secure CRAM-MD5 password, if " + "the server supports it." +@@ -1922,11 +1996,11 @@ msgstr "" + "Tato volba vás připojí k serveru pomocí bezpečného hesla CRAM-MD5, pokud ho " + "server podporuje." + +-#: ../camel/camel-sasl-digest-md5.c:50 ++#: ../camel/camel-sasl-digest-md5.c:48 + msgid "DIGEST-MD5" + msgstr "DIGEST-MD5" + +-#: ../camel/camel-sasl-digest-md5.c:52 ++#: ../camel/camel-sasl-digest-md5.c:50 + msgid "" + "This option will connect to the server using a secure DIGEST-MD5 password, " + "if the server supports it." +@@ -1934,27 +2008,27 @@ msgstr "" + "Tato volba vás připojí k serveru pomocí bezpečného hesla DIGEST-MD5, pokud " + "ho server podporuje." + +-#: ../camel/camel-sasl-digest-md5.c:820 ++#: ../camel/camel-sasl-digest-md5.c:845 + msgid "Server challenge too long (>2048 octets)" + msgstr "Challenge serveru příliš dlouhá (>2048 oktetů)" + +-#: ../camel/camel-sasl-digest-md5.c:829 ++#: ../camel/camel-sasl-digest-md5.c:854 + msgid "Server challenge invalid\n" + msgstr "Zpráva challenge pro server neplatná\n" + +-#: ../camel/camel-sasl-digest-md5.c:835 ++#: ../camel/camel-sasl-digest-md5.c:860 + msgid "Server challenge contained invalid \"Quality of Protection\" token" + msgstr "Challenge serveru obsahovala neplatný token \"Kvalita ochrany\"" + +-#: ../camel/camel-sasl-digest-md5.c:865 ++#: ../camel/camel-sasl-digest-md5.c:890 + msgid "Server response did not contain authorization data" + msgstr "Odpověď serveru neobsahovala data o autorizaci" + +-#: ../camel/camel-sasl-digest-md5.c:883 ++#: ../camel/camel-sasl-digest-md5.c:908 + msgid "Server response contained incomplete authorization data" + msgstr "Odpověď serveru obsahovala neúplná data o autorizaci" + +-#: ../camel/camel-sasl-digest-md5.c:893 ++#: ../camel/camel-sasl-digest-md5.c:918 + msgid "Server response does not match" + msgstr "Odpověď serveru neodpovídá" + +@@ -2026,7 +2100,7 @@ msgstr "Odkazované údaje vypršely." + #: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253 + #: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304 + #: ../camel/camel-sasl-kerberos4.c:231 +-#: ../camel/providers/imap/camel-imap-store.c:1317 ++#: ../camel/providers/imap/camel-imap-store.c:1272 + msgid "Bad authentication response from server." + msgstr "Neplatná odpověď autentizace od serveru." + +@@ -2099,22 +2173,22 @@ msgstr "Přihlášení POP před SMTP po + msgid "POP Before SMTP auth using a non-pop source" + msgstr "Přihlášení POP před SMTP bez použití zdroje POP" + +-#: ../camel/camel-search-private.c:150 ++#: ../camel/camel-search-private.c:149 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "Překlad regulárního výrazu selhal: %s: %s" + +-#: ../camel/camel-service.c:272 ++#: ../camel/camel-service.c:270 + #, c-format + msgid "URL '%s' needs a username component" + msgstr "URL '%s' vyžaduje komponentu jména uživatele" + +-#: ../camel/camel-service.c:276 ++#: ../camel/camel-service.c:274 + #, c-format + msgid "URL '%s' needs a host component" + msgstr "URL '%s' vyžaduje komponentu hostitele" + +-#: ../camel/camel-service.c:280 ++#: ../camel/camel-service.c:278 + #, c-format + msgid "URL '%s' needs a path component" + msgstr "URL '%s' vyžaduje komponentu cesty" +@@ -2133,7 +2207,7 @@ msgstr "" + msgid "Please enter the %s password for %s on host %s." + msgstr "Zadejte prosím %s heslo pro %s na počítači %s." + +-#: ../camel/camel-smime-context.c:234 ++#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "Nemohu najít certifikát pro '%s'" +@@ -2156,7 +2230,7 @@ msgstr "Nemohu přiložit data CMS" + + #: ../camel/camel-smime-context.c:264 + msgid "Cannot create CMS Signer information" +-msgstr "Nemohu vytvořit informace o podepisovateli CMS" ++msgstr "Nelze vytvořit informace o podepisující osobě CMS" + + #: ../camel/camel-smime-context.c:270 + msgid "Cannot find certificate chain" +@@ -2185,7 +2259,7 @@ msgstr "Nemohu přidat šifrovací certi + + #: ../camel/camel-smime-context.c:333 + msgid "Cannot add CMS Signer information" +-msgstr "Nemohu přidat informace o podepisovateli CMS" ++msgstr "Nelze přidat informace o podepisující osobě CMS" + + #: ../camel/camel-smime-context.c:403 ../camel/camel-smime-context.c:851 + msgid "Cannot create encoder context" +@@ -2260,10 +2334,12 @@ msgid "Certificate import failed" + msgstr "Import certifikátu selhal" + + #: ../camel/camel-smime-context.c:602 ++#, c-format + msgid "Certificate is the only message, cannot verify certificates" + msgstr "Certifikát je jediná zpráva, nemohu ověřit certifikáty" + + #: ../camel/camel-smime-context.c:605 ++#, c-format + msgid "Certificate is the only message, certificates imported and verified" + msgstr "Certifikát je jediná zpráva, certifikáty importovány a ověřeny" + +@@ -2280,11 +2356,6 @@ msgstr "Podepisující: %s <%s>: %s\n" + msgid "Decoder failed" + msgstr "Dekodér selhal" + +-#: ../camel/camel-smime-context.c:778 +-#, c-format +-msgid "Cannot find certificate for `%s'" +-msgstr "Nemohu najít certifikát pro `%s'" +- + #: ../camel/camel-smime-context.c:785 + msgid "Cannot find common bulk encryption algorithm" + msgstr "Nemohu najít společný algoritmus pro šifrování" +@@ -2339,45 +2410,45 @@ msgstr "import klíčů: neimplementová + msgid "export keys: unimplemented" + msgstr "export klíčů: neimplementováno" + +-#: ../camel/camel-store.c:219 ++#: ../camel/camel-store.c:272 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:174 + msgid "Cannot get folder: Invalid operation on this store" + msgstr "Nemohu získat složku: Neplatná operace pro tento sklad" + +-#: ../camel/camel-store.c:252 ++#: ../camel/camel-store.c:305 + #, c-format +-msgid "Cannot create folder `%s': folder exists" +-msgstr "Nemohu vytvořit složku `%s': složka existuje" ++msgid "Cannot create folder '%s': folder exists" ++msgstr "Nelze vytvořit složku '%s': složka existuje" + +-#: ../camel/camel-store.c:316 ++#: ../camel/camel-store.c:369 + msgid "Cannot create folder: Invalid operation on this store" + msgstr "Nemohu vytvořit složku: Neplatná operace pro tento sklad" + +-#: ../camel/camel-store.c:344 ++#: ../camel/camel-store.c:397 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "Nemohu vytvořit složku: %s: složka existuje" + +-#: ../camel/camel-store.c:408 ../camel/camel-vee-store.c:369 +-#: ../camel/providers/local/camel-maildir-store.c:218 ++#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384 ++#: ../camel/providers/local/camel-maildir-store.c:219 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Nemohu odstranit složku: %s: Neplatná operace" + +-#: ../camel/camel-store.c:458 ../camel/camel-vee-store.c:406 +-#: ../camel/providers/local/camel-maildir-store.c:290 ++#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421 ++#: ../camel/providers/local/camel-maildir-store.c:291 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Nemohu přejmenovat složku: %s: Neplatná operace" + + #. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:799 ../camel/camel-vtrash-folder.c:52 +-#: ../camel/providers/imap/camel-imap-store.c:1077 ++#: ../camel/camel-store.c:856 ../camel/camel-vtrash-folder.c:53 ++#: ../camel/providers/imap/camel-imap-store.c:1060 + msgid "Trash" + msgstr "Koš" + + #. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:802 ../camel/camel-vtrash-folder.c:54 ++#: ../camel/camel-store.c:859 ../camel/camel-vtrash-folder.c:55 + msgid "Junk" + msgstr "Nevyžádaná pošta" + +@@ -2435,11 +2506,11 @@ msgstr "Nedostatek paměti" + + #: ../camel/camel-tcp-stream-openssl.c:601 + msgid "Zero-depth self-signed certificate" +-msgstr "Samopodepsaný certifikát s nulovou úrovní" ++msgstr "Certifikát podepsaný sám sebou s nulovou úrovní" + + #: ../camel/camel-tcp-stream-openssl.c:603 + msgid "Self-signed certificate in chain" +-msgstr "Samopodepsaný certifikát v řetězci" ++msgstr "Certifikát podepsaný sám sebou v řetězci" + + #: ../camel/camel-tcp-stream-openssl.c:605 + msgid "Unable to get issuer's certificate locally" +@@ -2497,7 +2568,7 @@ msgstr "Použití klíče nepodporuje ce + msgid "Error in application verification" + msgstr "Chyba v ověření aplikace" + +-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:871 ++#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880 + #, c-format + msgid "" + "Issuer: %s\n" +@@ -2510,11 +2581,11 @@ msgstr "" + "Otisk: %s\n" + "Podpis: %s" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "GOOD" + msgstr "DOBŘE" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "BAD" + msgstr "ŠPATNĚ" + +@@ -2538,7 +2609,7 @@ msgstr "" + "Chcete ho přesto akceptovat?" + + #. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:881 ++#: ../camel/camel-tcp-stream-ssl.c:890 + #, c-format + msgid "" + "SSL Certificate check for %s:\n" +@@ -2553,7 +2624,7 @@ msgstr "" + "\n" + "Chcete ho akceptovat?" + +-#: ../camel/camel-tcp-stream-ssl.c:925 ++#: ../camel/camel-tcp-stream-ssl.c:934 + #, c-format + msgid "" + "Certificate problem: %s\n" +@@ -2562,7 +2633,7 @@ msgstr "" + "Problém s certifikátem: %s\n" + "Vystavitel: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:977 ++#: ../camel/camel-tcp-stream-ssl.c:986 + #, c-format + msgid "" + "Bad certificate domain: %s\n" +@@ -2571,7 +2642,7 @@ msgstr "" + "Chybná doména certifikátu: %s\n" + "Vystavitel: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:995 ++#: ../camel/camel-tcp-stream-ssl.c:1004 + #, c-format + msgid "" + "Certificate expired: %s\n" +@@ -2580,7 +2651,7 @@ msgstr "" + "Certifikát vypršel: %s\n" + "Vystavitel: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1012 ++#: ../camel/camel-tcp-stream-ssl.c:1021 + #, c-format + msgid "" + "Certificate revocation list expired: %s\n" +@@ -2591,47 +2662,47 @@ msgstr "" + + #: ../camel/camel-url.c:313 + #, c-format +-msgid "Could not parse URL `%s'" +-msgstr "Nemohu zpracovat URL `%s'" ++msgid "Could not parse URL '%s'" ++msgstr "Nelze zpracovat URL '%s'" + +-#: ../camel/camel-vee-folder.c:482 ++#: ../camel/camel-vee-folder.c:584 + #, c-format +-msgid "Error storing `%s': %s" +-msgstr "Chyba při ukládání `%s': %s" ++msgid "Error storing '%s': %s" ++msgstr "Chyba při ukládání '%s': %s" + +-#: ../camel/camel-vee-folder.c:524 ++#: ../camel/camel-vee-folder.c:638 + #, c-format + msgid "No such message %s in %s" + msgstr "Taková zpráva neexistuje %s v %s" + +-#: ../camel/camel-vee-folder.c:649 ../camel/camel-vee-folder.c:655 ++#: ../camel/camel-vee-folder.c:761 ../camel/camel-vee-folder.c:767 + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "Nemohu kopírovat nebo přesunout zprávy do Virtuální složky" + +-#: ../camel/camel-vee-store.c:102 ../camel/camel-vee-store.c:345 ++#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115 ++#: ../camel/camel-vee-store.c:360 + msgid "Unmatched" + msgstr "Nepřiřazené" + +-#: ../camel/camel-vee-store.c:392 ++#: ../camel/camel-vee-store.c:407 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Nemohu odstranit složku: %s: Složka neexistuje" + +-#: ../camel/camel-vee-store.c:414 ++#: ../camel/camel-vee-store.c:429 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Nemohu přejmenovat složku: %s: Složka neexistuje" + +-#: ../camel/camel-vtrash-folder.c:53 ++#: ../camel/camel-vtrash-folder.c:54 + msgid "Cannot copy messages to the Trash folder" + msgstr "Nemohu kopírovat zprávy do složky Koš" + +-#: ../camel/camel-vtrash-folder.c:55 ++#: ../camel/camel-vtrash-folder.c:56 + msgid "Cannot copy messages to the Junk folder" + msgstr "Nelze kopírovat zprávy do složky Nevyžádaná pošta" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2167 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #, c-format + msgid "" + "Cannot get message: %s\n" +@@ -2640,115 +2711,115 @@ msgstr "" + "Nemohu získat zprávu: %s\n" + " %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2167 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #: ../camel/providers/local/camel-maildir-folder.c:251 + #: ../camel/providers/local/camel-mbox-folder.c:348 + #: ../camel/providers/local/camel-mh-folder.c:204 + msgid "No such message" + msgstr "Taková zpráva neexistuje" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:130 +-#: ../camel/providers/imap4/camel-imap4-folder.c:791 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:128 ++#: ../camel/providers/imap4/camel-imap4-folder.c:812 + #: ../camel/providers/nntp/camel-nntp-folder.c:156 + #: ../camel/providers/nntp/camel-nntp-folder.c:232 +-#: ../camel/providers/nntp/camel-nntp-folder.c:371 +-#: ../camel/providers/pop3/camel-pop3-folder.c:262 +-#: ../camel/providers/pop3/camel-pop3-folder.c:518 +-#: ../camel/providers/pop3/camel-pop3-folder.c:579 +-#: ../camel/providers/pop3/camel-pop3-folder.c:597 ++#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/pop3/camel-pop3-folder.c:266 ++#: ../camel/providers/pop3/camel-pop3-folder.c:559 ++#: ../camel/providers/pop3/camel-pop3-folder.c:620 ++#: ../camel/providers/pop3/camel-pop3-folder.c:638 + msgid "User canceled" + msgstr "Uživatel zrušen" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137 +-#: ../camel/providers/imap4/camel-imap4-folder.c:796 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:135 ++#: ../camel/providers/imap4/camel-imap4-folder.c:817 + #: ../camel/providers/nntp/camel-nntp-folder.c:147 + #: ../camel/providers/nntp/camel-nntp-folder.c:149 + #: ../camel/providers/nntp/camel-nntp-folder.c:158 + #: ../camel/providers/nntp/camel-nntp-folder.c:234 +-#: ../camel/providers/pop3/camel-pop3-folder.c:521 +-#: ../camel/providers/pop3/camel-pop3-folder.c:582 +-#: ../camel/providers/pop3/camel-pop3-folder.c:589 +-#: ../camel/providers/pop3/camel-pop3-folder.c:600 ++#: ../camel/providers/pop3/camel-pop3-folder.c:386 ++#: ../camel/providers/pop3/camel-pop3-folder.c:562 ++#: ../camel/providers/pop3/camel-pop3-folder.c:623 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 ++#: ../camel/providers/pop3/camel-pop3-folder.c:641 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Nemohu získat zprávu %s: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:154 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:162 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2141 +-#: ../camel/providers/imap4/camel-imap4-folder.c:814 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:152 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:160 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164 ++#: ../camel/providers/imap4/camel-imap4-folder.c:835 + msgid "This message is not available in offline mode." + msgstr "Tato zpráva není dostupná v režimu offline." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1690 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1737 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:172 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:179 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747 + msgid "Could not get message" + msgstr "Nemohu získat zprávu" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:816 +-#: ../camel/providers/imap/camel-imap-folder.c:265 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:818 ++#: ../camel/providers/imap/camel-imap-folder.c:248 + #, c-format + msgid "Could not load summary for %s" + msgstr "Nemohu načíst souhrn pro %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1065 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071 + msgid "Trash Folder Full. Please Empty." + msgstr "Koš je plný, prosím vyprázdněte ho." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1242 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248 + #: ../camel/providers/groupwise/camel-groupwise-store.c:623 + #: ../camel/providers/groupwise/camel-groupwise-store.c:736 +-#: ../camel/providers/imap/camel-imap-folder.c:2538 +-#: ../camel/providers/imap/camel-imap-folder.c:2608 ++#: ../camel/providers/imap/camel-imap-folder.c:3193 ++#: ../camel/providers/imap/camel-imap-folder.c:3269 + #, c-format + msgid "Fetching summary information for new messages in %s" + msgstr "Stahuji souhrnné informace o nových zprávách v %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2008 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2050 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073 + #, c-format +-msgid "Cannot append message to folder `%s': %s" +-msgstr "Nemohu přidat zprávu do složky `%s': %s" ++msgid "Cannot append message to folder '%s': %s" ++msgstr "Nelze přidat zprávu do složky '%s': %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2038 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061 + #, c-format + msgid "Cannot create message: %s" + msgstr "Nemohu vytvořit zprávu: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:284 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:285 + #, c-format + msgid "Cannot get folder container %s" + msgstr "Nemohu získat úložiště složky %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:348 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:349 + #: ../camel/providers/imap4/camel-imap4-journal.c:319 + msgid "Cannot append message in offline mode: cache unavailable" + msgstr "Nemohu přidat v režimu offline: cache není k dispozici" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:364 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:365 + #: ../camel/providers/imap4/camel-imap4-journal.c:335 + #, c-format + msgid "Cannot append message in offline mode: %s" + msgstr "Nemohu přidat zprávu v režimu offline: %s" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:55 +-#: ../camel/providers/imap4/camel-imap4-provider.c:38 ++#: ../camel/providers/imap4/camel-imap4-provider.c:39 + msgid "Checking for new mail" + msgstr "Kontrola nové pošty" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:57 + #: ../camel/providers/hula/camel-hula-provider.c:51 + #: ../camel/providers/imap/camel-imap-provider.c:46 +-#: ../camel/providers/imap4/camel-imap4-provider.c:40 ++#: ../camel/providers/imap4/camel-imap4-provider.c:41 + msgid "C_heck for new messages in all folders" + msgstr "_Hledat novou poštu ve všech složkách" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:60 +-#: ../camel/providers/imap/camel-imap-provider.c:66 +-#: ../camel/providers/imap4/camel-imap4-provider.c:51 ++#: ../camel/providers/imap/camel-imap-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:52 + #: ../camel/providers/local/camel-local-provider.c:46 + #: ../camel/providers/local/camel-local-provider.c:86 + #: ../camel/providers/local/camel-local-provider.c:106 +@@ -2764,7 +2835,7 @@ msgid "Check new messages for J_unk cont + msgstr "Hledat nev_yžádanou poštu v nových zprávách" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:66 +-#: ../camel/providers/imap/camel-imap-provider.c:72 ++#: ../camel/providers/imap/camel-imap-provider.c:74 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Hledat nevyžádanou poštu jen v nových _příchozích zprávách" + +@@ -2790,8 +2861,8 @@ msgstr "Pro přístup k serverům Novell + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:106 + #: ../camel/providers/hula/camel-hula-provider.c:95 +-#: ../camel/providers/imap/camel-imap-provider.c:98 +-#: ../camel/providers/imap4/camel-imap4-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap4/camel-imap4-provider.c:84 + #: ../camel/providers/imapp/camel-imapp-provider.c:67 + #: ../camel/providers/nntp/camel-nntp-provider.c:74 + #: ../camel/providers/pop3/camel-pop3-provider.c:72 +@@ -2810,7 +2881,7 @@ msgid "Host or user not available in url + msgstr "Počítač nebo uživatel není dostupný v url" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:206 +-#: ../camel/providers/imap/camel-imap-store.c:1401 ++#: ../camel/providers/imap/camel-imap-store.c:1356 + msgid "You did not enter a password." + msgstr "Neuvedli jste heslo." + +@@ -2819,35 +2890,35 @@ msgid "Some features may not work correc + msgstr "Některé funkce možná s vaší verzí serveru nebudou fungovat správně" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:532 +-#: ../camel/providers/imap/camel-imap-store.c:1912 +-#: ../camel/providers/imap/camel-imap-store.c:2103 ++#: ../camel/providers/imap/camel-imap-store.c:1846 ++#: ../camel/providers/imap/camel-imap-store.c:2044 + #, c-format + msgid "No such folder %s" + msgstr "Složka %s neexistuje" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1217 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1219 + msgid "Cannot create GroupWise folders in offline mode." + msgstr "Nemohu vytvářet složky GroupWise v režimu offline." + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1231 +-#: ../camel/providers/imap/camel-imap-store.c:1987 +-#: ../camel/providers/imap/camel-imap-store.c:2356 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1233 ++#: ../camel/providers/imap/camel-imap-store.c:1921 ++#: ../camel/providers/imap/camel-imap-store.c:2301 + msgid "The parent folder is not allowed to contain subfolders" + msgstr "Rodičovská složka nemůže obsahovat podsložky" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1307 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1309 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1330 + #, c-format +-msgid "Cannot rename Groupwise folder `%s' to `%s'" +-msgstr "Nemohu přejmenovat složku GroupWise `%s' na `%s'" ++msgid "Cannot rename Groupwise folder '%s' to '%s'" ++msgstr "Nelze přejmenovat složku GroupWise '%s' na '%s'" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1360 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:121 + #, c-format + msgid "GroupWise server %s" + msgstr "Server GroupWise %s" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1364 + #, c-format + msgid "GroupWise service for %s on %s" + msgstr "Služba GroupWise pro %s na %s" +@@ -2868,7 +2939,7 @@ msgid "" + "of your mail.\n" + msgstr "" + "Překročili jste limit úložného prostoru tohoto účtu. Vaše zprávy jsou " +-"zařazeny ve složce K odeslání. Odešleteje znovu stisknutím Odeslat/přijmout " ++"zařazeny ve složce K odeslání. Odešlete je znovu stisknutím Odeslat/přijmout " + "po odstranění/archivaci některých zpráv.\n" + + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 +@@ -2883,36 +2954,36 @@ msgid "Checking for New Mail" + msgstr "Kontrola nové pošty" + + #: ../camel/providers/hula/camel-hula-provider.c:54 +-#: ../camel/providers/imap/camel-imap-provider.c:50 ++#: ../camel/providers/imap/camel-imap-provider.c:52 + msgid "Connection to Server" + msgstr "Přepojení k serveru" + + #: ../camel/providers/hula/camel-hula-provider.c:56 +-#: ../camel/providers/imap/camel-imap-provider.c:52 ++#: ../camel/providers/imap/camel-imap-provider.c:54 + msgid "_Use custom command to connect to server" + msgstr "_Používat pro připojení k serveru vlastní příkaz" + + #: ../camel/providers/hula/camel-hula-provider.c:58 +-#: ../camel/providers/imap/camel-imap-provider.c:54 ++#: ../camel/providers/imap/camel-imap-provider.c:56 + msgid "Command:" + msgstr "Příkaz:" + + #: ../camel/providers/hula/camel-hula-provider.c:61 +-#: ../camel/providers/imap/camel-imap-provider.c:58 +-#: ../camel/providers/imap4/camel-imap4-provider.c:43 ++#: ../camel/providers/imap/camel-imap-provider.c:60 ++#: ../camel/providers/imap4/camel-imap4-provider.c:44 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Složky" + + #: ../camel/providers/hula/camel-hula-provider.c:63 +-#: ../camel/providers/imap/camel-imap-provider.c:60 +-#: ../camel/providers/imap4/camel-imap4-provider.c:45 ++#: ../camel/providers/imap/camel-imap-provider.c:62 ++#: ../camel/providers/imap4/camel-imap4-provider.c:46 + msgid "_Show only subscribed folders" + msgstr "_Zobrazovat pouze přihlášené složky" + + #: ../camel/providers/hula/camel-hula-provider.c:65 +-#: ../camel/providers/imap/camel-imap-provider.c:62 +-#: ../camel/providers/imap4/camel-imap4-provider.c:47 ++#: ../camel/providers/imap/camel-imap-provider.c:64 ++#: ../camel/providers/imap4/camel-imap4-provider.c:48 + msgid "O_verride server-supplied folder namespace" + msgstr "_Předefinovat jmenný prostor složek ze serveru" + +@@ -2933,22 +3004,32 @@ msgid "This option will connect to the H + msgstr "" + "Tato volba připojí k serveru Hula pomocí hesla přenášeného jako čistý text." + +-#: ../camel/providers/imap/camel-imap-command.c:224 +-#: ../camel/providers/imap/camel-imap-command.c:266 +-#: ../camel/providers/imap/camel-imap-command.c:472 +-#: ../camel/providers/imap/camel-imap-store.c:3058 ++#: ../camel/providers/imap/camel-imap-command.c:183 ++#: ../camel/providers/imap/camel-imap-command.c:267 ++msgid "No output stream" ++msgstr "Žádný odchozí proud" ++ ++#: ../camel/providers/imap/camel-imap-command.c:188 ++#: ../camel/providers/imap/camel-imap-command.c:272 ++msgid "No input stream" ++msgstr "Žádný vstupní proud" ++ ++#: ../camel/providers/imap/camel-imap-command.c:231 ++#: ../camel/providers/imap/camel-imap-command.c:280 ++#: ../camel/providers/imap/camel-imap-command.c:494 ++#: ../camel/providers/imap/camel-imap-store.c:3034 + msgid "Operation cancelled" + msgstr "Operace zrušena" + +-#: ../camel/providers/imap/camel-imap-command.c:311 +-#: ../camel/providers/imap/camel-imap-store.c:3061 ++#: ../camel/providers/imap/camel-imap-command.c:333 ++#: ../camel/providers/imap/camel-imap-store.c:3037 + #, c-format + msgid "Server unexpectedly disconnected: %s" + msgstr "Server neočekávaně zrušil spojení: %s" + + #. for imap ALERT codes, account user@host + #. we might get a ']' from a BAD response since we +12, but who cares? +-#: ../camel/providers/imap/camel-imap-command.c:332 ++#: ../camel/providers/imap/camel-imap-command.c:354 + #, c-format + msgid "" + "Alert from IMAP server %s@%s:\n" +@@ -2957,244 +3038,259 @@ msgstr "" + "Výstraha od IMAP serveru %s@%s:\n" + "%s" + +-#: ../camel/providers/imap/camel-imap-command.c:401 ++#: ../camel/providers/imap/camel-imap-command.c:423 + #, c-format + msgid "Unexpected response from IMAP server: %s" + msgstr "Neočekávaná odpověď od IMAP serveru: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:411 ++#: ../camel/providers/imap/camel-imap-command.c:433 + #, c-format + msgid "IMAP command failed: %s" + msgstr "Příkaz IMAP selhal: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:486 ++#: ../camel/providers/imap/camel-imap-command.c:508 + msgid "Server response ended too soon." + msgstr "Odpověď serveru skončila příliš brzy." + +-#: ../camel/providers/imap/camel-imap-command.c:693 ++#: ../camel/providers/imap/camel-imap-command.c:715 + #, c-format + msgid "IMAP server response did not contain %s information" + msgstr "Odpověď IMAP serveru neobsahovala informaci %s" + +-#: ../camel/providers/imap/camel-imap-command.c:729 ++#: ../camel/providers/imap/camel-imap-command.c:751 + #, c-format + msgid "Unexpected OK response from IMAP server: %s" + msgstr "Neočekávaná odpověď OK od IMAP serveru: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:87 ++#: ../camel/providers/imap/camel-imap-folder.c:88 + msgid "Always check for new mail in this folder" + msgstr "Vždy hledat nevyžádanou poštu jen v nových zprávách této složky" + +-#: ../camel/providers/imap/camel-imap-folder.c:246 ++#: ../camel/providers/imap/camel-imap-folder.c:229 + #, c-format + msgid "Could not create directory %s: %s" + msgstr "Nemohu vytvořit adresář %s: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:350 +-msgid "Folder was destroyed and recreated on server." +-msgstr "Složka byl zrušena a znovu vytvořena na serveru." +- + #. Check UIDs and flags of all messages we already know of. +-#: ../camel/providers/imap/camel-imap-folder.c:682 ++#: ../camel/providers/imap/camel-imap-folder.c:844 + #, c-format + msgid "Scanning for changed messages in %s" + msgstr "Hledám změněné zprávy v %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2127 ++#: ../camel/providers/imap/camel-imap-folder.c:1869 ++#, c-format ++msgid "Unexpected response status '%s' after APPEND command" ++msgstr "Neočekávaná odpověď '%s' po příkazu APPEND" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1884 ++msgid "No response on continuation after APPEND command" ++msgstr "Žádná odpověď po příkazu APPEND" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1926 ++msgid "Unknown error occurred during APPEND command!" ++msgstr "Během příkazu APPEND se vyskytla neznámá chyba!" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2738 + #, c-format + msgid "Unable to retrieve message: %s" + msgstr "Nemohu přijmout zprávu: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2206 +-#: ../camel/providers/imap/camel-imap-folder.c:2892 ++#: ../camel/providers/imap/camel-imap-folder.c:2779 ++#, c-format ++msgid "Cannot get message with message ID %s: %s" ++msgstr "Nelze získat zprávu s ID %s: %s" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2780 ++msgid "No such message available." ++msgstr "Žádná taková zpráva není k dispozici." ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2819 ++#: ../camel/providers/imap/camel-imap-folder.c:3571 + #: ../camel/providers/nntp/camel-nntp-folder.c:220 + msgid "This message is not currently available" + msgstr "Tato zpráva není právě dostupná" + +-#: ../camel/providers/imap/camel-imap-folder.c:2727 ++#: ../camel/providers/imap/camel-imap-folder.c:3398 + #, c-format + msgid "Incomplete server response: no information provided for message %d" + msgstr "" + "Neúplná odpověď od serveru: pro zprávu %d nebyly poskytnuty žádné informace" + +-#: ../camel/providers/imap/camel-imap-folder.c:2735 ++#: ../camel/providers/imap/camel-imap-folder.c:3406 + #, c-format + msgid "Incomplete server response: no UID provided for message %d" + msgstr "Neúplná odpověď od serveru: pro zprávu %d nebylo poskytnuto UID" + +-#: ../camel/providers/imap/camel-imap-folder.c:2748 +-#, c-format +-msgid "" +-"Unexpected server response: Identical UIDs provided for messages %d and %d" +-msgstr "" +-"Neočekávaná odpověď od serveru: Pro zprávy %d a %d bylo poskytnuto identické " +-"UID" +- +-#: ../camel/providers/imap/camel-imap-folder.c:2930 ++#: ../camel/providers/imap/camel-imap-folder.c:3609 + msgid "Could not find message body in FETCH response." + msgstr "Nemohu nalézt tělo zprávy v odpovědi FETCH." + +-#: ../camel/providers/imap/camel-imap-message-cache.c:161 ++#: ../camel/providers/imap/camel-imap-message-cache.c:160 ++#: ../camel/providers/imap/camel-imap-message-cache.c:220 + #, c-format + msgid "Could not open cache directory: %s" + msgstr "Nemohu otevřít adresář cache: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:267 +-#: ../camel/providers/imap/camel-imap-message-cache.c:324 +-#: ../camel/providers/imap/camel-imap-message-cache.c:355 +-#: ../camel/providers/imap/camel-imap-message-cache.c:387 ++#: ../camel/providers/imap/camel-imap-message-cache.c:307 ++#: ../camel/providers/imap/camel-imap-message-cache.c:364 ++#: ../camel/providers/imap/camel-imap-message-cache.c:395 ++#: ../camel/providers/imap/camel-imap-message-cache.c:427 + #, c-format + msgid "Failed to cache message %s: %s" + msgstr "Nemohu uložit zprávu %s do cache: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:438 ++#: ../camel/providers/imap/camel-imap-message-cache.c:478 + #, c-format + msgid "Failed to cache %s: %s" + msgstr "Nemohu uložit %s do cache: %s" + +-#: ../camel/providers/imap/camel-imap-provider.c:64 +-#: ../camel/providers/imap4/camel-imap4-provider.c:49 ++#: ../camel/providers/imap/camel-imap-provider.c:48 ++msgid "Ch_eck for new messages in subscribed folders" ++msgstr "_Hledat nové zprávy v přihlášených složkách" ++ ++#: ../camel/providers/imap/camel-imap-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:50 + msgid "Namespace:" + msgstr "Jmenný prostor:" + +-#: ../camel/providers/imap/camel-imap-provider.c:68 +-#: ../camel/providers/imap4/camel-imap4-provider.c:53 ++#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap4/camel-imap4-provider.c:54 + msgid "_Apply filters to new messages in INBOX on this server" + msgstr "_Použít filtry na nové příchozí zprávy na tomto serveru" + +-#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap/camel-imap-provider.c:72 + msgid "Check new messages for Jun_k contents" + msgstr "Hledat n_evyžádanou poštu v nových zprávách" + +-#: ../camel/providers/imap/camel-imap-provider.c:74 +-#: ../camel/providers/imap4/camel-imap4-provider.c:59 ++#: ../camel/providers/imap/camel-imap-provider.c:76 ++#: ../camel/providers/imap4/camel-imap4-provider.c:60 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "Automaticky _synchronizovat vzdálenou poštu s místní" + +-#: ../camel/providers/imap/camel-imap-provider.c:81 ++#: ../camel/providers/imap/camel-imap-provider.c:83 + msgid "IMAP" + msgstr "IMAP" + +-#: ../camel/providers/imap/camel-imap-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:85 + msgid "For reading and storing mail on IMAP servers." + msgstr "Pro čtení a ukládání pošty na IMAP serverech." + +-#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap/camel-imap-provider.c:102 + #: ../camel/providers/imapp/camel-imapp-provider.c:69 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Tato volba připojí na IMAP server pomocí hesel přenášených jako čistý text." + +-#: ../camel/providers/imap/camel-imap-store.c:457 +-#: ../camel/providers/imap4/camel-imap4-store.c:212 ++#: ../camel/providers/imap/camel-imap-store.c:436 ++#: ../camel/providers/imap4/camel-imap4-store.c:214 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP server %s" + +-#: ../camel/providers/imap/camel-imap-store.c:459 +-#: ../camel/providers/imap4/camel-imap4-store.c:214 ++#: ../camel/providers/imap/camel-imap-store.c:438 ++#: ../camel/providers/imap4/camel-imap4-store.c:216 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "IMAP služba pro %s na %s" + +-#: ../camel/providers/imap/camel-imap-store.c:587 +-#: ../camel/providers/imap/camel-imap-store.c:602 +-#: ../camel/providers/imap4/camel-imap4-store.c:249 +-#: ../camel/providers/imap4/camel-imap4-store.c:264 ++#: ../camel/providers/imap/camel-imap-store.c:567 ++#: ../camel/providers/imap/camel-imap-store.c:582 ++#: ../camel/providers/imap4/camel-imap4-store.c:251 ++#: ../camel/providers/imap4/camel-imap4-store.c:266 + #: ../camel/providers/nntp/camel-nntp-store.c:183 + #: ../camel/providers/nntp/camel-nntp-store.c:198 +-#: ../camel/providers/pop3/camel-pop3-store.c:173 +-#: ../camel/providers/pop3/camel-pop3-store.c:187 +-#: ../camel/providers/smtp/camel-smtp-transport.c:258 +-#: ../camel/providers/smtp/camel-smtp-transport.c:273 ++#: ../camel/providers/pop3/camel-pop3-store.c:171 ++#: ../camel/providers/pop3/camel-pop3-store.c:185 ++#: ../camel/providers/smtp/camel-smtp-transport.c:260 ++#: ../camel/providers/smtp/camel-smtp-transport.c:275 + #, c-format + msgid "Could not connect to %s: %s" + msgstr "Nemohu se připojit k %s: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:588 +-#: ../camel/providers/imap4/camel-imap4-store.c:250 ++#: ../camel/providers/imap/camel-imap-store.c:568 ++#: ../camel/providers/imap4/camel-imap4-store.c:252 + #: ../camel/providers/nntp/camel-nntp-store.c:184 +-#: ../camel/providers/pop3/camel-pop3-store.c:174 +-#: ../camel/providers/smtp/camel-smtp-transport.c:259 ++#: ../camel/providers/pop3/camel-pop3-store.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:261 + msgid "SSL unavailable" + msgstr "SSL není k dispozici" + +-#: ../camel/providers/imap/camel-imap-store.c:599 +-#: ../camel/providers/imap/camel-imap-store.c:881 ++#: ../camel/providers/imap/camel-imap-store.c:579 ++#: ../camel/providers/imap/camel-imap-store.c:861 + msgid "Connection cancelled" + msgstr "Spojení zrušeno" + +-#: ../camel/providers/imap/camel-imap-store.c:710 +-#: ../camel/providers/imap/camel-imap-store.c:729 +-#: ../camel/providers/imap/camel-imap-store.c:735 +-#: ../camel/providers/imap/camel-imap-store.c:761 +-#: ../camel/providers/imap4/camel-imap4-store.c:312 +-#: ../camel/providers/imap4/camel-imap4-store.c:327 +-#: ../camel/providers/imap4/camel-imap4-store.c:335 ++#: ../camel/providers/imap/camel-imap-store.c:690 ++#: ../camel/providers/imap/camel-imap-store.c:709 ++#: ../camel/providers/imap/camel-imap-store.c:715 ++#: ../camel/providers/imap/camel-imap-store.c:741 ++#: ../camel/providers/imap4/camel-imap4-store.c:314 ++#: ../camel/providers/imap4/camel-imap4-store.c:329 ++#: ../camel/providers/imap4/camel-imap4-store.c:338 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Nemohu se připojit k serveru IMAP %s v zabezpečeném režimu: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:711 +-#: ../camel/providers/smtp/camel-smtp-transport.c:331 ++#: ../camel/providers/imap/camel-imap-store.c:691 ++#: ../camel/providers/smtp/camel-smtp-transport.c:333 + msgid "STARTTLS not supported" + msgstr "STARTTLS není podporováno" + +-#: ../camel/providers/imap/camel-imap-store.c:730 ++#: ../camel/providers/imap/camel-imap-store.c:710 + msgid "SSL negotiations failed" + msgstr "Vyjednávání SSL selhalo" + +-#: ../camel/providers/imap/camel-imap-store.c:736 +-#: ../camel/providers/imap4/camel-imap4-store.c:336 +-#: ../camel/providers/smtp/camel-smtp-transport.c:370 ++#: ../camel/providers/imap/camel-imap-store.c:716 ++#: ../camel/providers/imap4/camel-imap4-store.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:372 + msgid "SSL is not available in this build" + msgstr "SSL v tomto sestavení není k dispozici" + +-#: ../camel/providers/imap/camel-imap-store.c:884 ++#: ../camel/providers/imap/camel-imap-store.c:864 + #, c-format + msgid "Could not connect with command \"%s\": %s" + msgstr "Nemohu se připojit příkazem \"%s\": %s" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imap/camel-imap-store.c:1069 +-#: ../camel/providers/imap/camel-imap-store.c:2452 +-#: ../camel/providers/imap4/camel-imap4-store-summary.c:367 +-#: ../camel/providers/imap4/camel-imap4-store.c:1326 ++#: ../camel/providers/imap/camel-imap-store.c:1052 ++#: ../camel/providers/imap/camel-imap-store.c:2397 ++#: ../camel/providers/imap4/camel-imap4-store-summary.c:368 ++#: ../camel/providers/imap4/camel-imap4-store.c:1408 + #: ../camel/providers/local/camel-maildir-folder.c:77 +-#: ../camel/providers/local/camel-maildir-store.c:218 +-#: ../camel/providers/local/camel-maildir-store.c:290 +-#: ../camel/providers/local/camel-maildir-store.c:514 +-#: ../camel/providers/local/camel-maildir-store.c:527 ++#: ../camel/providers/local/camel-maildir-store.c:219 ++#: ../camel/providers/local/camel-maildir-store.c:291 ++#: ../camel/providers/local/camel-maildir-store.c:517 ++#: ../camel/providers/local/camel-maildir-store.c:530 + #: ../camel/providers/local/camel-spool-store.c:464 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264 + msgid "Inbox" + msgstr "Příchozí" + +-#: ../camel/providers/imap/camel-imap-store.c:1071 ++#: ../camel/providers/imap/camel-imap-store.c:1054 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263 + msgid "Drafts" + msgstr "Koncepty" + +-#: ../camel/providers/imap/camel-imap-store.c:1073 ++#: ../camel/providers/imap/camel-imap-store.c:1056 + msgid "Sent" + msgstr "Odesláno" + +-#: ../camel/providers/imap/camel-imap-store.c:1075 ++#: ../camel/providers/imap/camel-imap-store.c:1058 + msgid "Templates" + msgstr "Šablony" + +-#: ../camel/providers/imap/camel-imap-store.c:1348 ++#: ../camel/providers/imap/camel-imap-store.c:1303 + #, c-format + msgid "IMAP server %s does not support requested authentication type %s" + msgstr "IMAP server %s nepodporuje požadovaný typ autentizace %s" + +-#: ../camel/providers/imap/camel-imap-store.c:1358 +-#: ../camel/providers/smtp/camel-smtp-transport.c:504 ++#: ../camel/providers/imap/camel-imap-store.c:1313 ++#: ../camel/providers/smtp/camel-smtp-transport.c:507 + #, c-format + msgid "No support for authentication type %s" + msgstr "Typ autentizace %s není podporován" + +-#: ../camel/providers/imap/camel-imap-store.c:1430 ++#: ../camel/providers/imap/camel-imap-store.c:1385 + #, c-format + msgid "" + "Unable to authenticate to IMAP server.\n" +@@ -3205,34 +3301,34 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/imap/camel-imap-store.c:1924 +-#: ../camel/providers/imap/camel-imap-store.c:2294 +-#: ../camel/providers/imap4/camel-imap4-store.c:956 ++#: ../camel/providers/imap/camel-imap-store.c:1858 ++#: ../camel/providers/imap/camel-imap-store.c:2239 ++#: ../camel/providers/imap4/camel-imap4-store.c:959 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "Název složky \"%s\" je neplatný, protože obsahuje znak \"%c\"" + +-#: ../camel/providers/imap/camel-imap-store.c:2041 +-#: ../camel/providers/local/camel-maildir-store.c:191 ++#: ../camel/providers/imap/camel-imap-store.c:1975 ++#: ../camel/providers/local/camel-maildir-store.c:192 + #: ../camel/providers/local/camel-mbox-store.c:204 + #: ../camel/providers/local/camel-mh-store.c:249 + #, c-format +-msgid "Cannot create folder `%s': folder exists." +-msgstr "Nemohu vytvořit složku `%s': složka existuje." ++msgid "Cannot create folder '%s': folder exists." ++msgstr "Nelze vytvořit složku '%s': složka existuje." + +-#: ../camel/providers/imap/camel-imap-store.c:2305 ++#: ../camel/providers/imap/camel-imap-store.c:2250 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "Neznámá rodičovská složka: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:550 +-#: ../camel/providers/imap4/camel-imap4-command.c:557 ++#: ../camel/providers/imap4/camel-imap4-command.c:576 ++#: ../camel/providers/imap4/camel-imap4-command.c:583 + #, c-format + msgid "Failed sending command to IMAP server %s: %s" + msgstr "Nemohu odeslat příkaz IMAP serveru %s: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:660 ++#: ../camel/providers/imap4/camel-imap4-command.c:686 + #, c-format + msgid "Unexpected response from IMAP4 server %s: %s" + msgstr "Neočekávaná odpověď od IMAP4 serveru %s: %s" +@@ -3240,136 +3336,155 @@ msgstr "Neočekávaná odpověď od IMAP + #: ../camel/providers/imap4/camel-imap4-engine.c:221 + #, c-format + msgid "Unexpected greeting from IMAP server %s." +-msgstr "Neočekávaný pozdrav od IMAP serveru: %s" ++msgstr "Neočekávaný pozdrav od IMAP serveru: %s." + +-#: ../camel/providers/imap4/camel-imap4-engine.c:431 ++#: ../camel/providers/imap4/camel-imap4-engine.c:450 + #, c-format +-msgid "Cannot select folder `%s': Invalid mailbox name" +-msgstr "Nemohu odstranit složku '%s': Neplatný název schránky" ++msgid "Cannot select folder '%s': Invalid mailbox name" ++msgstr "Nelze zvolit složku '%s': Neplatný název schránky" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:437 ++#: ../camel/providers/imap4/camel-imap4-engine.c:456 + #, c-format +-msgid "Cannot select folder `%s': Bad command" +-msgstr "Nemohu zvolit složku `%s': Špatný příkaz" ++msgid "Cannot select folder '%s': Bad command" ++msgstr "Nelze zvolit složku '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:1547 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1586 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1631 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1687 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1433 ++#, c-format ++msgid "Failed to send command to IMAP server %s: %s" ++msgstr "Nelze odeslat příkaz IMAP serveru %s: %s" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:1435 ++msgid "service unavailable" ++msgstr "služba je nedostupná" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:1569 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1608 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1653 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1709 + #, c-format + msgid "IMAP4 server %s unexpectedly disconnected: %s" + msgstr "IMAP4 server %s se neočekávaně odpojil: %s" + + #: ../camel/providers/imap4/camel-imap4-folder.c:89 + msgid "" +-"Enable Mailing-List detection required for some filter and vFolder rules" ++"Enable extended Mailing-List detection required for some filter and vFolder " ++"rules" ++msgstr "" ++"Povolit rozšířenou detekci poštovních konferencí vyžadovanou pro některé " ++"filtry a pravidla v-složek" ++ ++#: ../camel/providers/imap4/camel-imap4-folder.c:90 ++msgid "Expire cached messages that haven't been read in X seconds" + msgstr "" +-"Povolit detekci poštovních konferencí vyžadovanou pro některé filtry a " +-"pravidla v-složek" ++"Nechat vypršet dočasně uložené zprávy, které nebyly přečteny v X sekundách" ++ ++#: ../camel/providers/imap4/camel-imap4-folder.c:91 ++msgid "Expire cached messages older than X seconds" ++msgstr "Nechat vypršet dočasně uložené zprávy, starší než X sekund" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:402 ++#: ../camel/providers/imap4/camel-imap4-folder.c:423 + #, c-format +-msgid "Cannot access folder `%s': %s" +-msgstr "Nemohu přistupovat ke složce `%s': %s" ++msgid "Cannot access folder '%s': %s" ++msgstr "Nelze přistupovat ke složce '%s': %s" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:461 ++#: ../camel/providers/imap4/camel-imap4-folder.c:482 + #, c-format +-msgid "Cannot sync flags to folder `%s': Unknown" +-msgstr "Nemohu synchronizovat značky do složky `%s': Neznámé" ++msgid "Cannot sync flags to folder '%s': Unknown error" ++msgstr "Nelze synchronizovat značky do složky '%s': Neznámá chyba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:467 ++#: ../camel/providers/imap4/camel-imap4-folder.c:488 + #, c-format +-msgid "Cannot sync flags to folder `%s': Bad command" +-msgstr "Nemohu synchronizovat značky do složky `%s': Špatný příkaz" ++msgid "Cannot sync flags to folder '%s': Bad command" ++msgstr "Nelze synchronizovat značky do složky '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:607 ++#: ../camel/providers/imap4/camel-imap4-folder.c:628 + #, c-format +-msgid "Cannot expunge folder `%s': Unknown" +-msgstr "Nemohu vyčistit složku `%s': Neznámé" ++msgid "Cannot expunge folder '%s': Unknown error" ++msgstr "Nelze vyčistit složku '%s': Neznámá chyba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:612 ++#: ../camel/providers/imap4/camel-imap4-folder.c:633 + #, c-format +-msgid "Cannot expunge folder `%s': Bad command" +-msgstr "Nemohu vyčistit složku `%s': Špatný příkaz" ++msgid "Cannot expunge folder '%s': Bad command" ++msgstr "Nelze vyčistit složku '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:868 ++#: ../camel/providers/imap4/camel-imap4-folder.c:889 + #, c-format +-msgid "Cannot get message %s from folder `%s': No such message" +-msgstr "Nemohu získat zprávu %s ze složky %s: Tato zpráva neexistuje" ++msgid "Cannot get message %s from folder '%s': No such message" ++msgstr "Nelze získat zprávu %s ze složky '%s': Tato zpráva neexistuje" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:873 ++#: ../camel/providers/imap4/camel-imap4-folder.c:894 + #, c-format +-msgid "Cannot get message %s from folder `%s': Bad command" +-msgstr "Nemohu získat zprávu %s ze složky %s: Špatný příkaz" ++msgid "Cannot get message %s from folder '%s': Bad command" ++msgstr "Nelze získat zprávu %s ze složky '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:917 ++#: ../camel/providers/imap4/camel-imap4-folder.c:938 + #, c-format +-msgid "Cannot append message to folder `%s': Folder is read-only" +-msgstr "Nemohu přidat zprávu do složky `%s': Složka je jen pro čtení" ++msgid "Cannot append message to folder '%s': Folder is read-only" ++msgstr "Nelze přidat zprávu do složky '%s': Složka je jen pro čtení" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1010 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1031 + #, c-format +-msgid "Cannot append message to folder `%s': Unknown error" +-msgstr "Nemohu přidat zprávu do složky `%s': Neznámá chyba" ++msgid "Cannot append message to folder '%s': Unknown error" ++msgstr "Nelze přidat zprávu do složky '%s': Neznámá chyba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1040 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1061 + #, c-format +-msgid "Cannot append message to folder `%s': Bad command" +-msgstr "Nemohu přidat zprávu do složky `%s': Špatný příkaz" ++msgid "Cannot append message to folder '%s': Bad command" ++msgstr "Nelze přidat zprávu do složky '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1160 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1181 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown" +-msgstr "Nemohu přesunout zprávy ze složky `%s' do složky `%s': Neznámé" ++msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" ++msgstr "Nelze přesunout zprávy ze složky '%s' do složky '%s': Neznámá chyba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1164 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1185 + #, c-format +-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown" +-msgstr "Nemohu zkopírovat zprávy ze složky `%s' do složky `%s': Neznámé" ++msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" ++msgstr "Nelze zkopírovat zprávy ze složky '%s' do složky '%s': Neznámá chyba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1172 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1193 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command" +-msgstr "Nemohu přesunout zprávy ze složky `%s' do složky `%s': Špatný příkaz" ++msgid "Cannot move messages from folder '%s' to folder '%s': Bad command" ++msgstr "Nelze přesunout zprávy ze složky '%s' do složky '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1176 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1197 + #, c-format +-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command" +-msgstr "Nemohu zkopírovat zprávy ze složky `%s' do složky `%s': Špatný příkaz" ++msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command" ++msgstr "Nelze zkopírovat zprávy ze složky '%s' do složky '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:55 ++#: ../camel/providers/imap4/camel-imap4-provider.c:56 + msgid "Check new messages for _Junk contents" + msgstr "Hledat nev_yžádanou poštu v nových zprávách" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:57 ++#: ../camel/providers/imap4/camel-imap4-provider.c:58 + msgid "Only check for Junk messa_ges in the INBOX folder" + msgstr "Hledat nevyžádanou poštu _jen v nových příchozích zprávách" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:67 + msgid "IMAP4rev1" + msgstr "IMAP4rev1" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:69 + msgid "For reading and storing mail on IMAPv4rev1 servers." + msgstr "Pro čtení a ukládání pošty na serverech IMAPv4rev1." + +-#: ../camel/providers/imap4/camel-imap4-provider.c:85 ++#: ../camel/providers/imap4/camel-imap4-provider.c:86 + msgid "" + "This option will connect to the IMAPv4rev1 server using a plaintext password." + msgstr "" + "Tato volba připojí k serveru IMAPv4rev1 pomocí hesla přenášeného jako čistý " + "text." + +-#: ../camel/providers/imap4/camel-imap4-store.c:261 ++#: ../camel/providers/imap4/camel-imap4-store.c:263 + #: ../camel/providers/imapp/camel-imapp-store.c:249 + #: ../camel/providers/nntp/camel-nntp-store.c:195 + #: ../camel/providers/nntp/camel-nntp-store.c:214 +-#: ../camel/providers/pop3/camel-pop3-store.c:184 +-#: ../camel/providers/smtp/camel-smtp-transport.c:270 ++#: ../camel/providers/pop3/camel-pop3-store.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:272 + msgid "Connection canceled" + msgstr "Spojení zrušeno" + +-#: ../camel/providers/imap4/camel-imap4-store.c:298 ++#: ../camel/providers/imap4/camel-imap4-store.c:300 + #, c-format + msgid "" + "Failed to connect to IMAP server %s in secure mode: Server does not support " +@@ -3378,147 +3493,149 @@ msgstr "" + "Nemohu se připojit k serveru IMAP %s v zabezpečeném režimu: Server " + "nepodporuje STARTTLS" + +-#: ../camel/providers/imap4/camel-imap4-store.c:328 +-#: ../camel/providers/pop3/camel-pop3-store.c:252 ++#: ../camel/providers/imap4/camel-imap4-store.c:330 ++#: ../camel/providers/pop3/camel-pop3-store.c:250 + msgid "TLS negotiations failed" + msgstr "Vyjednávání TLS selhalo" + +-#: ../camel/providers/imap4/camel-imap4-store.c:412 ++#: ../camel/providers/imap4/camel-imap4-store.c:415 + #, c-format + msgid "" + "Cannot authenticate to IMAP server %s using the %s authentication mechanism" + msgstr "" + "Nemohu se autentizovat u IMAP serveru %s pomocí mechanismu autentizace %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:535 ++#: ../camel/providers/imap4/camel-imap4-store.c:538 + #, c-format + msgid "Cannot authenticate to IMAP server %s using %s" + msgstr "Nemohu se autentizovat u IMAP serveru %s pomocí %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:698 +-#: ../camel/providers/imap4/camel-imap4-store.c:966 ++#: ../camel/providers/imap4/camel-imap4-store.c:701 ++#: ../camel/providers/imap4/camel-imap4-store.c:969 + msgid "Cannot create IMAP folders in offline mode." + msgstr "Nemohu vytvářet složky IMAP v režimu offline." + +-#: ../camel/providers/imap4/camel-imap4-store.c:737 ++#: ../camel/providers/imap4/camel-imap4-store.c:740 + #, c-format +-msgid "Cannot get folder `%s' on IMAP server %s: Unknown" +-msgstr "Nemohu získat složku `%s' na IMAP serveru %s: Neznámé" ++msgid "Cannot get folder '%s' on IMAP server %s: Unknown error" ++msgstr "Nelze získat složku '%s' na IMAP serveru %s: Neznámá chyba" + +-#: ../camel/providers/imap4/camel-imap4-store.c:818 ++#: ../camel/providers/imap4/camel-imap4-store.c:821 + #, c-format +-msgid "Cannot get LIST information for `%s' on IMAP server %s: %s" +-msgstr "Nemohu získat informace LIST pro `%s' na IMAP serveru %s: %s" ++msgid "Cannot get LIST information for '%s' on IMAP server %s: %s" ++msgstr "Nelze získat informace LIST pro '%s' na IMAP serveru %s: %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:820 +-#: ../camel/providers/imap4/camel-imap4-store.c:1495 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + msgid "Bad command" + msgstr "Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-store.c:899 ++#: ../camel/providers/imap4/camel-imap4-store.c:902 + #, c-format +-msgid "Cannot create folder `%s': Invalid mailbox name" +-msgstr "Nemohu přejmenovat složku `%s': Neplatný název schránky" ++msgid "Cannot create folder '%s': Invalid mailbox name" ++msgstr "Nelze přejmenovat složku '%s': Neplatný název schránky" + +-#: ../camel/providers/imap4/camel-imap4-store.c:904 ++#: ../camel/providers/imap4/camel-imap4-store.c:907 + #, c-format +-msgid "Cannot create folder `%s': Bad command" +-msgstr "Nemohu vytvořit složku `%s': Špatný příkaz" ++msgid "Cannot create folder '%s': Bad command" ++msgstr "Nelze vytvořit složku '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1010 ++#: ../camel/providers/imap4/camel-imap4-store.c:1013 + #, c-format +-msgid "Cannot delete folder `%s': Special folder" +-msgstr "Nemohu odstranit složku `%s': Speciální složka" ++msgid "Cannot delete folder '%s': Special folder" ++msgstr "Nelze odstranit složku '%s': Speciální složka" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1017 ++#: ../camel/providers/imap4/camel-imap4-store.c:1020 + msgid "Cannot delete IMAP folders in offline mode." + msgstr "Nemohu odstraňovat složky IMAP v režimu offline." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1076 ++#: ../camel/providers/imap4/camel-imap4-store.c:1079 + #, c-format +-msgid "Cannot delete folder `%s': Invalid mailbox name" +-msgstr "Nemohu odstranit složku `%s': Neplatný název schránky" ++msgid "Cannot delete folder '%s': Invalid mailbox name" ++msgstr "Nelze odstranit složku '%s': Neplatný název schránky" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1081 ++#: ../camel/providers/imap4/camel-imap4-store.c:1084 + #, c-format +-msgid "Cannot delete folder `%s': Bad command" +-msgstr "Nemohu odstranit složku `%s': Špatný příkaz" ++msgid "Cannot delete folder '%s': Bad command" ++msgstr "Nelze odstranit složku '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1101 ++#: ../camel/providers/imap4/camel-imap4-store.c:1104 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Special folder" +-msgstr "Nemohu přejmenovat složku `%s' na `%s': Speciální složka" ++msgid "Cannot rename folder '%s' to '%s': Special folder" ++msgstr "Nelze přejmenovat složku '%s' na '%s': Speciální složka" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1108 ++#: ../camel/providers/imap4/camel-imap4-store.c:1111 + msgid "Cannot rename IMAP folders in offline mode." + msgstr "Nemohu přejmenovávat složky IMAP v režimu offline." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1139 ++#: ../camel/providers/imap4/camel-imap4-store.c:1142 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name" +-msgstr "Nemohu přejmenovat složku `%s' na `%s': Neplatný název schránky" ++msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name" ++msgstr "Nelze přejmenovat složku '%s' na '%s': Neplatný název schránky" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1144 ++#: ../camel/providers/imap4/camel-imap4-store.c:1147 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Bad command" +-msgstr "Nemohu přejmenovat složku `%s' na `%s': Špatný příkaz" ++msgid "Cannot rename folder '%s' to '%s': Bad command" ++msgstr "Nelze přejmenovat složku '%s' na '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1493 ++#. Translators: the first %s is an IMAP4 command, either LSUB or LIST. ++#. * The fourth one is an error message. ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 + #, c-format +-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s" +-msgstr "Nemohu získat informace %s pro vzorek `%s' na IMAP serveru %s: %s" ++msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" ++msgstr "Nelze získat informace %s pro vzorek '%s' na IMAP serveru %s: %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1533 ++#: ../camel/providers/imap4/camel-imap4-store.c:1638 + msgid "Cannot subscribe to IMAP folders in offline mode." + msgstr "Nemohu se přihlašovat ke složkám IMAP v režimu offline." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1578 ++#: ../camel/providers/imap4/camel-imap4-store.c:1683 + #, c-format +-msgid "Cannot subscribe to folder `%s': Invalid mailbox name" +-msgstr "Nemohu se přihlásit ke složce `%s': Neplatný název schránky" ++msgid "Cannot subscribe to folder '%s': Invalid mailbox name" ++msgstr "Nelze se přihlásit ke složce '%s': Neplatný název schránky" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1583 ++#: ../camel/providers/imap4/camel-imap4-store.c:1688 + #, c-format +-msgid "Cannot subscribe to folder `%s': Bad command" +-msgstr "Nemohu se přihlásit ke složce `%s': Špatný příkaz" ++msgid "Cannot subscribe to folder '%s': Bad command" ++msgstr "Nelze se přihlásit ke složce '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1605 ++#: ../camel/providers/imap4/camel-imap4-store.c:1710 + msgid "Cannot unsubscribe from IMAP folders in offline mode." + msgstr "Nemohu se odhlásit od složek IMAP v režimu offline." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1650 ++#: ../camel/providers/imap4/camel-imap4-store.c:1755 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name" +-msgstr "Nemohu se odhlásit od složky `%s': Neplatný název schránky" ++msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" ++msgstr "Nelze se odhlásit od složky '%s': Neplatný název schránky" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1655 ++#: ../camel/providers/imap4/camel-imap4-store.c:1760 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Bad command" +-msgstr "Nemohu se odhlásit od složky `%s': Špatný příkaz" ++msgid "Cannot unsubscribe from folder '%s': Bad command" ++msgstr "Nelze se odhlásit od složky '%s': Špatný příkaz" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1451 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1596 + msgid "Scanning for changed messages" + msgstr "Hledám změněné zprávy" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1472 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1617 + #, c-format + msgid "IMAP server %s is in an inconsistent state." + msgstr "IMAP server %s je v nekonzistentním stavu." + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1499 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1644 + msgid "Fetching envelopes of new messages" + msgstr "Stahuji obálky nových zpráv" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:370 ++#: ../camel/providers/imap4/camel-imap4-utils.c:437 + #, c-format + msgid "Unexpected token in response from IMAP server %s: " + msgstr "Neočekávaný token v odpovědi od IMAP serveru %s: " + +-#: ../camel/providers/imap4/camel-imap4-utils.c:393 ++#: ../camel/providers/imap4/camel-imap4-utils.c:460 + msgid "No data" + msgstr "Žádná data" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:556 ++#: ../camel/providers/imap4/camel-imap4-utils.c:623 + #, c-format + msgid "IMAP server %s unexpectedly disconnected: %s" + msgstr "IMAP server %s se neočekávaně odpojil: %s" +@@ -3560,27 +3677,27 @@ msgid "Index message body data" + msgstr "Indexovat data těl zpráv" + + #. $HOME relative path + protocol string +-#: ../camel/providers/local/camel-local-folder.c:382 ++#: ../camel/providers/local/camel-local-folder.c:390 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + + #. /var/spool/mail relative path + protocol +-#: ../camel/providers/local/camel-local-folder.c:386 +-#: ../camel/providers/local/camel-local-folder.c:389 ++#: ../camel/providers/local/camel-local-folder.c:394 ++#: ../camel/providers/local/camel-local-folder.c:397 + #, c-format + msgid "mailbox:%s (%s)" + msgstr "schránka %s (%s)" + + #. a full path + protocol +-#: ../camel/providers/local/camel-local-folder.c:393 ++#: ../camel/providers/local/camel-local-folder.c:401 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + + #: ../camel/providers/local/camel-local-provider.c:48 +-msgid "_Use the `.folders' folder summary file (exmh)" +-msgstr "P_oužívat soubor se souhrnnými informacemi `.folders' (exmh)" ++msgid "_Use the '.folders' folder summary file (exmh)" ++msgstr "P_oužívat soubor se souhrnnými informacemi '.folders' (exmh)" + + #: ../camel/providers/local/camel-local-provider.c:55 + msgid "MH-format mail directories" +@@ -3637,71 +3754,58 @@ msgstr "" + msgid "Standard Unix mbox spool directory" + msgstr "Standardní Unixový sdílený adresář mbox" + +-#: ../camel/providers/local/camel-local-store.c:159 +-#: ../camel/providers/local/camel-local-store.c:270 ++#: ../camel/providers/local/camel-local-store.c:171 ++#: ../camel/providers/local/camel-local-store.c:282 + #: ../camel/providers/local/camel-mbox-store.c:359 + #: ../camel/providers/local/camel-spool-store.c:129 + #, c-format + msgid "Store root %s is not an absolute path" + msgstr "Kořen pro ukládání %s není absolutní cesta" + +-#: ../camel/providers/local/camel-local-store.c:166 ++#: ../camel/providers/local/camel-local-store.c:178 + #, c-format + msgid "Store root %s is not a regular directory" + msgstr "Kořen ukládání %s není běžný adresář" + +-#: ../camel/providers/local/camel-local-store.c:175 +-#: ../camel/providers/local/camel-local-store.c:183 +-#: ../camel/providers/local/camel-local-store.c:281 ++#: ../camel/providers/local/camel-local-store.c:187 ++#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:293 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "Nemohu získat složku: %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:207 + msgid "Local stores do not have an inbox" + msgstr "Lokální ukládání nemá složku pro příchozí poštu" + +-#: ../camel/providers/local/camel-local-store.c:241 ++#: ../camel/providers/local/camel-local-store.c:253 + #, c-format + msgid "Local mail file %s" + msgstr "Místní poštovní soubor %s" + +-#: ../camel/providers/local/camel-local-store.c:359 ++#: ../camel/providers/local/camel-local-store.c:348 + #, c-format + msgid "Could not rename folder %s to %s: %s" + msgstr "Nemohu přejmenovat složku %s na %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:427 ++#: ../camel/providers/local/camel-local-store.c:416 + #, c-format + msgid "Could not rename '%s': %s" + msgstr "Nemohu přejmenovat '%s': %s" + +-#: ../camel/providers/local/camel-local-store.c:452 +-#: ../camel/providers/local/camel-local-store.c:462 +-#: ../camel/providers/local/camel-mbox-store.c:276 +-#: ../camel/providers/local/camel-mbox-store.c:288 +-#, c-format +-msgid "Could not delete folder summary file `%s': %s" +-msgstr "Nemohu odstranit soubor souhrnu složky `%s': %s" +- +-#: ../camel/providers/local/camel-local-store.c:472 ++#: ../camel/providers/local/camel-local-store.c:441 + #: ../camel/providers/local/camel-mbox-store.c:300 + #, c-format +-msgid "Could not delete folder index file `%s': %s" +-msgstr "Nemohu odstranit soubor indexu složky `%s': %s" ++msgid "Could not delete folder index file '%s': %s" ++msgstr "Nelze odstranit soubor indexu složky '%s': %s" + +-#: ../camel/providers/local/camel-local-store.c:495 ++#: ../camel/providers/local/camel-local-store.c:464 + #: ../camel/providers/local/camel-mbox-store.c:324 + #, c-format +-msgid "Could not delete folder meta file `%s': %s" +-msgstr "Nemohu odstranit metasoubor složky `%s': %s" ++msgid "Could not delete folder meta file '%s': %s" ++msgstr "Nelze odstranit metasoubor složky '%s': %s" + +-#: ../camel/providers/local/camel-local-summary.c:409 +-#, c-format +-msgid "Could not save summary: %s: %s" +-msgstr "Nemohu uložit souhrn: %s: %s" +- +-#: ../camel/providers/local/camel-local-summary.c:467 ++#: ../camel/providers/local/camel-local-summary.c:506 + msgid "Unable to add message to summary: unknown reason" + msgstr "Nemohu přidat zprávu do souhrnu: neznámý důvod" + +@@ -3736,70 +3840,70 @@ msgstr "" + msgid "Invalid message contents" + msgstr "Neplatný obsah zprávy" + +-#: ../camel/providers/local/camel-maildir-store.c:147 +-#: ../camel/providers/local/camel-maildir-store.c:172 ++#: ../camel/providers/local/camel-maildir-store.c:148 ++#: ../camel/providers/local/camel-maildir-store.c:173 + #: ../camel/providers/local/camel-mbox-store.c:176 + #: ../camel/providers/local/camel-mbox-store.c:188 + #, c-format +-msgid "Cannot create folder `%s': %s" +-msgstr "Nemohu vytvořit složku `%s': %s" ++msgid "Cannot create folder '%s': %s" ++msgstr "Nelze vytvořit složku '%s': %s" + +-#: ../camel/providers/local/camel-maildir-store.c:160 ++#: ../camel/providers/local/camel-maildir-store.c:161 + #: ../camel/providers/local/camel-mbox-store.c:147 + #: ../camel/providers/local/camel-mh-store.c:217 + #, c-format +-msgid "Cannot get folder `%s': %s" +-msgstr "Nemohu získat složku `%s': %s" ++msgid "Cannot get folder '%s': %s" ++msgstr "Nelze získat složku '%s': %s" + +-#: ../camel/providers/local/camel-maildir-store.c:164 ++#: ../camel/providers/local/camel-maildir-store.c:165 + #: ../camel/providers/local/camel-mbox-store.c:155 + #: ../camel/providers/local/camel-mh-store.c:224 + #, c-format +-msgid "Cannot get folder `%s': folder does not exist." +-msgstr "Nemohu získat složku `%s': složka neexistuje." ++msgid "Cannot get folder '%s': folder does not exist." ++msgstr "Nelze získat složku '%s': složka neexistuje." + +-#: ../camel/providers/local/camel-maildir-store.c:188 ++#: ../camel/providers/local/camel-maildir-store.c:189 + #, c-format +-msgid "Cannot get folder `%s': not a maildir directory." +-msgstr "Nemohu získat složku `%s': není to adresář maildir." ++msgid "Cannot get folder '%s': not a maildir directory." ++msgstr "Nelze získat složku '%s': není to adresář maildir." + +-#: ../camel/providers/local/camel-maildir-store.c:233 +-#: ../camel/providers/local/camel-maildir-store.c:271 ++#: ../camel/providers/local/camel-maildir-store.c:234 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mh-store.c:273 + #, c-format +-msgid "Could not delete folder `%s': %s" +-msgstr "Nemohu odstranit složku `%s': %s" ++msgid "Could not delete folder '%s': %s" ++msgstr "Nelze odstranit složku '%s': %s" + +-#: ../camel/providers/local/camel-maildir-store.c:235 ++#: ../camel/providers/local/camel-maildir-store.c:236 + msgid "not a maildir directory" + msgstr "není adresář maildir" + +-#: ../camel/providers/local/camel-maildir-store.c:439 ++#: ../camel/providers/local/camel-maildir-store.c:440 + #: ../camel/providers/local/camel-spool-store.c:331 + #: ../camel/providers/local/camel-spool-store.c:345 + #, c-format +-msgid "Could not scan folder `%s': %s" +-msgstr "Nemohu prohledat složku `%s': %s" ++msgid "Could not scan folder '%s': %s" ++msgstr "Nelze prohledat složku '%s': %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:433 +-#: ../camel/providers/local/camel-maildir-summary.c:567 ++#: ../camel/providers/local/camel-maildir-summary.c:434 ++#: ../camel/providers/local/camel-maildir-summary.c:553 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "Nemohu otevřít cestu poštovní schránky: %s: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:560 ++#: ../camel/providers/local/camel-maildir-summary.c:546 + msgid "Checking folder consistency" + msgstr "Kontroluji konzistenci složky" + +-#: ../camel/providers/local/camel-maildir-summary.c:664 ++#: ../camel/providers/local/camel-maildir-summary.c:650 + msgid "Checking for new messages" + msgstr "Hledám nové zprávy" + +-#: ../camel/providers/local/camel-maildir-summary.c:755 +-#: ../camel/providers/local/camel-mbox-summary.c:436 +-#: ../camel/providers/local/camel-mbox-summary.c:609 +-#: ../camel/providers/local/camel-mbox-summary.c:706 +-#: ../camel/providers/local/camel-spool-summary.c:140 ++#: ../camel/providers/local/camel-maildir-summary.c:736 ++#: ../camel/providers/local/camel-mbox-summary.c:534 ++#: ../camel/providers/local/camel-mbox-summary.c:714 ++#: ../camel/providers/local/camel-mbox-summary.c:810 ++#: ../camel/providers/local/camel-spool-summary.c:158 + msgid "Storing folder" + msgstr "Ukládám složku" + +@@ -3839,34 +3943,40 @@ msgstr "Nemohu vytvořit složku s tímt + + #: ../camel/providers/local/camel-mbox-store.c:198 + #, c-format +-msgid "Cannot get folder `%s': not a regular file." +-msgstr "Nemohu získat složku `%s': není to normální soubor." ++msgid "Cannot get folder '%s': not a regular file." ++msgstr "Nelze získat složku '%s': není to normální soubor." + + #: ../camel/providers/local/camel-mbox-store.c:228 + #: ../camel/providers/local/camel-mbox-store.c:239 + #: ../camel/providers/local/camel-mbox-store.c:262 + #, c-format + msgid "" +-"Could not delete folder `%s':\n" ++"Could not delete folder '%s':\n" + "%s" + msgstr "" +-"Nemohu odstranit složku `%s':\n" ++"Nelze odstranit složku '%s':\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:247 + #, c-format +-msgid "`%s' is not a regular file." +-msgstr "`%s' není obvyklý soubor." ++msgid "'%s' is not a regular file." ++msgstr "'%s' není obvyklý soubor." + + #: ../camel/providers/local/camel-mbox-store.c:254 + #, c-format +-msgid "Folder `%s' is not empty. Not deleted." +-msgstr "Složka `%s' není prázdná. Nebyla odstraněna." ++msgid "Folder '%s' is not empty. Not deleted." ++msgstr "Složka '%s' není prázdná. Nebyla odstraněna." ++ ++#: ../camel/providers/local/camel-mbox-store.c:276 ++#: ../camel/providers/local/camel-mbox-store.c:288 ++#, c-format ++msgid "Could not delete folder summary file '%s': %s" ++msgstr "Nelze odstranit soubor souhrnu složky '%s': %s" + + #: ../camel/providers/local/camel-mbox-store.c:378 + #, c-format +-msgid "Cannot create directory `%s': %s." +-msgstr "Nemohu vytvořit adresář `%s': %s." ++msgid "Cannot create directory '%s': %s." ++msgstr "Nelze vytvořit adresář '%s': %s." + + #: ../camel/providers/local/camel-mbox-store.c:392 + #, c-format +@@ -3883,89 +3993,84 @@ msgstr "Nový název složky není platn + + #: ../camel/providers/local/camel-mbox-store.c:498 + #, c-format +-msgid "Could not rename `%s': `%s': %s" +-msgstr "Nemohu přejmenovat `%s': `%s': %s" ++msgid "Could not rename '%s': '%s': %s" ++msgstr "Nelze přejmenovat '%s': '%s': %s" + + #: ../camel/providers/local/camel-mbox-store.c:579 + #, c-format + msgid "Could not rename '%s' to %s: %s" + msgstr "Nemohu přejmenovat '%s' na %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:442 ++#: ../camel/providers/local/camel-mbox-summary.c:540 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "Nemohu otevřít složku: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:490 ++#: ../camel/providers/local/camel-mbox-summary.c:588 + #, c-format + msgid "Fatal mail parser error near position %ld in folder %s" + msgstr "Kritická chyba zpracování zprávy na pozici %ld ve složce %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:546 ++#: ../camel/providers/local/camel-mbox-summary.c:651 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Nemohu zkontrolovat složku: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:614 +-#: ../camel/providers/local/camel-mbox-summary.c:711 +-#: ../camel/providers/local/camel-spool-summary.c:145 ++#: ../camel/providers/local/camel-mbox-summary.c:719 ++#: ../camel/providers/local/camel-mbox-summary.c:815 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Nemohu otevřít soubor: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:626 +-#: ../camel/providers/local/camel-spool-summary.c:158 ++#: ../camel/providers/local/camel-mbox-summary.c:731 ++#: ../camel/providers/local/camel-spool-summary.c:176 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Nemohu otevřít dočasnou poštovní schránku: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:639 +-#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:744 ++#: ../camel/providers/local/camel-mbox-summary.c:920 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Nemohu zavřít zdrojovou složku: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:648 ++#: ../camel/providers/local/camel-mbox-summary.c:753 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Nemohu zavřít dočasnou složku: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:663 ++#: ../camel/providers/local/camel-mbox-summary.c:768 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Nemohu přejmenovat složku: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:722 +-#: ../camel/providers/local/camel-mbox-summary.c:1046 ++#: ../camel/providers/local/camel-mbox-summary.c:826 ++#: ../camel/providers/local/camel-mbox-summary.c:1050 + #, c-format + msgid "Could not store folder: %s" + msgstr "Nemohu uložit složku: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:770 +-#: ../camel/providers/local/camel-mbox-summary.c:799 ++#: ../camel/providers/local/camel-mbox-summary.c:862 ++#: ../camel/providers/local/camel-mbox-summary.c:870 ++#: ../camel/providers/local/camel-mbox-summary.c:1080 + #: ../camel/providers/local/camel-mbox-summary.c:1088 +-#: ../camel/providers/local/camel-mbox-summary.c:1117 +-msgid "Detected a corrupt mbox file or an invalid 'From' header" +-msgstr "Detekován poškozený soubor mbox nebo neplatná hlavička 'Od'" ++msgid "Summary and folder mismatch, even after a sync" ++msgstr "Neshoda shrnutí a složky, dokonce i po synchronizaci" + +-#: ../camel/providers/local/camel-mbox-summary.c:935 +-#: ../camel/providers/local/camel-spool-summary.c:326 ++#: ../camel/providers/local/camel-mbox-summary.c:1013 ++#: ../camel/providers/local/camel-spool-summary.c:344 + #, c-format + msgid "Unknown error: %s" + msgstr "Neznámá chyba: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:971 +-#, c-format +-msgid "Folder %s cannot be opened: %s" +-msgstr "Schránku %s nelze otevřít: %s" +- ++#: ../camel/providers/local/camel-mbox-summary.c:1156 + #: ../camel/providers/local/camel-mbox-summary.c:1182 +-#: ../camel/providers/local/camel-mbox-summary.c:1208 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Zápis do dočasné schránky selhal: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1199 ++#: ../camel/providers/local/camel-mbox-summary.c:1173 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Zápis do dočasné schránky selhal: %s: %s" +@@ -3981,61 +4086,61 @@ msgstr "Nemohu přidat zprávu do adres + + #: ../camel/providers/local/camel-mh-store.c:232 + #, c-format +-msgid "Could not create folder `%s': %s" +-msgstr "Nemohu vytvořit složku `%s': %s" ++msgid "Could not create folder '%s': %s" ++msgstr "Nelze vytvořit složku '%s': %s" + + #: ../camel/providers/local/camel-mh-store.c:244 + #, c-format +-msgid "Cannot get folder `%s': not a directory." +-msgstr "Nemohu získat složku: %s: není to adresář." ++msgid "Cannot get folder '%s': not a directory." ++msgstr "Nelze získat složku '%s': není to adresář." + +-#: ../camel/providers/local/camel-mh-summary.c:246 ++#: ../camel/providers/local/camel-mh-summary.c:248 + #, c-format + msgid "Cannot open MH directory path: %s: %s" + msgstr "Nemohu otevřít cestu adresáře MH: %s: %s" + + #: ../camel/providers/local/camel-spool-store.c:135 + #, c-format +-msgid "Spool `%s' cannot be opened: %s" +-msgstr "Schránku `%s' nelze otevřít: %s" ++msgid "Spool '%s' cannot be opened: %s" ++msgstr "Schránku '%s' nelze otevřít: %s" + + #: ../camel/providers/local/camel-spool-store.c:147 + #, c-format +-msgid "Spool `%s' is not a regular file or directory" +-msgstr "Schránka `%s' není běžný soubor nebo adresář" ++msgid "Spool '%s' is not a regular file or directory" ++msgstr "Schránka '%s' není běžný soubor nebo adresář" + + #: ../camel/providers/local/camel-spool-store.c:166 + #, c-format +-msgid "Folder `%s/%s' does not exist." +-msgstr "Složka `%s/%s' neexistuje." ++msgid "Folder '%s/%s' does not exist." ++msgstr "Složka '%s/%s' neexistuje." + + #: ../camel/providers/local/camel-spool-store.c:176 + #, c-format + msgid "" +-"Could not open folder `%s':\n" ++"Could not open folder '%s':\n" + "%s" + msgstr "" +-"Nemohu otevřít složku `%s':\n" ++"Nelze otevřít složku '%s':\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:180 + #, c-format +-msgid "Folder `%s' does not exist." +-msgstr "Složka `%s' neexistuje." ++msgid "Folder '%s' does not exist." ++msgstr "Složka '%s' neexistuje." + + #: ../camel/providers/local/camel-spool-store.c:185 + #, c-format + msgid "" +-"Could not create folder `%s':\n" ++"Could not create folder '%s':\n" + "%s" + msgstr "" +-"Nemohu vytvořit složku `%s':\n" ++"Nelze vytvořit složku '%s':\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:193 + #, c-format +-msgid "`%s' is not a mailbox file." +-msgstr "`%s' není soubor schránky." ++msgid "'%s' is not a mailbox file." ++msgstr "'%s' není soubor schránky." + + #: ../camel/providers/local/camel-spool-store.c:210 + msgid "Store does not support an INBOX" +@@ -4059,28 +4164,28 @@ msgstr "Složky schránky nelze přejmen + msgid "Spool folders cannot be deleted" + msgstr "Složky schránky nelze odstranit" + +-#: ../camel/providers/local/camel-spool-summary.c:171 +-#: ../camel/providers/local/camel-spool-summary.c:181 +-#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:189 ++#: ../camel/providers/local/camel-spool-summary.c:199 ++#: ../camel/providers/local/camel-spool-summary.c:209 + #, c-format + msgid "Could not sync temporary folder %s: %s" + msgstr "nemohu synchronizovat dočasnou složku %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:207 ++#: ../camel/providers/local/camel-spool-summary.c:225 + #, c-format + msgid "Could not sync spool folder %s: %s" + msgstr "Nemohu synchronizovat složku fronty %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:238 +-#: ../camel/providers/local/camel-spool-summary.c:255 +-#: ../camel/providers/local/camel-spool-summary.c:266 ++#: ../camel/providers/local/camel-spool-summary.c:256 ++#: ../camel/providers/local/camel-spool-summary.c:273 ++#: ../camel/providers/local/camel-spool-summary.c:284 + #, c-format + msgid "" + "Could not sync spool folder %s: %s\n" +-"Folder may be corrupt, copy saved in `%s'" ++"Folder may be corrupt, copy saved in '%s'" + msgstr "" +-"Nemohu synchronizovat složku fronty %s: %s\n" +-"Složka je možná poškozena, kopie uložena do `%s'" ++"Nelze synchronizovat složku fronty %s: %s\n" ++"Složka je možná poškozena, kopie uložena do '%s'" + + #: ../camel/providers/nntp/camel-nntp-folder.c:176 + #: ../camel/providers/nntp/camel-nntp-folder.c:208 +@@ -4088,19 +4193,19 @@ msgstr "" + msgid "Internal error: UID in invalid format: %s" + msgstr "Interní chyba: uid v neplatném formátu: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:331 +-#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/nntp/camel-nntp-folder.c:330 ++#: ../camel/providers/nntp/camel-nntp-folder.c:333 + #: ../camel/providers/nntp/camel-nntp-folder.c:375 ++#: ../camel/providers/nntp/camel-nntp-folder.c:377 + #, c-format + msgid "Posting failed: %s" + msgstr "Posílání selhalo: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:393 ++#: ../camel/providers/nntp/camel-nntp-folder.c:395 + msgid "You cannot post NNTP messages while working offline!" + msgstr "Nemůžete posílat zprávy NNTP, když pracujete při odpojení!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:404 ++#: ../camel/providers/nntp/camel-nntp-folder.c:406 + msgid "You cannot copy messages from a NNTP folder!" + msgstr "Nemůžete kopírovat zprávy ze složky NNTP!" + +@@ -4212,61 +4317,61 @@ msgstr "Nepřipojen." + msgid "No such folder: %s" + msgstr "Taková složka neexistuje: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:222 +-#: ../camel/providers/nntp/camel-nntp-summary.c:318 ++#: ../camel/providers/nntp/camel-nntp-summary.c:273 ++#: ../camel/providers/nntp/camel-nntp-summary.c:369 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: Hledám nové zprávy" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:229 ++#: ../camel/providers/nntp/camel-nntp-summary.c:280 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "Neočekávaná odpověď serveru od xover: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:332 ++#: ../camel/providers/nntp/camel-nntp-summary.c:383 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "Neočekávaná odpověď serveru od head: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:372 ++#: ../camel/providers/nntp/camel-nntp-summary.c:423 + msgid "Use cancel" + msgstr "Použít Zrušit" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:374 ++#: ../camel/providers/nntp/camel-nntp-summary.c:425 + #, c-format + msgid "Operation failed: %s" + msgstr "Operace selhala: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:247 ++#: ../camel/providers/pop3/camel-pop3-folder.c:251 + msgid "Retrieving POP summary" + msgstr "Načítám shrnutí POP" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:265 ++#: ../camel/providers/pop3/camel-pop3-folder.c:269 + #, c-format + msgid "Cannot get POP summary: %s" + msgstr "Nemohu získat shrnutí POP: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:308 ++#: ../camel/providers/pop3/camel-pop3-folder.c:312 + msgid "Expunging old messages" + msgstr "Odstraňuji staré zprávy" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:316 ++#: ../camel/providers/pop3/camel-pop3-folder.c:320 + msgid "Expunging deleted messages" + msgstr "Odstraňuji odstraněné zprávy" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:492 ++#: ../camel/providers/pop3/camel-pop3-folder.c:533 + #, c-format + msgid "No message with UID %s" + msgstr "Žádná zpráva s uid %s" + + #. Sigh, most of the crap in this function is so that the cancel button + #. returns the proper exception code. Sigh. +-#: ../camel/providers/pop3/camel-pop3-folder.c:499 ++#: ../camel/providers/pop3/camel-pop3-folder.c:540 + #, c-format + msgid "Retrieving POP message %d" + msgstr "Načítám POP zprávu %d" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:589 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 + msgid "Unknown reason" + msgstr "Neznámý důvod" + +@@ -4309,34 +4414,34 @@ msgstr "" + "APOP. Nemusí to fungovat pro všechny uživatele i u serverů, které tvrdí, že " + "tento protokol podporují." + +-#: ../camel/providers/pop3/camel-pop3-store.c:210 ++#: ../camel/providers/pop3/camel-pop3-store.c:208 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "Nemohu přečíst platný pozdrav od POP serveru %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:227 +-#: ../camel/providers/pop3/camel-pop3-store.c:241 +-#: ../camel/providers/pop3/camel-pop3-store.c:251 +-#: ../camel/providers/pop3/camel-pop3-store.c:257 ++#: ../camel/providers/pop3/camel-pop3-store.c:225 ++#: ../camel/providers/pop3/camel-pop3-store.c:239 ++#: ../camel/providers/pop3/camel-pop3-store.c:249 ++#: ../camel/providers/pop3/camel-pop3-store.c:255 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "Nemohu se připojit k POP serveru %s v zabezpečeném režimu: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:228 ++#: ../camel/providers/pop3/camel-pop3-store.c:226 + msgid "STLS not supported by server" + msgstr "STLS není serverem podporováno" + +-#: ../camel/providers/pop3/camel-pop3-store.c:258 ++#: ../camel/providers/pop3/camel-pop3-store.c:256 + msgid "TLS is not available in this build" + msgstr "TLS v tomto sestavení není k dispozici" + +-#: ../camel/providers/pop3/camel-pop3-store.c:364 ++#: ../camel/providers/pop3/camel-pop3-store.c:362 + #, c-format + msgid "Could not connect to POP server %s" + msgstr "Nemohu se připojit k POP serveru %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:405 +-#: ../camel/providers/pop3/camel-pop3-store.c:542 ++#: ../camel/providers/pop3/camel-pop3-store.c:403 ++#: ../camel/providers/pop3/camel-pop3-store.c:536 + #, c-format + msgid "" + "Unable to connect to POP server %s: No support for requested authentication " +@@ -4345,30 +4450,30 @@ msgstr "" + "Nemohu se připojit k POP serveru %s: Požadovaný mechanismus autentizace není " + "podporován." + +-#: ../camel/providers/pop3/camel-pop3-store.c:421 ++#: ../camel/providers/pop3/camel-pop3-store.c:419 + #, c-format +-msgid "SASL `%s' Login failed for POP server %s: %s" +-msgstr "Přihlášení SASL `%s' k POP serveru %s selhalo: %s" ++msgid "SASL '%s' Login failed for POP server %s: %s" ++msgstr "Přihlášení SASL '%s' k POP serveru %s selhalo: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:433 ++#: ../camel/providers/pop3/camel-pop3-store.c:431 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "Nemohu se přihlásit k POP serveru %s: Chyba protokolu SASL" + +-#: ../camel/providers/pop3/camel-pop3-store.c:452 ++#: ../camel/providers/pop3/camel-pop3-store.c:450 + #, c-format + msgid "Failed to authenticate on POP server %s: %s" + msgstr "Nemohu se autentizovat u POP serveru %s: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:512 ++#: ../camel/providers/pop3/camel-pop3-store.c:509 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " + "attack suspected. Please contact your admin." + msgstr "Nelze se připojit k POP serveru %s:\t. Obdrženo neplatné APOP ID. " + +-#: ../camel/providers/pop3/camel-pop3-store.c:556 +-#: ../camel/providers/pop3/camel-pop3-store.c:569 ++#: ../camel/providers/pop3/camel-pop3-store.c:550 ++#: ../camel/providers/pop3/camel-pop3-store.c:563 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" +@@ -4377,7 +4482,7 @@ msgstr "" + "Nemohu se připojit k POP serveru %s.\n" + "Chyba při posílání hesla: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:563 ++#: ../camel/providers/pop3/camel-pop3-store.c:557 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" +@@ -4386,10 +4491,10 @@ msgstr "" + "Nemohu se připojit k POP serveru %s.\n" + "Chyba při posílání jména uživatele: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:669 ++#: ../camel/providers/pop3/camel-pop3-store.c:663 + #, c-format +-msgid "No such folder `%s'." +-msgstr "Složka `%s' neexistuje." ++msgid "No such folder '%s'." ++msgstr "Složka '%s' neexistuje." + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:38 + msgid "Sendmail" +@@ -4446,129 +4551,129 @@ msgstr "SMTP" + msgid "For delivering mail by connecting to a remote mailhub using SMTP." + msgstr "Pro doručování pošty spojením se vzdáleným serverem pomocí SMTP." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:168 + msgid "Syntax error, command unrecognized" + msgstr "Syntaktická chyba, příkaz neznámý" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:170 + msgid "Syntax error in parameters or arguments" + msgstr "Syntaktická chyba v parametrech nebo argumentech" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:170 ++#: ../camel/providers/smtp/camel-smtp-transport.c:172 + msgid "Command not implemented" + msgstr "Příkaz není implementovaný" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:174 + msgid "Command parameter not implemented" + msgstr "Parametr příkazu není implementovaný" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:174 ++#: ../camel/providers/smtp/camel-smtp-transport.c:176 + msgid "System status, or system help reply" + msgstr "Stav systému nebo odpověď na pomoc" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:176 ++#: ../camel/providers/smtp/camel-smtp-transport.c:178 + msgid "Help message" + msgstr "Nápověda" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:180 + msgid "Service ready" + msgstr "Služba připravena" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:180 ++#: ../camel/providers/smtp/camel-smtp-transport.c:182 + msgid "Service closing transmission channel" + msgstr "Služba zavírá přenosový kanál" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:184 + msgid "Service not available, closing transmission channel" + msgstr "Služba není k dispozici, zavírám přenosový kanál" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:184 ++#: ../camel/providers/smtp/camel-smtp-transport.c:186 + msgid "Requested mail action okay, completed" + msgstr "Požadovaná poštovní akce v pořádku, dokončena" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:186 ++#: ../camel/providers/smtp/camel-smtp-transport.c:188 + msgid "User not local; will forward to " + msgstr "Uživatel není místní; předám na " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:188 ++#: ../camel/providers/smtp/camel-smtp-transport.c:190 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "" + "Požadovaná poštovní akce nebyla vykonána, poštovní schránka není k dispozici" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:190 ++#: ../camel/providers/smtp/camel-smtp-transport.c:192 + msgid "Requested action not taken: mailbox unavailable" + msgstr "Požadovaná akce nebyla vykonána, poštovní schránka není k dispozici" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:192 ++#: ../camel/providers/smtp/camel-smtp-transport.c:194 + msgid "Requested action aborted: error in processing" + msgstr "Požadovaná činnost se nezdařila: chyba při zpracování" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:194 ++#: ../camel/providers/smtp/camel-smtp-transport.c:196 + msgid "User not local; please try " + msgstr "Uživatel není místní; zkuste prosím " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:196 ++#: ../camel/providers/smtp/camel-smtp-transport.c:198 + msgid "Requested action not taken: insufficient system storage" + msgstr "Požadovaná akce nebyla vykonána: nedostatek místa v systému" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:198 ++#: ../camel/providers/smtp/camel-smtp-transport.c:200 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "Požadovaná poštovní akce přerušena: přesáhnutí alokace místa" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:200 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "Požadovaná akce nebyla vykonána: název poštovní schránky nepovolen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:204 + msgid "Start mail input; end with ." + msgstr "Spustit vstup pošty, končí ." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:204 ++#: ../camel/providers/smtp/camel-smtp-transport.c:206 + msgid "Transaction failed" + msgstr "Transakce selhala" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/providers/smtp/camel-smtp-transport.c:210 + msgid "A password transition is needed" + msgstr "Vyžadován přenos hesla" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:210 ++#: ../camel/providers/smtp/camel-smtp-transport.c:212 + msgid "Authentication mechanism is too weak" + msgstr "Mechanismus autentizace je příliš slabý" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:212 ++#: ../camel/providers/smtp/camel-smtp-transport.c:214 + msgid "Encryption required for requested authentication mechanism" + msgstr "Pro požadovaný způsob autentizace je vyžadováno šifrovaní" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:214 ++#: ../camel/providers/smtp/camel-smtp-transport.c:216 + msgid "Temporary authentication failure" +-msgstr "Dočasné selhání autentizace." ++msgstr "Dočasné selhání autentizace" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:295 ++#: ../camel/providers/smtp/camel-smtp-transport.c:297 + msgid "Welcome response error" + msgstr "Chyba odpovědi přivítání" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:330 +-#: ../camel/providers/smtp/camel-smtp-transport.c:363 +-#: ../camel/providers/smtp/camel-smtp-transport.c:369 ++#: ../camel/providers/smtp/camel-smtp-transport.c:332 ++#: ../camel/providers/smtp/camel-smtp-transport.c:365 ++#: ../camel/providers/smtp/camel-smtp-transport.c:371 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "Nemohu se připojit k SMTP serveru %s v zabezpečeném režimu: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:341 + #, c-format + msgid "STARTTLS command failed: %s" + msgstr "Příkaz STARTTLS selhal: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:354 ++#: ../camel/providers/smtp/camel-smtp-transport.c:356 + msgid "STARTTLS command failed" + msgstr "Příkaz STARTTLS selhal" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:494 ++#: ../camel/providers/smtp/camel-smtp-transport.c:497 + #, c-format + msgid "SMTP server %s does not support requested authentication type %s." + msgstr "SMTP server %s nepodporuje požadovaný typ autentizace %s." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:559 ++#: ../camel/providers/smtp/camel-smtp-transport.c:564 + #, c-format + msgid "" + "Unable to authenticate to SMTP server.\n" +@@ -4579,93 +4684,93 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:683 ++#: ../camel/providers/smtp/camel-smtp-transport.c:697 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP server %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:685 ++#: ../camel/providers/smtp/camel-smtp-transport.c:699 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "Doručení pošty SMTP pomocí %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:717 + msgid "Cannot send message: service not connected." + msgstr "Nemohu odeslat zprávu: služba není připojena." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:709 ++#: ../camel/providers/smtp/camel-smtp-transport.c:723 + msgid "Cannot send message: sender address not valid." + msgstr "Nemohu odeslat zprávu: adresa odesílatele není platná." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:713 ++#: ../camel/providers/smtp/camel-smtp-transport.c:727 + msgid "Sending message" + msgstr "Posílám zprávu" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:728 ++#: ../camel/providers/smtp/camel-smtp-transport.c:742 + msgid "Cannot send message: no recipients defined." + msgstr "Nemohu odeslat zprávu: nebyli určeni příjemci." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:753 + msgid "Cannot send message: one or more invalid recipients" + msgstr "Nemohu odeslat zprávu: jeden nebo více neplatných příjemců" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:968 ++#: ../camel/providers/smtp/camel-smtp-transport.c:982 + msgid "SMTP Greeting" + msgstr "Pozdrav SMTP" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:993 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1007 + #, c-format + msgid "HELO command failed: %s" + msgstr "Příkaz HELO selhal: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1010 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1024 + msgid "HELO command failed" + msgstr "Příkaz HELO selhal" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1073 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1090 + msgid "SMTP Authentication" + msgstr "Autentizace SMTP" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1079 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1096 + msgid "Error creating SASL authentication object." + msgstr "Chyba při vytváření objektu autentizace SASL." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1096 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1107 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1124 + #, c-format + msgid "AUTH command failed: %s" + msgstr "Příkaz AUTH selhal: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1130 + msgid "AUTH command failed" + msgstr "Příkaz AUTH selhal" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1177 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1200 + msgid "Bad authentication response from server.\n" + msgstr "Neplatná odpověď autentizace od serveru.\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1227 + #, c-format + msgid "MAIL FROM command failed: %s: mail not sent" + msgstr "Příkaz MAIL FROM selhal: %s: pošta neodeslána" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1219 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1244 + msgid "MAIL FROM command failed" + msgstr "Příkaz MAIL FROM selhal" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1243 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1268 + #, c-format + msgid "RCPT TO command failed: %s: mail not sent" + msgstr "Příkaz RCPT TO selhal: %s: pošta neodeslána" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1262 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1287 + #, c-format + msgid "RCPT TO <%s> failed" + msgstr "RCPT TO <%s> selhal" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1301 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1359 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1378 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1327 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1396 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1415 + #, c-format + msgid "DATA command failed: %s: mail not sent" + msgstr "Příkaz DATA selhal: %s: pošta neodeslána" +@@ -4673,26 +4778,26 @@ msgstr "Příkaz DATA selhal: %s: pošta + #. we should have gotten instructions on how to use the DATA command: + #. * 354 Enter mail, end with "." on a line by itself + #. +-#: ../camel/providers/smtp/camel-smtp-transport.c:1318 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1394 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1344 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1431 + msgid "DATA command failed" + msgstr "Příkaz DATA selhal" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1417 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1454 + #, c-format + msgid "RSET command failed: %s" + msgstr "Příkaz RSET selhal: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1433 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1470 + msgid "RSET command failed" + msgstr "Příkaz RSET selhal" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1456 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1493 + #, c-format + msgid "QUIT command failed: %s" + msgstr "Příkaz QUIT selhal: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1470 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1507 + msgid "QUIT command failed" + msgstr "Příkaz QUIT selhal" + +@@ -4753,27 +4858,28 @@ msgstr "Osobní" + msgid "Phone Calls" + msgstr "Telefonní hovory" + +-#: ../libedataserver/e-categories.c:60 ++#. Translators: "Status" is a category name; it can mean anything user wants to ++#: ../libedataserver/e-categories.c:61 + msgid "Status" + msgstr "Stav" + +-#: ../libedataserver/e-categories.c:61 ++#: ../libedataserver/e-categories.c:62 + msgid "Strategies" + msgstr "Strategie" + +-#: ../libedataserver/e-categories.c:62 ++#: ../libedataserver/e-categories.c:63 + msgid "Suppliers" + msgstr "Dodavatelé" + +-#: ../libedataserver/e-categories.c:63 ++#: ../libedataserver/e-categories.c:64 + msgid "Time & Expenses" + msgstr "Čas a výdaje" + +-#: ../libedataserver/e-categories.c:64 ++#: ../libedataserver/e-categories.c:65 + msgid "VIP" + msgstr "VIP" + +-#: ../libedataserver/e-categories.c:65 ++#: ../libedataserver/e-categories.c:66 + msgid "Waiting" + msgstr "Čeká" + +@@ -4781,7 +4887,7 @@ msgstr "Čeká" + #. in 12-hour format. + #. strftime format of a weekday, a date and a + #. time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1628 ../libedataserver/e-time-utils.c:1887 ++#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%A %d.%m.%Y %H:%M:%S" + +@@ -4789,7 +4895,7 @@ msgstr "%A %d.%m.%Y %H:%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:1633 ../libedataserver/e-time-utils.c:1878 ++#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%A %d.%m.%Y %H:%M:%S" + +@@ -4797,7 +4903,7 @@ msgstr "%A %d.%m.%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:1638 ../libedataserver/e-time-utils.c:1883 ++#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%A %d.%m.%Y %H:%M" + +@@ -4805,78 +4911,78 @@ msgstr "%A %d.%m.%Y %H:%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:1643 ../libedataserver/e-time-utils.c:1874 ++#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898 + msgid "%a %m/%d/%Y %H:%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. +-#: ../libedataserver/e-time-utils.c:1648 ++#: ../libedataserver/e-time-utils.c:1664 + msgid "%a %m/%d/%Y %I %p" + msgstr "%A %d.%m.%Y %H" + + #. strptime format of a weekday, a date and a time, + #. in 24-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1653 ++#: ../libedataserver/e-time-utils.c:1669 + msgid "%a %m/%d/%Y %H" + 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:1656 ../libedataserver/e-time-utils.c:1753 +-#: ../libedataserver/e-time-utils.c:1869 ++#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773 ++#: ../libedataserver/e-time-utils.c:1893 + 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:1664 ++#: ../libedataserver/e-time-utils.c:1680 + msgid "%m/%d/%Y %I:%M:%S %p" + msgstr "%d.%m.%Y %H:%M:%S" + + #. strptime format of a date and a time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1684 + msgid "%m/%d/%Y %H:%M:%S" + msgstr "%d.%m.%Y %H:%M:%S" + + #. strptime format of a date and a time, in 12-hour format, + #. without seconds. +-#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1689 + msgid "%m/%d/%Y %I:%M %p" + msgstr "%d.%m.%Y %H:%M" + + #. strptime format of a date and a time, in 24-hour format, + #. without seconds. +-#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1694 + msgid "%m/%d/%Y %H:%M" + msgstr "%d.%m.%Y %H:%M" + + #. strptime format of a date and a time, in 12-hour format, + #. without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1683 ++#: ../libedataserver/e-time-utils.c:1699 + msgid "%m/%d/%Y %I %p" + msgstr "%d.%m.%Y %H" + + #. strptime format of a date and a time, in 24-hour format, + #. without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1688 ++#: ../libedataserver/e-time-utils.c:1704 + msgid "%m/%d/%Y %H" + 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:1691 ../libedataserver/e-time-utils.c:1756 ++#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776 + 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:1810 ../libedataserver/e-time-utils.c:1932 ++#: ../libedataserver/e-time-utils.c:1834 ../libedataserver/e-time-utils.c:1956 + msgid "%I:%M:%S %p" + msgstr "%H:%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:1814 ../libedataserver/e-time-utils.c:1924 ++#: ../libedataserver/e-time-utils.c:1838 ../libedataserver/e-time-utils.c:1948 + msgid "%H:%M:%S" + msgstr "%H:%M:%S" + +@@ -4884,47 +4990,47 @@ msgstr "%H:%M:%S" + #. in 12-hour format. + #. strftime format of a time in 12-hour format, + #. without seconds. +-#: ../libedataserver/e-time-utils.c:1819 ../libedataserver/e-time-utils.c:1929 ++#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953 + msgid "%I:%M %p" + msgstr "%H:%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:1823 ../libedataserver/e-time-utils.c:1921 ++#: ../libedataserver/e-time-utils.c:1847 ../libedataserver/e-time-utils.c:1945 + 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:1826 ++#: ../libedataserver/e-time-utils.c:1850 + msgid "%H%M" + msgstr "%H%M" + + #. strptime format for hour and AM/PM, 12-hour format. +-#: ../libedataserver/e-time-utils.c:1830 ++#: ../libedataserver/e-time-utils.c:1854 + msgid "%I %p" + msgstr "%H" + +-#: ../libedataserverui/e-book-auth-util.c:89 ++#: ../libedataserverui/e-book-auth-util.c:90 + msgid "Accessing LDAP Server anonymously" + msgstr "Přistupuji k serveru LDAP anonymně" + +-#: ../libedataserverui/e-book-auth-util.c:193 ++#: ../libedataserverui/e-book-auth-util.c:192 + msgid "Failed to authenticate.\n" + msgstr "Nemohu se autentizovat.\n" + +-#: ../libedataserverui/e-categories-dialog.c:274 ++#: ../libedataserverui/e-categories-dialog.c:261 + #, c-format + msgid "" + "There is already a category '%s' in the configuration. Please use another " + "name" + msgstr "Kategorie '%s' již v nastavení existuje. Použijte prosím jiný název" + +-#: ../libedataserverui/e-categories-dialog.c:475 ++#: ../libedataserverui/e-categories-dialog.c:466 + msgid "Icon" + msgstr "Ikona" + +-#: ../libedataserverui/e-categories-dialog.c:480 ++#: ../libedataserverui/e-categories-dialog.c:471 + msgid "Category" + msgstr "Kategorie" + +@@ -4960,19 +5066,19 @@ msgstr "_Upravit" + msgid "categories" + msgstr "kategorie" + +-#: ../libedataserverui/e-name-selector-dialog.c:275 ++#: ../libedataserverui/e-name-selector-dialog.c:272 + msgid "Select Contacts from Address Book" + msgstr "Vyberte kontakty z adresáře" + +-#: ../libedataserverui/e-name-selector-dialog.c:555 ++#: ../libedataserverui/e-name-selector-dialog.c:559 + msgid "_Add" + msgstr "_Přidat" + +-#: ../libedataserverui/e-name-selector-dialog.c:580 ++#: ../libedataserverui/e-name-selector-dialog.c:584 + msgid "_Remove" + msgstr "_Odstranit" + +-#: ../libedataserverui/e-name-selector-dialog.c:753 ++#: ../libedataserverui/e-name-selector-dialog.c:761 + #: ../libedataserverui/e-name-selector-dialog.glade.h:6 + msgid "Any Category" + msgstr "Jakákoliv kategorie" +@@ -5015,67 +5121,76 @@ msgid "_Search:" + msgstr "_Hledat:" + + #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2249 ++#: ../libedataserverui/e-name-selector-entry.c:2369 + #, c-format + msgid "E_xpand %s Inline" + msgstr "_Rozšířit %s jako vložené" + + #. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2264 ++#: ../libedataserverui/e-name-selector-entry.c:2384 + #, c-format + msgid "Cop_y %s" + msgstr "_Kopírovat %s" + + #. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2274 ++#: ../libedataserverui/e-name-selector-entry.c:2394 + #, c-format + msgid "C_ut %s" + msgstr "_Vyjmout %s" + + #. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2291 ++#: ../libedataserverui/e-name-selector-entry.c:2411 + #, c-format + msgid "_Edit %s" + msgstr "_Upravit %s" + +-#: ../libedataserverui/e-name-selector-list.c:479 ++#: ../libedataserverui/e-name-selector-list.c:466 + #, c-format + msgid "_Delete %s" + msgstr "_Odstranit %s" + +-#: ../libedataserverui/e-passwords.c:941 ++#: ../libedataserverui/e-passwords.c:218 ++#, c-format ++msgid "Keyring key is unusable: no user or host name" ++msgstr "Klíč z Klíčenky je nepoužitelný: žádný uživatel nebo hostitel" ++ ++#: ../libedataserverui/e-passwords.c:1055 ++msgid "You have the Caps Lock key on." ++msgstr "Máte zapnutou klávesu Caps Lock." ++ ++#: ../libedataserverui/e-passwords.c:1175 + msgid "_Remember this passphrase" + msgstr "Za_pamatovat si toto heslo" + +-#: ../libedataserverui/e-passwords.c:942 ++#: ../libedataserverui/e-passwords.c:1176 + msgid "_Remember this passphrase for the remainder of this session" + msgstr "Zap_amatovat si toto heslo po zbytek sezení" + +-#: ../libedataserverui/e-passwords.c:947 ++#: ../libedataserverui/e-passwords.c:1181 + msgid "_Remember this password" + msgstr "Za_pamatovat si toto heslo" + +-#: ../libedataserverui/e-passwords.c:948 ++#: ../libedataserverui/e-passwords.c:1182 + msgid "_Remember this password for the remainder of this session" + msgstr "Za_pamatovat si toto heslo na zbytek sezení" + + #. prepare the dialog +-#: ../libedataserverui/e-source-selector-dialog.c:101 ++#: ../libedataserverui/e-source-selector-dialog.c:95 + msgid "Select destination" + msgstr "Zvolte cíl" + +-#: ../libedataserverui/e-source-selector-dialog.c:154 ++#: ../libedataserverui/e-source-selector-dialog.c:148 + msgid "_Destination" + msgstr "_Cíl:" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1660 +-#: ../servers/exchange/storage/exchange-account.c:939 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1683 ++#: ../servers/exchange/storage/exchange-account.c:953 + #, c-format + msgid "Enter password for %s" + msgstr "Zadejte heslo pro %s" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1661 +-#: ../servers/exchange/storage/exchange-account.c:944 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1684 ++#: ../servers/exchange/storage/exchange-account.c:958 + msgid "Enter password" + msgstr "Zadejte heslo" + +@@ -5179,26 +5294,26 @@ msgstr "Tuto operaci nelze provést v re + + #. i18n: This is the title of an "other user's folders" + #. hierarchy. Eg, "John Doe's Folders". +-#: ../servers/exchange/storage/exchange-account.c:635 ++#: ../servers/exchange/storage/exchange-account.c:644 + #, c-format + msgid "%s's Folders" + msgstr "Složky uživatele %s" + +-#: ../servers/exchange/storage/exchange-account.c:1245 ++#: ../servers/exchange/storage/exchange-account.c:1259 + msgid "Personal Folders" + msgstr "Osobní složky" + +-#: ../servers/exchange/storage/exchange-account.c:1260 ++#: ../servers/exchange/storage/exchange-account.c:1274 + msgid "Favorite Public Folders" + msgstr "Oblíbené veřejné složky" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1277 ++#: ../servers/exchange/storage/exchange-account.c:1291 + msgid "All Public Folders" + msgstr "Všechny veřejné složky" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1291 ++#: ../servers/exchange/storage/exchange-account.c:1305 + msgid "Global Address List" + msgstr "Globální seznam adres" + +@@ -5226,19 +5341,19 @@ msgstr "Odeslané" + msgid "Tasks" + msgstr "Úkoly" + +-#: ../servers/groupwise/e-gw-connection.c:191 ++#: ../servers/groupwise/e-gw-connection.c:225 + msgid "Invalid connection" + msgstr "Neplatné spojení" + +-#: ../servers/groupwise/e-gw-connection.c:195 ++#: ../servers/groupwise/e-gw-connection.c:229 + msgid "Invalid response from server" + msgstr "Neplatná odpověď od serveru" + +-#: ../servers/groupwise/e-gw-connection.c:197 ++#: ../servers/groupwise/e-gw-connection.c:231 + msgid "No response from the server" + msgstr "Žádná odpověď od serveru" + +-#: ../servers/groupwise/e-gw-connection.c:203 ++#: ../servers/groupwise/e-gw-connection.c:237 + msgid "Bad parameter" + msgstr "Špatný parametr" + +@@ -5259,7 +5374,7 @@ msgid "Evolution Data Server logging ser + msgstr "Služba zaznamenávání Evolution Data Server" + + #. dialog display isn't working out +-#: ../src/server.c:110 ++#: ../src/server.c:109 + #, c-format + msgid "Multiple segmentation faults occurred; cannot display error dialog\n" + msgstr "Došlo k několika chybám segmentace; nemohu zobrazit dialog o chybě\n" +Index: evolution-data-server-2.23.92/po/hu.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/hu.po ++++ evolution-data-server-2.23.92/po/hu.po +@@ -9,8 +9,8 @@ msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server.HEAD.hu\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-02-18 11:03+0000\n" +-"PO-Revision-Date: 2008-03-04 12:58+0100\n" ++"POT-Creation-Date: 2008-08-18 05:26+0000\n" ++"PO-Revision-Date: 2008-09-13 15:00+0200\n" + "Last-Translator: Gabor Kelemen \n" + "Language-Team: Hungarian \n" + "MIME-Version: 1.0\n" +@@ -19,63 +19,63 @@ msgstr "" + "X-Generator: KBabel 1.11.4\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:554 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2310 ++#: ../addressbook/backends/file/e-book-backend-file.c:555 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475 + msgid "Loading..." +-msgstr "Betöltés..." ++msgstr "Betöltés…" + +-#: ../addressbook/backends/file/e-book-backend-file.c:557 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2269 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2289 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2308 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4156 ++#: ../addressbook/backends/file/e-book-backend-file.c:558 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4282 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477 + msgid "Searching..." +-msgstr "Keresés..." ++msgstr "Keresés…" + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2670 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4315 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4446 + #, c-format + msgid "Downloading contacts (%d)... " +-msgstr "Névjegyek letöltése (%d)... " ++msgstr "Névjegyek letöltése (%d)… " + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2825 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3016 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3060 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103 + #, c-format + msgid "Updating contacts cache (%d)... " +-msgstr "Névjegyek gyorsítótárának frissítése (%d)... " ++msgstr "Névjegyek gyorsítótárának frissítése (%d)… " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:742 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751 + msgid "Using Distinguished Name (DN)" + msgstr "Megkülönböztető név (DN) használatával" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754 + msgid "Using Email Address" + msgstr "E-mail cím használatával" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1002 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017 + msgid "Reconnecting to LDAP server..." +-msgstr "Újrakapcsolódás az LDAP kiszolgálóhoz..." ++msgstr "Újrakapcsolódás az LDAP kiszolgálóhoz…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1598 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1613 + msgid "Adding contact to LDAP server..." +-msgstr "Névjegy hozzáadása az LDAP kiszolgálóhoz..." ++msgstr "Névjegy hozzáadása az LDAP kiszolgálóhoz…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1726 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1747 + msgid "Removing contact from LDAP server..." +-msgstr "Névjegy eltávolítása az LDAP kiszolgálóról..." ++msgstr "Névjegy eltávolítása az LDAP kiszolgálóról…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2031 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2058 + msgid "Modifying contact from LDAP server..." +-msgstr "Névjegy módosítása az LDAP kiszolgálón..." ++msgstr "Névjegy módosítása az LDAP kiszolgálón…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4027 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4142 + msgid "Receiving LDAP search results..." +-msgstr "LDAP keresés eredményeinek letöltése..." ++msgstr "LDAP keresés eredményeinek letöltése…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4176 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4304 + msgid "Error performing search" + msgstr "Hiba a keresés közben" + +@@ -83,106 +83,107 @@ msgstr "Hiba a keresés közben" + #. * function names, e.g. + #. * "e_book_add_contact" on book before + #. * "e_book_open +-#: ../addressbook/libebook/e-book.c:254 ../addressbook/libebook/e-book.c:258 +-#: ../addressbook/libebook/e-book.c:470 ../addressbook/libebook/e-book.c:474 +-#: ../addressbook/libebook/e-book.c:615 ../addressbook/libebook/e-book.c:619 +-#: ../addressbook/libebook/e-book.c:708 ../addressbook/libebook/e-book.c:712 +-#: ../addressbook/libebook/e-book.c:1022 ../addressbook/libebook/e-book.c:1027 +-#: ../addressbook/libebook/e-book.c:1214 ../addressbook/libebook/e-book.c:1218 +-#: ../addressbook/libebook/e-book.c:1375 ../addressbook/libebook/e-book.c:1379 +-#: ../addressbook/libebook/e-book.c:1588 ../addressbook/libebook/e-book.c:1592 +-#: ../addressbook/libebook/e-book.c:1829 ../addressbook/libebook/e-book.c:1833 +-#: ../addressbook/libebook/e-book.c:2070 ../addressbook/libebook/e-book.c:2074 +-#: ../addressbook/libebook/e-book.c:2286 ../addressbook/libebook/e-book.c:2290 +-#: ../addressbook/libebook/e-book.c:3425 ++#: ../addressbook/libebook/e-book.c:252 ../addressbook/libebook/e-book.c:256 ++#: ../addressbook/libebook/e-book.c:461 ../addressbook/libebook/e-book.c:465 ++#: ../addressbook/libebook/e-book.c:604 ../addressbook/libebook/e-book.c:608 ++#: ../addressbook/libebook/e-book.c:695 ../addressbook/libebook/e-book.c:699 ++#: ../addressbook/libebook/e-book.c:995 ../addressbook/libebook/e-book.c:1000 ++#: ../addressbook/libebook/e-book.c:1179 ../addressbook/libebook/e-book.c:1183 ++#: ../addressbook/libebook/e-book.c:1338 ../addressbook/libebook/e-book.c:1342 ++#: ../addressbook/libebook/e-book.c:1544 ../addressbook/libebook/e-book.c:1548 ++#: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791 ++#: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029 ++#: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238 ++#: ../addressbook/libebook/e-book.c:3339 + #, c-format + msgid "\"%s\" on book before \"%s\"" + msgstr "„%s” „%s” előtt van a könyvnél" + +-#: ../addressbook/libebook/e-book.c:267 ../addressbook/libebook/e-book.c:483 +-#: ../addressbook/libebook/e-book.c:628 ../addressbook/libebook/e-book.c:721 +-#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1228 +-#: ../addressbook/libebook/e-book.c:1389 ../addressbook/libebook/e-book.c:1601 +-#: ../addressbook/libebook/e-book.c:1842 ../addressbook/libebook/e-book.c:2084 +-#: ../addressbook/libebook/e-book.c:2299 ../addressbook/libebook/e-book.c:2665 +-#: ../addressbook/libebook/e-book.c:2871 ++#: ../addressbook/libebook/e-book.c:265 ../addressbook/libebook/e-book.c:474 ++#: ../addressbook/libebook/e-book.c:617 ../addressbook/libebook/e-book.c:708 ++#: ../addressbook/libebook/e-book.c:1010 ../addressbook/libebook/e-book.c:1193 ++#: ../addressbook/libebook/e-book.c:1352 ../addressbook/libebook/e-book.c:1557 ++#: ../addressbook/libebook/e-book.c:1800 ../addressbook/libebook/e-book.c:2039 ++#: ../addressbook/libebook/e-book.c:2247 ../addressbook/libebook/e-book.c:2593 ++#: ../addressbook/libebook/e-book.c:2792 ++#, c-format + msgid "book busy" + msgstr "a könyv foglalt" + +-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:304 +-#: ../addressbook/libebook/e-book.c:516 ../addressbook/libebook/e-book.c:520 +-#: ../addressbook/libebook/e-book.c:657 ../addressbook/libebook/e-book.c:661 +-#: ../addressbook/libebook/e-book.c:750 ../addressbook/libebook/e-book.c:754 +-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069 +-#: ../addressbook/libebook/e-book.c:1260 ../addressbook/libebook/e-book.c:1263 +-#: ../addressbook/libebook/e-book.c:1418 ../addressbook/libebook/e-book.c:1422 +-#: ../addressbook/libebook/e-book.c:1637 ../addressbook/libebook/e-book.c:1641 +-#: ../addressbook/libebook/e-book.c:1889 ../addressbook/libebook/e-book.c:1893 +-#: ../addressbook/libebook/e-book.c:2116 ../addressbook/libebook/e-book.c:2120 +-#: ../addressbook/libebook/e-book.c:2327 ../addressbook/libebook/e-book.c:2331 +-#: ../addressbook/libebook/e-book.c:2606 ../addressbook/libebook/e-book.c:2693 +-#: ../addressbook/libebook/e-book.c:2697 ../addressbook/libebook/e-book.c:2899 +-#: ../addressbook/libebook/e-book.c:2903 ../addressbook/libebook/e-book.c:3434 ++#: ../addressbook/libebook/e-book.c:296 ../addressbook/libebook/e-book.c:300 ++#: ../addressbook/libebook/e-book.c:505 ../addressbook/libebook/e-book.c:509 ++#: ../addressbook/libebook/e-book.c:644 ../addressbook/libebook/e-book.c:648 ++#: ../addressbook/libebook/e-book.c:735 ../addressbook/libebook/e-book.c:739 ++#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1040 ++#: ../addressbook/libebook/e-book.c:1223 ../addressbook/libebook/e-book.c:1226 ++#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1383 ++#: ../addressbook/libebook/e-book.c:1593 ../addressbook/libebook/e-book.c:1597 ++#: ../addressbook/libebook/e-book.c:1847 ../addressbook/libebook/e-book.c:1851 ++#: ../addressbook/libebook/e-book.c:2069 ../addressbook/libebook/e-book.c:2073 ++#: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277 ++#: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619 ++#: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818 ++#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3348 + #, c-format + msgid "CORBA exception making \"%s\" call" + msgstr "CORBA-kivétel „%s” hívást hoz létre" + +-#: ../addressbook/libebook/e-book.c:2587 ++#: ../addressbook/libebook/e-book.c:2523 + #, c-format + msgid "%s: there is no current operation" + msgstr "%s: jelenleg nincs művelet" + +-#: ../addressbook/libebook/e-book.c:2622 ++#: ../addressbook/libebook/e-book.c:2552 + #, c-format + msgid "%s: could not cancel" + msgstr "%s: nem szakítható meg" + +-#: ../addressbook/libebook/e-book.c:2651 ../addressbook/libebook/e-book.c:2655 ++#: ../addressbook/libebook/e-book.c:2579 ../addressbook/libebook/e-book.c:2583 + #, c-format + msgid "\"%s\" on book after \"%s\"" + msgstr "„%s” „%s” után van a könyvnél" + +-#: ../addressbook/libebook/e-book.c:2721 ++#: ../addressbook/libebook/e-book.c:2647 + #, c-format + msgid "%s: canceled" + msgstr "%s: megszakítva" + +-#: ../addressbook/libebook/e-book.c:3289 ++#: ../addressbook/libebook/e-book.c:3203 + #, c-format + msgid "%s: Invalid source." + msgstr "%s: Érvénytelen forrás." + +-#: ../addressbook/libebook/e-book.c:3297 ../addressbook/libebook/e-book.c:3363 ++#: ../addressbook/libebook/e-book.c:3211 ../addressbook/libebook/e-book.c:3277 + #, c-format + msgid "%s: no factories available for URI `%s'" + msgstr "%s: nem érhető el factory a(z) „%s” URI számára" + +-#: ../addressbook/libebook/e-book.c:3309 ++#: ../addressbook/libebook/e-book.c:3223 + #, c-format + msgid "%s: Could not create EBookListener" + msgstr "%s: Nem lehet létrehozni EBookListenert" + +-#: ../addressbook/libebook/e-book.c:3576 ++#: ../addressbook/libebook/e-book.c:3490 + #, c-format + msgid "%s: there was no self contact UID stored in gconf" + msgstr "%s: nem volt saját névjegy UID tárolva a gconfban" + +-#: ../addressbook/libebook/e-book.c:3709 ++#: ../addressbook/libebook/e-book.c:3623 + #, c-format + msgid "%s: there was no source for uid `%s' stored in gconf." + msgstr "%s: a(z) „%s” uid-nak nem volt tárolva forrása a gconfban." + + #. Dummy row as EContactField starts from 1 +-#: ../addressbook/libebook/e-contact.c:114 ++#: ../addressbook/libebook/e-contact.c:113 + msgid "Unique ID" + msgstr "Egyedi azonosító" + +-#: ../addressbook/libebook/e-contact.c:115 ++#: ../addressbook/libebook/e-contact.c:114 + msgid "File Under" + msgstr "Mentés mint" + + #. URI of the book to which the contact belongs to +-#: ../addressbook/libebook/e-contact.c:117 ++#: ../addressbook/libebook/e-contact.c:116 + msgid "Book URI" + msgstr "Könyv URI címe" + +@@ -190,559 +191,565 @@ msgstr "Könyv URI címe" + #. 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:123 ++#: ../addressbook/libebook/e-contact.c:122 + msgid "Full Name" + msgstr "Teljes név" + +-#: ../addressbook/libebook/e-contact.c:124 ++#: ../addressbook/libebook/e-contact.c:123 + msgid "Given Name" + msgstr "Keresztnév" + +-#: ../addressbook/libebook/e-contact.c:125 ++#: ../addressbook/libebook/e-contact.c:124 + msgid "Family Name" + msgstr "Vezetéknév" + +-#: ../addressbook/libebook/e-contact.c:126 ++#: ../addressbook/libebook/e-contact.c:125 + msgid "Nickname" + msgstr "Becenév" + + #. Email fields +-#: ../addressbook/libebook/e-contact.c:129 ++#: ../addressbook/libebook/e-contact.c:128 + msgid "Email 1" + msgstr "1. e-mail" + +-#: ../addressbook/libebook/e-contact.c:130 ++#: ../addressbook/libebook/e-contact.c:129 + msgid "Email 2" + msgstr "2. e-mail" + +-#: ../addressbook/libebook/e-contact.c:131 ++#: ../addressbook/libebook/e-contact.c:130 + msgid "Email 3" + msgstr "3. e-mail" + +-#: ../addressbook/libebook/e-contact.c:132 ++#: ../addressbook/libebook/e-contact.c:131 + msgid "Email 4" + msgstr "4. e-mail" + +-#: ../addressbook/libebook/e-contact.c:134 ++#: ../addressbook/libebook/e-contact.c:133 + msgid "Mailer" + msgstr "Levelező" + + #. Address Labels +-#: ../addressbook/libebook/e-contact.c:137 ++#: ../addressbook/libebook/e-contact.c:136 + msgid "Home Address Label" + msgstr "Otthoni cím címke" + +-#: ../addressbook/libebook/e-contact.c:138 ++#: ../addressbook/libebook/e-contact.c:137 + msgid "Work Address Label" + msgstr "Munkahelyi cím címke" + +-#: ../addressbook/libebook/e-contact.c:139 ++#: ../addressbook/libebook/e-contact.c:138 + msgid "Other Address Label" + msgstr "Egyéb cím címke" + + #. Phone fields +-#: ../addressbook/libebook/e-contact.c:142 ++#: ../addressbook/libebook/e-contact.c:141 + msgid "Assistant Phone" + msgstr "Asszisztens telefonja" + +-#: ../addressbook/libebook/e-contact.c:143 ++#: ../addressbook/libebook/e-contact.c:142 + msgid "Business Phone" + msgstr "Munkahelyi telefon" + +-#: ../addressbook/libebook/e-contact.c:144 ++#: ../addressbook/libebook/e-contact.c:143 + msgid "Business Phone 2" + msgstr "2. munkahelyi telefon" + +-#: ../addressbook/libebook/e-contact.c:145 ++#: ../addressbook/libebook/e-contact.c:144 + msgid "Business Fax" + msgstr "Üzleti fax" + +-#: ../addressbook/libebook/e-contact.c:146 ++#: ../addressbook/libebook/e-contact.c:145 + msgid "Callback Phone" + msgstr "Visszahívó telefon" + +-#: ../addressbook/libebook/e-contact.c:147 ++#: ../addressbook/libebook/e-contact.c:146 + msgid "Car Phone" + msgstr "Autótelefon" + +-#: ../addressbook/libebook/e-contact.c:148 ++#: ../addressbook/libebook/e-contact.c:147 + msgid "Company Phone" + msgstr "Céges telefon" + +-#: ../addressbook/libebook/e-contact.c:149 ++#: ../addressbook/libebook/e-contact.c:148 + msgid "Home Phone" + msgstr "Otthoni telefon" + +-#: ../addressbook/libebook/e-contact.c:150 ++#: ../addressbook/libebook/e-contact.c:149 + msgid "Home Phone 2" + msgstr "2. otthoni telefon" + +-#: ../addressbook/libebook/e-contact.c:151 ++#: ../addressbook/libebook/e-contact.c:150 + msgid "Home Fax" + msgstr "Otthoni fax" + +-#: ../addressbook/libebook/e-contact.c:152 ++#: ../addressbook/libebook/e-contact.c:151 + msgid "ISDN" + msgstr "ISDN" + +-#: ../addressbook/libebook/e-contact.c:153 ++#: ../addressbook/libebook/e-contact.c:152 + msgid "Mobile Phone" + msgstr "Mobiltelefon" + +-#: ../addressbook/libebook/e-contact.c:154 ++#: ../addressbook/libebook/e-contact.c:153 + msgid "Other Phone" + msgstr "Egyéb telefon" + +-#: ../addressbook/libebook/e-contact.c:155 ++#: ../addressbook/libebook/e-contact.c:154 + msgid "Other Fax" + msgstr "Egyéb fax" + +-#: ../addressbook/libebook/e-contact.c:156 ++#: ../addressbook/libebook/e-contact.c:155 + msgid "Pager" + msgstr "Személyhívó" + +-#: ../addressbook/libebook/e-contact.c:157 ++#: ../addressbook/libebook/e-contact.c:156 + msgid "Primary Phone" + msgstr "Elsődleges telefon" + +-#: ../addressbook/libebook/e-contact.c:158 ++#: ../addressbook/libebook/e-contact.c:157 + msgid "Radio" + msgstr "Rádió" + +-#: ../addressbook/libebook/e-contact.c:159 ++#: ../addressbook/libebook/e-contact.c:158 + msgid "Telex" + msgstr "Telex" + + #. To translators: TTY is Teletypewriter +-#: ../addressbook/libebook/e-contact.c:161 ++#: ../addressbook/libebook/e-contact.c:160 + msgid "TTY" + msgstr "TTY" + + #. Organizational fields +-#: ../addressbook/libebook/e-contact.c:164 ++#: ../addressbook/libebook/e-contact.c:163 + msgid "Organization" + msgstr "Szervezet" + +-#: ../addressbook/libebook/e-contact.c:165 ++#: ../addressbook/libebook/e-contact.c:164 + msgid "Organizational Unit" + msgstr "Szervezeti egység" + +-#: ../addressbook/libebook/e-contact.c:166 ++#: ../addressbook/libebook/e-contact.c:165 + msgid "Office" + msgstr "Hivatal" + +-#: ../addressbook/libebook/e-contact.c:167 ++#: ../addressbook/libebook/e-contact.c:166 + msgid "Title" + msgstr "Beosztás" + +-#: ../addressbook/libebook/e-contact.c:168 ++#: ../addressbook/libebook/e-contact.c:167 + msgid "Role" + msgstr "Szerep" + +-#: ../addressbook/libebook/e-contact.c:169 ++#: ../addressbook/libebook/e-contact.c:168 + msgid "Manager" + msgstr "Főnök" + +-#: ../addressbook/libebook/e-contact.c:170 ++#: ../addressbook/libebook/e-contact.c:169 + msgid "Assistant" + msgstr "Asszisztens" + + #. Web fields +-#: ../addressbook/libebook/e-contact.c:173 ++#: ../addressbook/libebook/e-contact.c:172 + msgid "Homepage URL" + msgstr "Honlap URL" + +-#: ../addressbook/libebook/e-contact.c:174 ++#: ../addressbook/libebook/e-contact.c:173 + msgid "Weblog URL" + msgstr "Weblog URL" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:177 +-#: ../libedataserverui/e-categories-dialog.c:439 ++#: ../addressbook/libebook/e-contact.c:176 ++#: ../libedataserverui/e-categories-dialog.c:426 + msgid "Categories" + msgstr "Kategóriák" + + #. Collaboration fields +-#: ../addressbook/libebook/e-contact.c:180 ++#: ../addressbook/libebook/e-contact.c:179 + msgid "Calendar URI" + msgstr "Naptár URI" + +-#: ../addressbook/libebook/e-contact.c:181 ++#: ../addressbook/libebook/e-contact.c:180 + msgid "Free/Busy URL" + msgstr "Szabad/foglalt URL" + +-#: ../addressbook/libebook/e-contact.c:182 ++#: ../addressbook/libebook/e-contact.c:181 + msgid "ICS Calendar" + msgstr "ICS-naptár" + +-#: ../addressbook/libebook/e-contact.c:183 ++#: ../addressbook/libebook/e-contact.c:182 + msgid "Video Conferencing URL" + msgstr "Videokonferencia URL" + + #. Misc fields +-#: ../addressbook/libebook/e-contact.c:186 ++#: ../addressbook/libebook/e-contact.c:185 + msgid "Spouse's Name" + msgstr "Házastárs neve" + +-#: ../addressbook/libebook/e-contact.c:187 ++#: ../addressbook/libebook/e-contact.c:186 + msgid "Note" + msgstr "Megjegyzés" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:190 ++#: ../addressbook/libebook/e-contact.c:189 + msgid "AIM Home Screen Name 1" + msgstr "1. Otthoni AIM felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:191 ++#: ../addressbook/libebook/e-contact.c:190 + msgid "AIM Home Screen Name 2" + msgstr "2. Otthoni AIM felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:192 ++#: ../addressbook/libebook/e-contact.c:191 + msgid "AIM Home Screen Name 3" + msgstr "3. Otthoni AIM felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:193 ++#: ../addressbook/libebook/e-contact.c:192 + msgid "AIM Work Screen Name 1" + msgstr "1. Munkahelyi AIM felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:194 ++#: ../addressbook/libebook/e-contact.c:193 + msgid "AIM Work Screen Name 2" + msgstr "2. Munkahelyi AIM felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:195 ++#: ../addressbook/libebook/e-contact.c:194 + msgid "AIM Work Screen Name 3" + msgstr "3. Munkahelyi AIM felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:196 ++#: ../addressbook/libebook/e-contact.c:195 + msgid "GroupWise Home Screen Name 1" + msgstr "1. Otthoni GroupWise felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:197 ++#: ../addressbook/libebook/e-contact.c:196 + msgid "GroupWise Home Screen Name 2" + msgstr "2. Otthoni GroupWise felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:198 ++#: ../addressbook/libebook/e-contact.c:197 + msgid "GroupWise Home Screen Name 3" + msgstr "3. Otthoni GroupWise felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:199 ++#: ../addressbook/libebook/e-contact.c:198 + msgid "GroupWise Work Screen Name 1" + msgstr "1. Munkahelyi GroupWise felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:200 ++#: ../addressbook/libebook/e-contact.c:199 + msgid "GroupWise Work Screen Name 2" + msgstr "2. Munkahelyi GroupWise felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:201 ++#: ../addressbook/libebook/e-contact.c:200 + msgid "GroupWise Work Screen Name 3" + msgstr "3. Munkahelyi GroupWise felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:202 ++#: ../addressbook/libebook/e-contact.c:201 + msgid "Jabber Home Id 1" + msgstr "1. Otthoni Jabber-azonosító" + +-#: ../addressbook/libebook/e-contact.c:203 ++#: ../addressbook/libebook/e-contact.c:202 + msgid "Jabber Home Id 2" + msgstr "2. Otthoni Jabber-azonosító" + +-#: ../addressbook/libebook/e-contact.c:204 ++#: ../addressbook/libebook/e-contact.c:203 + msgid "Jabber Home Id 3" + msgstr "3. Otthoni Jabber-azonosító" + +-#: ../addressbook/libebook/e-contact.c:205 ++#: ../addressbook/libebook/e-contact.c:204 + msgid "Jabber Work Id 1" + msgstr "1. Munkahelyi Jabber-azonosító" + +-#: ../addressbook/libebook/e-contact.c:206 ++#: ../addressbook/libebook/e-contact.c:205 + msgid "Jabber Work Id 2" + msgstr "2. Munkahelyi Jabber-azonosító" + +-#: ../addressbook/libebook/e-contact.c:207 ++#: ../addressbook/libebook/e-contact.c:206 + msgid "Jabber Work Id 3" + msgstr "3. Munkahelyi Jabber-azonosító" + +-#: ../addressbook/libebook/e-contact.c:208 ++#: ../addressbook/libebook/e-contact.c:207 + msgid "Yahoo! Home Screen Name 1" + msgstr "1. Otthoni Yahoo! felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:209 ++#: ../addressbook/libebook/e-contact.c:208 + msgid "Yahoo! Home Screen Name 2" + msgstr "2. Otthoni Yahoo! felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:210 ++#: ../addressbook/libebook/e-contact.c:209 + msgid "Yahoo! Home Screen Name 3" + msgstr "3. Otthoni Yahoo! felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:211 ++#: ../addressbook/libebook/e-contact.c:210 + msgid "Yahoo! Work Screen Name 1" + msgstr "1. Munkahelyi Yahoo! felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:212 ++#: ../addressbook/libebook/e-contact.c:211 + msgid "Yahoo! Work Screen Name 2" + msgstr "2. Munkahelyi Yahoo! felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:213 ++#: ../addressbook/libebook/e-contact.c:212 + msgid "Yahoo! Work Screen Name 3" + msgstr "3. Munkahelyi Yahoo! felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:214 ++#: ../addressbook/libebook/e-contact.c:213 + msgid "MSN Home Screen Name 1" + msgstr "1. Otthoni MSN felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:215 ++#: ../addressbook/libebook/e-contact.c:214 + msgid "MSN Home Screen Name 2" + msgstr "2. Otthoni MSN felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:216 ++#: ../addressbook/libebook/e-contact.c:215 + msgid "MSN Home Screen Name 3" + msgstr "3. Otthoni MSN felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:217 ++#: ../addressbook/libebook/e-contact.c:216 + msgid "MSN Work Screen Name 1" + msgstr "1. Munkahelyi MSN felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:218 ++#: ../addressbook/libebook/e-contact.c:217 + msgid "MSN Work Screen Name 2" + msgstr "2. Munkahelyi MSN felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:219 ++#: ../addressbook/libebook/e-contact.c:218 + msgid "MSN Work Screen Name 3" + msgstr "3. Munkahelyi MSN felhasználónév" + +-#: ../addressbook/libebook/e-contact.c:220 ++#: ../addressbook/libebook/e-contact.c:219 + msgid "ICQ Home Id 1" + msgstr "1. Otthoni ICQ azonosító" + +-#: ../addressbook/libebook/e-contact.c:221 ++#: ../addressbook/libebook/e-contact.c:220 + msgid "ICQ Home Id 2" + msgstr "2. Otthoni ICQ azonosító" + +-#: ../addressbook/libebook/e-contact.c:222 ++#: ../addressbook/libebook/e-contact.c:221 + msgid "ICQ Home Id 3" + msgstr "3. Otthoni ICQ azonosító" + +-#: ../addressbook/libebook/e-contact.c:223 ++#: ../addressbook/libebook/e-contact.c:222 + msgid "ICQ Work Id 1" + msgstr "1. Munkahelyi ICQ azonosító" + +-#: ../addressbook/libebook/e-contact.c:224 ++#: ../addressbook/libebook/e-contact.c:223 + msgid "ICQ Work Id 2" + msgstr "2. Munkahelyi ICQ azonosító" + +-#: ../addressbook/libebook/e-contact.c:225 ++#: ../addressbook/libebook/e-contact.c:224 + msgid "ICQ Work Id 3" + msgstr "3. Munkahelyi ICQ azonosító" + + #. Last modified time +-#: ../addressbook/libebook/e-contact.c:228 ++#: ../addressbook/libebook/e-contact.c:227 + msgid "Last Revision" + msgstr "Utolsó módosítás" + +-#: ../addressbook/libebook/e-contact.c:229 ++#: ../addressbook/libebook/e-contact.c:228 + msgid "Name or Org" + msgstr "Név vagy szervezet" + + #. Address fields +-#: ../addressbook/libebook/e-contact.c:232 ++#: ../addressbook/libebook/e-contact.c:231 + msgid "Address List" + msgstr "Címlista" + +-#: ../addressbook/libebook/e-contact.c:233 ++#: ../addressbook/libebook/e-contact.c:232 + msgid "Home Address" + msgstr "Otthoni cím" + +-#: ../addressbook/libebook/e-contact.c:234 ++#: ../addressbook/libebook/e-contact.c:233 + msgid "Work Address" + msgstr "Munkahelyi cím" + +-#: ../addressbook/libebook/e-contact.c:235 ++#: ../addressbook/libebook/e-contact.c:234 + msgid "Other Address" + msgstr "Egyéb cím" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:238 ++#: ../addressbook/libebook/e-contact.c:237 + msgid "Category List" + msgstr "Kategórialista" + + #. Photo/Logo +-#: ../addressbook/libebook/e-contact.c:241 ++#: ../addressbook/libebook/e-contact.c:240 + msgid "Photo" + msgstr "Fotó" + +-#: ../addressbook/libebook/e-contact.c:242 ++#: ../addressbook/libebook/e-contact.c:241 + msgid "Logo" + msgstr "Logó" + +-#: ../addressbook/libebook/e-contact.c:244 ++#: ../addressbook/libebook/e-contact.c:243 + msgid "Name" + msgstr "Név" + +-#: ../addressbook/libebook/e-contact.c:245 ++#: ../addressbook/libebook/e-contact.c:244 + msgid "Email List" + msgstr "E-mail lista" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:248 ++#: ../addressbook/libebook/e-contact.c:247 + msgid "AIM Screen Name List" +-msgstr "AIM felhasználónévlista" ++msgstr "AIM felhasználónév-lista" + +-#: ../addressbook/libebook/e-contact.c:249 ++#: ../addressbook/libebook/e-contact.c:248 + msgid "GroupWise Id List" + msgstr "GroupWise azonosítólista" + +-#: ../addressbook/libebook/e-contact.c:250 ++#: ../addressbook/libebook/e-contact.c:249 + msgid "Jabber Id List" + msgstr "Jabber-azonosítólista" + +-#: ../addressbook/libebook/e-contact.c:251 ++#: ../addressbook/libebook/e-contact.c:250 + msgid "Yahoo! Screen Name List" +-msgstr "Yahoo! felhasználónévlista" ++msgstr "Yahoo! felhasználónév-lista" + +-#: ../addressbook/libebook/e-contact.c:252 ++#: ../addressbook/libebook/e-contact.c:251 + msgid "MSN Screen Name List" +-msgstr "MSN felhasználónévlista" ++msgstr "MSN felhasználónév-lista" + +-#: ../addressbook/libebook/e-contact.c:253 ++#: ../addressbook/libebook/e-contact.c:252 + msgid "ICQ Id List" + msgstr "ICQ azonosítólista" + +-#: ../addressbook/libebook/e-contact.c:255 ++#: ../addressbook/libebook/e-contact.c:254 + msgid "Wants HTML Mail" + msgstr "HTML levelet kér" + +-#: ../addressbook/libebook/e-contact.c:257 ++#: ../addressbook/libebook/e-contact.c:256 + msgid "List" + msgstr "Lista" + +-#: ../addressbook/libebook/e-contact.c:258 ++#: ../addressbook/libebook/e-contact.c:257 + msgid "List Show Addresses" + msgstr "Listázás címek szerint" + +-#: ../addressbook/libebook/e-contact.c:260 ++#: ../addressbook/libebook/e-contact.c:259 + msgid "Birth Date" + msgstr "Születési dátum" + +-#: ../addressbook/libebook/e-contact.c:261 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:462 ++#: ../addressbook/libebook/e-contact.c:260 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461 + #: ../libedataserver/e-categories.c:43 + msgid "Anniversary" + msgstr "Évforduló" + + #. Security fields +-#: ../addressbook/libebook/e-contact.c:264 ++#: ../addressbook/libebook/e-contact.c:263 + msgid "X.509 Certificate" + msgstr "X.509 tanúsítvány" + +-#: ../addressbook/libebook/e-contact.c:266 ++#: ../addressbook/libebook/e-contact.c:265 + msgid "Gadu-Gadu Home Id 1" + msgstr "1. Otthoni Gadu-Gadu azonosító" + +-#: ../addressbook/libebook/e-contact.c:267 ++#: ../addressbook/libebook/e-contact.c:266 + msgid "Gadu-Gadu Home Id 2" + msgstr "2. Otthoni Gadu-Gadu azonosító" + +-#: ../addressbook/libebook/e-contact.c:268 ++#: ../addressbook/libebook/e-contact.c:267 + msgid "Gadu-Gadu Home Id 3" + msgstr "3. Otthoni Gadu-Gadu azonosító" + +-#: ../addressbook/libebook/e-contact.c:269 ++#: ../addressbook/libebook/e-contact.c:268 + msgid "Gadu-Gadu Work Id 1" + msgstr "1. Munkahelyi Gadu-Gadu azonosító" + +-#: ../addressbook/libebook/e-contact.c:270 ++#: ../addressbook/libebook/e-contact.c:269 + msgid "Gadu-Gadu Work Id 2" + msgstr "2. Munkahelyi Gadu-Gadu azonosító" + +-#: ../addressbook/libebook/e-contact.c:271 ++#: ../addressbook/libebook/e-contact.c:270 + msgid "Gadu-Gadu Work Id 3" + msgstr "3. Munkahelyi Gadu-Gadu azonosító" + +-#: ../addressbook/libebook/e-contact.c:272 ++#: ../addressbook/libebook/e-contact.c:271 + msgid "Gadu-Gadu Id List" + msgstr "Gadu-Gadu azonosítólista" + + #. Geo information +-#: ../addressbook/libebook/e-contact.c:275 ++#: ../addressbook/libebook/e-contact.c:274 + msgid "Geographic Information" + msgstr "Földrajzi információk" + +-#: ../addressbook/libebook/e-contact.c:277 ++#: ../addressbook/libebook/e-contact.c:276 + msgid "Telephone" + msgstr "Telefon" + +-#: ../addressbook/libebook/e-contact.c:1494 +-#: ../addressbook/libebook/e-destination.c:770 ++#: ../addressbook/libebook/e-contact.c:1493 ++#: ../addressbook/libebook/e-destination.c:761 + msgid "Unnamed List" + msgstr "Névtelen lista" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:464 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463 + #: ../libedataserver/e-categories.c:44 + msgid "Birthday" + msgstr "Születésnap" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:490 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489 + #, c-format + msgid "Birthday: %s" + msgstr "Születésnap: %s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:514 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513 + #, c-format + msgid "Anniversary: %s" + msgstr "Évforduló: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:203 ++#: ../calendar/backends/file/e-cal-backend-file.c:214 + msgid "Cannot save calendar data: Malformed URI." + msgstr "Nem menthetők a naptáradatok: rosszul formázott URI." + ++#: ../calendar/backends/file/e-cal-backend-file.c:221 ++#: ../calendar/backends/file/e-cal-backend-file.c:227 ++msgid "Cannot save calendar data" ++msgstr "Nem menthetők a naptáradatok" ++ + #: ../calendar/backends/google/e-cal-backend-google-utils.c:335 + msgid "Could not create thread for getting deltas" + msgstr "Nem sikerült létrehozni szálat a delták letöltéséhez" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:367 +-#: ../calendar/backends/google/e-cal-backend-google.c:1175 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1030 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1329 ++#: ../calendar/backends/google/e-cal-backend-google.c:1194 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352 + #: ../calendar/backends/http/e-cal-backend-http.c:569 + #: ../calendar/backends/weather/e-cal-backend-weather.c:466 + msgid "Could not create cache file" + msgstr "Nem lehet létrehozni a gyorsítótár fájlt" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:380 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1042 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065 + msgid "Could not create thread for populating cache" + msgstr "Nem sikerült létrehozni szálat a gyorsítótárfájl megtöltéséhez" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1028 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1784 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795 + msgid "Reply Requested: by " + msgstr "Választ igényelt:" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1033 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1789 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800 + msgid "Reply Requested: When convenient" + msgstr "Választ igényelt: Ha megfelelő" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:275 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277 + #, c-format + msgid "Loading %s items" + msgstr "%s elem betöltése" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:866 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260 + msgid "Calendar" + msgstr "Naptár" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:924 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947 + msgid "Invalid server URI" + msgstr "Érvénytelen kiszolgáló URI" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:943 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:952 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1048 +-#: ../calendar/libecal/e-cal.c:5031 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1069 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1101 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1139 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071 ++#: ../calendar/libecal/e-cal.c:5082 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:109 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145 + #: ../camel/providers/groupwise/camel-groupwise-store.c:594 + #: ../camel/providers/groupwise/camel-groupwise-store.c:746 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:157 +@@ -955,7 +962,7 @@ msgstr "%.1f-%.1f cm hó\n" + msgid "%.1f-%.1fin snow\n" + msgstr "%.1f-%.1f in hó\n" + +-#: ../calendar/libecal/e-cal-component.c:1315 ++#: ../calendar/libecal/e-cal-component.c:1322 + msgid "Untitled appointment" + msgstr "Névtelen találkozó" + +@@ -1083,24 +1090,24 @@ msgstr "30." + msgid "31st" + msgstr "31." + +-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712 ++#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713 + msgid "High" + msgstr "Magas" + +-#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714 ++#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715 + msgid "Normal" + msgstr "Normális" + +-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:716 ++#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717 + msgid "Low" + msgstr "Alacsony" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:710 ++#: ../calendar/libecal/e-cal-util.c:711 + msgid "Undefined" + msgstr "Nem definiált" + +-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:200 ++#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199 + #, c-format + msgid "Enter password for %s (user %s)" + msgstr "Adja meg %s jelszavát (%s felhasználó)" +@@ -1114,87 +1121,106 @@ msgstr "Adja meg %s jelszavát (%s felha + msgid "Enter password for %s to enable proxy for user %s" + msgstr "Adja meg %s jelszavát a proxy engedélyezéséhez %s felhasználó számára" + +-#: ../calendar/libecal/e-cal.c:5003 ++#: ../calendar/libecal/e-cal.c:5054 + msgid "Invalid argument" + msgstr "Érvénytelen paraméter" + +-#: ../calendar/libecal/e-cal.c:5005 ++#: ../calendar/libecal/e-cal.c:5056 + msgid "Backend is busy" + msgstr "A háttér foglalt" + +-#: ../calendar/libecal/e-cal.c:5007 ++#: ../calendar/libecal/e-cal.c:5058 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:97 + msgid "Repository is offline" + msgstr "Az adattár offline" + +-#: ../calendar/libecal/e-cal.c:5009 ++#: ../calendar/libecal/e-cal.c:5060 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:121 + msgid "No such calendar" + msgstr "Nincs ilyen naptár" + +-#: ../calendar/libecal/e-cal.c:5011 ../servers/groupwise/e-gw-connection.c:199 ++#: ../calendar/libecal/e-cal.c:5062 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:103 ++#: ../servers/groupwise/e-gw-connection.c:233 + msgid "Object not found" + msgstr "Az objektum nem található" + +-#: ../calendar/libecal/e-cal.c:5013 ../servers/groupwise/e-gw-connection.c:193 ++#: ../calendar/libecal/e-cal.c:5064 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:105 ++#: ../servers/groupwise/e-gw-connection.c:227 + msgid "Invalid object" + msgstr "Érvénytelen objektum" + +-#: ../calendar/libecal/e-cal.c:5015 ++#: ../calendar/libecal/e-cal.c:5066 + msgid "URI not loaded" + msgstr "URI nincs betöltve" + +-#: ../calendar/libecal/e-cal.c:5017 ++#: ../calendar/libecal/e-cal.c:5068 + msgid "URI already loaded" + msgstr "URI már be van töltve" + +-#: ../calendar/libecal/e-cal.c:5019 ++#: ../calendar/libecal/e-cal.c:5070 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:99 + #: ../servers/exchange/storage/e-storage.c:571 + msgid "Permission denied" + msgstr "Hozzáférés megtagadva" + +-#: ../calendar/libecal/e-cal.c:5021 ../servers/groupwise/e-gw-connection.c:201 ++#: ../calendar/libecal/e-cal.c:5072 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:123 ++#: ../servers/groupwise/e-gw-connection.c:235 + msgid "Unknown User" + msgstr "Ismeretlen felhasználó" + +-#: ../calendar/libecal/e-cal.c:5023 ++#: ../calendar/libecal/e-cal.c:5074 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:107 + msgid "Object ID already exists" + msgstr "Az objektumazonosító már létezik" + +-#: ../calendar/libecal/e-cal.c:5025 ++#: ../calendar/libecal/e-cal.c:5076 + msgid "Protocol not supported" + msgstr "A protokoll nem támogatott" + +-#: ../calendar/libecal/e-cal.c:5027 ++#: ../calendar/libecal/e-cal.c:5078 + msgid "Operation has been canceled" + msgstr "Művelet megszakítva" + +-#: ../calendar/libecal/e-cal.c:5029 ++#: ../calendar/libecal/e-cal.c:5080 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:135 + msgid "Could not cancel operation" + msgstr "Nem lehet megszakítani a műveletet" + +-#: ../calendar/libecal/e-cal.c:5033 +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 ++#: ../calendar/libecal/e-cal.c:5084 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:111 ++#: ../camel/providers/smtp/camel-smtp-transport.c:218 + msgid "Authentication required" + msgstr "Hitelesítés szükséges" + +-#: ../calendar/libecal/e-cal.c:5035 ++#: ../calendar/libecal/e-cal.c:5086 + msgid "A CORBA exception has occurred" + msgstr "CORBA-kivétel történt" + +-#: ../calendar/libecal/e-cal.c:5037 ++#: ../calendar/libecal/e-cal.c:5088 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:138 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 +-#: ../camel/providers/imap/camel-imap-command.c:312 +-#: ../camel/providers/imap/camel-imap-command.c:412 +-#: ../camel/providers/imap/camel-imap-store.c:762 +-#: ../camel/providers/imap4/camel-imap4-store.c:313 +-#: ../camel/providers/pop3/camel-pop3-store.c:559 ++#: ../camel/providers/imap/camel-imap-command.c:434 ++#: ../camel/providers/imap/camel-imap-store.c:742 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1570 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1609 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1654 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1710 ++#: ../camel/providers/imap4/camel-imap4-store.c:315 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/providers/pop3/camel-pop3-store.c:560 + #: ../camel/providers/pop3/camel-pop3-store.c:566 +-#: ../camel/providers/pop3/camel-pop3-store.c:572 + #: ../servers/exchange/storage/e-storage.c:585 +-#: ../servers/groupwise/e-gw-connection.c:207 ++#: ../servers/groupwise/e-gw-connection.c:241 + msgid "Unknown error" + msgstr "Ismeretlen hiba" + +-#: ../calendar/libecal/e-cal.c:5039 ++#: ../calendar/libecal/e-cal.c:5090 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:95 + #: ../servers/exchange/storage/e-storage.c:553 + msgid "No error" + msgstr "Nincs hiba" +@@ -1275,7 +1301,9 @@ msgid "" + "\"%s\" expects the first argument to be either \"any\", \"summary\", or " + "\"description\", or \"location\", or \"attendee\", or \"organizer\", or " + "\"classification\"" +-msgstr "„%s” első paraméterként a következők egyikét várja: „any”, „summary”, „description”, „location”, „attendee”, „organizer” vagy „classification”" ++msgstr "" ++"„%s” első paraméterként a következők egyikét várja: „any”, „summary”, " ++"„description”, „location”, „attendee”, „organizer” vagy „classification”" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:925 + #, c-format +@@ -1288,8 +1316,52 @@ msgid "" + "\"%s\" expects all arguments to be strings or one and only one argument to " + "be a boolean false (#f)" + msgstr "" +-"a(z) „%s” elvárja, hogy minden paraméter karakterlánc legyen vagy, hogy " +-"egy és csak egy paraméter logikai hamis (#f) érték legyen" ++"a(z) „%s” elvárja, hogy minden paraméter karakterlánc legyen vagy, hogy egy " ++"és csak egy paraméter logikai hamis (#f) érték legyen" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:101 ++msgid "Invalid range" ++msgstr "Érvénytelen tartomány" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:113 ++msgid "Unsupported field" ++msgstr "Nem támogatott mező" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:115 ++msgid "Unsupported method" ++msgstr "Nem támogatott metódus" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:117 ++msgid "Unsupported authentication method" ++msgstr "Nem támogatott hitelesítési metódus" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:119 ++msgid "TLS not available" ++msgstr "TLS nem érhető el" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:125 ++msgid "Offline unavailable" ++msgstr "Offline nem érhető el" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:127 ++msgid "Search size limit exceeded" ++msgstr "A keresési méretkorlát túllépve" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:129 ++msgid "Search time limit exceeded" ++msgstr "A keresési időkorlát túllépve" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:131 ++msgid "Invalid query" ++msgstr "Érvénytelen lekérdezés" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:133 ++msgid "Query refused" ++msgstr "Lekérdezés visszautasítva" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:140 ++msgid "Invalid server version" ++msgstr "Érvénytelen kiszolgálóverzió" + + #: ../camel/camel-cipher-context.c:102 + msgid "Signing is not supported by this cipher" +@@ -1331,15 +1403,19 @@ msgstr "Nem tudja importálni a kulcsot + msgid "You may not export keys with this cipher" + msgstr "Nem tudja exportálni a kulcsot ezzel a titkosítással" + +-#: ../camel/camel-data-cache.c:137 ++#: ../camel/camel-data-cache.c:136 + msgid "Unable to create cache path" + msgstr "Nem lehet létrehozni az ideiglenes tároló útvonalát" + +-#: ../camel/camel-data-cache.c:384 ++#: ../camel/camel-data-cache.c:381 + #, c-format + msgid "Could not remove cache entry: %s: %s" + msgstr "Nem sikerült megnyitni a gyorstár könyvtárát: %s %s" + ++#: ../camel/camel-db.c:107 ++msgid "Insufficient memory" ++msgstr "Kevés a memória" ++ + #: ../camel/camel-disco-diary.c:198 + #, c-format + msgid "" +@@ -1352,13 +1428,14 @@ msgstr "" + "amikor ismét kapcsolódik a hálózathoz." + + #: ../camel/camel-disco-diary.c:261 ++#: ../camel/providers/imap/camel-imap-journal.c:299 + #, c-format + msgid "" +-"Could not open `%s':\n" ++"Could not open '%s':\n" + "%s\n" + "Changes made to this folder will not be resynchronized." + msgstr "" +-"„%s” megnyitása nem sikerült:\n" ++"„%s” nem nyitható meg:\n" + "%s\n" + "Az ebben a mappában történt változások nem lesznek újraszinkronizálva." + +@@ -1374,97 +1451,100 @@ msgstr "A mappa tartalmáról helyi más + msgid "Downloading new messages for offline mode" + msgstr "Új üzenetek letöltése kapcsolat nélküli módhoz" + +-#: ../camel/camel-disco-folder.c:468 ++#: ../camel/camel-disco-folder.c:469 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "%s mappa előkészítése a kapcsolat nélküli módhoz" + + #: ../camel/camel-disco-store.c:403 +-#: ../camel/providers/imap/camel-imap-store.c:3018 ++#: ../camel/providers/imap/camel-imap-store.c:1002 ++#: ../camel/providers/imap/camel-imap-store.c:1810 ++#: ../camel/providers/imap/camel-imap-store.c:2226 ++#: ../camel/providers/imap/camel-imap-store.c:2989 + msgid "You must be working online to complete this operation" + msgstr "A művelet befejezéséhez hálózati kapcsolattal kell rendelkezned" + +-#: ../camel/camel-exception.c:264 ++#: ../camel/camel-exception.c:262 + msgid "No description available" + msgstr "Nincs leírás" + +-#: ../camel/camel-filter-driver.c:786 ++#: ../camel/camel-filter-driver.c:785 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "Nem sikerült létrehozni a(z) „%s” gyermekfolyamatot: %s" + +-#: ../camel/camel-filter-driver.c:828 ++#: ../camel/camel-filter-driver.c:827 + #, c-format + msgid "Invalid message stream received from %s: %s" + msgstr "Érvénytelen üzenetfolyam érkezett innen: %s: %s" + +-#: ../camel/camel-filter-driver.c:1017 ../camel/camel-filter-driver.c:1026 ++#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025 + msgid "Syncing folders" + msgstr "Mappák szinkronizálása" + +-#: ../camel/camel-filter-driver.c:1115 ../camel/camel-filter-driver.c:1495 ++#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1494 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "Hiba a szűrő feldolgozása közben: %s: %s" + +-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1504 ++#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1503 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "Hiba a szűrő végrehajtása közben: %s: %s" + +-#: ../camel/camel-filter-driver.c:1192 ++#: ../camel/camel-filter-driver.c:1191 + msgid "Unable to open spool folder" + msgstr "Nem sikerült megnyitni a spool mappát" + +-#: ../camel/camel-filter-driver.c:1201 ++#: ../camel/camel-filter-driver.c:1200 + msgid "Unable to process spool folder" + msgstr "Nem sikerült feldolgozni a spool mappát" + +-#: ../camel/camel-filter-driver.c:1216 ++#: ../camel/camel-filter-driver.c:1215 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "%d. üzenet letöltése (%d%%)" + +-#: ../camel/camel-filter-driver.c:1220 ++#: ../camel/camel-filter-driver.c:1219 + msgid "Cannot open message" + msgstr "Nem lehet megnyitni a levelet" + +-#: ../camel/camel-filter-driver.c:1221 ../camel/camel-filter-driver.c:1234 ++#: ../camel/camel-filter-driver.c:1220 ../camel/camel-filter-driver.c:1233 + #, c-format + msgid "Failed on message %d" + msgstr "%d. üzenet rossz" + +-#: ../camel/camel-filter-driver.c:1248 ../camel/camel-filter-driver.c:1339 ++#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1338 + msgid "Syncing folder" + msgstr "Mappa szinkronizálása" + +-#: ../camel/camel-filter-driver.c:1252 ../camel/camel-filter-driver.c:1344 ++#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1343 + msgid "Complete" + msgstr "Kész" + +-#: ../camel/camel-filter-driver.c:1309 ++#: ../camel/camel-filter-driver.c:1308 + #, c-format + msgid "Getting message %d of %d" + msgstr "Levelek letöltése: %d/%d" + +-#: ../camel/camel-filter-driver.c:1324 ++#: ../camel/camel-filter-driver.c:1323 + #, c-format + msgid "Failed at message %d of %d" + msgstr "Hiba a(z) %d / %d üzenetnél" + +-#: ../camel/camel-filter-search.c:139 ++#: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" + msgstr "Az üzenet letöltése sikertelen" + +-#: ../camel/camel-filter-search.c:402 ++#: ../camel/camel-filter-search.c:401 + msgid "Invalid arguments to (system-flag)" + msgstr "Érvénytelen argumentumok (system-flag)" + +-#: ../camel/camel-filter-search.c:417 ++#: ../camel/camel-filter-search.c:416 + msgid "Invalid arguments to (user-tag)" + msgstr "Érvénytelen argumentumok (user-tag)" + +-#: ../camel/camel-filter-search.c:582 ++#: ../camel/camel-filter-search.c:581 + #, c-format + msgid "Failed to create create child process '%s': %s" + msgstr "Nem sikerült gyermekfolyamatot létrehozni: „%s”: %s" +@@ -1475,7 +1555,7 @@ msgstr "Nem sikerült gyermekfolyamatot + msgid "Error executing filter search: %s: %s" + msgstr "Hiba a szűrt keresés végrehajtása közben: %s: %s" + +-#: ../camel/camel-folder-search.c:358 ../camel/camel-folder-search.c:480 ++#: ../camel/camel-folder-search.c:332 ../camel/camel-folder-search.c:444 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -1484,7 +1564,7 @@ msgstr "" + "Nem sikerült értelmezni a keresőkifejezést: %s\n" + "%s" + +-#: ../camel/camel-folder-search.c:368 ../camel/camel-folder-search.c:490 ++#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:454 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -1493,72 +1573,72 @@ msgstr "" + "Hiba a keresőkifejezés végrehajtása közben: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:677 ../camel/camel-folder-search.c:712 ++#: ../camel/camel-folder-search.c:643 ../camel/camel-folder-search.c:685 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "A(z) (%s) egyetlen logikai eredményt vár" + +-#: ../camel/camel-folder-search.c:765 ++#: ../camel/camel-folder-search.c:738 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) nem engedélyezett a(z) %s elemen belül" + +-#: ../camel/camel-folder-search.c:771 ../camel/camel-folder-search.c:778 ++#: ../camel/camel-folder-search.c:744 ../camel/camel-folder-search.c:751 + #, c-format + msgid "(%s) requires a match type string" + msgstr "A(z) (%s) egy keresési típusszöveget igényel" + +-#: ../camel/camel-folder-search.c:805 ++#: ../camel/camel-folder-search.c:778 + #, c-format + msgid "(%s) expects an array result" + msgstr "A(z) (%s) egy tömb eredményt vár" + +-#: ../camel/camel-folder-search.c:814 ++#: ../camel/camel-folder-search.c:787 + #, c-format + msgid "(%s) requires the folder set" + msgstr "A(z) (%s) a mappahalmazt igényli" + +-#: ../camel/camel-folder-search.c:909 ++#: ../camel/camel-folder-search.c:882 + #, c-format + msgid "Performing query on unknown header: %s" + msgstr "Lekérdezés futtatása ismeretlen fejlécen: %s" + +-#: ../camel/camel-folder.c:618 ++#: ../camel/camel-folder.c:693 + #, c-format + msgid "Unsupported operation: append message: for %s" + msgstr "Nem támogatott művelet: üzenet hozzáfűzése: %s" + +-#: ../camel/camel-folder.c:1240 ++#: ../camel/camel-folder.c:1349 + #, c-format + msgid "Unsupported operation: search by expression: for %s" + msgstr "Nem támogatott művelet: keresés kifejezés szerint: %s" + +-#: ../camel/camel-folder.c:1281 ++#: ../camel/camel-folder.c:1390 + #, c-format + msgid "Unsupported operation: search by UIDs: for %s" + msgstr "Nem támogatott művelet: keresés UID szerint: %s" + +-#: ../camel/camel-folder.c:1397 ++#: ../camel/camel-folder.c:1506 + msgid "Moving messages" + msgstr "Levelek áthelyezése" + +-#: ../camel/camel-folder.c:1397 ++#: ../camel/camel-folder.c:1506 + msgid "Copying messages" + msgstr "Levelek másolása" + +-#: ../camel/camel-folder.c:1651 ++#: ../camel/camel-folder.c:1852 + msgid "Learning junk" + msgstr "Levélszemét tanulása" + +-#: ../camel/camel-folder.c:1668 ++#: ../camel/camel-folder.c:1869 + msgid "Learning non-junk" + msgstr "Nem levélszemét tanulása" + +-#: ../camel/camel-folder.c:1687 ++#: ../camel/camel-folder.c:1888 + msgid "Filtering new message(s)" + msgstr "Új üzenet(ek) szűrése" + +-#: ../camel/camel-gpg-context.c:754 ++#: ../camel/camel-gpg-context.c:755 + #, c-format + msgid "" + "Unexpected GnuPG status message encountered:\n" +@@ -1569,15 +1649,15 @@ msgstr "" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:769 ++#: ../camel/camel-gpg-context.c:770 + msgid "Failed to parse gpg userid hint." + msgstr "A gpg felhasználói azonosító sikertelen elemzése." + +-#: ../camel/camel-gpg-context.c:793 ../camel/camel-gpg-context.c:807 ++#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808 + msgid "Failed to parse gpg passphrase request." + msgstr "A gpg jelmondatkérés elemzése sikertelen." + +-#: ../camel/camel-gpg-context.c:827 ++#: ../camel/camel-gpg-context.c:828 + #, c-format + msgid "" + "You need a PIN to unlock the key for your\n" +@@ -1586,7 +1666,7 @@ msgstr "" + "Egy PIN szükséges a SmartCard kulcsának\n" + "feloldásához: „%s”" + +-#: ../camel/camel-gpg-context.c:831 ++#: ../camel/camel-gpg-context.c:832 + #, c-format + msgid "" + "You need a passphrase to unlock the key for\n" +@@ -1595,103 +1675,97 @@ msgstr "" + "Meg kell adnia a jelmondatot „%s”\n" + "titkos kulcsának érvényesítéséhez" + +-#: ../camel/camel-gpg-context.c:836 ++#: ../camel/camel-gpg-context.c:837 + #, c-format +-msgid "Unexpected request from GnuPG for `%s'" +-msgstr "Váratlan kérés a GnuPG részéről a következőre: „%s”" ++msgid "Unexpected request from GnuPG for '%s'" ++msgstr "Váratlan kérés a GnuPG-től a következőre: „%s”" + +-#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:1066 ++#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068 + #: ../camel/providers/nntp/camel-nntp-store.c:1281 + msgid "Canceled." + msgstr "Megszakítva." + +-#: ../camel/camel-gpg-context.c:875 ++#: ../camel/camel-gpg-context.c:876 + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "A titkos kulcs érvényesítéséhez 3 alkalommal adott meg rossz jelmondatot." + +-#: ../camel/camel-gpg-context.c:883 ++#: ../camel/camel-gpg-context.c:884 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "Váratlan válasz a GnuPG részéről: %s" + +-#: ../camel/camel-gpg-context.c:936 ++#: ../camel/camel-gpg-context.c:937 + msgid "Failed to encrypt: No valid recipients specified." + msgstr "Sikertelen titkosítás: Nincs érvényes címzett megadva." + + #. always called on an i/o error +-#: ../camel/camel-gpg-context.c:1204 ../camel/camel-gpg-context.c:1332 +-#: ../camel/camel-gpg-context.c:1826 ../camel/camel-gpg-context.c:1871 ++#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1334 ++#: ../camel/camel-gpg-context.c:1829 ../camel/camel-gpg-context.c:1874 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "A gpg végrehajtása sikertelen: %s" + +-#: ../camel/camel-gpg-context.c:1300 ../camel/camel-smime-context.c:392 ++#: ../camel/camel-gpg-context.c:1302 ../camel/camel-smime-context.c:392 + #, c-format + msgid "Could not generate signing data: %s" + msgstr "Nem sikerült az aláírási adatok előállítása: %s" + +-#: ../camel/camel-gpg-context.c:1347 ../camel/camel-gpg-context.c:1531 +-#: ../camel/camel-gpg-context.c:1616 ../camel/camel-gpg-context.c:1631 +-#: ../camel/camel-gpg-context.c:1748 ../camel/camel-gpg-context.c:1763 +-#: ../camel/camel-gpg-context.c:1842 ../camel/camel-gpg-context.c:1887 ++#: ../camel/camel-gpg-context.c:1349 ../camel/camel-gpg-context.c:1534 ++#: ../camel/camel-gpg-context.c:1619 ../camel/camel-gpg-context.c:1634 ++#: ../camel/camel-gpg-context.c:1750 ../camel/camel-gpg-context.c:1765 ++#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1890 + msgid "Failed to execute gpg." + msgstr "A gpg végrehajtása sikertelen." + +-#: ../camel/camel-gpg-context.c:1366 ++#: ../camel/camel-gpg-context.c:1368 + msgid "This is a digitally signed message part" + msgstr "Ez az üzenetrész digitális aláírással van ellátva" + +-#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457 +-#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1479 ++#: ../camel/camel-gpg-context.c:1453 ../camel/camel-gpg-context.c:1459 ++#: ../camel/camel-gpg-context.c:1465 ../camel/camel-gpg-context.c:1480 + #: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706 + #: ../camel/camel-smime-context.c:713 + msgid "Cannot verify message signature: Incorrect message format" + msgstr "Nem ellenőrizhető az üzenet aláírása: helytelen üzenetformátum" + +-#: ../camel/camel-gpg-context.c:1516 ++#: ../camel/camel-gpg-context.c:1519 + #, c-format + msgid "Cannot verify message signature: could not create temp file: %s" + msgstr "" + "Nem ellenőrizhető a levél aláírása: nem sikerült létrehozni az ideiglenes " + "fájlt: %s" + +-#: ../camel/camel-gpg-context.c:1599 ++#: ../camel/camel-gpg-context.c:1602 + #, c-format + msgid "Could not generate encrypting data: %s" + msgstr "Nem lehet előállítani titkosított adatokat: %s" + +-#: ../camel/camel-gpg-context.c:1649 ++#: ../camel/camel-gpg-context.c:1652 + msgid "This is a digitally encrypted message part" + msgstr "Ez egy digitálisan aláírt üzenetrész" + +-#: ../camel/camel-gpg-context.c:1702 ../camel/camel-gpg-context.c:1710 +-#: ../camel/camel-gpg-context.c:1730 ++#: ../camel/camel-gpg-context.c:1705 ../camel/camel-gpg-context.c:1713 ++#: ../camel/camel-gpg-context.c:1732 + msgid "Cannot decrypt message: Incorrect message format" + msgstr "Nem lehet visszafejteni az üzenetet: helytelen üzenetformátum" + +-#: ../camel/camel-gpg-context.c:1719 ++#: ../camel/camel-gpg-context.c:1722 + msgid "Failed to decrypt MIME part: protocol error" + msgstr "Protokoll hiba miatt sikertelen a MIME titkosítás feloldása" + +-#: ../camel/camel-gpg-context.c:1784 ../camel/camel-smime-context.c:969 ++#: ../camel/camel-gpg-context.c:1787 ../camel/camel-smime-context.c:969 + msgid "Encrypted content" + msgstr "Titkosított tartalom" + +-#: ../camel/camel-gpg-context.c:1803 ++#: ../camel/camel-gpg-context.c:1806 + msgid "Unable to parse message content" + msgstr "Nem lehet feldolgozni a levél tartalmát" + +-#: ../camel/camel-gpg-context.c:1827 ../camel/camel-gpg-context.c:1872 ++#: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875 + #: ../camel/camel-tcp-stream-openssl.c:635 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1548 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1587 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1632 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1688 +-#: ../camel/providers/imap4/camel-imap4-store.c:820 +-#: ../camel/providers/imap4/camel-imap4-store.c:1495 +-#: ../camel/providers/imap4/camel-imap4-utils.c:557 +-#: ../camel/providers/smtp/camel-smtp-transport.c:164 +-#: ../camel/providers/smtp/camel-smtp-transport.c:219 ++#: ../camel/providers/imap4/camel-imap4-utils.c:624 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:221 + msgid "Unknown" + msgstr "Ismeretlen" + +@@ -1789,44 +1863,44 @@ msgstr "Hiba az ideiglenes levélfájl + msgid "Error copying mail temp file: %s" + msgstr "Hiba az ideiglenes levélfájl másolása közben: %s" + +-#: ../camel/camel-multipart-signed.c:595 ++#: ../camel/camel-multipart-signed.c:593 + msgid "parse error" + msgstr "értelmezési hiba" + +-#: ../camel/camel-net-utils.c:506 ../camel/camel-net-utils.c:668 +-#: ../camel/camel-net-utils.c:800 +-#: ../camel/providers/pop3/camel-pop3-store.c:449 +-#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667 ++#: ../camel/camel-net-utils.c:799 ++#: ../camel/providers/pop3/camel-pop3-store.c:447 ++#: ../camel/providers/pop3/camel-pop3-store.c:547 + msgid "Canceled" + msgstr "Megszakítva" + +-#: ../camel/camel-net-utils.c:525 ++#: ../camel/camel-net-utils.c:524 + msgid "cannot create thread" + msgstr "nem lehet létrehozni a szálat" + +-#: ../camel/camel-net-utils.c:672 ++#: ../camel/camel-net-utils.c:671 + #, c-format + msgid "Resolving: %s" + msgstr "„%s” feloldása" + +-#: ../camel/camel-net-utils.c:694 ++#: ../camel/camel-net-utils.c:693 + msgid "Host lookup failed" + msgstr "Gépkikeresés sikertelen" + +-#: ../camel/camel-net-utils.c:696 ++#: ../camel/camel-net-utils.c:695 + #, c-format + msgid "Host lookup failed: %s: %s" + msgstr "Sikertelen gépkikeresés: %s: %s" + +-#: ../camel/camel-net-utils.c:804 ++#: ../camel/camel-net-utils.c:803 + msgid "Resolving address" + msgstr "Cím feloldása" + +-#: ../camel/camel-net-utils.c:824 ++#: ../camel/camel-net-utils.c:823 + msgid "Name lookup failed" + msgstr "Névkikeresés sikertelen" + +-#: ../camel/camel-net-utils.c:827 ++#: ../camel/camel-net-utils.c:826 + #, c-format + msgid "Name lookup failed: %s" + msgstr "A névkikeresés sikertelen: %s" +@@ -1838,37 +1912,37 @@ msgstr "A(z) „%s” mappában lévő l + + #: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187 + #, c-format +-msgid "Cannot write offline journal for folder `%s': %s" ++msgid "Cannot write offline journal for folder '%s': %s" + msgstr "Nem írható offline napló a(z) „%s” mappához: %s" + +-#: ../camel/camel-provider.c:62 ++#: ../camel/camel-provider.c:60 + msgid "Virtual folder email provider" + msgstr "Virtuális mappa e-mail szolgáltató" + +-#: ../camel/camel-provider.c:64 ++#: ../camel/camel-provider.c:62 + msgid "For reading mail as a query of another set of folders" + msgstr "" + "A leveleket más mappákon futtatott lekérdezés eredményétől függően " + "csoportosíthatja" + +-#: ../camel/camel-provider.c:187 ++#: ../camel/camel-provider.c:184 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." + msgstr "%s betöltése sikertelen: A modulbetöltés nem támogatott a rendszereden." + +-#: ../camel/camel-provider.c:196 ++#: ../camel/camel-provider.c:193 + #, c-format + msgid "Could not load %s: %s" + msgstr "%s betöltése sikertelen: %s" + +-#: ../camel/camel-provider.c:204 ++#: ../camel/camel-provider.c:201 + #, c-format + msgid "Could not load %s: No initialization code in module." + msgstr "%s betöltése sikertelen: Nincs inicializáló kód a modulban." + +-#: ../camel/camel-provider.c:376 ../camel/camel-session.c:177 ++#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177 + #, c-format +-msgid "No provider available for protocol `%s'" ++msgid "No provider available for protocol '%s'" + msgstr "„%s” protokollhoz nincs elérhető szolgáltató" + + #: ../camel/camel-sasl-anonymous.c:37 +@@ -1910,11 +1984,11 @@ msgstr "" + "Érvénytelen nyomkövetési információ:\n" + "%s" + +-#: ../camel/camel-sasl-cram-md5.c:40 ++#: ../camel/camel-sasl-cram-md5.c:38 + msgid "CRAM-MD5" + msgstr "CRAM-MD5" + +-#: ../camel/camel-sasl-cram-md5.c:42 ++#: ../camel/camel-sasl-cram-md5.c:40 + msgid "" + "This option will connect to the server using a secure CRAM-MD5 password, if " + "the server supports it." +@@ -1922,11 +1996,11 @@ msgstr "" + "Ezt a lehetőséget választva biztonságos CRAM-MD5 jelszóval csatlakozik a " + "kiszolgálóhoz, ha az támogatja azt." + +-#: ../camel/camel-sasl-digest-md5.c:50 ++#: ../camel/camel-sasl-digest-md5.c:48 + msgid "DIGEST-MD5" + msgstr "DIGEST-MD5" + +-#: ../camel/camel-sasl-digest-md5.c:52 ++#: ../camel/camel-sasl-digest-md5.c:50 + msgid "" + "This option will connect to the server using a secure DIGEST-MD5 password, " + "if the server supports it." +@@ -1934,29 +2008,29 @@ msgstr "" + "Ezt a lehetőséget választva biztonságos DIGEST-MD5 jelszóval csatlakozik a " + "kiszolgálóhoz, ha az támogatja azt." + +-#: ../camel/camel-sasl-digest-md5.c:820 ++#: ../camel/camel-sasl-digest-md5.c:845 + msgid "Server challenge too long (>2048 octets)" + msgstr "A kiszolgáló felszólítása túl hosszú (>2048 bájt)" + +-#: ../camel/camel-sasl-digest-md5.c:829 ++#: ../camel/camel-sasl-digest-md5.c:854 + msgid "Server challenge invalid\n" + msgstr "A kiszolgáló felszólítása érvénytelen\n" + +-#: ../camel/camel-sasl-digest-md5.c:835 ++#: ../camel/camel-sasl-digest-md5.c:860 + msgid "Server challenge contained invalid \"Quality of Protection\" token" + msgstr "" + "A kiszolgáló felszólítása érvénytelen „Quality of Protection” tokent " + "tartalmazott" + +-#: ../camel/camel-sasl-digest-md5.c:865 ++#: ../camel/camel-sasl-digest-md5.c:890 + msgid "Server response did not contain authorization data" + msgstr "A kiszolgáló válasza nem tartalmazott engedélyezési adatokat" + +-#: ../camel/camel-sasl-digest-md5.c:883 ++#: ../camel/camel-sasl-digest-md5.c:908 + msgid "Server response contained incomplete authorization data" + msgstr "A kiszolgáló válasza hiányos engedélyezési adatokat tartalmazott" + +-#: ../camel/camel-sasl-digest-md5.c:893 ++#: ../camel/camel-sasl-digest-md5.c:918 + msgid "Server response does not match" + msgstr "A kiszolgáló válasza nem egyezik" + +@@ -2031,7 +2105,7 @@ msgstr "A hivatkozott azonosító adatok + #: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253 + #: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304 + #: ../camel/camel-sasl-kerberos4.c:231 +-#: ../camel/providers/imap/camel-imap-store.c:1317 ++#: ../camel/providers/imap/camel-imap-store.c:1272 + msgid "Bad authentication response from server." + msgstr "Rossz hitelesítési válasz a kiszolgálótól." + +@@ -2104,22 +2178,22 @@ msgstr "POP az SMTP hitelesítés előtt + msgid "POP Before SMTP auth using a non-pop source" + msgstr "POP az SMTP hitelesítés előtt nem pop forrás használatával" + +-#: ../camel/camel-search-private.c:150 ++#: ../camel/camel-search-private.c:149 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "A reguláris kifejezés lefordítása sikertelen: %s: %s" + +-#: ../camel/camel-service.c:272 ++#: ../camel/camel-service.c:270 + #, c-format + msgid "URL '%s' needs a username component" + msgstr "„%s” URL címben kell lennie felhasználónév összetevőnek" + +-#: ../camel/camel-service.c:276 ++#: ../camel/camel-service.c:274 + #, c-format + msgid "URL '%s' needs a host component" + msgstr "„%s” URL címben kell lennie gépnév összetevőnek" + +-#: ../camel/camel-service.c:280 ++#: ../camel/camel-service.c:278 + #, c-format + msgid "URL '%s' needs a path component" + msgstr "„%s” URL címben kell lennie útvonal összetevőnek" +@@ -2138,7 +2212,7 @@ msgstr "" + msgid "Please enter the %s password for %s on host %s." + msgstr "Adja meg %s %s jelszavát a(z) %s gépen" + +-#: ../camel/camel-smime-context.c:234 ++#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "Nem található tanúsítvány a következőhöz: %s" +@@ -2265,10 +2339,12 @@ msgid "Certificate import failed" + msgstr "Tanúsítványimportálás sikertelen" + + #: ../camel/camel-smime-context.c:602 ++#, c-format + msgid "Certificate is the only message, cannot verify certificates" + msgstr "A tanúsítvány az egyetlen üzenet, a tanúsítványok nem ellenőrizhetők" + + #: ../camel/camel-smime-context.c:605 ++#, c-format + msgid "Certificate is the only message, certificates imported and verified" + msgstr "" + "A tanúsítvány az egyetlen üzenet, a tanúsítványok importálva és ellenőrizve " +@@ -2287,11 +2363,6 @@ msgstr "Aláíró: %s <%s>: %s\n" + msgid "Decoder failed" + msgstr "Visszafejtés sikertelen" + +-#: ../camel/camel-smime-context.c:778 +-#, c-format +-msgid "Cannot find certificate for `%s'" +-msgstr "Nem található tanúsítvány ehhez: %s" +- + #: ../camel/camel-smime-context.c:785 + msgid "Cannot find common bulk encryption algorithm" + msgstr "Nem található általános titkosítási algoritmus " +@@ -2346,45 +2417,45 @@ msgstr "kulcsok importálása: nincs meg + msgid "export keys: unimplemented" + msgstr "kulcsok exportálása: nincs megvalósítva" + +-#: ../camel/camel-store.c:219 ++#: ../camel/camel-store.c:272 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:174 + msgid "Cannot get folder: Invalid operation on this store" + msgstr "Nem sikerült megnyitni a könyvtárat: Érvénytelen művelet ezen a tárolón" + +-#: ../camel/camel-store.c:252 ++#: ../camel/camel-store.c:305 + #, c-format +-msgid "Cannot create folder `%s': folder exists" ++msgid "Cannot create folder '%s': folder exists" + msgstr "Nem lehet létrehozni a(z) „%s” mappát: a mappa létezik" + +-#: ../camel/camel-store.c:316 ++#: ../camel/camel-store.c:369 + msgid "Cannot create folder: Invalid operation on this store" + msgstr "Nem sikerült létrehozni a könyvtárat: Érvénytelen művelet ezen a tárolón" + +-#: ../camel/camel-store.c:344 ++#: ../camel/camel-store.c:397 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "Nem lehet létrehozni a(z) „%s” mappát: a mappa létezik" + +-#: ../camel/camel-store.c:408 ../camel/camel-vee-store.c:369 +-#: ../camel/providers/local/camel-maildir-store.c:218 ++#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384 ++#: ../camel/providers/local/camel-maildir-store.c:219 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet" + +-#: ../camel/camel-store.c:458 ../camel/camel-vee-store.c:406 +-#: ../camel/providers/local/camel-maildir-store.c:290 ++#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421 ++#: ../camel/providers/local/camel-maildir-store.c:291 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet" + + #. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:799 ../camel/camel-vtrash-folder.c:52 +-#: ../camel/providers/imap/camel-imap-store.c:1077 ++#: ../camel/camel-store.c:854 ../camel/camel-vtrash-folder.c:53 ++#: ../camel/providers/imap/camel-imap-store.c:1060 + msgid "Trash" + msgstr "Kuka" + + #. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:802 ../camel/camel-vtrash-folder.c:54 ++#: ../camel/camel-store.c:857 ../camel/camel-vtrash-folder.c:55 + msgid "Junk" + msgstr "Levélszemét" + +@@ -2504,7 +2575,7 @@ msgstr "A használatban lévő kulcs nem + msgid "Error in application verification" + msgstr "Hiba az alkalmazás igazolásában" + +-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:871 ++#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880 + #, c-format + msgid "" + "Issuer: %s\n" +@@ -2517,11 +2588,11 @@ msgstr "" + "Ujjlenyomat: %s\n" + "Aláírás: %s" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "GOOD" + msgstr "JÓ" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "BAD" + msgstr "ROSSZ" + +@@ -2545,7 +2616,7 @@ msgstr "" + "Ennek ellenére elfogadja?" + + #. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:881 ++#: ../camel/camel-tcp-stream-ssl.c:890 + #, c-format + msgid "" + "SSL Certificate check for %s:\n" +@@ -2561,7 +2632,7 @@ msgstr "" + "\n" + "Elfogadja?" + +-#: ../camel/camel-tcp-stream-ssl.c:925 ++#: ../camel/camel-tcp-stream-ssl.c:934 + #, c-format + msgid "" + "Certificate problem: %s\n" +@@ -2570,7 +2641,7 @@ msgstr "" + "Tanúsítványprobléma: %s\n" + "Kibocsátó: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:977 ++#: ../camel/camel-tcp-stream-ssl.c:986 + #, c-format + msgid "" + "Bad certificate domain: %s\n" +@@ -2579,7 +2650,7 @@ msgstr "" + "Hibás tanúsítványtartomány: %s\n" + "Kibocsátó: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:995 ++#: ../camel/camel-tcp-stream-ssl.c:1004 + #, c-format + msgid "" + "Certificate expired: %s\n" +@@ -2588,7 +2659,7 @@ msgstr "" + "A tanúsítvány lejárt: %s\n" + "Kibocsátó: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1012 ++#: ../camel/camel-tcp-stream-ssl.c:1021 + #, c-format + msgid "" + "Certificate revocation list expired: %s\n" +@@ -2599,47 +2670,47 @@ msgstr "" + + #: ../camel/camel-url.c:313 + #, c-format +-msgid "Could not parse URL `%s'" ++msgid "Could not parse URL '%s'" + msgstr "Nem sikerült értelmezni ezt az URL címet: „%s”" + +-#: ../camel/camel-vee-folder.c:482 ++#: ../camel/camel-vee-folder.c:585 + #, c-format +-msgid "Error storing `%s': %s" ++msgid "Error storing '%s': %s" + msgstr "Hiba „%s” tárolásakor: %s" + +-#: ../camel/camel-vee-folder.c:524 ++#: ../camel/camel-vee-folder.c:631 + #, c-format + msgid "No such message %s in %s" + msgstr "Nincs ilyen üzenet (%s) ezen a helyen: %s" + +-#: ../camel/camel-vee-folder.c:649 ../camel/camel-vee-folder.c:655 ++#: ../camel/camel-vee-folder.c:754 ../camel/camel-vee-folder.c:760 + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába" + +-#: ../camel/camel-vee-store.c:102 ../camel/camel-vee-store.c:345 ++#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115 ++#: ../camel/camel-vee-store.c:360 + msgid "Unmatched" + msgstr "Ki nem válogatott" + +-#: ../camel/camel-vee-store.c:392 ++#: ../camel/camel-vee-store.c:407 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa" + +-#: ../camel/camel-vee-store.c:414 ++#: ../camel/camel-vee-store.c:429 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa" + +-#: ../camel/camel-vtrash-folder.c:53 ++#: ../camel/camel-vtrash-folder.c:54 + msgid "Cannot copy messages to the Trash folder" + msgstr "Nem lehet átmásolni az üzeneteket a Kuka mappába" + +-#: ../camel/camel-vtrash-folder.c:55 ++#: ../camel/camel-vtrash-folder.c:56 + msgid "Cannot copy messages to the Junk folder" + msgstr "Nem lehet átmásolni az üzeneteket a Levélszemét mappába" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2167 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #, c-format + msgid "" + "Cannot get message: %s\n" +@@ -2648,117 +2719,117 @@ msgstr "" + "Nem sikerült betölteni a levelet: %s\n" + " %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2167 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #: ../camel/providers/local/camel-maildir-folder.c:251 + #: ../camel/providers/local/camel-mbox-folder.c:348 + #: ../camel/providers/local/camel-mh-folder.c:204 + msgid "No such message" + msgstr "Nincs ilyen üzenet" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:130 +-#: ../camel/providers/imap4/camel-imap4-folder.c:791 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:128 ++#: ../camel/providers/imap4/camel-imap4-folder.c:812 + #: ../camel/providers/nntp/camel-nntp-folder.c:156 + #: ../camel/providers/nntp/camel-nntp-folder.c:232 +-#: ../camel/providers/nntp/camel-nntp-folder.c:371 +-#: ../camel/providers/pop3/camel-pop3-folder.c:262 +-#: ../camel/providers/pop3/camel-pop3-folder.c:518 +-#: ../camel/providers/pop3/camel-pop3-folder.c:579 +-#: ../camel/providers/pop3/camel-pop3-folder.c:597 ++#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/pop3/camel-pop3-folder.c:266 ++#: ../camel/providers/pop3/camel-pop3-folder.c:560 ++#: ../camel/providers/pop3/camel-pop3-folder.c:621 ++#: ../camel/providers/pop3/camel-pop3-folder.c:639 + msgid "User canceled" + msgstr "Felhasználói megszakítás" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137 +-#: ../camel/providers/imap4/camel-imap4-folder.c:796 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:135 ++#: ../camel/providers/imap4/camel-imap4-folder.c:817 + #: ../camel/providers/nntp/camel-nntp-folder.c:147 + #: ../camel/providers/nntp/camel-nntp-folder.c:149 + #: ../camel/providers/nntp/camel-nntp-folder.c:158 + #: ../camel/providers/nntp/camel-nntp-folder.c:234 +-#: ../camel/providers/pop3/camel-pop3-folder.c:521 +-#: ../camel/providers/pop3/camel-pop3-folder.c:582 +-#: ../camel/providers/pop3/camel-pop3-folder.c:589 +-#: ../camel/providers/pop3/camel-pop3-folder.c:600 ++#: ../camel/providers/pop3/camel-pop3-folder.c:388 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 ++#: ../camel/providers/pop3/camel-pop3-folder.c:624 ++#: ../camel/providers/pop3/camel-pop3-folder.c:631 ++#: ../camel/providers/pop3/camel-pop3-folder.c:642 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Nem sikerült betölteni a levelet: %s: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:154 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:162 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2141 +-#: ../camel/providers/imap4/camel-imap4-folder.c:814 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:152 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:160 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164 ++#: ../camel/providers/imap4/camel-imap4-folder.c:835 + msgid "This message is not available in offline mode." + msgstr "Ez az üzenet nem érhető el kapcsolat nélküli módban." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1690 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1737 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:172 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:179 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747 + msgid "Could not get message" + msgstr "Nem sikerült az üzenetet letölteni" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:816 +-#: ../camel/providers/imap/camel-imap-folder.c:265 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:818 ++#: ../camel/providers/imap/camel-imap-folder.c:248 + #, c-format + msgid "Could not load summary for %s" + msgstr "Nem sikerült betölteni %s összefoglalóját" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1065 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071 + msgid "Trash Folder Full. Please Empty." + msgstr "A Kuka mappa megtelt, ürítse ki." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1242 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248 + #: ../camel/providers/groupwise/camel-groupwise-store.c:623 + #: ../camel/providers/groupwise/camel-groupwise-store.c:736 +-#: ../camel/providers/imap/camel-imap-folder.c:2538 +-#: ../camel/providers/imap/camel-imap-folder.c:2608 ++#: ../camel/providers/imap/camel-imap-folder.c:3161 ++#: ../camel/providers/imap/camel-imap-folder.c:3238 + #, c-format + msgid "Fetching summary information for new messages in %s" + msgstr "Összefoglaló adatok letöltése az új levelekhez ezen: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2008 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2050 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073 + #, c-format +-msgid "Cannot append message to folder `%s': %s" ++msgid "Cannot append message to folder '%s': %s" + msgstr "Nem lehet a levelet a(z) „%s” mappához fűzni: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2038 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061 + #, c-format + msgid "Cannot create message: %s" + msgstr "Nem lehet létrehozni az üzenetet: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:284 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:285 + #, c-format + msgid "Cannot get folder container %s" + msgstr "Nem lehet betölteni a mappakonténert: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:348 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:349 + #: ../camel/providers/imap4/camel-imap4-journal.c:319 + msgid "Cannot append message in offline mode: cache unavailable" + msgstr "" + "Nem lehet a levelet kapcsolat nélküli módban összefűzni: a gyorsítótár nem " + "áll rendelkezésre" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:364 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:365 + #: ../camel/providers/imap4/camel-imap4-journal.c:335 + #, c-format + msgid "Cannot append message in offline mode: %s" + msgstr "Nem lehet a levelet kapcsolat nélküli módban összefűzni: %s" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:55 +-#: ../camel/providers/imap4/camel-imap4-provider.c:38 ++#: ../camel/providers/imap4/camel-imap4-provider.c:39 + msgid "Checking for new mail" + msgstr "Új levelek keresése" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:57 + #: ../camel/providers/hula/camel-hula-provider.c:51 + #: ../camel/providers/imap/camel-imap-provider.c:46 +-#: ../camel/providers/imap4/camel-imap4-provider.c:40 ++#: ../camel/providers/imap4/camel-imap4-provider.c:41 + msgid "C_heck for new messages in all folders" + msgstr "Új levelek _keresése az összes mappában" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:60 +-#: ../camel/providers/imap/camel-imap-provider.c:66 +-#: ../camel/providers/imap4/camel-imap4-provider.c:51 ++#: ../camel/providers/imap/camel-imap-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:52 + #: ../camel/providers/local/camel-local-provider.c:46 + #: ../camel/providers/local/camel-local-provider.c:86 + #: ../camel/providers/local/camel-local-provider.c:106 +@@ -2776,7 +2847,7 @@ msgid "Check new messages for J_unk cont + msgstr "_Levélszemét keresése az új levelek között" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:66 +-#: ../camel/providers/imap/camel-imap-provider.c:72 ++#: ../camel/providers/imap/camel-imap-provider.c:74 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Levélsze_mét keresése csak az Érkezett mappában" + +@@ -2802,8 +2873,8 @@ msgstr "Novell GroupWise kiszolgálók e + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:106 + #: ../camel/providers/hula/camel-hula-provider.c:95 +-#: ../camel/providers/imap/camel-imap-provider.c:98 +-#: ../camel/providers/imap4/camel-imap4-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap4/camel-imap4-provider.c:84 + #: ../camel/providers/imapp/camel-imapp-provider.c:67 + #: ../camel/providers/nntp/camel-nntp-provider.c:74 + #: ../camel/providers/pop3/camel-pop3-provider.c:72 +@@ -2821,7 +2892,7 @@ msgid "Host or user not available in url + msgstr "Az url címben lévő kiszolgáló vagy felhasználó nem érhető el" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:206 +-#: ../camel/providers/imap/camel-imap-store.c:1401 ++#: ../camel/providers/imap/camel-imap-store.c:1356 + msgid "You did not enter a password." + msgstr "Nem adott meg jelszót." + +@@ -2832,35 +2903,35 @@ msgstr "" + "jelenlegi verziójával" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:532 +-#: ../camel/providers/imap/camel-imap-store.c:1912 +-#: ../camel/providers/imap/camel-imap-store.c:2103 ++#: ../camel/providers/imap/camel-imap-store.c:1846 ++#: ../camel/providers/imap/camel-imap-store.c:2044 + #, c-format + msgid "No such folder %s" + msgstr "Nincs %s nevű mappa" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1217 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1219 + msgid "Cannot create GroupWise folders in offline mode." + msgstr "Nem lehet GroupWise mappákat létrehozni kapcsolat nélküli módban." + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1231 +-#: ../camel/providers/imap/camel-imap-store.c:1987 +-#: ../camel/providers/imap/camel-imap-store.c:2356 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1233 ++#: ../camel/providers/imap/camel-imap-store.c:1921 ++#: ../camel/providers/imap/camel-imap-store.c:2301 + msgid "The parent folder is not allowed to contain subfolders" + msgstr "A szülőmappa nem tartalmazhat almappákat" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1307 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1309 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1330 + #, c-format +-msgid "Cannot rename Groupwise folder `%s' to `%s'" ++msgid "Cannot rename Groupwise folder '%s' to '%s'" + msgstr "Nem nevezhető át a(z) „%s” GroupWise mappa a következőre: „%s”" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1360 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:121 + #, c-format + msgid "GroupWise server %s" + msgstr "%s GroupWise kiszolgáló" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1364 + #, c-format + msgid "GroupWise service for %s on %s" + msgstr "GroupWise szolgáltatás a következőnek %s, ezen a címen: %s" +@@ -2896,36 +2967,36 @@ msgid "Checking for New Mail" + msgstr "Új levelek keresése" + + #: ../camel/providers/hula/camel-hula-provider.c:54 +-#: ../camel/providers/imap/camel-imap-provider.c:50 ++#: ../camel/providers/imap/camel-imap-provider.c:52 + msgid "Connection to Server" + msgstr "Kapcsolódás a kiszolgálóhoz" + + #: ../camel/providers/hula/camel-hula-provider.c:56 +-#: ../camel/providers/imap/camel-imap-provider.c:52 ++#: ../camel/providers/imap/camel-imap-provider.c:54 + msgid "_Use custom command to connect to server" + msgstr "Egyéni parancs _használata a kiszolgálóhoz kapcsolódáshoz" + + #: ../camel/providers/hula/camel-hula-provider.c:58 +-#: ../camel/providers/imap/camel-imap-provider.c:54 ++#: ../camel/providers/imap/camel-imap-provider.c:56 + msgid "Command:" + msgstr "Parancs:" + + #: ../camel/providers/hula/camel-hula-provider.c:61 +-#: ../camel/providers/imap/camel-imap-provider.c:58 +-#: ../camel/providers/imap4/camel-imap4-provider.c:43 ++#: ../camel/providers/imap/camel-imap-provider.c:60 ++#: ../camel/providers/imap4/camel-imap4-provider.c:44 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Mappák" + + #: ../camel/providers/hula/camel-hula-provider.c:63 +-#: ../camel/providers/imap/camel-imap-provider.c:60 +-#: ../camel/providers/imap4/camel-imap4-provider.c:45 ++#: ../camel/providers/imap/camel-imap-provider.c:62 ++#: ../camel/providers/imap4/camel-imap4-provider.c:46 + msgid "_Show only subscribed folders" + msgstr "Csak az elő_fizetett mappák megjelenítése" + + #: ../camel/providers/hula/camel-hula-provider.c:65 +-#: ../camel/providers/imap/camel-imap-provider.c:62 +-#: ../camel/providers/imap4/camel-imap4-provider.c:47 ++#: ../camel/providers/imap/camel-imap-provider.c:64 ++#: ../camel/providers/imap4/camel-imap4-provider.c:48 + msgid "O_verride server-supplied folder namespace" + msgstr "A kiszolgáló által _nyújtott mappanevek felülbírálata" + +@@ -2947,22 +3018,32 @@ msgstr "" + "Ez a beállítás egyszerű szöveges jelszó használatával létesít kapcsolatot a " + "Hula kiszolgálóval." + +-#: ../camel/providers/imap/camel-imap-command.c:224 +-#: ../camel/providers/imap/camel-imap-command.c:266 +-#: ../camel/providers/imap/camel-imap-command.c:472 +-#: ../camel/providers/imap/camel-imap-store.c:3058 ++#: ../camel/providers/imap/camel-imap-command.c:183 ++#: ../camel/providers/imap/camel-imap-command.c:267 ++msgid "No output stream" ++msgstr "Nincs kimeneti adatfolyam" ++ ++#: ../camel/providers/imap/camel-imap-command.c:188 ++#: ../camel/providers/imap/camel-imap-command.c:272 ++msgid "No input stream" ++msgstr "Nincs bemeneti adatfolyam" ++ ++#: ../camel/providers/imap/camel-imap-command.c:231 ++#: ../camel/providers/imap/camel-imap-command.c:280 ++#: ../camel/providers/imap/camel-imap-command.c:494 ++#: ../camel/providers/imap/camel-imap-store.c:3029 + msgid "Operation cancelled" + msgstr "A művelet leállítva" + +-#: ../camel/providers/imap/camel-imap-command.c:311 +-#: ../camel/providers/imap/camel-imap-store.c:3061 ++#: ../camel/providers/imap/camel-imap-command.c:333 ++#: ../camel/providers/imap/camel-imap-store.c:3032 + #, c-format + msgid "Server unexpectedly disconnected: %s" + msgstr "A kiszolgáló váratlanul szétkapcsolt: %s" + + #. for imap ALERT codes, account user@host + #. we might get a ']' from a BAD response since we +12, but who cares? +-#: ../camel/providers/imap/camel-imap-command.c:332 ++#: ../camel/providers/imap/camel-imap-command.c:354 + #, c-format + msgid "" + "Alert from IMAP server %s@%s:\n" +@@ -2971,245 +3052,263 @@ msgstr "" + "Riasztás a(z) %s@%s IMAP kiszolgálótól:\n" + "%s" + +-#: ../camel/providers/imap/camel-imap-command.c:401 ++#: ../camel/providers/imap/camel-imap-command.c:423 + #, c-format + msgid "Unexpected response from IMAP server: %s" + msgstr "Váratlan válasz az IMAP kiszolgálótól: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:411 ++#: ../camel/providers/imap/camel-imap-command.c:433 + #, c-format + msgid "IMAP command failed: %s" + msgstr "Az IMAP parancs sikertelen: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:486 ++#: ../camel/providers/imap/camel-imap-command.c:508 + msgid "Server response ended too soon." + msgstr "A kiszolgáló válasza túl hamar véget ért." + +-#: ../camel/providers/imap/camel-imap-command.c:693 ++#: ../camel/providers/imap/camel-imap-command.c:715 + #, c-format + msgid "IMAP server response did not contain %s information" + msgstr "Az IMAP kiszolgáló válasza nem tartalmaz %s információt" + +-#: ../camel/providers/imap/camel-imap-command.c:729 ++#: ../camel/providers/imap/camel-imap-command.c:751 + #, c-format + msgid "Unexpected OK response from IMAP server: %s" + msgstr "Váratlan OK válasz az IMAP kiszolgálótól: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:87 ++#: ../camel/providers/imap/camel-imap-folder.c:88 + msgid "Always check for new mail in this folder" + msgstr "Levelek keresése ebben a mappában mindig" + +-#: ../camel/providers/imap/camel-imap-folder.c:246 ++#: ../camel/providers/imap/camel-imap-folder.c:229 + #, c-format + msgid "Could not create directory %s: %s" + msgstr "Nem sikerült létrehozni %s könyvtárat: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:350 +-msgid "Folder was destroyed and recreated on server." +-msgstr "A mappa megsemmisült, és újra létre lett hozva a kiszolgálón." +- + #. Check UIDs and flags of all messages we already know of. +-#: ../camel/providers/imap/camel-imap-folder.c:682 ++#: ../camel/providers/imap/camel-imap-folder.c:843 + #, c-format + msgid "Scanning for changed messages in %s" + msgstr "Megváltozott levelek keresése ebben: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2127 ++#: ../camel/providers/imap/camel-imap-folder.c:1838 ++#, c-format ++msgid "Unexpected response status '%s' after APPEND command" ++msgstr "Váratlan válaszállapot („%s”) az APPEND parancs után" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1853 ++msgid "No response on continuation after APPEND command" ++msgstr "Nincs válasz vagy folytatás az APPEND parancs után" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1895 ++msgid "Unknown error occurred during APPEND command!" ++msgstr "Váratlan hiba történt az APPEND parancs után" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2707 + #, c-format + msgid "Unable to retrieve message: %s" + msgstr "Nem lehet elhozni a levelet: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2206 +-#: ../camel/providers/imap/camel-imap-folder.c:2892 ++#: ../camel/providers/imap/camel-imap-folder.c:2748 ++#, c-format ++msgid "Cannot get message with message ID %s: %s" ++msgstr "Nem lehet letölteni a(z) %s azonosítójú levelet: %s" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2749 ++msgid "No such message available." ++msgstr "Nincs ilyen üzenet" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2788 ++#: ../camel/providers/imap/camel-imap-folder.c:3540 + #: ../camel/providers/nntp/camel-nntp-folder.c:220 + msgid "This message is not currently available" + msgstr "Ez az üzenet jelenleg nem érhető el" + +-#: ../camel/providers/imap/camel-imap-folder.c:2727 ++#: ../camel/providers/imap/camel-imap-folder.c:3367 + #, c-format + msgid "Incomplete server response: no information provided for message %d" + msgstr "Hiányos válasz a kiszolgálótól: %d. üzenethez nem adott információt" + +-#: ../camel/providers/imap/camel-imap-folder.c:2735 ++#: ../camel/providers/imap/camel-imap-folder.c:3375 + #, c-format + msgid "Incomplete server response: no UID provided for message %d" + msgstr "Hiányos válasz a kiszolgálótól: %d. üzenethez nem adott UID-et" + +-#: ../camel/providers/imap/camel-imap-folder.c:2748 +-#, c-format +-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d" +-msgstr "Váratlan válasz a kiszolgálótól: Azonos UID a(z) %d. és %d. üzenetekhez " +- +-#: ../camel/providers/imap/camel-imap-folder.c:2930 ++#: ../camel/providers/imap/camel-imap-folder.c:3578 + msgid "Could not find message body in FETCH response." + msgstr "Nem található a levéltörzs a FETCH válaszban." + +-#: ../camel/providers/imap/camel-imap-message-cache.c:161 ++#: ../camel/providers/imap/camel-imap-message-cache.c:160 ++#: ../camel/providers/imap/camel-imap-message-cache.c:220 + #, c-format + msgid "Could not open cache directory: %s" + msgstr "Nem sikerült megnyitni a gyorsítótár könyvtárát: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:267 +-#: ../camel/providers/imap/camel-imap-message-cache.c:324 +-#: ../camel/providers/imap/camel-imap-message-cache.c:355 +-#: ../camel/providers/imap/camel-imap-message-cache.c:387 ++#: ../camel/providers/imap/camel-imap-message-cache.c:307 ++#: ../camel/providers/imap/camel-imap-message-cache.c:364 ++#: ../camel/providers/imap/camel-imap-message-cache.c:395 ++#: ../camel/providers/imap/camel-imap-message-cache.c:427 + #, c-format + msgid "Failed to cache message %s: %s" + msgstr "Nem sikerült gyorsítótárazni %s üzenetet: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:438 ++#: ../camel/providers/imap/camel-imap-message-cache.c:478 + #, c-format + msgid "Failed to cache %s: %s" + msgstr "Nem sikerült gyorsítótárazni: %s: %s" + +-#: ../camel/providers/imap/camel-imap-provider.c:64 +-#: ../camel/providers/imap4/camel-imap4-provider.c:49 ++#: ../camel/providers/imap/camel-imap-provider.c:48 ++msgid "Ch_eck for new messages in subscribed folders" ++msgstr "Új levelek _keresése a feliratkozott mappában" ++ ++#: ../camel/providers/imap/camel-imap-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:50 + msgid "Namespace:" + msgstr "Névtér:" + +-#: ../camel/providers/imap/camel-imap-provider.c:68 +-#: ../camel/providers/imap4/camel-imap4-provider.c:53 ++#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap4/camel-imap4-provider.c:54 + msgid "_Apply filters to new messages in INBOX on this server" + msgstr "" + "Szűrők _alkalmazása az új levelekre ennek a kiszolgálónak az Érkezett " + "mappájában" + +-#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap/camel-imap-provider.c:72 + msgid "Check new messages for Jun_k contents" + msgstr "_Levélszemét keresése az új levelek között" + +-#: ../camel/providers/imap/camel-imap-provider.c:74 +-#: ../camel/providers/imap4/camel-imap4-provider.c:59 ++#: ../camel/providers/imap/camel-imap-provider.c:76 ++#: ../camel/providers/imap4/camel-imap4-provider.c:60 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "A tá_voli levelek automatikus szinkronizálása a helyiekkel" + +-#: ../camel/providers/imap/camel-imap-provider.c:81 ++#: ../camel/providers/imap/camel-imap-provider.c:83 + msgid "IMAP" + msgstr "IMAP" + +-#: ../camel/providers/imap/camel-imap-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:85 + msgid "For reading and storing mail on IMAP servers." + msgstr "Levelek olvasására és tárolására IMAP kiszolgálókon." + +-#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap/camel-imap-provider.c:102 + #: ../camel/providers/imapp/camel-imapp-provider.c:69 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Ez a beállítás egyszerű szöveges jelszó használatával létesít kapcsolatot az " + "IMAP kiszolgálóval." + +-#: ../camel/providers/imap/camel-imap-store.c:457 +-#: ../camel/providers/imap4/camel-imap4-store.c:212 ++#: ../camel/providers/imap/camel-imap-store.c:436 ++#: ../camel/providers/imap4/camel-imap4-store.c:214 + #, c-format + msgid "IMAP server %s" + msgstr "%s IMAP kiszolgáló" + +-#: ../camel/providers/imap/camel-imap-store.c:459 +-#: ../camel/providers/imap4/camel-imap4-store.c:214 ++#: ../camel/providers/imap/camel-imap-store.c:438 ++#: ../camel/providers/imap4/camel-imap4-store.c:216 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "IMAP szolgáltatás a következőnek %s, ezen a címen: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:587 +-#: ../camel/providers/imap/camel-imap-store.c:602 +-#: ../camel/providers/imap4/camel-imap4-store.c:249 +-#: ../camel/providers/imap4/camel-imap4-store.c:264 ++#: ../camel/providers/imap/camel-imap-store.c:567 ++#: ../camel/providers/imap/camel-imap-store.c:582 ++#: ../camel/providers/imap4/camel-imap4-store.c:251 ++#: ../camel/providers/imap4/camel-imap4-store.c:266 + #: ../camel/providers/nntp/camel-nntp-store.c:183 + #: ../camel/providers/nntp/camel-nntp-store.c:198 +-#: ../camel/providers/pop3/camel-pop3-store.c:173 +-#: ../camel/providers/pop3/camel-pop3-store.c:187 +-#: ../camel/providers/smtp/camel-smtp-transport.c:258 +-#: ../camel/providers/smtp/camel-smtp-transport.c:273 ++#: ../camel/providers/pop3/camel-pop3-store.c:171 ++#: ../camel/providers/pop3/camel-pop3-store.c:185 ++#: ../camel/providers/smtp/camel-smtp-transport.c:260 ++#: ../camel/providers/smtp/camel-smtp-transport.c:275 + #, c-format + msgid "Could not connect to %s: %s" + msgstr "Nem sikerült kapcsolódni a következőhöz: %s: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:588 +-#: ../camel/providers/imap4/camel-imap4-store.c:250 ++#: ../camel/providers/imap/camel-imap-store.c:568 ++#: ../camel/providers/imap4/camel-imap4-store.c:252 + #: ../camel/providers/nntp/camel-nntp-store.c:184 +-#: ../camel/providers/pop3/camel-pop3-store.c:174 +-#: ../camel/providers/smtp/camel-smtp-transport.c:259 ++#: ../camel/providers/pop3/camel-pop3-store.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:261 + msgid "SSL unavailable" + msgstr "SSL nem érhető el" + +-#: ../camel/providers/imap/camel-imap-store.c:599 +-#: ../camel/providers/imap/camel-imap-store.c:881 ++#: ../camel/providers/imap/camel-imap-store.c:579 ++#: ../camel/providers/imap/camel-imap-store.c:861 + msgid "Connection cancelled" + msgstr "Kapcsolat megszakítva" + +-#: ../camel/providers/imap/camel-imap-store.c:707 +-#: ../camel/providers/imap/camel-imap-store.c:729 +-#: ../camel/providers/imap/camel-imap-store.c:735 +-#: ../camel/providers/imap/camel-imap-store.c:761 +-#: ../camel/providers/imap4/camel-imap4-store.c:312 +-#: ../camel/providers/imap4/camel-imap4-store.c:327 +-#: ../camel/providers/imap4/camel-imap4-store.c:335 ++#: ../camel/providers/imap/camel-imap-store.c:690 ++#: ../camel/providers/imap/camel-imap-store.c:709 ++#: ../camel/providers/imap/camel-imap-store.c:715 ++#: ../camel/providers/imap/camel-imap-store.c:741 ++#: ../camel/providers/imap4/camel-imap4-store.c:314 ++#: ../camel/providers/imap4/camel-imap4-store.c:329 ++#: ../camel/providers/imap4/camel-imap4-store.c:338 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "" + "Nem sikerült biztonságos kapcsolattal kapcsolódni a(z) %s IMAP " + "kiszolgálóhoz: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:708 +-#: ../camel/providers/smtp/camel-smtp-transport.c:331 ++#: ../camel/providers/imap/camel-imap-store.c:691 ++#: ../camel/providers/smtp/camel-smtp-transport.c:333 + msgid "STARTTLS not supported" + msgstr "A STARTTLS nem támogatott" + +-#: ../camel/providers/imap/camel-imap-store.c:730 ++#: ../camel/providers/imap/camel-imap-store.c:710 + msgid "SSL negotiations failed" + msgstr "SSL tárgyalás sikertelen" + +-#: ../camel/providers/imap/camel-imap-store.c:736 +-#: ../camel/providers/imap4/camel-imap4-store.c:336 +-#: ../camel/providers/smtp/camel-smtp-transport.c:370 ++#: ../camel/providers/imap/camel-imap-store.c:716 ++#: ../camel/providers/imap4/camel-imap4-store.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:372 + msgid "SSL is not available in this build" + msgstr "Az SSL nem áll rendelkezésre a program ezen példányában" + +-#: ../camel/providers/imap/camel-imap-store.c:884 ++#: ../camel/providers/imap/camel-imap-store.c:864 + #, c-format + msgid "Could not connect with command \"%s\": %s" + msgstr "Nem lehet csatlakozni a(z) „%s” paranccsal: %s" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imap/camel-imap-store.c:1069 +-#: ../camel/providers/imap/camel-imap-store.c:2452 +-#: ../camel/providers/imap4/camel-imap4-store-summary.c:367 +-#: ../camel/providers/imap4/camel-imap4-store.c:1326 ++#: ../camel/providers/imap/camel-imap-store.c:1052 ++#: ../camel/providers/imap/camel-imap-store.c:2397 ++#: ../camel/providers/imap4/camel-imap4-store-summary.c:368 ++#: ../camel/providers/imap4/camel-imap4-store.c:1408 + #: ../camel/providers/local/camel-maildir-folder.c:77 +-#: ../camel/providers/local/camel-maildir-store.c:218 +-#: ../camel/providers/local/camel-maildir-store.c:290 +-#: ../camel/providers/local/camel-maildir-store.c:514 +-#: ../camel/providers/local/camel-maildir-store.c:527 ++#: ../camel/providers/local/camel-maildir-store.c:219 ++#: ../camel/providers/local/camel-maildir-store.c:291 ++#: ../camel/providers/local/camel-maildir-store.c:517 ++#: ../camel/providers/local/camel-maildir-store.c:530 + #: ../camel/providers/local/camel-spool-store.c:464 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264 + msgid "Inbox" + msgstr "Beérkezett levelek" + +-#: ../camel/providers/imap/camel-imap-store.c:1071 ++#: ../camel/providers/imap/camel-imap-store.c:1054 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263 + msgid "Drafts" + msgstr "Piszkozatok" + +-#: ../camel/providers/imap/camel-imap-store.c:1073 ++#: ../camel/providers/imap/camel-imap-store.c:1056 + msgid "Sent" + msgstr "Elküldött" + +-#: ../camel/providers/imap/camel-imap-store.c:1075 ++#: ../camel/providers/imap/camel-imap-store.c:1058 + msgid "Templates" + msgstr "Sablonok" + +-#: ../camel/providers/imap/camel-imap-store.c:1348 ++#: ../camel/providers/imap/camel-imap-store.c:1303 + #, c-format + msgid "IMAP server %s does not support requested authentication type %s" + msgstr "%s IMAP kiszolgáló nem támogatja a kért %s hitelesítési típust" + +-#: ../camel/providers/imap/camel-imap-store.c:1358 +-#: ../camel/providers/smtp/camel-smtp-transport.c:504 ++#: ../camel/providers/imap/camel-imap-store.c:1313 ++#: ../camel/providers/smtp/camel-smtp-transport.c:507 + #, c-format + msgid "No support for authentication type %s" + msgstr "%s hitelesítési típus nem támogatott" + +-#: ../camel/providers/imap/camel-imap-store.c:1430 ++#: ../camel/providers/imap/camel-imap-store.c:1385 + #, c-format + msgid "" + "Unable to authenticate to IMAP server.\n" +@@ -3220,33 +3319,33 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/imap/camel-imap-store.c:1924 +-#: ../camel/providers/imap/camel-imap-store.c:2294 +-#: ../camel/providers/imap4/camel-imap4-store.c:956 ++#: ../camel/providers/imap/camel-imap-store.c:1858 ++#: ../camel/providers/imap/camel-imap-store.c:2239 ++#: ../camel/providers/imap4/camel-imap4-store.c:959 + #, c-format + msgid "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "A mappanév „%s” nem érvényes, mert a(z) „%c” karaktert tartalmazza" + +-#: ../camel/providers/imap/camel-imap-store.c:2041 +-#: ../camel/providers/local/camel-maildir-store.c:191 ++#: ../camel/providers/imap/camel-imap-store.c:1975 ++#: ../camel/providers/local/camel-maildir-store.c:192 + #: ../camel/providers/local/camel-mbox-store.c:204 + #: ../camel/providers/local/camel-mh-store.c:249 + #, c-format +-msgid "Cannot create folder `%s': folder exists." ++msgid "Cannot create folder '%s': folder exists." + msgstr "Nem lehet létrehozni a(z) „%s” mappát: a mappa létezik." + +-#: ../camel/providers/imap/camel-imap-store.c:2305 ++#: ../camel/providers/imap/camel-imap-store.c:2250 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "Ismeretlen szülőmappa: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:550 +-#: ../camel/providers/imap4/camel-imap4-command.c:557 ++#: ../camel/providers/imap4/camel-imap4-command.c:576 ++#: ../camel/providers/imap4/camel-imap4-command.c:583 + #, c-format + msgid "Failed sending command to IMAP server %s: %s" + msgstr "Parancs küldése a(z) %s IMAP kiszolgálónak sikertelen: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:660 ++#: ../camel/providers/imap4/camel-imap4-command.c:686 + #, c-format + msgid "Unexpected response from IMAP4 server %s: %s" + msgstr "Váratlan válasz a(z) %s IMAP4 kiszolgálótól: %s" +@@ -3256,136 +3355,155 @@ msgstr "Váratlan válasz a(z) %s IMAP4 + msgid "Unexpected greeting from IMAP server %s." + msgstr "Váratlan üdvözlés a(z) %s IMAP kiszolgálótól." + +-#: ../camel/providers/imap4/camel-imap4-engine.c:431 ++#: ../camel/providers/imap4/camel-imap4-engine.c:450 + #, c-format +-msgid "Cannot select folder `%s': Invalid mailbox name" +-msgstr "Nem jelölhető ki a(z) %s mappa: Érvénytelen postafióknév" ++msgid "Cannot select folder '%s': Invalid mailbox name" ++msgstr "Nem jelölhető ki a(z) „%s” mappa: Érvénytelen postafióknév" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:437 ++#: ../camel/providers/imap4/camel-imap4-engine.c:456 + #, c-format +-msgid "Cannot select folder `%s': Bad command" ++msgid "Cannot select folder '%s': Bad command" + msgstr "Nem választható ki a(z) „%s” mappa: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:1547 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1586 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1631 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1687 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1433 ++#, c-format ++msgid "Failed to send command to IMAP server %s: %s" ++msgstr "Parancs küldése a(z) %s IMAP kiszolgálónak sikertelen: %s" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:1435 ++msgid "service unavailable" ++msgstr "a szolgáltatás nem érhető el" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:1569 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1608 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1653 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1709 + #, c-format + msgid "IMAP4 server %s unexpectedly disconnected: %s" + msgstr "A(z) %s IMAP4 kiszolgáló váratlanul szétkapcsolt: %s" + + #: ../camel/providers/imap4/camel-imap4-folder.c:89 +-msgid "Enable Mailing-List detection required for some filter and vFolder rules" ++msgid "" ++"Enable extended Mailing-List detection required for some filter and vFolder " ++"rules" + msgstr "" +-"A levelezőlista-érzékelés engedélyezése szükséges néhány szűrő és vMappa " ++"A bővített levelezőlista-felismerés engedélyezése szükséges néhány szűrő és vMappa " + "szabályhoz" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:402 ++#: ../camel/providers/imap4/camel-imap4-folder.c:90 ++msgid "Expire cached messages that haven't been read in X seconds" ++msgstr "Gyorsítótárazott üzenetek lejárttá tétele ha X másodpercig nem olvassák el" ++ ++#: ../camel/providers/imap4/camel-imap4-folder.c:91 ++msgid "Expire cached messages older than X seconds" ++msgstr "X másodpercnél régebbi gyorsítótárazott üzenetek lejárttá tétele" ++ ++#: ../camel/providers/imap4/camel-imap4-folder.c:423 + #, c-format +-msgid "Cannot access folder `%s': %s" ++msgid "Cannot access folder '%s': %s" + msgstr "Nem lehet hozzáférni a(z) „%s” mappához: %s" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:461 ++#: ../camel/providers/imap4/camel-imap4-folder.c:482 + #, c-format +-msgid "Cannot sync flags to folder `%s': Unknown" ++msgid "Cannot sync flags to folder '%s': Unknown error" + msgstr "Nem lehet szinkronizálni a(z) „%s” mappa jelzőit: Ismeretlen hiba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:467 ++#: ../camel/providers/imap4/camel-imap4-folder.c:488 + #, c-format +-msgid "Cannot sync flags to folder `%s': Bad command" ++msgid "Cannot sync flags to folder '%s': Bad command" + msgstr "Nem lehet szinkronizálni a(z) „%s” mappa jelzőit: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:607 ++#: ../camel/providers/imap4/camel-imap4-folder.c:628 + #, c-format +-msgid "Cannot expunge folder `%s': Unknown" ++msgid "Cannot expunge folder '%s': Unknown error" + msgstr "Nem lehet eltávolítani a(z) „%s” mappát: Ismeretlen hiba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:612 ++#: ../camel/providers/imap4/camel-imap4-folder.c:633 + #, c-format +-msgid "Cannot expunge folder `%s': Bad command" ++msgid "Cannot expunge folder '%s': Bad command" + msgstr "Nem lehet eltávolítani a(z) „%s” mappát: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:868 ++#: ../camel/providers/imap4/camel-imap4-folder.c:889 + #, c-format +-msgid "Cannot get message %s from folder `%s': No such message" +-msgstr "Nem sikerült betölteni a(z) %s levelet a(z) %s mappából: Nincs ilyen levél" ++msgid "Cannot get message %s from folder '%s': No such message" ++msgstr "Nem sikerült betölteni a(z) %s levelet a(z) „%s” mappából: Nincs ilyen levél" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:873 ++#: ../camel/providers/imap4/camel-imap4-folder.c:894 + #, c-format +-msgid "Cannot get message %s from folder `%s': Bad command" +-msgstr "Nem sikerült betölteni a(z) %s levelet a(z) %s mappából: Rossz parancs" ++msgid "Cannot get message %s from folder '%s': Bad command" ++msgstr "Nem sikerült betölteni a(z) %s levelet a(z) „%s” mappából: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:917 ++#: ../camel/providers/imap4/camel-imap4-folder.c:938 + #, c-format +-msgid "Cannot append message to folder `%s': Folder is read-only" ++msgid "Cannot append message to folder '%s': Folder is read-only" + msgstr "Nem lehet a levelet a(z) „%s” mappához fűzni: A mappa csak olvasható" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1010 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1031 + #, c-format +-msgid "Cannot append message to folder `%s': Unknown error" +-msgstr "Nem lehet a levelet a(z) %s mappához fűzni: Ismeretlen hiba" ++msgid "Cannot append message to folder '%s': Unknown error" ++msgstr "Nem lehet a levelet a(z) „%s” mappához fűzni: Ismeretlen hiba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1040 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1061 + #, c-format +-msgid "Cannot append message to folder `%s': Bad command" +-msgstr "Nem lehet a levelet a(z) %s mappához fűzni: Rossz parancs" ++msgid "Cannot append message to folder '%s': Bad command" ++msgstr "Nem lehet a levelet a(z) „%s” mappához fűzni: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1160 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1181 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown" +-msgstr "Nem lehet mozgatni az üzeneteket a(z) %s mappából a(z) %s mappába: Ismeretlen" ++msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" ++msgstr "Nem lehet mozgatni az üzeneteket a(z) „%s” mappából a(z) „%s” mappába: Ismeretlen hiba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1164 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1185 + #, c-format +-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown" +-msgstr "Nem lehet az üzeneteket a(z) %s mappából a(z) %s mappába másolni: Ismeretlen" ++msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" ++msgstr "Nem lehet az üzeneteket a(z) „%s” mappából a(z) „%s” mappába másolni: Ismeretlen hiba" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1172 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1193 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command" ++msgid "Cannot move messages from folder '%s' to folder '%s': Bad command" + msgstr "" +-"Nem lehet mozgatni az üzeneteket a(z) %s mappából a(z) %s mappába: Rossz " ++"Nem lehet mozgatni az üzeneteket a(z) „%s” mappából a(z) „%s” mappába: Rossz " + "parancs" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1176 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1197 + #, c-format +-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command" ++msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command" + msgstr "" +-"Nem lehet az üzeneteket a(z) %s mappából a(z) %s mappába másolni: Rossz " ++"Nem lehet az üzeneteket a(z) „%s” mappából a(z) „%s” mappába másolni: Rossz " + "parancs" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:55 ++#: ../camel/providers/imap4/camel-imap4-provider.c:56 + msgid "Check new messages for _Junk contents" + msgstr "_Levélszemét keresése az új levelek között" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:57 ++#: ../camel/providers/imap4/camel-imap4-provider.c:58 + msgid "Only check for Junk messa_ges in the INBOX folder" + msgstr "Levél_szemét keresése csak az Érkezett mappában" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:67 + msgid "IMAP4rev1" + msgstr "IMAP4rev1" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:69 + msgid "For reading and storing mail on IMAPv4rev1 servers." + msgstr "Levelek olvasására és tárolására IMAPv4rev1 kiszolgálókon." + +-#: ../camel/providers/imap4/camel-imap4-provider.c:85 ++#: ../camel/providers/imap4/camel-imap4-provider.c:86 + msgid "This option will connect to the IMAPv4rev1 server using a plaintext password." + msgstr "" + "Ez a beállítás egyszerű szöveges jelszó használatával létesít kapcsolatot az " + "IMAPv4rev1 kiszolgálóval." + +-#: ../camel/providers/imap4/camel-imap4-store.c:261 ++#: ../camel/providers/imap4/camel-imap4-store.c:263 + #: ../camel/providers/imapp/camel-imapp-store.c:249 + #: ../camel/providers/nntp/camel-nntp-store.c:195 + #: ../camel/providers/nntp/camel-nntp-store.c:214 +-#: ../camel/providers/pop3/camel-pop3-store.c:184 +-#: ../camel/providers/smtp/camel-smtp-transport.c:270 ++#: ../camel/providers/pop3/camel-pop3-store.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:272 + msgid "Connection canceled" + msgstr "Kapcsolat megszakítva" + +-#: ../camel/providers/imap4/camel-imap4-store.c:298 ++#: ../camel/providers/imap4/camel-imap4-store.c:300 + #, c-format + msgid "" + "Failed to connect to IMAP server %s in secure mode: Server does not support " +@@ -3394,149 +3512,149 @@ msgstr "" + "Nem sikerült biztonságos módban kapcsolódni a(z) %s IMAP kiszolgálóhoz: a " + "kiszolgáló nem támogatja a STARTTLS-t" + +-#: ../camel/providers/imap4/camel-imap4-store.c:328 +-#: ../camel/providers/pop3/camel-pop3-store.c:252 ++#: ../camel/providers/imap4/camel-imap4-store.c:330 ++#: ../camel/providers/pop3/camel-pop3-store.c:250 + msgid "TLS negotiations failed" + msgstr "A TLS tárgyalás meghiúsult" + +-#: ../camel/providers/imap4/camel-imap4-store.c:412 ++#: ../camel/providers/imap4/camel-imap4-store.c:415 + #, c-format + msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism" + msgstr "" + "Nem sikerült kapcsolódni a(z) %s IMAP kiszolgálóhoz a(z) %s hitelesítési " + "mechanizmussal" + +-#: ../camel/providers/imap4/camel-imap4-store.c:535 ++#: ../camel/providers/imap4/camel-imap4-store.c:538 + #, c-format + msgid "Cannot authenticate to IMAP server %s using %s" + msgstr "Sikertelen hitelesítés a(z) %s IMAP kiszolgálón %s használatával" + +-#: ../camel/providers/imap4/camel-imap4-store.c:698 +-#: ../camel/providers/imap4/camel-imap4-store.c:966 ++#: ../camel/providers/imap4/camel-imap4-store.c:701 ++#: ../camel/providers/imap4/camel-imap4-store.c:969 + msgid "Cannot create IMAP folders in offline mode." + msgstr "Nem lehet IMAP mappákat létrehozni kapcsolat nélküli módban." + +-#: ../camel/providers/imap4/camel-imap4-store.c:737 ++#: ../camel/providers/imap4/camel-imap4-store.c:740 + #, c-format +-msgid "Cannot get folder `%s' on IMAP server %s: Unknown" +-msgstr "Nem lehet lekérdezni a(z) „%s” mappát a(z) %s IMAP kiszolgálón: Ismeretlen" ++msgid "Cannot get folder '%s' on IMAP server %s: Unknown error" ++msgstr "Nem lehet lekérdezni a(z) „%s” mappát a(z) %s IMAP kiszolgálón: Ismeretlen hiba" + +-#: ../camel/providers/imap4/camel-imap4-store.c:818 ++#: ../camel/providers/imap4/camel-imap4-store.c:821 + #, c-format +-msgid "Cannot get LIST information for `%s' on IMAP server %s: %s" ++msgid "Cannot get LIST information for '%s' on IMAP server %s: %s" + msgstr "" + "Nem lehet lekérni a LIST információkat a következőhöz: „%s” a(z) %s IMAP " + "kiszolgálón: %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:820 +-#: ../camel/providers/imap4/camel-imap4-store.c:1495 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 + msgid "Bad command" + msgstr "Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-store.c:899 ++#: ../camel/providers/imap4/camel-imap4-store.c:902 + #, c-format +-msgid "Cannot create folder `%s': Invalid mailbox name" +-msgstr "Nem lehet létrehozni a(z) %s mappát: Érvénytelen postafióknév" ++msgid "Cannot create folder '%s': Invalid mailbox name" ++msgstr "Nem lehet létrehozni a(z) „%s” mappát: Érvénytelen postafióknév" + +-#: ../camel/providers/imap4/camel-imap4-store.c:904 ++#: ../camel/providers/imap4/camel-imap4-store.c:907 + #, c-format +-msgid "Cannot create folder `%s': Bad command" ++msgid "Cannot create folder '%s': Bad command" + msgstr "Nem lehet létrehozni a(z) „%s” mappát: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1010 ++#: ../camel/providers/imap4/camel-imap4-store.c:1013 + #, c-format +-msgid "Cannot delete folder `%s': Special folder" +-msgstr "Nem lehet törölni a(z) %s mappát: Különleges mappa" ++msgid "Cannot delete folder '%s': Special folder" ++msgstr "Nem lehet törölni a(z) „%s” mappát: Különleges mappa" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1017 ++#: ../camel/providers/imap4/camel-imap4-store.c:1020 + msgid "Cannot delete IMAP folders in offline mode." + msgstr "Nem lehet IMAP mappákat törölni kapcsolat nélküli módban." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1076 ++#: ../camel/providers/imap4/camel-imap4-store.c:1079 + #, c-format +-msgid "Cannot delete folder `%s': Invalid mailbox name" +-msgstr "Nem lehet törölni a(z) %s mappát: Érvénytelen postafióknév" ++msgid "Cannot delete folder '%s': Invalid mailbox name" ++msgstr "Nem lehet törölni a(z) „%s” mappát: Érvénytelen postafióknév" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1081 ++#: ../camel/providers/imap4/camel-imap4-store.c:1084 + #, c-format +-msgid "Cannot delete folder `%s': Bad command" +-msgstr "Nem lehet törölni a(z) %s mappát: Rossz parancs" ++msgid "Cannot delete folder '%s': Bad command" ++msgstr "Nem lehet törölni a(z) „%s” mappát: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1101 ++#: ../camel/providers/imap4/camel-imap4-store.c:1104 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Special folder" ++msgid "Cannot rename folder '%s' to '%s': Special folder" + msgstr "Nem nevezhető át a(z) „%s” mappa a következőre: „%s” Különleges mappa" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1108 ++#: ../camel/providers/imap4/camel-imap4-store.c:1111 + msgid "Cannot rename IMAP folders in offline mode." + msgstr "Nem lehet IMAP mappákat átnevezni kapcsolat nélküli módban." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1139 ++#: ../camel/providers/imap4/camel-imap4-store.c:1142 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name" +-msgstr "Nem lehet átnevezni a(z) %s mappát erre: %s : Érvénytelen postafióknév" ++msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name" ++msgstr "Nem lehet átnevezni a(z) „%s” mappát erre: „%s”: Érvénytelen postafióknév" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1144 ++#: ../camel/providers/imap4/camel-imap4-store.c:1147 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Bad command" +-msgstr "Nem lehet átnevezni a(z) %s mappát erre: %s : Rossz parancs" ++msgid "Cannot rename folder '%s' to '%s': Bad command" ++msgstr "Nem lehet átnevezni a(z) „%s” mappát erre: „%s”: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1493 ++#: ../camel/providers/imap4/camel-imap4-store.c:1575 + #, c-format +-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s" +-msgstr "Nem lehet megszerezni %s információt %s mintához %s IMAP kiszolgálón: %s" ++msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" ++msgstr "Nem lehet megszerezni %s információt „%s” mintához a(z) %s IMAP kiszolgálón: %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1533 ++#: ../camel/providers/imap4/camel-imap4-store.c:1636 + msgid "Cannot subscribe to IMAP folders in offline mode." + msgstr "Nem lehet IMAP mappákra feliratkozni kapcsolat nélküli módban." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1578 ++#: ../camel/providers/imap4/camel-imap4-store.c:1681 + #, c-format +-msgid "Cannot subscribe to folder `%s': Invalid mailbox name" +-msgstr "Nem lehet feliratkozni a(z) %s mappára : Érvénytelen postafióknév" ++msgid "Cannot subscribe to folder '%s': Invalid mailbox name" ++msgstr "Nem lehet feliratkozni a(z) „%s” mappára: Érvénytelen postafióknév" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1583 ++#: ../camel/providers/imap4/camel-imap4-store.c:1686 + #, c-format +-msgid "Cannot subscribe to folder `%s': Bad command" +-msgstr "Nem lehet feliratkozni a(z) %s mappára : Rossz parancs" ++msgid "Cannot subscribe to folder '%s': Bad command" ++msgstr "Nem lehet feliratkozni a(z) „%s” mappára: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1605 ++#: ../camel/providers/imap4/camel-imap4-store.c:1708 + msgid "Cannot unsubscribe from IMAP folders in offline mode." + msgstr "Nem lehet IMAP mappákról leiratkozni kapcsolat nélküli módban." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1650 ++#: ../camel/providers/imap4/camel-imap4-store.c:1753 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name" +-msgstr "Nem lehet leiratkozni a(z) %s mappáról : Érvénytelen postafióknév" ++msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" ++msgstr "Nem lehet leiratkozni a(z) „%s” mappáról: Érvénytelen postafióknév" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1655 ++#: ../camel/providers/imap4/camel-imap4-store.c:1758 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Bad command" +-msgstr "Nem lehet leiratkozni a(z) %s mappáról : Rossz parancs" ++msgid "Cannot unsubscribe from folder '%s': Bad command" ++msgstr "Nem lehet leiratkozni a(z) „%s” mappáról: Rossz parancs" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1451 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1596 + msgid "Scanning for changed messages" + msgstr "Megváltozott levelek keresése" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1472 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1617 + #, c-format + msgid "IMAP server %s is in an inconsistent state." + msgstr "A(z) %s IMAP kiszolgáló inkonzisztens állapotban van." + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1499 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1644 + msgid "Fetching envelopes of new messages" + msgstr "Az új levelek borítékainak letöltése" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:370 ++#: ../camel/providers/imap4/camel-imap4-utils.c:437 + #, c-format + msgid "Unexpected token in response from IMAP server %s: " + msgstr "Váratlan szimbólum a válaszban %s IMAP kiszolgálótól: " + +-#: ../camel/providers/imap4/camel-imap4-utils.c:393 ++#: ../camel/providers/imap4/camel-imap4-utils.c:460 + msgid "No data" + msgstr "Nincs adat" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:556 ++#: ../camel/providers/imap4/camel-imap4-utils.c:623 + #, c-format + msgid "IMAP server %s unexpectedly disconnected: %s" + msgstr "A(z) %s IMAP kiszolgáló váratlanul szétkapcsolt: %s" +@@ -3577,26 +3695,26 @@ msgid "Index message body data" + msgstr "Levéltörzs adatainak indexelése" + + #. $HOME relative path + protocol string +-#: ../camel/providers/local/camel-local-folder.c:382 ++#: ../camel/providers/local/camel-local-folder.c:390 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + + #. /var/spool/mail relative path + protocol +-#: ../camel/providers/local/camel-local-folder.c:386 +-#: ../camel/providers/local/camel-local-folder.c:389 ++#: ../camel/providers/local/camel-local-folder.c:394 ++#: ../camel/providers/local/camel-local-folder.c:397 + #, c-format + msgid "mailbox:%s (%s)" + msgstr "postaláda:%s (%s)" + + #. a full path + protocol +-#: ../camel/providers/local/camel-local-folder.c:393 ++#: ../camel/providers/local/camel-local-folder.c:401 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + + #: ../camel/providers/local/camel-local-provider.c:48 +-msgid "_Use the `.folders' folder summary file (exmh)" ++msgid "_Use the '.folders' folder summary file (exmh)" + msgstr "_Használja a „.folders” mappaösszegző fájlt (exmh)" + + #: ../camel/providers/local/camel-local-provider.c:55 +@@ -3654,71 +3772,58 @@ msgstr "" + msgid "Standard Unix mbox spool directory" + msgstr "Szabványos Unix mbox tárolókönyvtár" + +-#: ../camel/providers/local/camel-local-store.c:159 +-#: ../camel/providers/local/camel-local-store.c:270 ++#: ../camel/providers/local/camel-local-store.c:171 ++#: ../camel/providers/local/camel-local-store.c:282 + #: ../camel/providers/local/camel-mbox-store.c:359 + #: ../camel/providers/local/camel-spool-store.c:129 + #, c-format + msgid "Store root %s is not an absolute path" + msgstr "%s tárológyökér nem abszolút útvonal" + +-#: ../camel/providers/local/camel-local-store.c:166 ++#: ../camel/providers/local/camel-local-store.c:178 + #, c-format + msgid "Store root %s is not a regular directory" + msgstr "%s tárológyökér nem közönséges könyvtár" + +-#: ../camel/providers/local/camel-local-store.c:175 +-#: ../camel/providers/local/camel-local-store.c:183 +-#: ../camel/providers/local/camel-local-store.c:281 ++#: ../camel/providers/local/camel-local-store.c:187 ++#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:293 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "Nem sikerült betölteni a mappát: %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:207 + msgid "Local stores do not have an inbox" + msgstr "A helyi tárolók nem rendelkeznek Bejövő mappával" + +-#: ../camel/providers/local/camel-local-store.c:241 ++#: ../camel/providers/local/camel-local-store.c:253 + #, c-format + msgid "Local mail file %s" + msgstr "%s helyi levél fájl" + +-#: ../camel/providers/local/camel-local-store.c:359 ++#: ../camel/providers/local/camel-local-store.c:348 + #, c-format + msgid "Could not rename folder %s to %s: %s" + msgstr "Nem sikerült %s mappát %s névre átnevezni: %s" + +-#: ../camel/providers/local/camel-local-store.c:427 ++#: ../camel/providers/local/camel-local-store.c:416 + #, c-format + msgid "Could not rename '%s': %s" + msgstr "Az átnevezés nem sikerült „%s”: %s" + +-#: ../camel/providers/local/camel-local-store.c:452 +-#: ../camel/providers/local/camel-local-store.c:462 +-#: ../camel/providers/local/camel-mbox-store.c:276 +-#: ../camel/providers/local/camel-mbox-store.c:288 +-#, c-format +-msgid "Could not delete folder summary file `%s': %s" +-msgstr "Nem lehet törölni a(z) „%s” mappaösszegző-fájlt: %s" +- +-#: ../camel/providers/local/camel-local-store.c:472 ++#: ../camel/providers/local/camel-local-store.c:441 + #: ../camel/providers/local/camel-mbox-store.c:300 + #, c-format +-msgid "Could not delete folder index file `%s': %s" ++msgid "Could not delete folder index file '%s': %s" + msgstr "Nem sikerült „%s” mappaindexfájlt törölni: %s" + +-#: ../camel/providers/local/camel-local-store.c:495 ++#: ../camel/providers/local/camel-local-store.c:464 + #: ../camel/providers/local/camel-mbox-store.c:324 + #, c-format +-msgid "Could not delete folder meta file `%s': %s" ++msgid "Could not delete folder meta file '%s': %s" + msgstr "Nem lehet a(z) „%s” mappametafájlt törölni: %s" + +-#: ../camel/providers/local/camel-local-summary.c:409 +-#, c-format +-msgid "Could not save summary: %s: %s" +-msgstr "Nem sikerült menteni az összefoglalót: %s: %s" +- +-#: ../camel/providers/local/camel-local-summary.c:467 ++#: ../camel/providers/local/camel-local-summary.c:506 + msgid "Unable to add message to summary: unknown reason" + msgstr "Nem sikerült hozzáadni a levelet az összefoglalóhoz: ismeretlen ok" + +@@ -3753,49 +3858,49 @@ msgstr "" + msgid "Invalid message contents" + msgstr "Az üzenet tartalma érvénytelen" + +-#: ../camel/providers/local/camel-maildir-store.c:147 +-#: ../camel/providers/local/camel-maildir-store.c:172 ++#: ../camel/providers/local/camel-maildir-store.c:148 ++#: ../camel/providers/local/camel-maildir-store.c:173 + #: ../camel/providers/local/camel-mbox-store.c:176 + #: ../camel/providers/local/camel-mbox-store.c:188 + #, c-format +-msgid "Cannot create folder `%s': %s" ++msgid "Cannot create folder '%s': %s" + msgstr "Nem lehet létrehozni a(z) „%s” mappát: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:160 ++#: ../camel/providers/local/camel-maildir-store.c:161 + #: ../camel/providers/local/camel-mbox-store.c:147 + #: ../camel/providers/local/camel-mh-store.c:217 + #, c-format +-msgid "Cannot get folder `%s': %s" ++msgid "Cannot get folder '%s': %s" + msgstr "Nem lehet lekérdezni a(z) „%s” mappát: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:164 ++#: ../camel/providers/local/camel-maildir-store.c:165 + #: ../camel/providers/local/camel-mbox-store.c:155 + #: ../camel/providers/local/camel-mh-store.c:224 + #, c-format +-msgid "Cannot get folder `%s': folder does not exist." ++msgid "Cannot get folder '%s': folder does not exist." + msgstr "Nem lehet lekérdezni a(z) „%s” mappát: a mappa nem létezik." + +-#: ../camel/providers/local/camel-maildir-store.c:188 ++#: ../camel/providers/local/camel-maildir-store.c:189 + #, c-format +-msgid "Cannot get folder `%s': not a maildir directory." ++msgid "Cannot get folder '%s': not a maildir directory." + msgstr "Nem lehet lekérdezni a(z) „%s” mappát: nem maildir könyvtár." + +-#: ../camel/providers/local/camel-maildir-store.c:233 +-#: ../camel/providers/local/camel-maildir-store.c:271 ++#: ../camel/providers/local/camel-maildir-store.c:234 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mh-store.c:273 + #, c-format +-msgid "Could not delete folder `%s': %s" ++msgid "Could not delete folder '%s': %s" + msgstr "Nem sikerült törölni a mappát: „%s”: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:235 ++#: ../camel/providers/local/camel-maildir-store.c:236 + msgid "not a maildir directory" + msgstr "nem maildir könyvtár" + +-#: ../camel/providers/local/camel-maildir-store.c:439 ++#: ../camel/providers/local/camel-maildir-store.c:440 + #: ../camel/providers/local/camel-spool-store.c:331 + #: ../camel/providers/local/camel-spool-store.c:345 + #, c-format +-msgid "Could not scan folder `%s': %s" ++msgid "Could not scan folder '%s': %s" + msgstr "Nem sikerült pásztázni a mappát: „%s”: %s" + + #: ../camel/providers/local/camel-maildir-summary.c:433 +@@ -3812,11 +3917,11 @@ msgstr "Mappa konzisztenciájának ellen + msgid "Checking for new messages" + msgstr "Új levelek keresése" + +-#: ../camel/providers/local/camel-maildir-summary.c:755 +-#: ../camel/providers/local/camel-mbox-summary.c:436 +-#: ../camel/providers/local/camel-mbox-summary.c:609 +-#: ../camel/providers/local/camel-mbox-summary.c:706 +-#: ../camel/providers/local/camel-spool-summary.c:140 ++#: ../camel/providers/local/camel-maildir-summary.c:756 ++#: ../camel/providers/local/camel-mbox-summary.c:517 ++#: ../camel/providers/local/camel-mbox-summary.c:690 ++#: ../camel/providers/local/camel-mbox-summary.c:786 ++#: ../camel/providers/local/camel-spool-summary.c:141 + msgid "Storing folder" + msgstr "Mappa tárolása" + +@@ -3856,7 +3961,7 @@ msgstr "Nem lehet könyvtárat létrehoz + + #: ../camel/providers/local/camel-mbox-store.c:198 + #, c-format +-msgid "Cannot get folder `%s': not a regular file." ++msgid "Cannot get folder '%s': not a regular file." + msgstr "Nem lehet lekérdezni a(z) „%s” mappát: nem közönséges fájl." + + #: ../camel/providers/local/camel-mbox-store.c:228 +@@ -3864,7 +3969,7 @@ msgstr "Nem lehet lekérdezni a(z) „%s + #: ../camel/providers/local/camel-mbox-store.c:262 + #, c-format + msgid "" +-"Could not delete folder `%s':\n" ++"Could not delete folder '%s':\n" + "%s" + msgstr "" + "Nem sikerült törölni a mappát: „%s”:\n" +@@ -3872,17 +3977,23 @@ msgstr "" + + #: ../camel/providers/local/camel-mbox-store.c:247 + #, c-format +-msgid "`%s' is not a regular file." ++msgid "'%s' is not a regular file." + msgstr "„%s” nem közönséges fájl." + + #: ../camel/providers/local/camel-mbox-store.c:254 + #, c-format +-msgid "Folder `%s' is not empty. Not deleted." ++msgid "Folder '%s' is not empty. Not deleted." + msgstr "„%s” mappa nem üres. Nem törölhető." + ++#: ../camel/providers/local/camel-mbox-store.c:276 ++#: ../camel/providers/local/camel-mbox-store.c:288 ++#, c-format ++msgid "Could not delete folder summary file '%s': %s" ++msgstr "Nem lehet törölni a(z) „%s” mappaösszegző-fájlt: %s" ++ + #: ../camel/providers/local/camel-mbox-store.c:378 + #, c-format +-msgid "Cannot create directory `%s': %s." ++msgid "Cannot create directory '%s': %s." + msgstr "Nem lehet létrehozni a(z) „%s” könyvtárat: %s." + + #: ../camel/providers/local/camel-mbox-store.c:392 +@@ -3900,7 +4011,7 @@ msgstr "Az új mappanév érvénytelen." + + #: ../camel/providers/local/camel-mbox-store.c:498 + #, c-format +-msgid "Could not rename `%s': `%s': %s" ++msgid "Could not rename '%s': '%s': %s" + msgstr "A(z) „%s” nem nevezhető át: „%s”: %s" + + #: ../camel/providers/local/camel-mbox-store.c:579 +@@ -3908,81 +4019,76 @@ msgstr "A(z) „%s” nem nevezhető át + msgid "Could not rename '%s' to %s: %s" + msgstr "A(z) „%s” nem nevezhető át %s névre: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:442 ++#: ../camel/providers/local/camel-mbox-summary.c:523 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "Nem sikerült megnyitni a mappát: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:490 ++#: ../camel/providers/local/camel-mbox-summary.c:571 + #, c-format + msgid "Fatal mail parser error near position %ld in folder %s" + msgstr "Végzetes levélértelmezési hiba %ld pozíció közelében a(z) %s mappában" + +-#: ../camel/providers/local/camel-mbox-summary.c:546 ++#: ../camel/providers/local/camel-mbox-summary.c:627 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Nem sikerült ellenőrizni a mappát: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:614 +-#: ../camel/providers/local/camel-mbox-summary.c:711 +-#: ../camel/providers/local/camel-spool-summary.c:145 ++#: ../camel/providers/local/camel-mbox-summary.c:695 ++#: ../camel/providers/local/camel-mbox-summary.c:791 ++#: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Nem sikerült megnyitni ezt a fájlt: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:626 +-#: ../camel/providers/local/camel-spool-summary.c:158 ++#: ../camel/providers/local/camel-mbox-summary.c:707 ++#: ../camel/providers/local/camel-spool-summary.c:159 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Nem sikerült megnyitni az ideiglenes postafiókot: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:639 +-#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:720 ++#: ../camel/providers/local/camel-mbox-summary.c:896 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Nem sikerült lezárni a forrásmappát %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:648 ++#: ../camel/providers/local/camel-mbox-summary.c:729 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Nem sikerült bezárni az ideiglenes mappát: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:663 ++#: ../camel/providers/local/camel-mbox-summary.c:744 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Nem sikerült átnevezni ezt a mappát: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:722 +-#: ../camel/providers/local/camel-mbox-summary.c:1046 ++#: ../camel/providers/local/camel-mbox-summary.c:802 ++#: ../camel/providers/local/camel-mbox-summary.c:1024 + #, c-format + msgid "Could not store folder: %s" + msgstr "Nem sikerült tárolni ezt a mappát: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:770 +-#: ../camel/providers/local/camel-mbox-summary.c:799 +-#: ../camel/providers/local/camel-mbox-summary.c:1088 +-#: ../camel/providers/local/camel-mbox-summary.c:1117 +-msgid "Detected a corrupt mbox file or an invalid 'From' header" +-msgstr "Sérült mbox fájl vagy érvénytelen „Feladó” fejléc" ++#: ../camel/providers/local/camel-mbox-summary.c:838 ++#: ../camel/providers/local/camel-mbox-summary.c:846 ++#: ../camel/providers/local/camel-mbox-summary.c:1055 ++#: ../camel/providers/local/camel-mbox-summary.c:1063 ++msgid "Summary and folder mismatch, even after a sync" ++msgstr "Az összefoglaló és a mappa eltér, még szinkronizálás után is" + +-#: ../camel/providers/local/camel-mbox-summary.c:935 +-#: ../camel/providers/local/camel-spool-summary.c:326 ++#: ../camel/providers/local/camel-mbox-summary.c:989 ++#: ../camel/providers/local/camel-spool-summary.c:327 + #, c-format + msgid "Unknown error: %s" + msgstr "Ismeretlen hiba: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:971 +-#, c-format +-msgid "Folder %s cannot be opened: %s" +-msgstr "A mappa (%s) nem nyitható meg: %s" +- +-#: ../camel/providers/local/camel-mbox-summary.c:1182 +-#: ../camel/providers/local/camel-mbox-summary.c:1208 ++#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:1153 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Az írás meghiúsult az ideiglenes postafiókba: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1199 ++#: ../camel/providers/local/camel-mbox-summary.c:1144 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Az írás meghiúsult az ideiglenes postafiókba: %s: %s" +@@ -3998,12 +4104,12 @@ msgstr "Nem lehet a levelet az mh mappá + + #: ../camel/providers/local/camel-mh-store.c:232 + #, c-format +-msgid "Could not create folder `%s': %s" ++msgid "Could not create folder '%s': %s" + msgstr "Nem lehet létrehozni a(z) „%s” mappát: %s" + + #: ../camel/providers/local/camel-mh-store.c:244 + #, c-format +-msgid "Cannot get folder `%s': not a directory." ++msgid "Cannot get folder '%s': not a directory." + msgstr "Nem lehet lekérdezni a(z) „%s” mappát: nem könyvtár." + + #: ../camel/providers/local/camel-mh-summary.c:246 +@@ -4013,45 +4119,45 @@ msgstr "Nem sikerült megnyitni az MH k + + #: ../camel/providers/local/camel-spool-store.c:135 + #, c-format +-msgid "Spool `%s' cannot be opened: %s" ++msgid "Spool '%s' cannot be opened: %s" + msgstr "A spool („%s”) nem nyitható meg: %s" + + #: ../camel/providers/local/camel-spool-store.c:147 + #, c-format +-msgid "Spool `%s' is not a regular file or directory" ++msgid "Spool '%s' is not a regular file or directory" + msgstr "A spool („%s”) nem közönséges fájl vagy könyvtár" + + #: ../camel/providers/local/camel-spool-store.c:166 + #, c-format +-msgid "Folder `%s/%s' does not exist." ++msgid "Folder '%s/%s' does not exist." + msgstr "„%s/%s” mappa nem létezik." + + #: ../camel/providers/local/camel-spool-store.c:176 + #, c-format + msgid "" +-"Could not open folder `%s':\n" ++"Could not open folder '%s':\n" + "%s" + msgstr "" +-"Nem sikerült megnyitni „%s” mappát:\n" ++"Nem sikerült megnyitni a mappát („%s”):\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:180 + #, c-format +-msgid "Folder `%s' does not exist." +-msgstr "„%s” mappa nem létezik." ++msgid "Folder '%s' does not exist." ++msgstr "A mappa („%s”) nem létezik." + + #: ../camel/providers/local/camel-spool-store.c:185 + #, c-format + msgid "" +-"Could not create folder `%s':\n" ++"Could not create folder '%s':\n" + "%s" + msgstr "" +-"Nem sikerült létrehozni a mappát: „%s”:\n" ++"Nem sikerült létrehozni a mappát („%s”):\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:193 + #, c-format +-msgid "`%s' is not a mailbox file." ++msgid "'%s' is not a mailbox file." + msgstr "„%s” nem postafiókfájl." + + #: ../camel/providers/local/camel-spool-store.c:210 +@@ -4076,25 +4182,25 @@ msgstr "Spool mappát nem lehet átnevez + msgid "Spool folders cannot be deleted" + msgstr "Spool mappát nem lehet törölni" + +-#: ../camel/providers/local/camel-spool-summary.c:171 +-#: ../camel/providers/local/camel-spool-summary.c:181 +-#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:172 ++#: ../camel/providers/local/camel-spool-summary.c:182 ++#: ../camel/providers/local/camel-spool-summary.c:192 + #, c-format + msgid "Could not sync temporary folder %s: %s" + msgstr "Nem sikerült szinkronizálni ezt az ideiglenes mappát: %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:207 ++#: ../camel/providers/local/camel-spool-summary.c:208 + #, c-format + msgid "Could not sync spool folder %s: %s" + msgstr "Nem sikerült pásztázni ezt a spool mappát: „%s”: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:238 +-#: ../camel/providers/local/camel-spool-summary.c:255 +-#: ../camel/providers/local/camel-spool-summary.c:266 ++#: ../camel/providers/local/camel-spool-summary.c:239 ++#: ../camel/providers/local/camel-spool-summary.c:256 ++#: ../camel/providers/local/camel-spool-summary.c:267 + #, c-format + msgid "" + "Could not sync spool folder %s: %s\n" +-"Folder may be corrupt, copy saved in `%s'" ++"Folder may be corrupt, copy saved in '%s'" + msgstr "" + "Nem sikerült szinkronizálni ezt a spool mappát: %s: %s\n" + "A mappa valószínűleg sérült, másolat mentve „%s” néven" +@@ -4105,25 +4211,27 @@ msgstr "" + msgid "Internal error: UID in invalid format: %s" + msgstr "Belső hiba: az UID érvénytelen formátumú: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:331 +-#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/nntp/camel-nntp-folder.c:330 ++#: ../camel/providers/nntp/camel-nntp-folder.c:333 + #: ../camel/providers/nntp/camel-nntp-folder.c:375 ++#: ../camel/providers/nntp/camel-nntp-folder.c:377 + #, c-format + msgid "Posting failed: %s" + msgstr "Küldés sikertelen: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:393 ++#: ../camel/providers/nntp/camel-nntp-folder.c:395 + msgid "You cannot post NNTP messages while working offline!" + msgstr "Nem küldhet NNTP üzeneteket kapcsolat nélküli módban!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:404 ++#: ../camel/providers/nntp/camel-nntp-folder.c:406 + msgid "You cannot copy messages from a NNTP folder!" + msgstr "Nem másolhat leveleket egy NNTP mappából!" + + #: ../camel/providers/nntp/camel-nntp-provider.c:46 + msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" +-msgstr "Mappák mutatása _rövid jelöléssel (például: c.o.linux a comp.os.linux helyett)" ++msgstr "" ++"Mappák mutatása _rövid jelöléssel (például: c.o.linux a comp.os.linux " ++"helyett)" + + #: ../camel/providers/nntp/camel-nntp-provider.c:48 + msgid "In the subscription _dialog, show relative folder names" +@@ -4224,61 +4332,61 @@ msgstr "Nincs kapcsolat." + msgid "No such folder: %s" + msgstr "Nincs ilyen mappa: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:222 +-#: ../camel/providers/nntp/camel-nntp-summary.c:318 ++#: ../camel/providers/nntp/camel-nntp-summary.c:273 ++#: ../camel/providers/nntp/camel-nntp-summary.c:369 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: Új üzenetek keresése" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:229 ++#: ../camel/providers/nntp/camel-nntp-summary.c:280 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "Váratlan kiszolgálóválasz az xover részéről: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:332 ++#: ../camel/providers/nntp/camel-nntp-summary.c:383 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "Váratlan kiszolgálóválasz a head részéről: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:372 ++#: ../camel/providers/nntp/camel-nntp-summary.c:423 + msgid "Use cancel" + msgstr "Használja a „mégsem” lehetőséget" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:374 ++#: ../camel/providers/nntp/camel-nntp-summary.c:425 + #, c-format + msgid "Operation failed: %s" + msgstr "Művelet sikertelen: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:247 ++#: ../camel/providers/pop3/camel-pop3-folder.c:251 + msgid "Retrieving POP summary" + msgstr "POP-összefoglaló letöltése" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:265 ++#: ../camel/providers/pop3/camel-pop3-folder.c:269 + #, c-format + msgid "Cannot get POP summary: %s" + msgstr "Nem sikerült letölteni a POP-összefoglalót: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:308 ++#: ../camel/providers/pop3/camel-pop3-folder.c:312 + msgid "Expunging old messages" + msgstr "Régi levelek eltávolítása" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:316 ++#: ../camel/providers/pop3/camel-pop3-folder.c:320 + msgid "Expunging deleted messages" + msgstr "A törlésre kijelölt levelek eltávolítása" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:492 ++#: ../camel/providers/pop3/camel-pop3-folder.c:534 + #, c-format + msgid "No message with UID %s" + msgstr "Nincs %s felhasználóazonosítójú levél" + + #. Sigh, most of the crap in this function is so that the cancel button + #. returns the proper exception code. Sigh. +-#: ../camel/providers/pop3/camel-pop3-folder.c:499 ++#: ../camel/providers/pop3/camel-pop3-folder.c:541 + #, c-format + msgid "Retrieving POP message %d" + msgstr "%d. POP-levél letöltése" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:589 ++#: ../camel/providers/pop3/camel-pop3-folder.c:631 + msgid "Unknown reason" + msgstr "Ismeretlen ok" + +@@ -4322,34 +4430,34 @@ msgstr "" + "még azokon a kiszolgálókon sem, amelyek azt hirdetik magukról, hogy " + "támogatják." + +-#: ../camel/providers/pop3/camel-pop3-store.c:210 ++#: ../camel/providers/pop3/camel-pop3-store.c:208 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "Nem sikerült érvényes üdvözlést olvasni a(z) %s POP kiszolgálón" + +-#: ../camel/providers/pop3/camel-pop3-store.c:224 +-#: ../camel/providers/pop3/camel-pop3-store.c:241 +-#: ../camel/providers/pop3/camel-pop3-store.c:251 +-#: ../camel/providers/pop3/camel-pop3-store.c:257 ++#: ../camel/providers/pop3/camel-pop3-store.c:225 ++#: ../camel/providers/pop3/camel-pop3-store.c:239 ++#: ../camel/providers/pop3/camel-pop3-store.c:249 ++#: ../camel/providers/pop3/camel-pop3-store.c:255 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "Nem sikerült biztonságos módon kapcsolódni a(z) %s POP-kiszolgálóhoz: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:225 ++#: ../camel/providers/pop3/camel-pop3-store.c:226 + msgid "STLS not supported by server" + msgstr "A kiszolgáló nem támogatja az STLS-t" + +-#: ../camel/providers/pop3/camel-pop3-store.c:258 ++#: ../camel/providers/pop3/camel-pop3-store.c:256 + msgid "TLS is not available in this build" + msgstr "A TLS nem áll rendelkezésre a program ezen példányában" + +-#: ../camel/providers/pop3/camel-pop3-store.c:364 ++#: ../camel/providers/pop3/camel-pop3-store.c:362 + #, c-format + msgid "Could not connect to POP server %s" + msgstr "Nem sikerült kapcsolódni a(z) %s POP-kiszolgálóhoz" + +-#: ../camel/providers/pop3/camel-pop3-store.c:405 +-#: ../camel/providers/pop3/camel-pop3-store.c:542 ++#: ../camel/providers/pop3/camel-pop3-store.c:403 ++#: ../camel/providers/pop3/camel-pop3-store.c:536 + #, c-format + msgid "" + "Unable to connect to POP server %s: No support for requested authentication " +@@ -4358,22 +4466,22 @@ msgstr "" + "Nem sikerült kapcsolódni a(z) %s POP-kiszolgálóhoz. A kért hitelesítési " + "mechanizmus nem támogatott." + +-#: ../camel/providers/pop3/camel-pop3-store.c:421 ++#: ../camel/providers/pop3/camel-pop3-store.c:419 + #, c-format +-msgid "SASL `%s' Login failed for POP server %s: %s" ++msgid "SASL '%s' Login failed for POP server %s: %s" + msgstr "SASL „%s” Sikertelen bejelentkezés a(z) %s POP-kiszolgálóra: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:433 ++#: ../camel/providers/pop3/camel-pop3-store.c:431 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "SASL protokollhiba miatt nem lehet bejelentkezni a(z) %s POP-kiszolgálóra" + +-#: ../camel/providers/pop3/camel-pop3-store.c:452 ++#: ../camel/providers/pop3/camel-pop3-store.c:450 + #, c-format + msgid "Failed to authenticate on POP server %s: %s" + msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:512 ++#: ../camel/providers/pop3/camel-pop3-store.c:509 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " +@@ -4383,8 +4491,8 @@ msgstr "" + "érkezett. Ezt valószínűleg egy személyiséglopási támadás okozza, keresse meg " + "a rendszergazdát." + +-#: ../camel/providers/pop3/camel-pop3-store.c:556 +-#: ../camel/providers/pop3/camel-pop3-store.c:569 ++#: ../camel/providers/pop3/camel-pop3-store.c:550 ++#: ../camel/providers/pop3/camel-pop3-store.c:563 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" +@@ -4393,7 +4501,7 @@ msgstr "" + "Nem sikerült kapcsolódni a(z) %s POP-kiszolgálóhoz.\n" + "Hiba a jelszó küldése közben: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:563 ++#: ../camel/providers/pop3/camel-pop3-store.c:557 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" +@@ -4402,9 +4510,9 @@ msgstr "" + "Nem sikerült kapcsolódni a(z) %s POP kiszolgálóhoz.\n" + "Hiba a felhasználónév küldése közben: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:669 ++#: ../camel/providers/pop3/camel-pop3-store.c:663 + #, c-format +-msgid "No such folder `%s'." ++msgid "No such folder '%s'." + msgstr "Nincs „%s” mappa." + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:38 +@@ -4464,128 +4572,128 @@ msgstr "" + "SMTP használata levelek kézbesítéséhez egy távoli levélelosztóhoz " + "csatlakozással." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:168 + msgid "Syntax error, command unrecognized" + msgstr "Szintaktikai hiba, ismeretlen parancs" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:170 + msgid "Syntax error in parameters or arguments" + msgstr "Szintaktikai hiba a paraméterekben vagy argumentumokban" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:170 ++#: ../camel/providers/smtp/camel-smtp-transport.c:172 + msgid "Command not implemented" + msgstr "A parancs nincs megvalósítva" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:174 + msgid "Command parameter not implemented" + msgstr "A parancsparaméter nincs megvalósítva" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:174 ++#: ../camel/providers/smtp/camel-smtp-transport.c:176 + msgid "System status, or system help reply" + msgstr "Rendszerállapot, vagy rendszer-segédüzenet" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:176 ++#: ../camel/providers/smtp/camel-smtp-transport.c:178 + msgid "Help message" + msgstr "Segédüzenet" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:180 + msgid "Service ready" + msgstr "Szolgáltatás rendelkezésre áll" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:180 ++#: ../camel/providers/smtp/camel-smtp-transport.c:182 + msgid "Service closing transmission channel" + msgstr "A szolgáltatás lezárja az átviteli csatornát" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:184 + msgid "Service not available, closing transmission channel" + msgstr "A szolgáltatás nem érhető el, az átviteli csatorna lezáródik" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:184 ++#: ../camel/providers/smtp/camel-smtp-transport.c:186 + msgid "Requested mail action okay, completed" + msgstr "A kért levélművelet rendben, befejezve" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:186 ++#: ../camel/providers/smtp/camel-smtp-transport.c:188 + msgid "User not local; will forward to " + msgstr "A felhasználó nem helyi, továbbítás a -ra" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:188 ++#: ../camel/providers/smtp/camel-smtp-transport.c:190 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "A kért levélművelet sikertelen: nem érhető el a postafiók" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:190 ++#: ../camel/providers/smtp/camel-smtp-transport.c:192 + msgid "Requested action not taken: mailbox unavailable" + msgstr "A kért művelet sikertelen: nem érhető el a postafiók" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:192 ++#: ../camel/providers/smtp/camel-smtp-transport.c:194 + msgid "Requested action aborted: error in processing" + msgstr "A kért művelet megszakítva: hiba a feldolgozás közben" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:194 ++#: ../camel/providers/smtp/camel-smtp-transport.c:196 + msgid "User not local; please try " + msgstr "Nem helyi felhasználó; próbálja a -t" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:196 ++#: ../camel/providers/smtp/camel-smtp-transport.c:198 + msgid "Requested action not taken: insufficient system storage" + msgstr "A kért művelet sikertelen: elégtelen rendszertárolóhely" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:198 ++#: ../camel/providers/smtp/camel-smtp-transport.c:200 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "A kért művelt sikertelen: tárfoglalás túllépése" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:200 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "A kért művelet sikertelen: nem engedélyezett postafióknév" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:204 + msgid "Start mail input; end with ." + msgstr "Kezdje el írni a levelet, fejezze be . karakterekkel" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:204 ++#: ../camel/providers/smtp/camel-smtp-transport.c:206 + msgid "Transaction failed" + msgstr "Sikertelen tranzakció" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/providers/smtp/camel-smtp-transport.c:210 + msgid "A password transition is needed" + msgstr "Jelszóátvitel szükséges" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:210 ++#: ../camel/providers/smtp/camel-smtp-transport.c:212 + msgid "Authentication mechanism is too weak" + msgstr "A hitelesítési mechanizmus túl gyenge" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:212 ++#: ../camel/providers/smtp/camel-smtp-transport.c:214 + msgid "Encryption required for requested authentication mechanism" + msgstr "A kért hitelesítési mechanizmushoz titkosítás szükséges" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:214 ++#: ../camel/providers/smtp/camel-smtp-transport.c:216 + msgid "Temporary authentication failure" + msgstr "Átmeneti hitelesítési hiba" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:295 ++#: ../camel/providers/smtp/camel-smtp-transport.c:297 + msgid "Welcome response error" + msgstr "Hibás üdvözlő válasz" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:330 +-#: ../camel/providers/smtp/camel-smtp-transport.c:363 +-#: ../camel/providers/smtp/camel-smtp-transport.c:369 ++#: ../camel/providers/smtp/camel-smtp-transport.c:332 ++#: ../camel/providers/smtp/camel-smtp-transport.c:365 ++#: ../camel/providers/smtp/camel-smtp-transport.c:371 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "Sikertelen hitelesített kapcsolódás a(z) %s SMTP kiszolgálóhoz: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:341 + #, c-format + msgid "STARTTLS command failed: %s" + msgstr "A STARTTLS parancs sikertelen: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:354 ++#: ../camel/providers/smtp/camel-smtp-transport.c:356 + msgid "STARTTLS command failed" + msgstr "A STARTTLS parancs sikertelen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:494 ++#: ../camel/providers/smtp/camel-smtp-transport.c:497 + #, c-format + msgid "SMTP server %s does not support requested authentication type %s." + msgstr "%s SMTP kiszolgáló nem támogatja a kért %s hitelesítési típust." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:559 ++#: ../camel/providers/smtp/camel-smtp-transport.c:564 + #, c-format + msgid "" + "Unable to authenticate to SMTP server.\n" +@@ -4596,93 +4704,93 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:683 ++#: ../camel/providers/smtp/camel-smtp-transport.c:697 + #, c-format + msgid "SMTP server %s" + msgstr "%s SMTP kiszolgáló" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:685 ++#: ../camel/providers/smtp/camel-smtp-transport.c:699 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "SMTP levélküldés %s kiszolgálón keresztül" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:717 + msgid "Cannot send message: service not connected." + msgstr "Nem küldhető el a levél: a szolgáltatáshoz nincs kapcsolat." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:709 ++#: ../camel/providers/smtp/camel-smtp-transport.c:723 + msgid "Cannot send message: sender address not valid." + msgstr "Nem küldhető el a levél: a feladó címe érvénytelen." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:713 ++#: ../camel/providers/smtp/camel-smtp-transport.c:727 + msgid "Sending message" + msgstr "Levél küldése" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:728 ++#: ../camel/providers/smtp/camel-smtp-transport.c:742 + msgid "Cannot send message: no recipients defined." + msgstr "Nem küldhető el a levél: nincs címzett." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:753 + msgid "Cannot send message: one or more invalid recipients" + msgstr "Nem küldhető el a levél: egy vagy több érvénytelen címzett" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:968 ++#: ../camel/providers/smtp/camel-smtp-transport.c:982 + msgid "SMTP Greeting" + msgstr "SMTP üdvözlet" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:993 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1007 + #, c-format + msgid "HELO command failed: %s" + msgstr "A HELO-parancs sikertelen: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1010 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1024 + msgid "HELO command failed" + msgstr "A HELO-parancs sikertelen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1073 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1090 + msgid "SMTP Authentication" + msgstr "SMTP hitelesítés" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1079 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1096 + msgid "Error creating SASL authentication object." + msgstr "Hiba a SASL hitelesítési objektum létrehozásakor." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1096 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1107 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1124 + #, c-format + msgid "AUTH command failed: %s" + msgstr "Az AUTH-parancs sikertelen: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1130 + msgid "AUTH command failed" + msgstr "Az AUTH-parancs sikertelen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1177 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1200 + msgid "Bad authentication response from server.\n" + msgstr "Rossz hitelesítési válasz a kiszolgálótól.\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1227 + #, c-format + msgid "MAIL FROM command failed: %s: mail not sent" + msgstr "A MAIL FROM parancs sikertelen: %s: a levél nem ment el" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1219 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1244 + msgid "MAIL FROM command failed" + msgstr "A MAIL FROM parancs sikertelen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1243 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1268 + #, c-format + msgid "RCPT TO command failed: %s: mail not sent" + msgstr "Az RCPT TO parancs sikertelen: %s: a levél nem ment el" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1262 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1287 + #, c-format + msgid "RCPT TO <%s> failed" + msgstr "RCPT TO <%s> sikertelen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1301 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1359 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1378 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1327 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1396 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1415 + #, c-format + msgid "DATA command failed: %s: mail not sent" + msgstr "A DATA-parancs sikertelen: %s: a levél nem ment el" +@@ -4690,26 +4798,26 @@ msgstr "A DATA-parancs sikertelen: %s: a + #. we should have gotten instructions on how to use the DATA command: + #. * 354 Enter mail, end with "." on a line by itself + #. +-#: ../camel/providers/smtp/camel-smtp-transport.c:1318 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1394 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1344 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1431 + msgid "DATA command failed" + msgstr "A DATA-parancs sikertelen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1417 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1454 + #, c-format + msgid "RSET command failed: %s" + msgstr "Az RSET-parancs sikertelen: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1433 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1470 + msgid "RSET command failed" + msgstr "Az RSET-parancs sikertelen" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1456 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1493 + #, c-format + msgid "QUIT command failed: %s" + msgstr "A QUIT-parancs sikertelen: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1470 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1507 + msgid "QUIT command failed" + msgstr "A QUIT-parancs sikertelen" + +@@ -4770,27 +4878,28 @@ msgstr "Személyes" + msgid "Phone Calls" + msgstr "Telefonhívások" + +-#: ../libedataserver/e-categories.c:60 ++#. Translators: "Status" is a category name; it can mean anything user wants to ++#: ../libedataserver/e-categories.c:61 + msgid "Status" + msgstr "Állapot" + +-#: ../libedataserver/e-categories.c:61 ++#: ../libedataserver/e-categories.c:62 + msgid "Strategies" + msgstr "Stratégiák" + +-#: ../libedataserver/e-categories.c:62 ++#: ../libedataserver/e-categories.c:63 + msgid "Suppliers" + msgstr "Beszállítók" + +-#: ../libedataserver/e-categories.c:63 ++#: ../libedataserver/e-categories.c:64 + msgid "Time & Expenses" + msgstr "Idő és kiadások" + +-#: ../libedataserver/e-categories.c:64 ++#: ../libedataserver/e-categories.c:65 + msgid "VIP" + msgstr "VIP" + +-#: ../libedataserver/e-categories.c:65 ++#: ../libedataserver/e-categories.c:66 + msgid "Waiting" + msgstr "Várakozás" + +@@ -4798,7 +4907,7 @@ msgstr "Várakozás" + #. in 12-hour format. + #. strftime format of a weekday, a date and a + #. time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1628 ../libedataserver/e-time-utils.c:1887 ++#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%Y.%m.%d. %a %l.%M.%S %P" + +@@ -4806,7 +4915,7 @@ msgstr "%Y.%m.%d. %a %l.%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:1633 ../libedataserver/e-time-utils.c:1878 ++#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%Y.%m.%d. %a %k.%M.%S" + +@@ -4814,7 +4923,7 @@ 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:1638 ../libedataserver/e-time-utils.c:1883 ++#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%Y.%m.%d. %a %l.%M %P" + +@@ -4822,78 +4931,78 @@ msgstr "%Y.%m.%d. %a %l.%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:1643 ../libedataserver/e-time-utils.c:1874 ++#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898 + msgid "%a %m/%d/%Y %H:%M" + msgstr "%Y.%m.%d. %a %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:1648 ++#: ../libedataserver/e-time-utils.c:1664 + msgid "%a %m/%d/%Y %I %p" + msgstr "%Y.%m.%d. %a %l %P" + + #. strptime format of a weekday, a date and a time, + #. in 24-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1653 ++#: ../libedataserver/e-time-utils.c:1669 + msgid "%a %m/%d/%Y %H" + 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:1656 ../libedataserver/e-time-utils.c:1753 +-#: ../libedataserver/e-time-utils.c:1869 ++#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773 ++#: ../libedataserver/e-time-utils.c:1893 + 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:1664 ++#: ../libedataserver/e-time-utils.c:1680 + msgid "%m/%d/%Y %I:%M:%S %p" + msgstr "%Y.%m.%d. %l.%M.%S %P" + + #. strptime format of a date and a time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1668 ++#: ../libedataserver/e-time-utils.c:1684 + msgid "%m/%d/%Y %H:%M:%S" + msgstr "%Y.%m.%d. %k.%M.%S" + + #. strptime format of a date and a time, in 12-hour format, + #. without seconds. +-#: ../libedataserver/e-time-utils.c:1673 ++#: ../libedataserver/e-time-utils.c:1689 + msgid "%m/%d/%Y %I:%M %p" + msgstr "%Y.%m.%d. %l.%M %P" + + #. strptime format of a date and a time, in 24-hour format, + #. without seconds. +-#: ../libedataserver/e-time-utils.c:1678 ++#: ../libedataserver/e-time-utils.c:1694 + msgid "%m/%d/%Y %H:%M" + msgstr "%Y.%m.%d. %k.%M" + + #. strptime format of a date and a time, in 12-hour format, + #. without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1683 ++#: ../libedataserver/e-time-utils.c:1699 + msgid "%m/%d/%Y %I %p" + msgstr "%Y.%m.%d. %l %P" + + #. strptime format of a date and a time, in 24-hour format, + #. without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1688 ++#: ../libedataserver/e-time-utils.c:1704 + msgid "%m/%d/%Y %H" + 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:1691 ../libedataserver/e-time-utils.c:1756 ++#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776 + 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:1810 ../libedataserver/e-time-utils.c:1932 ++#: ../libedataserver/e-time-utils.c:1834 ../libedataserver/e-time-utils.c:1956 + msgid "%I:%M:%S %p" + msgstr "%l.%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:1814 ../libedataserver/e-time-utils.c:1924 ++#: ../libedataserver/e-time-utils.c:1838 ../libedataserver/e-time-utils.c:1948 + msgid "%H:%M:%S" + msgstr "%k.%M.%S" + +@@ -4901,47 +5010,47 @@ msgstr "%k.%M.%S" + #. in 12-hour format. + #. strftime format of a time in 12-hour format, + #. without seconds. +-#: ../libedataserver/e-time-utils.c:1819 ../libedataserver/e-time-utils.c:1929 ++#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953 + msgid "%I:%M %p" + msgstr "%l.%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:1823 ../libedataserver/e-time-utils.c:1921 ++#: ../libedataserver/e-time-utils.c:1847 ../libedataserver/e-time-utils.c:1945 + 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:1826 ++#: ../libedataserver/e-time-utils.c:1850 + msgid "%H%M" + msgstr "%k%M" + + #. strptime format for hour and AM/PM, 12-hour format. +-#: ../libedataserver/e-time-utils.c:1830 ++#: ../libedataserver/e-time-utils.c:1854 + msgid "%I %p" + msgstr "%l %P" + +-#: ../libedataserverui/e-book-auth-util.c:89 ++#: ../libedataserverui/e-book-auth-util.c:90 + msgid "Accessing LDAP Server anonymously" + msgstr "Az LDAP kiszolgáló elérése névtelenül" + +-#: ../libedataserverui/e-book-auth-util.c:193 ++#: ../libedataserverui/e-book-auth-util.c:192 + msgid "Failed to authenticate.\n" + msgstr "Sikertelen hitelesítés.\n" + +-#: ../libedataserverui/e-categories-dialog.c:274 ++#: ../libedataserverui/e-categories-dialog.c:261 + #, c-format + msgid "" + "There is already a category '%s' in the configuration. Please use another " + "name" + msgstr "Már létezik „%s” nevű kategória. Kérem válasszon másik nevet." + +-#: ../libedataserverui/e-categories-dialog.c:475 ++#: ../libedataserverui/e-categories-dialog.c:462 + msgid "Icon" + msgstr "Ikon" + +-#: ../libedataserverui/e-categories-dialog.c:480 ++#: ../libedataserverui/e-categories-dialog.c:467 + msgid "Category" + msgstr "Kategória" + +@@ -4977,19 +5086,19 @@ msgstr "S_zerkesztés" + msgid "categories" + msgstr "kategóriák" + +-#: ../libedataserverui/e-name-selector-dialog.c:273 ++#: ../libedataserverui/e-name-selector-dialog.c:266 + msgid "Select Contacts from Address Book" + msgstr "Névjegyek kijelölése a címjegyzékből" + +-#: ../libedataserverui/e-name-selector-dialog.c:553 ++#: ../libedataserverui/e-name-selector-dialog.c:546 + msgid "_Add" + msgstr "Hozzá_adás" + +-#: ../libedataserverui/e-name-selector-dialog.c:578 ++#: ../libedataserverui/e-name-selector-dialog.c:571 + msgid "_Remove" + msgstr "_Eltávolítás" + +-#: ../libedataserverui/e-name-selector-dialog.c:751 ++#: ../libedataserverui/e-name-selector-dialog.c:744 + #: ../libedataserverui/e-name-selector-dialog.glade.h:6 + msgid "Any Category" + msgstr "Bármely kategória" +@@ -5032,67 +5141,76 @@ msgid "_Search:" + msgstr "_Keresés:" + + #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2249 ++#: ../libedataserverui/e-name-selector-entry.c:2240 + #, c-format + msgid "E_xpand %s Inline" + msgstr "%s ki_bontása beágyazva" + + #. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2264 ++#: ../libedataserverui/e-name-selector-entry.c:2255 + #, c-format + msgid "Cop_y %s" + msgstr "%s más_olása" + + #. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2274 ++#: ../libedataserverui/e-name-selector-entry.c:2265 + #, c-format + msgid "C_ut %s" + msgstr "%s ki_vágása" + + #. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2291 ++#: ../libedataserverui/e-name-selector-entry.c:2282 + #, c-format + msgid "_Edit %s" + msgstr "%s s_zerkesztése" + +-#: ../libedataserverui/e-name-selector-list.c:479 ++#: ../libedataserverui/e-name-selector-list.c:466 + #, c-format + msgid "_Delete %s" + msgstr "%s tö_rlése" + +-#: ../libedataserverui/e-passwords.c:941 ++#: ../libedataserverui/e-passwords.c:218 ++#, c-format ++msgid "Keyring key is unusable: no user or host name" ++msgstr "A kulcstartó kulcsa használhatatlan: nincs felhasználó- vagy gépnév" ++ ++#: ../libedataserverui/e-passwords.c:1055 ++msgid "You have the Caps Lock key on." ++msgstr "A Caps Lock be van kapcsolva." ++ ++#: ../libedataserverui/e-passwords.c:1175 + msgid "_Remember this passphrase" + msgstr "_Emlékezzen erre a jelszóra" + +-#: ../libedataserverui/e-passwords.c:942 ++#: ../libedataserverui/e-passwords.c:1176 + msgid "_Remember this passphrase for the remainder of this session" + msgstr "E_mlékezzen erre a jelszóra a munkamenet hátralévő részében" + +-#: ../libedataserverui/e-passwords.c:947 ++#: ../libedataserverui/e-passwords.c:1181 + msgid "_Remember this password" + msgstr "_Emlékezzen erre a jelszóra" + +-#: ../libedataserverui/e-passwords.c:948 ++#: ../libedataserverui/e-passwords.c:1182 + msgid "_Remember this password for the remainder of this session" + msgstr "E_mlékezzen erre a jelszóra a munkamenet hátralévő részében" + + #. prepare the dialog +-#: ../libedataserverui/e-source-selector-dialog.c:101 ++#: ../libedataserverui/e-source-selector-dialog.c:95 + msgid "Select destination" + msgstr "Cél kiválasztása" + +-#: ../libedataserverui/e-source-selector-dialog.c:154 ++#: ../libedataserverui/e-source-selector-dialog.c:148 + msgid "_Destination" + msgstr "_Cél" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1660 +-#: ../servers/exchange/storage/exchange-account.c:939 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1683 ++#: ../servers/exchange/storage/exchange-account.c:953 + #, c-format + msgid "Enter password for %s" + msgstr "Adja meg %s jelszavát" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1661 +-#: ../servers/exchange/storage/exchange-account.c:944 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1684 ++#: ../servers/exchange/storage/exchange-account.c:958 + msgid "Enter password" + msgstr "Adja meg a jelszót" + +@@ -5196,26 +5314,26 @@ msgstr "Ez a művelet nem végezhető el + + #. i18n: This is the title of an "other user's folders" + #. hierarchy. Eg, "John Doe's Folders". +-#: ../servers/exchange/storage/exchange-account.c:635 ++#: ../servers/exchange/storage/exchange-account.c:644 + #, c-format + msgid "%s's Folders" + msgstr "%s mappái" + +-#: ../servers/exchange/storage/exchange-account.c:1245 ++#: ../servers/exchange/storage/exchange-account.c:1259 + msgid "Personal Folders" + msgstr "Személyes mappák" + +-#: ../servers/exchange/storage/exchange-account.c:1260 ++#: ../servers/exchange/storage/exchange-account.c:1274 + msgid "Favorite Public Folders" + msgstr "Kedvenc nyilvános mappák" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1277 ++#: ../servers/exchange/storage/exchange-account.c:1291 + msgid "All Public Folders" + msgstr "Minden nyilvános mappa" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1291 ++#: ../servers/exchange/storage/exchange-account.c:1305 + msgid "Global Address List" + msgstr "Globális címlista" + +@@ -5243,19 +5361,19 @@ msgstr "Elküldött elemek" + msgid "Tasks" + msgstr "Feladatok" + +-#: ../servers/groupwise/e-gw-connection.c:191 ++#: ../servers/groupwise/e-gw-connection.c:225 + msgid "Invalid connection" + msgstr "Érvénytelen kapcsolat" + +-#: ../servers/groupwise/e-gw-connection.c:195 ++#: ../servers/groupwise/e-gw-connection.c:229 + msgid "Invalid response from server" + msgstr "Érvénytelen válasz a kiszolgálótól" + +-#: ../servers/groupwise/e-gw-connection.c:197 ++#: ../servers/groupwise/e-gw-connection.c:231 + msgid "No response from the server" + msgstr "Nem érkezett válasz a kiszolgálótól" + +-#: ../servers/groupwise/e-gw-connection.c:203 ++#: ../servers/groupwise/e-gw-connection.c:237 + msgid "Bad parameter" + msgstr "Hibás paraméter" + +@@ -5276,7 +5394,7 @@ msgid "Evolution Data Server logging ser + msgstr "Evolution Adatkiszolgáló naplózó szolgáltatás" + + #. dialog display isn't working out +-#: ../src/server.c:110 ++#: ../src/server.c:109 + #, c-format + msgid "Multiple segmentation faults occurred; cannot display error dialog\n" + msgstr "" +Index: evolution-data-server-2.23.92/po/it.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/it.po ++++ evolution-data-server-2.23.92/po/it.po +@@ -21,74 +21,74 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: evolution-data-server 2.21.x\n" ++"Project-Id-Version: evolution-data-server 2.23.x\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-02-22 21:07+0100\n" +-"PO-Revision-Date: 2008-02-23 16:58+0100\n" ++"POT-Creation-Date: 2008-09-16 10:29+0200\n" ++"PO-Revision-Date: 2008-09-16 10:27+0200\n" + "Last-Translator: Luca Ferretti \n" + "Language-Team: Italian \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:554 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2317 ++#: ../addressbook/backends/file/e-book-backend-file.c:555 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475 + msgid "Loading..." + msgstr "Caricamento..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:557 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2276 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2296 ++#: ../addressbook/backends/file/e-book-backend-file.c:558 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4169 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477 + msgid "Searching..." + msgstr "Ricerca..." + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2677 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4328 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "Scaricamento contatti (%d)... " + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2832 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3023 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3067 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103 + #, c-format + msgid "Updating contacts cache (%d)... " + msgstr "Aggiornamento cache contatti (%d)... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:742 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751 + msgid "Using Distinguished Name (DN)" + msgstr "Uso nome distintivo (DN)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754 + msgid "Using Email Address" + msgstr "Uso indirizzo email" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1002 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019 + msgid "Reconnecting to LDAP server..." + msgstr "Riconnessione al server LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1598 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617 + msgid "Adding contact to LDAP server..." + msgstr "Aggiunta contatto al server LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1726 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Removing contact from LDAP server..." + msgstr "Rimozione contatto dal server LDAP..." + + # o "sul server" ? -Luca +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2031 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064 + msgid "Modifying contact from LDAP server..." + msgstr "Modifica contatto dal server LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4040 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148 + msgid "Receiving LDAP search results..." + msgstr "Ricezione risultati della ricerca LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4189 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310 + msgid "Error performing search" + msgstr "Errore nell'eseguire la ricerca" + +@@ -96,111 +96,114 @@ msgstr "Errore nell'eseguire la ricerca" + #. * function names, e.g. + #. * "e_book_add_contact" on book before + #. * "e_book_open +-#: ../addressbook/libebook/e-book.c:254 ../addressbook/libebook/e-book.c:258 +-#: ../addressbook/libebook/e-book.c:470 ../addressbook/libebook/e-book.c:474 +-#: ../addressbook/libebook/e-book.c:615 ../addressbook/libebook/e-book.c:619 +-#: ../addressbook/libebook/e-book.c:708 ../addressbook/libebook/e-book.c:712 +-#: ../addressbook/libebook/e-book.c:1022 ../addressbook/libebook/e-book.c:1027 +-#: ../addressbook/libebook/e-book.c:1214 ../addressbook/libebook/e-book.c:1218 +-#: ../addressbook/libebook/e-book.c:1375 ../addressbook/libebook/e-book.c:1379 +-#: ../addressbook/libebook/e-book.c:1588 ../addressbook/libebook/e-book.c:1592 +-#: ../addressbook/libebook/e-book.c:1829 ../addressbook/libebook/e-book.c:1833 +-#: ../addressbook/libebook/e-book.c:2070 ../addressbook/libebook/e-book.c:2074 +-#: ../addressbook/libebook/e-book.c:2286 ../addressbook/libebook/e-book.c:2290 +-#: ../addressbook/libebook/e-book.c:3425 ++#: ../addressbook/libebook/e-book.c:252 ../addressbook/libebook/e-book.c:256 ++#: ../addressbook/libebook/e-book.c:461 ../addressbook/libebook/e-book.c:465 ++#: ../addressbook/libebook/e-book.c:604 ../addressbook/libebook/e-book.c:608 ++#: ../addressbook/libebook/e-book.c:695 ../addressbook/libebook/e-book.c:699 ++#: ../addressbook/libebook/e-book.c:995 ../addressbook/libebook/e-book.c:1000 ++#: ../addressbook/libebook/e-book.c:1179 ../addressbook/libebook/e-book.c:1183 ++#: ../addressbook/libebook/e-book.c:1338 ../addressbook/libebook/e-book.c:1342 ++#: ../addressbook/libebook/e-book.c:1544 ../addressbook/libebook/e-book.c:1548 ++#: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791 ++#: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029 ++#: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238 ++#: ../addressbook/libebook/e-book.c:3364 + #, c-format + msgid "\"%s\" on book before \"%s\"" + msgstr "\"%s\" sulla rubrica prima di \"%s\"" + +-#: ../addressbook/libebook/e-book.c:267 ../addressbook/libebook/e-book.c:483 +-#: ../addressbook/libebook/e-book.c:628 ../addressbook/libebook/e-book.c:721 +-#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1228 +-#: ../addressbook/libebook/e-book.c:1389 ../addressbook/libebook/e-book.c:1601 +-#: ../addressbook/libebook/e-book.c:1842 ../addressbook/libebook/e-book.c:2084 +-#: ../addressbook/libebook/e-book.c:2299 ../addressbook/libebook/e-book.c:2665 +-#: ../addressbook/libebook/e-book.c:2871 ++#: ../addressbook/libebook/e-book.c:265 ../addressbook/libebook/e-book.c:474 ++#: ../addressbook/libebook/e-book.c:617 ../addressbook/libebook/e-book.c:708 ++#: ../addressbook/libebook/e-book.c:1010 ../addressbook/libebook/e-book.c:1193 ++#: ../addressbook/libebook/e-book.c:1352 ../addressbook/libebook/e-book.c:1557 ++#: ../addressbook/libebook/e-book.c:1800 ../addressbook/libebook/e-book.c:2039 ++#: ../addressbook/libebook/e-book.c:2247 ../addressbook/libebook/e-book.c:2593 ++#: ../addressbook/libebook/e-book.c:2792 + #, c-format + msgid "book busy" + msgstr "rubrica occupata" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:304 +-#: ../addressbook/libebook/e-book.c:516 ../addressbook/libebook/e-book.c:520 +-#: ../addressbook/libebook/e-book.c:657 ../addressbook/libebook/e-book.c:661 +-#: ../addressbook/libebook/e-book.c:750 ../addressbook/libebook/e-book.c:754 +-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069 +-#: ../addressbook/libebook/e-book.c:1260 ../addressbook/libebook/e-book.c:1263 +-#: ../addressbook/libebook/e-book.c:1418 ../addressbook/libebook/e-book.c:1422 +-#: ../addressbook/libebook/e-book.c:1637 ../addressbook/libebook/e-book.c:1641 +-#: ../addressbook/libebook/e-book.c:1889 ../addressbook/libebook/e-book.c:1893 +-#: ../addressbook/libebook/e-book.c:2116 ../addressbook/libebook/e-book.c:2120 +-#: ../addressbook/libebook/e-book.c:2327 ../addressbook/libebook/e-book.c:2331 +-#: ../addressbook/libebook/e-book.c:2606 ../addressbook/libebook/e-book.c:2693 +-#: ../addressbook/libebook/e-book.c:2697 ../addressbook/libebook/e-book.c:2899 +-#: ../addressbook/libebook/e-book.c:2903 ../addressbook/libebook/e-book.c:3434 ++#: ../addressbook/libebook/e-book.c:296 ../addressbook/libebook/e-book.c:300 ++#: ../addressbook/libebook/e-book.c:505 ../addressbook/libebook/e-book.c:509 ++#: ../addressbook/libebook/e-book.c:644 ../addressbook/libebook/e-book.c:648 ++#: ../addressbook/libebook/e-book.c:735 ../addressbook/libebook/e-book.c:739 ++#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1040 ++#: ../addressbook/libebook/e-book.c:1223 ../addressbook/libebook/e-book.c:1226 ++#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1383 ++#: ../addressbook/libebook/e-book.c:1593 ../addressbook/libebook/e-book.c:1597 ++#: ../addressbook/libebook/e-book.c:1847 ../addressbook/libebook/e-book.c:1851 ++#: ../addressbook/libebook/e-book.c:2069 ../addressbook/libebook/e-book.c:2073 ++#: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277 ++#: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619 ++#: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818 ++#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3373 + #, c-format + msgid "CORBA exception making \"%s\" call" + msgstr "Eccezione CORBA nell'eseguire la chiamata \"%s\"" + +-#: ../addressbook/libebook/e-book.c:2587 ++#: ../addressbook/libebook/e-book.c:2523 + #, c-format + msgid "%s: there is no current operation" + msgstr "%s: non c'è alcuna operazione in corso" + +-#: ../addressbook/libebook/e-book.c:2622 ++#: ../addressbook/libebook/e-book.c:2552 + #, c-format + msgid "%s: could not cancel" + msgstr "%s: impossibile annullare" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-book.c:2651 ../addressbook/libebook/e-book.c:2655 ++#: ../addressbook/libebook/e-book.c:2579 ../addressbook/libebook/e-book.c:2583 + #, c-format + msgid "\"%s\" on book after \"%s\"" + msgstr "\"%s\" sulla rubrica dopo \"%s\"" + +-#: ../addressbook/libebook/e-book.c:2721 ++#: ../addressbook/libebook/e-book.c:2647 + #, c-format + msgid "%s: canceled" + msgstr "%s: annullato" + +-#: ../addressbook/libebook/e-book.c:3289 ++#: ../addressbook/libebook/e-book.c:3228 + #, c-format + msgid "%s: Invalid source." + msgstr "%s: sorgente non valida." + + # GNOME-2-22 +-#: ../addressbook/libebook/e-book.c:3297 ../addressbook/libebook/e-book.c:3363 ++#: ../addressbook/libebook/e-book.c:3236 ../addressbook/libebook/e-book.c:3302 + #, c-format + msgid "%s: no factories available for URI `%s'" + msgstr "%s: nessuna fabbrica disponibile per l'URI «%s»" + +-#: ../addressbook/libebook/e-book.c:3309 ++#: ../addressbook/libebook/e-book.c:3248 + #, c-format + msgid "%s: Could not create EBookListener" + msgstr "%s: impossibile creare EBookListener" + +-#: ../addressbook/libebook/e-book.c:3576 ++# GNOME-2-24 ++#: ../addressbook/libebook/e-book.c:3515 + #, c-format + msgid "%s: there was no self contact UID stored in gconf" +-msgstr "%s: non c'è un UID del proprio contatto memorizzato in gconf" ++msgstr "" ++"%s: non era presente alcun UID del proprio contatto archiviato in gconf" + +-# GNOME-2-22 +-#: ../addressbook/libebook/e-book.c:3709 ++# GNOME-2-24 ++#: ../addressbook/libebook/e-book.c:3648 + #, c-format + msgid "%s: there was no source for uid `%s' stored in gconf." +-msgstr "%s: non c'è alcuna sorgente per l'uid \"%s\" memorizzato in gconf." ++msgstr "" ++"%s: non era presente alcuna sorgente per l'UID «%s» archiviata in gconf." + + #. Dummy row as EContactField starts from 1 +-#: ../addressbook/libebook/e-contact.c:114 ++#: ../addressbook/libebook/e-contact.c:113 + msgid "Unique ID" + msgstr "ID univoco" + +-#: ../addressbook/libebook/e-contact.c:115 ++#: ../addressbook/libebook/e-contact.c:114 + msgid "File Under" + msgstr "Registra come" + + #. URI of the book to which the contact belongs to +-#: ../addressbook/libebook/e-contact.c:117 ++#: ../addressbook/libebook/e-contact.c:116 + msgid "Book URI" + msgstr "URI rubrica" + +@@ -212,520 +215,520 @@ msgstr "URI rubrica" + #. 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:123 ++#: ../addressbook/libebook/e-contact.c:122 + 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:124 ++#: ../addressbook/libebook/e-contact.c:123 + msgid "Given Name" + msgstr "Nome" + +-#: ../addressbook/libebook/e-contact.c:125 ++#: ../addressbook/libebook/e-contact.c:124 + msgid "Family Name" + msgstr "Cognome" + +-#: ../addressbook/libebook/e-contact.c:126 ++#: ../addressbook/libebook/e-contact.c:125 + msgid "Nickname" + msgstr "Soprannome" + + #. Email fields +-#: ../addressbook/libebook/e-contact.c:129 ++#: ../addressbook/libebook/e-contact.c:128 + msgid "Email 1" + msgstr "Email 1" + +-#: ../addressbook/libebook/e-contact.c:130 ++#: ../addressbook/libebook/e-contact.c:129 + msgid "Email 2" + msgstr "Email 2" + +-#: ../addressbook/libebook/e-contact.c:131 ++#: ../addressbook/libebook/e-contact.c:130 + msgid "Email 3" + msgstr "Email 3" + +-#: ../addressbook/libebook/e-contact.c:132 ++#: ../addressbook/libebook/e-contact.c:131 + msgid "Email 4" + msgstr "Email 4" + +-#: ../addressbook/libebook/e-contact.c:134 ++#: ../addressbook/libebook/e-contact.c:133 + msgid "Mailer" + msgstr "Gestore di posta" + + #. Address Labels +-#: ../addressbook/libebook/e-contact.c:137 ++#: ../addressbook/libebook/e-contact.c:136 + msgid "Home Address Label" + msgstr "Etichetta indirizzo abitazione" + +-#: ../addressbook/libebook/e-contact.c:138 ++#: ../addressbook/libebook/e-contact.c:137 + msgid "Work Address Label" + msgstr "Etichetta indirizzo lavoro" + +-#: ../addressbook/libebook/e-contact.c:139 ++#: ../addressbook/libebook/e-contact.c:138 + msgid "Other Address Label" + msgstr "Etichetta altro indirizzo" + + #. Phone fields +-#: ../addressbook/libebook/e-contact.c:142 ++#: ../addressbook/libebook/e-contact.c:141 + msgid "Assistant Phone" + msgstr "Telefono assistente" + +-#: ../addressbook/libebook/e-contact.c:143 ++#: ../addressbook/libebook/e-contact.c:142 + msgid "Business Phone" + msgstr "Telefono ufficio" + +-#: ../addressbook/libebook/e-contact.c:144 ++#: ../addressbook/libebook/e-contact.c:143 + msgid "Business Phone 2" + msgstr "Telefono ufficio 2" + +-#: ../addressbook/libebook/e-contact.c:145 ++#: ../addressbook/libebook/e-contact.c:144 + msgid "Business Fax" + msgstr "Fax ufficio" + +-#: ../addressbook/libebook/e-contact.c:146 ++#: ../addressbook/libebook/e-contact.c:145 + msgid "Callback Phone" + msgstr "Telefono a cui richiamare" + +-#: ../addressbook/libebook/e-contact.c:147 ++#: ../addressbook/libebook/e-contact.c:146 + msgid "Car Phone" + msgstr "Telefono auto" + +-#: ../addressbook/libebook/e-contact.c:148 ++#: ../addressbook/libebook/e-contact.c:147 + msgid "Company Phone" + msgstr "Telefono ditta" + +-#: ../addressbook/libebook/e-contact.c:149 ++#: ../addressbook/libebook/e-contact.c:148 + msgid "Home Phone" + msgstr "Telefono abitazione" + +-#: ../addressbook/libebook/e-contact.c:150 ++#: ../addressbook/libebook/e-contact.c:149 + msgid "Home Phone 2" + msgstr "Telefono abitazione 2" + +-#: ../addressbook/libebook/e-contact.c:151 ++#: ../addressbook/libebook/e-contact.c:150 + msgid "Home Fax" + msgstr "Fax abitazione" + +-#: ../addressbook/libebook/e-contact.c:152 ++#: ../addressbook/libebook/e-contact.c:151 + msgid "ISDN" + msgstr "ISDN" + + # credo questo sia il risultato di una recente + # discussione su tp -Luca +-#: ../addressbook/libebook/e-contact.c:153 ++#: ../addressbook/libebook/e-contact.c:152 + msgid "Mobile Phone" + msgstr "Telefono cellulare" + +-#: ../addressbook/libebook/e-contact.c:154 ++#: ../addressbook/libebook/e-contact.c:153 + msgid "Other Phone" + msgstr "Altro telefono" + +-#: ../addressbook/libebook/e-contact.c:155 ++#: ../addressbook/libebook/e-contact.c:154 + msgid "Other Fax" + msgstr "Altro fax" + +-#: ../addressbook/libebook/e-contact.c:156 ++#: ../addressbook/libebook/e-contact.c:155 + msgid "Pager" + msgstr "Cercapersone" + +-#: ../addressbook/libebook/e-contact.c:157 ++#: ../addressbook/libebook/e-contact.c:156 + msgid "Primary Phone" + msgstr "Telefono principale" + +-#: ../addressbook/libebook/e-contact.c:158 ++#: ../addressbook/libebook/e-contact.c:157 + msgid "Radio" + msgstr "Radio" + +-#: ../addressbook/libebook/e-contact.c:159 ++#: ../addressbook/libebook/e-contact.c:158 + msgid "Telex" + msgstr "Telex" + + #. To translators: TTY is Teletypewriter +-#: ../addressbook/libebook/e-contact.c:161 ++#: ../addressbook/libebook/e-contact.c:160 + msgid "TTY" + msgstr "TTY" + + #. Organizational fields +-#: ../addressbook/libebook/e-contact.c:164 ++#: ../addressbook/libebook/e-contact.c:163 + msgid "Organization" + msgstr "Organizzazione" + +-#: ../addressbook/libebook/e-contact.c:165 ++#: ../addressbook/libebook/e-contact.c:164 + msgid "Organizational Unit" + msgstr "Unità organizzativa" + +-#: ../addressbook/libebook/e-contact.c:166 ++#: ../addressbook/libebook/e-contact.c:165 + 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:167 ++#: ../addressbook/libebook/e-contact.c:166 + msgid "Title" + msgstr "Titolo" + + # magari qui si potrebbe usare quel qualifica + # tolto sopra al posto di Ruolo +-#: ../addressbook/libebook/e-contact.c:168 ++#: ../addressbook/libebook/e-contact.c:167 + msgid "Role" + msgstr "Qualifica" + +-#: ../addressbook/libebook/e-contact.c:169 ++#: ../addressbook/libebook/e-contact.c:168 + msgid "Manager" + msgstr "Manager" + +-#: ../addressbook/libebook/e-contact.c:170 ++#: ../addressbook/libebook/e-contact.c:169 + msgid "Assistant" + msgstr "Assistente" + + #. Web fields +-#: ../addressbook/libebook/e-contact.c:173 ++#: ../addressbook/libebook/e-contact.c:172 + msgid "Homepage URL" + msgstr "URL della homepage" + +-#: ../addressbook/libebook/e-contact.c:174 ++#: ../addressbook/libebook/e-contact.c:173 + msgid "Weblog URL" + msgstr "URL del blog" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:177 +-#: ../libedataserverui/e-categories-dialog.c:439 ++#: ../addressbook/libebook/e-contact.c:176 ++#: ../libedataserverui/e-categories-dialog.c:426 + msgid "Categories" + msgstr "Categorie" + + #. Collaboration fields +-#: ../addressbook/libebook/e-contact.c:180 ++#: ../addressbook/libebook/e-contact.c:179 + msgid "Calendar URI" + msgstr "URI del calendario" + +-#: ../addressbook/libebook/e-contact.c:181 ++#: ../addressbook/libebook/e-contact.c:180 + msgid "Free/Busy URL" + msgstr "URL libero/occupato" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:182 ++#: ../addressbook/libebook/e-contact.c:181 + msgid "ICS Calendar" + msgstr "Calendario ICS" + +-#: ../addressbook/libebook/e-contact.c:183 ++#: ../addressbook/libebook/e-contact.c:182 + msgid "Video Conferencing URL" + msgstr "URL di video conferenza" + + #. Misc fields +-#: ../addressbook/libebook/e-contact.c:186 ++#: ../addressbook/libebook/e-contact.c:185 + msgid "Spouse's Name" + msgstr "Nome del coniuge" + +-#: ../addressbook/libebook/e-contact.c:187 ++#: ../addressbook/libebook/e-contact.c:186 + msgid "Note" + msgstr "Annotazioni" + + # GNOME-2-22 + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:190 ++#: ../addressbook/libebook/e-contact.c:189 + msgid "AIM Home Screen Name 1" + msgstr "Nominativo pubblico AIM personale 1" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:191 ++#: ../addressbook/libebook/e-contact.c:190 + msgid "AIM Home Screen Name 2" + msgstr "Nominativo pubblico AIM personale 2" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:192 ++#: ../addressbook/libebook/e-contact.c:191 + msgid "AIM Home Screen Name 3" + msgstr "Nominativo pubblico AIM personale 3" + +-#: ../addressbook/libebook/e-contact.c:193 ++#: ../addressbook/libebook/e-contact.c:192 + msgid "AIM Work Screen Name 1" + msgstr "Nominativo pubblico AIM lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:194 ++#: ../addressbook/libebook/e-contact.c:193 + msgid "AIM Work Screen Name 2" + msgstr "Nominativo pubblico AIM lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:195 ++#: ../addressbook/libebook/e-contact.c:194 + msgid "AIM Work Screen Name 3" + msgstr "Nominativo pubblico AIM lavoro 3" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:196 ++#: ../addressbook/libebook/e-contact.c:195 + msgid "GroupWise Home Screen Name 1" + msgstr "Nominativo pubblico Groupwise personale 1" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:197 ++#: ../addressbook/libebook/e-contact.c:196 + msgid "GroupWise Home Screen Name 2" + msgstr "Nominativo pubblico Groupwise personale 2" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:198 ++#: ../addressbook/libebook/e-contact.c:197 + msgid "GroupWise Home Screen Name 3" + msgstr "Nominativo pubblico Groupwise personale 3" + +-#: ../addressbook/libebook/e-contact.c:199 ++#: ../addressbook/libebook/e-contact.c:198 + msgid "GroupWise Work Screen Name 1" + msgstr "Nominativo pubblico Groupwise lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:200 ++#: ../addressbook/libebook/e-contact.c:199 + msgid "GroupWise Work Screen Name 2" + msgstr "Nominativo pubblico Groupwise lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:201 ++#: ../addressbook/libebook/e-contact.c:200 + msgid "GroupWise Work Screen Name 3" + msgstr "Nominativo pubblico Groupwise lavoro 3" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:202 ++#: ../addressbook/libebook/e-contact.c:201 + msgid "Jabber Home Id 1" + msgstr "ID Jabber personale 1" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:203 ++#: ../addressbook/libebook/e-contact.c:202 + msgid "Jabber Home Id 2" + msgstr "ID Jabber personale 2" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:204 ++#: ../addressbook/libebook/e-contact.c:203 + msgid "Jabber Home Id 3" + msgstr "ID Jabber personale 3" + +-#: ../addressbook/libebook/e-contact.c:205 ++#: ../addressbook/libebook/e-contact.c:204 + msgid "Jabber Work Id 1" + msgstr "ID Jabber lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:206 ++#: ../addressbook/libebook/e-contact.c:205 + msgid "Jabber Work Id 2" + msgstr "ID Jabber lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:207 ++#: ../addressbook/libebook/e-contact.c:206 + msgid "Jabber Work Id 3" + msgstr "ID Jabber lavoro 3" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:208 ++#: ../addressbook/libebook/e-contact.c:207 + msgid "Yahoo! Home Screen Name 1" + msgstr "Nominativo pubblico Yahoo! personale 1" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:209 ++#: ../addressbook/libebook/e-contact.c:208 + msgid "Yahoo! Home Screen Name 2" + msgstr "Nominativo pubblico Yahoo! personale 2" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:210 ++#: ../addressbook/libebook/e-contact.c:209 + msgid "Yahoo! Home Screen Name 3" + msgstr "Nominativo pubblico Yahoo! personale 3" + +-#: ../addressbook/libebook/e-contact.c:211 ++#: ../addressbook/libebook/e-contact.c:210 + msgid "Yahoo! Work Screen Name 1" + msgstr "Nominativo pubblico Yahoo! lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:212 ++#: ../addressbook/libebook/e-contact.c:211 + msgid "Yahoo! Work Screen Name 2" + msgstr "Nominativo pubblico Yahoo! lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:213 ++#: ../addressbook/libebook/e-contact.c:212 + msgid "Yahoo! Work Screen Name 3" + msgstr "Nominativo pubblico Yahoo! lavoro 3" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:214 ++#: ../addressbook/libebook/e-contact.c:213 + msgid "MSN Home Screen Name 1" + msgstr "Nominativo pubblico MSN personale 1" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:215 ++#: ../addressbook/libebook/e-contact.c:214 + msgid "MSN Home Screen Name 2" + msgstr "Nominativo pubblico MSN personale 2" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:216 ++#: ../addressbook/libebook/e-contact.c:215 + msgid "MSN Home Screen Name 3" + msgstr "Nominativo pubblico MSN personale 3" + +-#: ../addressbook/libebook/e-contact.c:217 ++#: ../addressbook/libebook/e-contact.c:216 + msgid "MSN Work Screen Name 1" + msgstr "Nominativo pubblico MSN lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:218 ++#: ../addressbook/libebook/e-contact.c:217 + msgid "MSN Work Screen Name 2" + msgstr "Nominativo pubblico MSN lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:219 ++#: ../addressbook/libebook/e-contact.c:218 + msgid "MSN Work Screen Name 3" + msgstr "Nominativo pubblico MSN lavoro 3" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:220 ++#: ../addressbook/libebook/e-contact.c:219 + msgid "ICQ Home Id 1" + msgstr "ID ICQ personale 1" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:221 ++#: ../addressbook/libebook/e-contact.c:220 + msgid "ICQ Home Id 2" + msgstr "ID ICQ personale 2" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:222 ++#: ../addressbook/libebook/e-contact.c:221 + msgid "ICQ Home Id 3" + msgstr "ID ICQ personale 3" + +-#: ../addressbook/libebook/e-contact.c:223 ++#: ../addressbook/libebook/e-contact.c:222 + msgid "ICQ Work Id 1" + msgstr "ID ICQ lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:224 ++#: ../addressbook/libebook/e-contact.c:223 + msgid "ICQ Work Id 2" + msgstr "ID ICQ lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:225 ++#: ../addressbook/libebook/e-contact.c:224 + msgid "ICQ Work Id 3" + msgstr "ID ICQ lavoro 3" + + #. Last modified time +-#: ../addressbook/libebook/e-contact.c:228 ++#: ../addressbook/libebook/e-contact.c:227 + msgid "Last Revision" + msgstr "Ultima revisione" + +-#: ../addressbook/libebook/e-contact.c:229 ++#: ../addressbook/libebook/e-contact.c:228 + msgid "Name or Org" + msgstr "Nome o Org" + + #. Address fields +-#: ../addressbook/libebook/e-contact.c:232 ++#: ../addressbook/libebook/e-contact.c:231 + msgid "Address List" + msgstr "Elenco degli indirizzi" + +-#: ../addressbook/libebook/e-contact.c:233 ++#: ../addressbook/libebook/e-contact.c:232 + msgid "Home Address" + msgstr "Indirizzo abitazione" + +-#: ../addressbook/libebook/e-contact.c:234 ++#: ../addressbook/libebook/e-contact.c:233 + msgid "Work Address" + msgstr "Indirizzo lavoro" + +-#: ../addressbook/libebook/e-contact.c:235 ++#: ../addressbook/libebook/e-contact.c:234 + msgid "Other Address" + msgstr "Altro indirizzo" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:238 ++#: ../addressbook/libebook/e-contact.c:237 + msgid "Category List" + msgstr "Elenco delle categorie" + + #. Photo/Logo +-#: ../addressbook/libebook/e-contact.c:241 ++#: ../addressbook/libebook/e-contact.c:240 + msgid "Photo" + msgstr "Fotografia" + +-#: ../addressbook/libebook/e-contact.c:242 ++#: ../addressbook/libebook/e-contact.c:241 + msgid "Logo" + msgstr "Logo" + +-#: ../addressbook/libebook/e-contact.c:244 ++#: ../addressbook/libebook/e-contact.c:243 + msgid "Name" + msgstr "Nome" + +-#: ../addressbook/libebook/e-contact.c:245 ++#: ../addressbook/libebook/e-contact.c:244 + msgid "Email List" + msgstr "Elenco delle email" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:248 ++#: ../addressbook/libebook/e-contact.c:247 + msgid "AIM Screen Name List" + msgstr "Elenco dei nominativi pubblici AIM" + +-#: ../addressbook/libebook/e-contact.c:249 ++#: ../addressbook/libebook/e-contact.c:248 + msgid "GroupWise Id List" + msgstr "Elenco degli ID GroupWise" + +-#: ../addressbook/libebook/e-contact.c:250 ++#: ../addressbook/libebook/e-contact.c:249 + msgid "Jabber Id List" + msgstr "Elenco degli ID Jabber" + +-#: ../addressbook/libebook/e-contact.c:251 ++#: ../addressbook/libebook/e-contact.c:250 + msgid "Yahoo! Screen Name List" + msgstr "Elenco dei nominativi pubblici Yahoo!" + +-#: ../addressbook/libebook/e-contact.c:252 ++#: ../addressbook/libebook/e-contact.c:251 + msgid "MSN Screen Name List" + msgstr "Elenco dei nominativi pubblici MSN" + +-#: ../addressbook/libebook/e-contact.c:253 ++#: ../addressbook/libebook/e-contact.c:252 + msgid "ICQ Id List" + msgstr "Elenco degli ID ICQ" + +-#: ../addressbook/libebook/e-contact.c:255 ++#: ../addressbook/libebook/e-contact.c:254 + msgid "Wants HTML Mail" + msgstr "Vuole posta in HTML" + +-#: ../addressbook/libebook/e-contact.c:257 ++#: ../addressbook/libebook/e-contact.c:256 + msgid "List" + msgstr "Elenco" + +-#: ../addressbook/libebook/e-contact.c:258 ++#: ../addressbook/libebook/e-contact.c:257 + msgid "List Show Addresses" + msgstr "Elenco mostra indirizzi" + +-#: ../addressbook/libebook/e-contact.c:260 ++#: ../addressbook/libebook/e-contact.c:259 + msgid "Birth Date" + msgstr "Data di nascita" + +-#: ../addressbook/libebook/e-contact.c:261 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:462 ++#: ../addressbook/libebook/e-contact.c:260 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461 + #: ../libedataserver/e-categories.c:43 + msgid "Anniversary" + msgstr "Anniversario" + + #. Security fields +-#: ../addressbook/libebook/e-contact.c:264 ++#: ../addressbook/libebook/e-contact.c:263 + msgid "X.509 Certificate" + msgstr "Certificato X.509" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:266 ++#: ../addressbook/libebook/e-contact.c:265 + msgid "Gadu-Gadu Home Id 1" + msgstr "ID Gadu-Gadu personale 1" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:267 ++#: ../addressbook/libebook/e-contact.c:266 + msgid "Gadu-Gadu Home Id 2" + msgstr "ID Gadu-Gadu personale 2" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:268 ++#: ../addressbook/libebook/e-contact.c:267 + msgid "Gadu-Gadu Home Id 3" + msgstr "ID Gadu-Gadu personale 3" + +-#: ../addressbook/libebook/e-contact.c:269 ++#: ../addressbook/libebook/e-contact.c:268 + msgid "Gadu-Gadu Work Id 1" + msgstr "ID Gadu-Gadu lavoro 1" + +-#: ../addressbook/libebook/e-contact.c:270 ++#: ../addressbook/libebook/e-contact.c:269 + msgid "Gadu-Gadu Work Id 2" + msgstr "ID Gadu-Gadu lavoro 2" + +-#: ../addressbook/libebook/e-contact.c:271 ++#: ../addressbook/libebook/e-contact.c:270 + msgid "Gadu-Gadu Work Id 3" + msgstr "ID Gadu-Gadu lavoro 3" + +-#: ../addressbook/libebook/e-contact.c:272 ++#: ../addressbook/libebook/e-contact.c:271 + msgid "Gadu-Gadu Id List" + msgstr "Elenco degli ID Gadu-Gadu" + + #. Geo information +-#: ../addressbook/libebook/e-contact.c:275 ++#: ../addressbook/libebook/e-contact.c:274 + msgid "Geographic Information" + msgstr "Informazioni geografiche" + + # GNOME-2-22 +-#: ../addressbook/libebook/e-contact.c:277 ++#: ../addressbook/libebook/e-contact.c:276 + msgid "Telephone" + msgstr "Telefono" + +-#: ../addressbook/libebook/e-contact.c:1494 ++#: ../addressbook/libebook/e-contact.c:1499 + #: ../addressbook/libebook/e-destination.c:761 + msgid "Unnamed List" + msgstr "Elenco senza nome" +@@ -734,50 +737,56 @@ msgstr "Elenco senza nome" + # Evolution salva il gg/mm/aaa in cui si è nati (giorno di nascita) + # o il giorno in cui ricorre (compleanno) ? -Luca + # +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:464 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463 + #: ../libedataserver/e-categories.c:44 + msgid "Birthday" + msgstr "Compleanno" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:490 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489 + #, c-format + msgid "Birthday: %s" + msgstr "Compleanno: %s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:514 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513 + #, c-format + msgid "Anniversary: %s" + msgstr "Anniversario: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:203 ++#: ../calendar/backends/file/e-cal-backend-file.c:212 + msgid "Cannot save calendar data: Malformed URI." + msgstr "Impossibile salvare i dati del calendario: URI mal formulata." + ++# GNOME-2-24 ++#: ../calendar/backends/file/e-cal-backend-file.c:219 ++#: ../calendar/backends/file/e-cal-backend-file.c:225 ++msgid "Cannot save calendar data" ++msgstr "Impossibile salvare i dati del calendario" ++ + #: ../calendar/backends/google/e-cal-backend-google-utils.c:335 + msgid "Could not create thread for getting deltas" + msgstr "Impossibile creare il thread per ottenere le differenze" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:367 +-#: ../calendar/backends/google/e-cal-backend-google.c:1175 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1039 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1338 +-#: ../calendar/backends/http/e-cal-backend-http.c:569 ++#: ../calendar/backends/google/e-cal-backend-google.c:1191 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #: ../calendar/backends/weather/e-cal-backend-weather.c:466 + msgid "Could not create cache file" + msgstr "Impossibile creare il file cache" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:380 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1051 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065 + msgid "Could not create thread for populating cache" + msgstr "Impossibile creare il thread per popolare la cache" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1028 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1784 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795 + msgid "Reply Requested: by " + msgstr "Risposta richiesta: da " + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1033 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1789 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800 + msgid "Reply Requested: When convenient" + msgstr "Risposta richiesta: se conveniente" + +@@ -786,38 +795,40 @@ msgstr "Risposta richiesta: se convenien + msgid "Loading %s items" + msgstr "Caricamento %s voci" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:875 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260 + msgid "Calendar" + msgstr "Calendario" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:933 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947 + msgid "Invalid server URI" + msgstr "URI del server non valido" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:952 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:961 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1057 +-#: ../calendar/libecal/e-cal.c:5031 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1069 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1101 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1139 ++# GNOME-2-24 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071 ++#: ../calendar/libecal/e-cal.c:5082 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:109 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145 + #: ../camel/providers/groupwise/camel-groupwise-store.c:594 + #: ../camel/providers/groupwise/camel-groupwise-store.c:746 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:157 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:184 + msgid "Authentication failed" +-msgstr "Autenticazione fallita" ++msgstr "Autenticazione non riuscita" + +-#: ../calendar/backends/http/e-cal-backend-http.c:269 ++#: ../calendar/backends/http/e-cal-backend-http.c:267 + msgid "Redirected to Invalid URI" + msgstr "Rediretto ad un URI non valido" + +-#: ../calendar/backends/http/e-cal-backend-http.c:290 ++#: ../calendar/backends/http/e-cal-backend-http.c:288 + msgid "Bad file format." + msgstr "Formato di file errato" + +-#: ../calendar/backends/http/e-cal-backend-http.c:296 ++#: ../calendar/backends/http/e-cal-backend-http.c:294 + msgid "Not a calendar." + msgstr "Non è un calendario." + +@@ -1015,7 +1026,7 @@ msgstr "%.1f-%.1fcm neve\n" + msgid "%.1f-%.1fin snow\n" + msgstr "%.1f-%.1fin neve\n" + +-#: ../calendar/libecal/e-cal-component.c:1315 ++#: ../calendar/libecal/e-cal-component.c:1322 + msgid "Untitled appointment" + msgstr "Appuntamento senza titolo" + +@@ -1143,24 +1154,24 @@ msgstr "30" + msgid "31st" + msgstr "31" + +-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712 ++#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713 + msgid "High" + msgstr "Alta" + +-#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714 ++#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715 + msgid "Normal" + msgstr "Normale" + +-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:716 ++#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717 + msgid "Low" + msgstr "Bassa" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:710 ++#: ../calendar/libecal/e-cal-util.c:711 + msgid "Undefined" + msgstr "Non definita" + +-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:200 ++#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199 + #, c-format + msgid "Enter password for %s (user %s)" + msgstr "Inserire password per %s (utente %s)" +@@ -1174,87 +1185,106 @@ msgstr "Inserire password per %s (utente + msgid "Enter password for %s to enable proxy for user %s" + msgstr "Inserire password per %s per abilitare il proxy per l'utente %s" + +-#: ../calendar/libecal/e-cal.c:5003 ++#: ../calendar/libecal/e-cal.c:5054 + msgid "Invalid argument" + msgstr "Argomento non valido" + +-#: ../calendar/libecal/e-cal.c:5005 ++#: ../calendar/libecal/e-cal.c:5056 + msgid "Backend is busy" + msgstr "Il backend è occupato" + +-#: ../calendar/libecal/e-cal.c:5007 ++#: ../calendar/libecal/e-cal.c:5058 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:97 + msgid "Repository is offline" + msgstr "Il repository è fuori rete" + +-#: ../calendar/libecal/e-cal.c:5009 ++#: ../calendar/libecal/e-cal.c:5060 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:121 + msgid "No such calendar" + msgstr "Non è presente alcun calendario" + +-#: ../calendar/libecal/e-cal.c:5011 ../servers/groupwise/e-gw-connection.c:199 ++#: ../calendar/libecal/e-cal.c:5062 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:103 ++#: ../servers/groupwise/e-gw-connection.c:233 + msgid "Object not found" + msgstr "Oggetto non trovato" + +-#: ../calendar/libecal/e-cal.c:5013 ../servers/groupwise/e-gw-connection.c:193 ++#: ../calendar/libecal/e-cal.c:5064 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:105 ++#: ../servers/groupwise/e-gw-connection.c:227 + msgid "Invalid object" + msgstr "Oggetto non valido" + +-#: ../calendar/libecal/e-cal.c:5015 ++#: ../calendar/libecal/e-cal.c:5066 + msgid "URI not loaded" + msgstr "URI non caricato" + +-#: ../calendar/libecal/e-cal.c:5017 ++#: ../calendar/libecal/e-cal.c:5068 + msgid "URI already loaded" + msgstr "URI già caricato" + +-#: ../calendar/libecal/e-cal.c:5019 ++#: ../calendar/libecal/e-cal.c:5070 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:99 + #: ../servers/exchange/storage/e-storage.c:571 + msgid "Permission denied" + msgstr "Permesso negato" + +-#: ../calendar/libecal/e-cal.c:5021 ../servers/groupwise/e-gw-connection.c:201 ++#: ../calendar/libecal/e-cal.c:5072 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:123 ++#: ../servers/groupwise/e-gw-connection.c:235 + msgid "Unknown User" + msgstr "Utente sconosciuto" + +-#: ../calendar/libecal/e-cal.c:5023 ++#: ../calendar/libecal/e-cal.c:5074 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:107 + msgid "Object ID already exists" + msgstr "ID dell'oggetto esiste già" + +-#: ../calendar/libecal/e-cal.c:5025 ++#: ../calendar/libecal/e-cal.c:5076 + msgid "Protocol not supported" + msgstr "Protocollo non supportato" + +-#: ../calendar/libecal/e-cal.c:5027 ++#: ../calendar/libecal/e-cal.c:5078 + msgid "Operation has been canceled" + msgstr "L'operazione è stata annullata" + +-#: ../calendar/libecal/e-cal.c:5029 ++#: ../calendar/libecal/e-cal.c:5080 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:136 + msgid "Could not cancel operation" + msgstr "Impossibile annullare l'operazione" + +-#: ../calendar/libecal/e-cal.c:5033 +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 ++#: ../calendar/libecal/e-cal.c:5084 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:111 ++#: ../camel/providers/smtp/camel-smtp-transport.c:218 + msgid "Authentication required" + msgstr "Autenticazione richiesta" + +-#: ../calendar/libecal/e-cal.c:5035 ++#: ../calendar/libecal/e-cal.c:5086 + msgid "A CORBA exception has occurred" + msgstr "È occorsa un'eccezione CORBA" + +-#: ../calendar/libecal/e-cal.c:5037 ++#: ../calendar/libecal/e-cal.c:5088 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:139 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 +-#: ../camel/providers/imap/camel-imap-command.c:312 +-#: ../camel/providers/imap/camel-imap-command.c:412 +-#: ../camel/providers/imap/camel-imap-store.c:762 +-#: ../camel/providers/imap4/camel-imap4-store.c:313 +-#: ../camel/providers/pop3/camel-pop3-store.c:559 ++#: ../camel/providers/imap/camel-imap-command.c:434 ++#: ../camel/providers/imap/camel-imap-store.c:742 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1570 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1609 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1654 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1710 ++#: ../camel/providers/imap4/camel-imap4-store.c:315 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 ++#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/providers/pop3/camel-pop3-store.c:560 + #: ../camel/providers/pop3/camel-pop3-store.c:566 +-#: ../camel/providers/pop3/camel-pop3-store.c:572 + #: ../servers/exchange/storage/e-storage.c:585 +-#: ../servers/groupwise/e-gw-connection.c:207 ++#: ../servers/groupwise/e-gw-connection.c:241 + msgid "Unknown error" + msgstr "Errore sconosciuto" + +-#: ../calendar/libecal/e-cal.c:5039 ++#: ../calendar/libecal/e-cal.c:5090 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:95 + #: ../servers/exchange/storage/e-storage.c:553 + msgid "No error" + msgstr "Nessun errore" +@@ -1355,6 +1385,62 @@ msgstr "" + "\"%s\" prevede che tutti gli argomenti siano stringhe o uno e soltanto uno " + "falso booleano (#f)" + ++# GNOME-2-24 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:101 ++msgid "Invalid range" ++msgstr "Intervallo non valido" ++ ++# GNOME-2-24 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:113 ++msgid "Unsupported field" ++msgstr "Campo non supportato" ++ ++# GNOME-2-24 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:115 ++msgid "Unsupported method" ++msgstr "Metodo non supportato" ++ ++# GNOME-2-4 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:117 ++msgid "Unsupported authentication method" ++msgstr "Metodo di autenticazione non supportato" ++ ++# GNOME-2-24 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:119 ++msgid "TLS not available" ++msgstr "TLS non disponibile" ++ ++# GNOME-2-24 ++#. Translators: This means "Offline mode unavailable" ++#: ../calendar/libedata-cal/e-cal-backend-util.c:126 ++msgid "Offline unavailable" ++msgstr "Fuori rete non disponibile" ++ ++# GNOME-2-24 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:128 ++msgid "Search size limit exceeded" ++msgstr "Limite dimensione ricerca superato" ++ ++# GNOME-2-24 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:130 ++msgid "Search time limit exceeded" ++msgstr "Limite tempo ricerca superato" ++ ++# GNOME-2-24 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:132 ++msgid "Invalid query" ++msgstr "Interrogazione non valida" ++ ++# GNOME-2-24 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:134 ++msgid "Query refused" ++msgstr "Interrogazione rifiutata" ++ ++# GNOME-2-24 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:141 ++msgid "Invalid server version" ++msgstr "Versione del server non valida" ++ + # ... ma che intende per cifrario??? -Luca + #: ../camel/camel-cipher-context.c:102 + msgid "Signing is not supported by this cipher" +@@ -1398,15 +1484,20 @@ msgstr "Impossibile importare chiavi con + msgid "You may not export keys with this cipher" + msgstr "Impossibile esportare chiavi con questa cifrario" + +-#: ../camel/camel-data-cache.c:137 ++#: ../camel/camel-data-cache.c:136 + msgid "Unable to create cache path" + msgstr "Impossibile creare il percorso per la cache" + +-#: ../camel/camel-data-cache.c:384 ++#: ../camel/camel-data-cache.c:381 + #, c-format + msgid "Could not remove cache entry: %s: %s" + msgstr "Impossibile rimuovere la voce cache: %s: %s" + ++# GNOME-2-24 ++#: ../camel/camel-db.c:102 ++msgid "Insufficient memory" ++msgstr "Memoria non sufficiente" ++ + #: ../camel/camel-disco-diary.c:198 + #, c-format + msgid "" +@@ -1418,16 +1509,18 @@ msgstr "" + "Ulteriori operazioni su questo server non saranno replicate\n" + "quando ci si riconnette alla rete." + ++# GNOME-2-24 + #: ../camel/camel-disco-diary.c:261 ++#: ../camel/providers/imap/camel-imap-journal.c:299 + #, c-format + msgid "" +-"Could not open `%s':\n" ++"Could not open '%s':\n" + "%s\n" + "Changes made to this folder will not be resynchronized." + msgstr "" +-"Impossibile aprire \"%s\":\n" ++"Impossibile aprire «%s»:\n" + "%s\n" +-"Le modifiche fatte a questa cartella non saranno risincronizzate." ++"Le modifiche apportate a questa cartella non saranno risincronizzate." + + #: ../camel/camel-disco-diary.c:297 + msgid "Resynchronizing with server" +@@ -1441,103 +1534,111 @@ msgstr "Copia il contenuto della cartell + msgid "Downloading new messages for offline mode" + msgstr "Scaricamento nuovi messaggi per la modalità fuori rete" + +-#: ../camel/camel-disco-folder.c:468 ++#: ../camel/camel-disco-folder.c:469 + #, c-format + msgid "Preparing folder '%s' for offline" +-msgstr "Preparazione cartella \"%s\" per l'accesso fuori rete" ++msgstr "Preparazione cartella «%s» per l'accesso fuori rete" + + # Umoristica: se in linea --> i ciccioni non possono completare + # questa operazione :-) -Luca + # + #: ../camel/camel-disco-store.c:403 +-#: ../camel/providers/imap/camel-imap-store.c:3018 ++#: ../camel/providers/imap/camel-imap-store.c:1002 ++#: ../camel/providers/imap/camel-imap-store.c:1810 ++#: ../camel/providers/imap/camel-imap-store.c:2226 ++#: ../camel/providers/imap/camel-imap-store.c:2994 + msgid "You must be working online to complete this operation" + msgstr "È necessario non essere fuori rete per completare questa operazione" + +-#: ../camel/camel-exception.c:264 ++#: ../camel/camel-exception.c:262 + msgid "No description available" + msgstr "Nessuna descrizione disponibile" + +-#: ../camel/camel-filter-driver.c:786 ++# GNOME-2-24 ++#: ../camel/camel-filter-driver.c:785 + #, c-format + msgid "Failed to create child process '%s': %s" +-msgstr "Creazione del processo figlio \"%s\" fallita: %s" ++msgstr "Creazione del processo figlio «%s» non riuscita: %s" + +-#: ../camel/camel-filter-driver.c:828 ++#: ../camel/camel-filter-driver.c:827 + #, c-format + msgid "Invalid message stream received from %s: %s" + msgstr "Flusso di messaggi non valido ricevuto da %s: %s" + +-#: ../camel/camel-filter-driver.c:1017 ../camel/camel-filter-driver.c:1026 ++#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025 + msgid "Syncing folders" + msgstr "Sincronizzazione cartelle" + +-#: ../camel/camel-filter-driver.c:1115 ../camel/camel-filter-driver.c:1495 ++#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1520 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "Errore nell'analizzare il filtro: %s: %s" + +-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1504 ++#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1529 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "Errore nell'eseguire il filtro: %s: %s" + +-#: ../camel/camel-filter-driver.c:1192 ++#: ../camel/camel-filter-driver.c:1211 + msgid "Unable to open spool folder" + msgstr "Impossibile aprire la cartella di spool" + +-#: ../camel/camel-filter-driver.c:1201 ++#: ../camel/camel-filter-driver.c:1220 + msgid "Unable to process spool folder" + msgstr "Impossibile analizzare la cartella di spool" + +-#: ../camel/camel-filter-driver.c:1216 ++#: ../camel/camel-filter-driver.c:1236 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "Ricezione del messaggio %d (%d%%)" + +-#: ../camel/camel-filter-driver.c:1220 ++#: ../camel/camel-filter-driver.c:1240 + msgid "Cannot open message" + msgstr "Impossibile aprire il messaggio" + +-#: ../camel/camel-filter-driver.c:1221 ../camel/camel-filter-driver.c:1234 ++# GNOME-2-24 ++#: ../camel/camel-filter-driver.c:1241 ../camel/camel-filter-driver.c:1259 + #, c-format + msgid "Failed on message %d" +-msgstr "Fallito al messaggio %d" ++msgstr "Non riuscito al messaggio %d" + +-#: ../camel/camel-filter-driver.c:1248 ../camel/camel-filter-driver.c:1339 ++#: ../camel/camel-filter-driver.c:1273 ../camel/camel-filter-driver.c:1364 + msgid "Syncing folder" + msgstr "Sincronizzazione cartella" + +-#: ../camel/camel-filter-driver.c:1252 ../camel/camel-filter-driver.c:1344 ++#: ../camel/camel-filter-driver.c:1277 ../camel/camel-filter-driver.c:1369 + msgid "Complete" + msgstr "Completato" + +-#: ../camel/camel-filter-driver.c:1309 ++#: ../camel/camel-filter-driver.c:1334 + #, c-format + msgid "Getting message %d of %d" + msgstr "Ricezione messaggio %d di %d" + +-#: ../camel/camel-filter-driver.c:1324 ++# GNOME-2-24 ++#: ../camel/camel-filter-driver.c:1349 + #, c-format + msgid "Failed at message %d of %d" +-msgstr "Fallito al messaggio %d di %d" ++msgstr "Non riuscito al messaggio %d di %d" + +-#: ../camel/camel-filter-search.c:139 ++# GNOME-2-24 ++#: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" +-msgstr "Ricezione del messaggio fallita" ++msgstr "Ricezione del messaggio non riuscita" + +-#: ../camel/camel-filter-search.c:402 ++#: ../camel/camel-filter-search.c:401 + msgid "Invalid arguments to (system-flag)" + msgstr "Argomenti non validi per (system-flag)" + +-#: ../camel/camel-filter-search.c:417 ++#: ../camel/camel-filter-search.c:416 + msgid "Invalid arguments to (user-tag)" + msgstr "Argomenti non validi per (user-tag)" + +-#: ../camel/camel-filter-search.c:582 ++# GNOME-2-24 ++#: ../camel/camel-filter-search.c:581 + #, c-format + msgid "Failed to create create child process '%s': %s" +-msgstr "Creazione del processo figlio \"%s\" fallita: %s" ++msgstr "Creazione del processo figlio «%s» non riuscita: %s" + + #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru. + #: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745 +@@ -1545,7 +1646,7 @@ msgstr "Creazione del processo figlio \" + msgid "Error executing filter search: %s: %s" + msgstr "Errore nell'eseguire la ricerca nei filtri: %s: %s" + +-#: ../camel/camel-folder-search.c:358 ../camel/camel-folder-search.c:480 ++#: ../camel/camel-folder-search.c:335 ../camel/camel-folder-search.c:447 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -1554,7 +1655,7 @@ msgstr "" + "Impossibile analizzare l'espressione di ricerca: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:368 ../camel/camel-folder-search.c:490 ++#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:457 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -1563,216 +1664,219 @@ msgstr "" + "Errore nell'eseguire l'espressione di ricerca: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:677 ../camel/camel-folder-search.c:712 ++#: ../camel/camel-folder-search.c:649 ../camel/camel-folder-search.c:692 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) richiede un singolo risultato booleano" + +-#: ../camel/camel-folder-search.c:765 ++#: ../camel/camel-folder-search.c:745 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) non consentito all'interno di %s" + +-#: ../camel/camel-folder-search.c:771 ../camel/camel-folder-search.c:778 ++#: ../camel/camel-folder-search.c:751 ../camel/camel-folder-search.c:758 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) richiede una stringa di tipo match" + +-#: ../camel/camel-folder-search.c:805 ++#: ../camel/camel-folder-search.c:785 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) attende un risultato array" + +-#: ../camel/camel-folder-search.c:814 ++#: ../camel/camel-folder-search.c:794 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) richiede il set di cartelle" + +-#: ../camel/camel-folder-search.c:909 ++#: ../camel/camel-folder-search.c:889 + #, c-format + msgid "Performing query on unknown header: %s" + msgstr "È stata effettuata una ricerca su un header sconosciuto: %s" + + # %s è il nome di una cartella CAMEL + # +-#: ../camel/camel-folder.c:618 ++#: ../camel/camel-folder.c:693 + #, c-format + msgid "Unsupported operation: append message: for %s" + msgstr "Operazione non supportata: accodamento messaggio per %s." + + # %s è il nome della cartella CAMEL + # +-#: ../camel/camel-folder.c:1240 ++#: ../camel/camel-folder.c:1349 + #, c-format + msgid "Unsupported operation: search by expression: for %s" + msgstr "Operazione non supportata: ricerca per espressione in %s" + + # %s è il nome della cartella CAMEL + # +-#: ../camel/camel-folder.c:1281 ++#: ../camel/camel-folder.c:1390 + #, c-format + msgid "Unsupported operation: search by UIDs: for %s" + msgstr "Operazione non supportata: ricerca per UID in %s" + +-#: ../camel/camel-folder.c:1397 ++#: ../camel/camel-folder.c:1506 + msgid "Moving messages" + msgstr "Spostamento messaggi" + +-#: ../camel/camel-folder.c:1397 ++#: ../camel/camel-folder.c:1506 + msgid "Copying messages" + msgstr "Copia messaggi" + +-#: ../camel/camel-folder.c:1651 ++#: ../camel/camel-folder.c:1852 + msgid "Learning junk" + msgstr "Apprendimento posta indesiderata" + + # Non è mia, ma dei traduttori MS :-( +-#: ../camel/camel-folder.c:1668 ++#: ../camel/camel-folder.c:1869 + msgid "Learning non-junk" + msgstr "Apprendimento posta attendibile" + +-#: ../camel/camel-folder.c:1687 ++#: ../camel/camel-folder.c:1888 + msgid "Filtering new message(s)" + msgstr "Filtraggio nuovi messaggi" + +-#: ../camel/camel-gpg-context.c:754 ++# GNOME-2-24 ++#: ../camel/camel-gpg-context.c:755 + #, c-format + msgid "" + "Unexpected GnuPG status message encountered:\n" + "\n" + "%s" + msgstr "" +-"È stato riscontrato un messaggio di stato GnuPG inaspettato:\n" ++"È stato riscontrato un messaggio di stato GnuPG inatteso:\n" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:769 ++# GNOME-2-24 ++#: ../camel/camel-gpg-context.c:770 + msgid "Failed to parse gpg userid hint." +-msgstr "Analisi userid hint gpg fallita." ++msgstr "Analisi userid hint gpg non riuscita." + +-#: ../camel/camel-gpg-context.c:793 ../camel/camel-gpg-context.c:807 ++# GNOME-2-24 ++#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808 + msgid "Failed to parse gpg passphrase request." +-msgstr "Analisi richiesta passphrase gpg fallita." ++msgstr "Analisi richiesta passphrase gpg non riuscita." + +-#: ../camel/camel-gpg-context.c:827 ++#: ../camel/camel-gpg-context.c:828 + #, c-format + 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\"" ++"della propria SmartCard: «%s»" + +-#: ../camel/camel-gpg-context.c:831 ++#: ../camel/camel-gpg-context.c:832 + #, c-format + 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\"" ++"per l'utente: «%s»" + +-#: ../camel/camel-gpg-context.c:836 ++# GNOME-2-24 ++#: ../camel/camel-gpg-context.c:837 + #, c-format +-msgid "Unexpected request from GnuPG for `%s'" +-msgstr "Richiesta inaspettata da GnuPG per «%s»" ++msgid "Unexpected request from GnuPG for '%s'" ++msgstr "Richiesta inattesa da GnuPG per «%s»" + +-#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:1066 ++#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068 + #: ../camel/providers/nntp/camel-nntp-store.c:1281 + msgid "Canceled." + msgstr "Annullato." + +-#: ../camel/camel-gpg-context.c:875 ++# GNOME-2-24 ++#: ../camel/camel-gpg-context.c:876 + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "" +-"Sblocco della chiave segreta fallito: sono state fornite 3 passphrase " ++"Sblocco della chiave segreta non riuscito: sono state fornite 3 passphrase " + "errate." + +-#: ../camel/camel-gpg-context.c:883 ++# GNOME-2-24 ++#: ../camel/camel-gpg-context.c:884 + #, c-format + msgid "Unexpected response from GnuPG: %s" +-msgstr "Risposta inaspettata da GnuPG: %s" ++msgstr "Risposta inattesa da GnuPG: %s" + +-#: ../camel/camel-gpg-context.c:936 ++# GNOME-2-24 ++#: ../camel/camel-gpg-context.c:937 + msgid "Failed to encrypt: No valid recipients specified." +-msgstr "Cifratura fallita: nessun destinatario valido specificato." ++msgstr "Cifratura non riuscita: nessun destinatario valido specificato." + ++# GNOME-2-24 + #. always called on an i/o error +-#: ../camel/camel-gpg-context.c:1204 ../camel/camel-gpg-context.c:1332 +-#: ../camel/camel-gpg-context.c:1826 ../camel/camel-gpg-context.c:1871 ++#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1334 ++#: ../camel/camel-gpg-context.c:1829 ../camel/camel-gpg-context.c:1874 + #, c-format + msgid "Failed to execute gpg: %s" +-msgstr "Esecuzione di gpg fallita: %s" ++msgstr "Esecuzione di gpg non riuscita: %s" + +-#: ../camel/camel-gpg-context.c:1300 ../camel/camel-smime-context.c:392 ++#: ../camel/camel-gpg-context.c:1302 ../camel/camel-smime-context.c:392 + #, c-format + msgid "Could not generate signing data: %s" + msgstr "Impossibile generare i dati per la firma: %s" + +-#: ../camel/camel-gpg-context.c:1347 ../camel/camel-gpg-context.c:1531 +-#: ../camel/camel-gpg-context.c:1616 ../camel/camel-gpg-context.c:1631 +-#: ../camel/camel-gpg-context.c:1748 ../camel/camel-gpg-context.c:1763 +-#: ../camel/camel-gpg-context.c:1842 ../camel/camel-gpg-context.c:1887 ++# GNOME-2-24 ++#: ../camel/camel-gpg-context.c:1349 ../camel/camel-gpg-context.c:1534 ++#: ../camel/camel-gpg-context.c:1619 ../camel/camel-gpg-context.c:1634 ++#: ../camel/camel-gpg-context.c:1750 ../camel/camel-gpg-context.c:1765 ++#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1890 + msgid "Failed to execute gpg." +-msgstr "Esecuzione di gpg fallita." ++msgstr "Esecuzione di gpg non riuscita." + +-#: ../camel/camel-gpg-context.c:1366 ++#: ../camel/camel-gpg-context.c:1368 + msgid "This is a digitally signed message part" + msgstr "Questa è una parte del messaggio firmata digitalmente" + +-#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457 +-#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1479 ++#: ../camel/camel-gpg-context.c:1453 ../camel/camel-gpg-context.c:1459 ++#: ../camel/camel-gpg-context.c:1465 ../camel/camel-gpg-context.c:1480 + #: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706 + #: ../camel/camel-smime-context.c:713 + msgid "Cannot verify message signature: Incorrect message format" + msgstr "" + "Impossibile verificare la firma del messaggio: formato messaggio non valido" + +-#: ../camel/camel-gpg-context.c:1516 ++#: ../camel/camel-gpg-context.c:1519 + #, c-format + msgid "Cannot verify message signature: could not create temp file: %s" + msgstr "" + "Impossibile verificare la firma del messaggio: impossibile creare un file " + "temporaneo: %s" + +-#: ../camel/camel-gpg-context.c:1599 ++#: ../camel/camel-gpg-context.c:1602 + #, c-format + msgid "Could not generate encrypting data: %s" + msgstr "Impossibile generare i dati per la crittografia: %s" + +-#: ../camel/camel-gpg-context.c:1649 ++#: ../camel/camel-gpg-context.c:1652 + msgid "This is a digitally encrypted message part" + msgstr "Questa è una parte del messaggio cifrata digitalmente" + +-#: ../camel/camel-gpg-context.c:1702 ../camel/camel-gpg-context.c:1710 +-#: ../camel/camel-gpg-context.c:1730 ++#: ../camel/camel-gpg-context.c:1705 ../camel/camel-gpg-context.c:1713 ++#: ../camel/camel-gpg-context.c:1732 + msgid "Cannot decrypt message: Incorrect message format" + msgstr "Impossibile decifrare il messaggio: formato del messaggio non valido" + +-# GNOME-2-22 +-#: ../camel/camel-gpg-context.c:1719 ++# GNOME-2-24 ++#: ../camel/camel-gpg-context.c:1722 + msgid "Failed to decrypt MIME part: protocol error" +-msgstr "Decrittazione della parte MIME fallita: errore di protocollo" ++msgstr "Decrittazione della parte MIME non riuscita: errore di protocollo" + +-#: ../camel/camel-gpg-context.c:1784 ../camel/camel-smime-context.c:969 ++#: ../camel/camel-gpg-context.c:1787 ../camel/camel-smime-context.c:969 + msgid "Encrypted content" + msgstr "Contenuto cifrato" + +-#: ../camel/camel-gpg-context.c:1803 ++#: ../camel/camel-gpg-context.c:1806 + msgid "Unable to parse message content" + msgstr "Impossibile elaborare il contenuto del messaggio" + +-#: ../camel/camel-gpg-context.c:1827 ../camel/camel-gpg-context.c:1872 ++#: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875 + #: ../camel/camel-tcp-stream-openssl.c:635 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1548 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1587 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1632 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1688 +-#: ../camel/providers/imap4/camel-imap4-store.c:820 +-#: ../camel/providers/imap4/camel-imap4-store.c:1495 +-#: ../camel/providers/imap4/camel-imap4-utils.c:557 +-#: ../camel/providers/smtp/camel-smtp-transport.c:164 +-#: ../camel/providers/smtp/camel-smtp-transport.c:219 ++#: ../camel/providers/imap4/camel-imap4-utils.c:624 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:221 + msgid "Unknown" + msgstr "Sconosciuto" + +@@ -1789,34 +1893,37 @@ msgstr "Impossibile eseguire un fork di + #: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" +-msgstr "Impossibile bloccare \"%s\": errore di protocollo con il lock-helper" ++msgstr "Impossibile bloccare «%s»: errore di protocollo con il lock-helper" + + #: ../camel/camel-lock-client.c:217 + #, c-format + msgid "Could not lock '%s'" +-msgstr "Impossibile bloccare \"%s\"" ++msgstr "Impossibile bloccare «%s»" + + #: ../camel/camel-lock.c:103 + #, c-format + msgid "Could not create lock file for %s: %s" + msgstr "Impossibile creare il file di blocco per %s; %s" + ++# GNOME-2-24 + #: ../camel/camel-lock.c:144 + #, c-format + msgid "Timed out trying to get lock file on %s. Try again later." + msgstr "" +-"Tempo scaduto nel tentativo di prendere il file di lock %s. Riprovare più " ++"Tempo scaduto nel tentativo di ottenere il file di lock %s. Riprovare più " + "tardi." + ++# GNOME-2-24 + #: ../camel/camel-lock.c:199 + #, c-format + msgid "Failed to get lock using fcntl(2): %s" +-msgstr "Rimozione del lock usando fcntl(2) fallita: %s" ++msgstr "Recupero del lock usando fcntl(2) non riuscita: %s" + ++# GNOME-2-24 + #: ../camel/camel-lock.c:262 + #, c-format + msgid "Failed to get lock using flock(2): %s" +-msgstr "Rimozione del lock usando flock(2) fallita: %s" ++msgstr "Recupero del lock usando flock(2) non riuscita: %s" + + #: ../camel/camel-movemail.c:106 + #, c-format +@@ -1833,10 +1940,11 @@ msgstr "Impossibile aprire il file di po + msgid "Could not open temporary mail file %s: %s" + msgstr "Impossibile aprire il file di posta temporaneo %s: %s" + ++# GNOME-2-24 + #: ../camel/camel-movemail.c:156 + #, c-format + msgid "Failed to store mail in temp file %s: %s" +-msgstr "Memorizzazione della posta nel file temporaneo %s fallita: %s" ++msgstr "Archiviazione della posta nel file temporaneo %s non riuscita: %s" + + #: ../camel/camel-movemail.c:186 + #, c-format +@@ -1848,10 +1956,11 @@ msgstr "Impossibile creare la pipe: %s" + msgid "Could not fork: %s" + msgstr "Impossibile fare un fork: %s" + ++# GNOME-2-24 + #: ../camel/camel-movemail.c:236 + #, c-format + msgid "Movemail program failed: %s" +-msgstr "Fallito lo spostamento della posta: %s" ++msgstr "Programma movemail non riuscito: %s" + + #: ../camel/camel-movemail.c:237 + msgid "(Unknown error)" +@@ -1872,88 +1981,93 @@ msgstr "Errore nello scrivere il file te + msgid "Error copying mail temp file: %s" + msgstr "Errore nel copiare il file temp di posta: %s" + +-#: ../camel/camel-multipart-signed.c:595 ++#: ../camel/camel-multipart-signed.c:593 + msgid "parse error" + msgstr "errore di analisi" + +-#: ../camel/camel-net-utils.c:506 ../camel/camel-net-utils.c:668 +-#: ../camel/camel-net-utils.c:800 +-#: ../camel/providers/pop3/camel-pop3-store.c:449 +-#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667 ++#: ../camel/camel-net-utils.c:799 ++#: ../camel/providers/pop3/camel-pop3-store.c:447 ++#: ../camel/providers/pop3/camel-pop3-store.c:547 + msgid "Canceled" + msgstr "Annullato" + +-#: ../camel/camel-net-utils.c:525 ++#: ../camel/camel-net-utils.c:524 + msgid "cannot create thread" + msgstr "impossibile creare il thread" + +-#: ../camel/camel-net-utils.c:672 ++#: ../camel/camel-net-utils.c:671 + #, c-format + msgid "Resolving: %s" + msgstr "Risoluzione: %s" + +-#: ../camel/camel-net-utils.c:694 ++# GNOME-2-24 ++#: ../camel/camel-net-utils.c:693 + msgid "Host lookup failed" +-msgstr "Ricerca dell'host fallita" ++msgstr "Ricerca dell'host non riuscita" + +-#: ../camel/camel-net-utils.c:696 ++# GNOME-2-24 ++#: ../camel/camel-net-utils.c:695 + #, c-format + msgid "Host lookup failed: %s: %s" +-msgstr "Ricerca dell'host fallita: %s: %s" ++msgstr "Ricerca dell'host non riuscita: %s: %s" + +-#: ../camel/camel-net-utils.c:804 ++#: ../camel/camel-net-utils.c:803 + msgid "Resolving address" + msgstr "Risoluzione indirizzo" + +-#: ../camel/camel-net-utils.c:824 ++# GNOME-2-24 ++#: ../camel/camel-net-utils.c:823 + msgid "Name lookup failed" +-msgstr "Ricerca del nome fallita" ++msgstr "Ricerca del nome non riuscita" + +-#: ../camel/camel-net-utils.c:827 ++# GNOME-2-24 ++#: ../camel/camel-net-utils.c:826 + #, c-format + msgid "Name lookup failed: %s" +-msgstr "Ricerca del nome fallita: %s" ++msgstr "Ricerca del nome non riuscita: %s" + + #: ../camel/camel-offline-folder.c:254 + #, c-format + msgid "Syncing messages in folder '%s' to disk" +-msgstr "Sincronizzazione messaggi nella cartella \"%s\" su disco" ++msgstr "Sincronizzazione messaggi nella cartella «%s» su disco" + ++# GNOME-2-24 + #: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187 + #, c-format +-msgid "Cannot write offline journal for folder `%s': %s" ++msgid "Cannot write offline journal for folder '%s': %s" + msgstr "" +-"Impossibile scrivere il diario per la cartella \"%s\" quando fuori rete: %s" ++"Impossibile scrivere il diario per la cartella «%s» quando fuori rete: %s" + +-#: ../camel/camel-provider.c:62 ++#: ../camel/camel-provider.c:60 + msgid "Virtual folder email provider" + msgstr "Fornitore di cartelle email virtuali" + +-#: ../camel/camel-provider.c:64 ++#: ../camel/camel-provider.c:62 + msgid "For reading mail as a query of another set of folders" + msgstr "Per leggere la posta come una ricerca di un altro insieme di cartelle" + +-#: ../camel/camel-provider.c:187 ++#: ../camel/camel-provider.c:184 + #, 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:196 ++#: ../camel/camel-provider.c:193 + #, c-format + msgid "Could not load %s: %s" + msgstr "Impossibile caricare %s: %s" + +-#: ../camel/camel-provider.c:204 ++#: ../camel/camel-provider.c:201 + #, c-format + msgid "Could not load %s: No initialization code in module." + msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo." + +-#: ../camel/camel-provider.c:376 ../camel/camel-session.c:177 ++#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177 + #, c-format +-msgid "No provider available for protocol `%s'" +-msgstr "Nessun fornitore disponibile per il protocollo \"%s\"" ++msgid "No provider available for protocol '%s'" ++msgstr "Nessun fornitore disponibile per il protocollo «%s»" + + #: ../camel/camel-sasl-anonymous.c:37 + msgid "Anonymous" +@@ -1965,7 +2079,7 @@ msgstr "Opzione per connessioni al serve + + #: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91 + msgid "Authentication failed." +-msgstr "Autenticazione non riuscita" ++msgstr "Autenticazione non riuscita." + + #: ../camel/camel-sasl-anonymous.c:133 + #, c-format +@@ -1994,11 +2108,11 @@ msgstr "" + "Informazioni di percorso non valide:\n" + "%s" + +-#: ../camel/camel-sasl-cram-md5.c:40 ++#: ../camel/camel-sasl-cram-md5.c:38 + msgid "CRAM-MD5" + msgstr "CRAM-MD5" + +-#: ../camel/camel-sasl-cram-md5.c:42 ++#: ../camel/camel-sasl-cram-md5.c:40 + msgid "" + "This option will connect to the server using a secure CRAM-MD5 password, if " + "the server supports it." +@@ -2006,11 +2120,11 @@ msgstr "" + "Opzione per connessioni al server usando una password CRAM-MD5 sicura, se il " + "server la supporta." + +-#: ../camel/camel-sasl-digest-md5.c:50 ++#: ../camel/camel-sasl-digest-md5.c:48 + msgid "DIGEST-MD5" + msgstr "DIGEST-MD5" + +-#: ../camel/camel-sasl-digest-md5.c:52 ++#: ../camel/camel-sasl-digest-md5.c:50 + msgid "" + "This option will connect to the server using a secure DIGEST-MD5 password, " + "if the server supports it." +@@ -2018,28 +2132,28 @@ msgstr "" + "Opzione per connessioni al server usando una password sicura DIGEST-MD5, se " + "il server la supporta." + +-#: ../camel/camel-sasl-digest-md5.c:820 ++#: ../camel/camel-sasl-digest-md5.c:845 + msgid "Server challenge too long (>2048 octets)" + msgstr "Server challenge troppo lungo (>2048 byte)" + +-#: ../camel/camel-sasl-digest-md5.c:829 ++#: ../camel/camel-sasl-digest-md5.c:854 + msgid "Server challenge invalid\n" + msgstr "Server challenge non valido\n" + +-#: ../camel/camel-sasl-digest-md5.c:835 ++#: ../camel/camel-sasl-digest-md5.c:860 + msgid "Server challenge contained invalid \"Quality of Protection\" token" + msgstr "" + "Il server challenge conteneva un token \"Quality of Protection\" non valido" + +-#: ../camel/camel-sasl-digest-md5.c:865 ++#: ../camel/camel-sasl-digest-md5.c:890 + msgid "Server response did not contain authorization data" + msgstr "La risposta del server non contiene dati per l'autenticazione" + +-#: ../camel/camel-sasl-digest-md5.c:883 ++#: ../camel/camel-sasl-digest-md5.c:908 + msgid "Server response contained incomplete authorization data" + msgstr "La risposta del server non contiene dati completi per l'autenticazione" + +-#: ../camel/camel-sasl-digest-md5.c:893 ++#: ../camel/camel-sasl-digest-md5.c:918 + msgid "Server response does not match" + msgstr "La risposta del server non corrisponde" + +@@ -2100,14 +2214,17 @@ msgstr "" + msgid "The supplied context handle did not refer to a valid context." + msgstr "L'handle del contenuto fornito non si riferisce a un contesto valido." + ++# GNOME-2-24 + #: ../camel/camel-sasl-gssapi.c:193 + msgid "The consistency checks performed on the input_token failed." +-msgstr "Il controllo di consistenza eseguito su input_token è fallito." ++msgstr "Verifiche di coerenze eseguite su input_token non riuscite." + ++# GNOME-2-24 + #: ../camel/camel-sasl-gssapi.c:196 + msgid "The consistency checks performed on the credential failed." +-msgstr "Il controllo di consistenza eseguito sulle credenziali è fallito." ++msgstr "Verifiche di coerenze eseguite su credential non riuscite." + ++# GNOME-2-24 + #: ../camel/camel-sasl-gssapi.c:199 + msgid "The referenced credentials have expired." + msgstr "Le credenziali di riferimento sono scadute." +@@ -2115,7 +2232,7 @@ msgstr "Le credenziali di riferimento so + #: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253 + #: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304 + #: ../camel/camel-sasl-kerberos4.c:231 +-#: ../camel/providers/imap/camel-imap-store.c:1317 ++#: ../camel/providers/imap/camel-imap-store.c:1272 + msgid "Bad authentication response from server." + msgstr "Risposta di autenticazione dal server errata." + +@@ -2133,13 +2250,14 @@ msgid "This option will connect to the s + msgstr "" + "Opzione per connessioni al server usando Kerberos 4 per l'autenticazione." + ++# GNOME-2-24 + #: ../camel/camel-sasl-kerberos4.c:174 + #, c-format + msgid "" + "Could not get Kerberos ticket:\n" + "%s" + msgstr "" +-"Impossibile avere il ticket di Kerberos:\n" ++"Impossibile ottenere il ticket di Kerberos:\n" + " %s" + + #: ../camel/camel-sasl-login.c:36 +@@ -2190,25 +2308,25 @@ msgstr "Autorizzazione POP prima di SMTP + msgid "POP Before SMTP auth using a non-pop source" + msgstr "Autorizzazione POP prima di SMTP usando una sorgente non-pop" + +-#: ../camel/camel-search-private.c:150 ++#: ../camel/camel-search-private.c:149 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "Compilazione dell'espressione regolare non riuscita: %s: %s" + +-#: ../camel/camel-service.c:272 ++#: ../camel/camel-service.c:270 + #, c-format + msgid "URL '%s' needs a username component" +-msgstr "URL \"%s\" necessita di un componente username" ++msgstr "URL «%s» necessita di un componente username" + +-#: ../camel/camel-service.c:276 ++#: ../camel/camel-service.c:274 + #, c-format + msgid "URL '%s' needs a host component" +-msgstr "URL \"%s\" necessita di un componente host" ++msgstr "URL «%s» necessita di un componente host" + +-#: ../camel/camel-service.c:280 ++#: ../camel/camel-service.c:278 + #, c-format + msgid "URL '%s' needs a path component" +-msgstr "URL \"%s\" necessita di un componente path" ++msgstr "URL «%s» necessita di un componente path" + + #: ../camel/camel-session.c:303 + #, c-format +@@ -2227,10 +2345,10 @@ msgstr "" + 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:234 ++#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778 + #, c-format + msgid "Cannot find certificate for '%s'" +-msgstr "Impossibile trovare certificato per \"%s\"" ++msgstr "Impossibile trovare certificato per «%s»" + + #: ../camel/camel-smime-context.c:240 + msgid "Cannot create CMS message" +@@ -2264,7 +2382,7 @@ msgstr "Impossibile aggiungere data firm + #: ../camel/camel-smime-context.c:298 ../camel/camel-smime-context.c:310 + #, c-format + msgid "Encryption certificate for '%s' does not exist" +-msgstr "Il certificato di crittografia per \"%s\" non esiste" ++msgstr "Il certificato di crittografia per «%s» non esiste" + + #: ../camel/camel-smime-context.c:317 + msgid "Cannot add SMIMEEncKeyPrefs attribute" +@@ -2286,13 +2404,15 @@ msgstr "Impossibile aggiungere informazi + msgid "Cannot create encoder context" + msgstr "Impossibile creare contesto del codificatore" + ++# GNOME-2-24 + #: ../camel/camel-smime-context.c:409 + msgid "Failed to add data to CMS encoder" +-msgstr "Aggiunta dei dati al codificatore CMS fallita" ++msgstr "Aggiunta dei dati al codificatore CMS non riuscita" + ++# GNOME-2-24 + #: ../camel/camel-smime-context.c:414 ../camel/camel-smime-context.c:868 + msgid "Failed to encode data" +-msgstr "Codifica dei dati fallita" ++msgstr "Codifica dei dati non riuscita" + + #: ../camel/camel-smime-context.c:487 + msgid "Unverified" +@@ -2373,14 +2493,10 @@ msgstr "Impossibile trovare le raccolte + msgid "Signer: %s <%s>: %s\n" + msgstr "Firmatario: %s <%s>: %s\n" + ++# GNOME-2-24 + #: ../camel/camel-smime-context.c:726 + msgid "Decoder failed" +-msgstr "Decodificatore fallito" +- +-#: ../camel/camel-smime-context.c:778 +-#, c-format +-msgid "Cannot find certificate for `%s'" +-msgstr "Impossibile trovare certificato per \"%s\"" ++msgstr "Decodificatore non riuscito" + + #: ../camel/camel-smime-context.c:785 + msgid "Cannot find common bulk encryption algorithm" +@@ -2415,15 +2531,16 @@ msgstr "Impossibile creare informazioni + msgid "Cannot add CMS Recipient information" + msgstr "Impossibile aggiungere informazioni destinatario CMS" + ++# GNOME-2-24 + #: ../camel/camel-smime-context.c:862 + msgid "Failed to add data to encoder" +-msgstr "Aggiunta dei dati al codificatore fallita" ++msgstr "Aggiunta dei dati al codificatore non riuscita" + +-# GNOME-2-22 ++# GNOME-2-24 + #: ../camel/camel-smime-context.c:949 + #, c-format + msgid "Decoder failed, error %d" +-msgstr "Decodificatore fallito, errore %d" ++msgstr "Decodificatore non riuscito, errore %d" + + # GNOME-2-22 + #: ../camel/camel-smime-context.c:956 +@@ -2438,58 +2555,62 @@ msgstr "importazione chiavi: non impleme + msgid "export keys: unimplemented" + msgstr "esportazione chiavi: non implementato" + +-#: ../camel/camel-store.c:219 ++# GNOME-2-24 ++#: ../camel/camel-store.c:272 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:174 + msgid "Cannot get folder: Invalid operation on this store" + msgstr "" +-"Impossibile ricevere la cartella: operazione non supportata in questo " ++"Impossibile ottenere la cartella: operazione non supportata in questo " + "archivio" + +-#: ../camel/camel-store.c:252 ++#: ../camel/camel-store.c:305 + #, c-format +-msgid "Cannot create folder `%s': folder exists" +-msgstr "Impossibile creare la cartella \"%s\": la cartella esiste" ++msgid "Cannot create folder '%s': folder exists" ++msgstr "Impossibile creare la cartella «%s»: la cartella esiste" + +-#: ../camel/camel-store.c:316 ++# GNOME-2-24 ++#: ../camel/camel-store.c:369 + msgid "Cannot create folder: Invalid operation on this store" + msgstr "" +-"Impossibile creare una cartella: operazione non supportata in questo archivio" ++"Impossibile creare una cartella: operazione non valida su questo archivio" + +-#: ../camel/camel-store.c:344 ++#: ../camel/camel-store.c:397 + #, c-format + msgid "Cannot create folder: %s: folder exists" +-msgstr "Impossibile creare la cartella \"%s\": esiste già" ++msgstr "Impossibile creare la cartella «%s»: esiste già" + +-#: ../camel/camel-store.c:408 ../camel/camel-vee-store.c:369 +-#: ../camel/providers/local/camel-maildir-store.c:218 ++#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384 ++#: ../camel/providers/local/camel-maildir-store.c:219 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Impossibile eliminare la cartella: %s: operazione non valida" + +-#: ../camel/camel-store.c:458 ../camel/camel-vee-store.c:406 +-#: ../camel/providers/local/camel-maildir-store.c:290 ++#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421 ++#: ../camel/providers/local/camel-maildir-store.c:291 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Impossibile rinominare la cartella %s: operazione non valida" + + #. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:799 ../camel/camel-vtrash-folder.c:52 +-#: ../camel/providers/imap/camel-imap-store.c:1077 ++#: ../camel/camel-store.c:856 ../camel/camel-vtrash-folder.c:53 ++#: ../camel/providers/imap/camel-imap-store.c:1060 + msgid "Trash" + msgstr "Cestino" + + #. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:802 ../camel/camel-vtrash-folder.c:54 ++#: ../camel/camel-store.c:859 ../camel/camel-vtrash-folder.c:55 + msgid "Junk" + msgstr "Indesiderata" + ++# GNOME-2-24 + #: ../camel/camel-tcp-stream-openssl.c:572 + msgid "Unable to get issuer's certificate" +-msgstr "Impossibile ricevere il certificato dall'emittente" ++msgstr "Impossibile ottenere il certificato dall'emittente" + ++# GNOME-2-24 + #: ../camel/camel-tcp-stream-openssl.c:574 + msgid "Unable to get Certificate Revocation List" +-msgstr "Impossibile ricevere l'elenco revoche dei certificati" ++msgstr "Impossibile ottenere l'elenco revoche dei certificati" + + #: ../camel/camel-tcp-stream-openssl.c:576 + msgid "Unable to decrypt certificate signature" +@@ -2543,9 +2664,10 @@ msgstr "Certificato autofirmato di profo + msgid "Self-signed certificate in chain" + msgstr "Certificato autofirmato in catena" + ++# GNOME-2-24 + #: ../camel/camel-tcp-stream-openssl.c:605 + msgid "Unable to get issuer's certificate locally" +-msgstr "Impossibile ricevere localmente il certificato dell'emittente" ++msgstr "Impossibile ottenere localmente il certificato dell'emittente" + + #: ../camel/camel-tcp-stream-openssl.c:607 + msgid "Unable to verify leaf signature" +@@ -2600,7 +2722,7 @@ msgstr "L'uso della chiave non consente + msgid "Error in application verification" + msgstr "Errore nella verifica dell'applicazione" + +-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:871 ++#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880 + #, c-format + msgid "" + "Issuer: %s\n" +@@ -2613,11 +2735,11 @@ msgstr "" + "Impronta digitale: %s\n" + "Firma: %s" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "GOOD" + msgstr "BENE" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "BAD" + msgstr "MALE" + +@@ -2641,7 +2763,7 @@ msgstr "" + "Accettare comunque?" + + #. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:881 ++#: ../camel/camel-tcp-stream-ssl.c:890 + #, c-format + msgid "" + "SSL Certificate check for %s:\n" +@@ -2655,7 +2777,7 @@ msgstr "" + "%s\n" + "Si desidera accettare?" + +-#: ../camel/camel-tcp-stream-ssl.c:925 ++#: ../camel/camel-tcp-stream-ssl.c:934 + #, c-format + msgid "" + "Certificate problem: %s\n" +@@ -2664,7 +2786,7 @@ msgstr "" + "Problema di certificato: %s\n" + "Emittente: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:977 ++#: ../camel/camel-tcp-stream-ssl.c:986 + #, c-format + msgid "" + "Bad certificate domain: %s\n" +@@ -2673,7 +2795,7 @@ msgstr "" + "Errato dominio del certificato: %s\n" + "Emittente: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:995 ++#: ../camel/camel-tcp-stream-ssl.c:1004 + #, c-format + msgid "" + "Certificate expired: %s\n" +@@ -2682,7 +2804,7 @@ msgstr "" + "Certificato scaduto: %s\n" + "Emittente: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1012 ++#: ../camel/camel-tcp-stream-ssl.c:1021 + #, c-format + msgid "" + "Certificate revocation list expired: %s\n" +@@ -2691,167 +2813,173 @@ msgstr "" + "L'elenco revoche dei certificati è scaduto: %s\n" + "Emittente: %s" + ++# GNOME-2-24 + #: ../camel/camel-url.c:313 + #, c-format +-msgid "Could not parse URL `%s'" +-msgstr "Impossibile interpretare URL \"%s\"" ++msgid "Could not parse URL '%s'" ++msgstr "Impossibile analizzare l'URL «%s»" + +-#: ../camel/camel-vee-folder.c:482 ++# GNOME-2-24 ++#: ../camel/camel-vee-folder.c:584 + #, c-format +-msgid "Error storing `%s': %s" +-msgstr "Errore durante la memorizzazione \"%s\": %s" ++msgid "Error storing '%s': %s" ++msgstr "Errore nell'archiaviare «%s»: %s" + +-#: ../camel/camel-vee-folder.c:524 ++#: ../camel/camel-vee-folder.c:638 + #, c-format + msgid "No such message %s in %s" + msgstr "Non è presente il messaggio %s in %s" + +-#: ../camel/camel-vee-folder.c:649 ../camel/camel-vee-folder.c:655 ++#: ../camel/camel-vee-folder.c:761 ../camel/camel-vee-folder.c:767 + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale" + +-#: ../camel/camel-vee-store.c:102 ../camel/camel-vee-store.c:345 ++#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115 ++#: ../camel/camel-vee-store.c:360 + msgid "Unmatched" + msgstr "Non corrispondenti" + +-#: ../camel/camel-vee-store.c:392 ++#: ../camel/camel-vee-store.c:407 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Impossibile eliminare la cartella %s: cartella inesistente" + +-#: ../camel/camel-vee-store.c:414 ++#: ../camel/camel-vee-store.c:429 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Impossibile rinominare la cartella %s: cartella inesistente" + +-#: ../camel/camel-vtrash-folder.c:53 ++#: ../camel/camel-vtrash-folder.c:54 + msgid "Cannot copy messages to the Trash folder" + msgstr "Impossibile copiare messaggi nella cartella cestino" + +-#: ../camel/camel-vtrash-folder.c:55 ++#: ../camel/camel-vtrash-folder.c:56 + msgid "Cannot copy messages to the Junk folder" + msgstr "Impossibile copiare messaggi nella cartella della posta indesiderata" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2167 ++# GNOME-2-24 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #, c-format + msgid "" + "Cannot get message: %s\n" + " %s" + msgstr "" +-"Impossibile ricevere il messaggio: %s\n" ++"Impossibile ottenere il messaggio: %s\n" + "%s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2167 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #: ../camel/providers/local/camel-maildir-folder.c:251 + #: ../camel/providers/local/camel-mbox-folder.c:348 + #: ../camel/providers/local/camel-mh-folder.c:204 + msgid "No such message" + msgstr "Messaggio assente" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:130 +-#: ../camel/providers/imap4/camel-imap4-folder.c:791 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:128 ++#: ../camel/providers/imap4/camel-imap4-folder.c:812 + #: ../camel/providers/nntp/camel-nntp-folder.c:156 + #: ../camel/providers/nntp/camel-nntp-folder.c:232 +-#: ../camel/providers/nntp/camel-nntp-folder.c:371 +-#: ../camel/providers/pop3/camel-pop3-folder.c:262 +-#: ../camel/providers/pop3/camel-pop3-folder.c:518 +-#: ../camel/providers/pop3/camel-pop3-folder.c:579 +-#: ../camel/providers/pop3/camel-pop3-folder.c:597 ++#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/pop3/camel-pop3-folder.c:266 ++#: ../camel/providers/pop3/camel-pop3-folder.c:559 ++#: ../camel/providers/pop3/camel-pop3-folder.c:620 ++#: ../camel/providers/pop3/camel-pop3-folder.c:638 + msgid "User canceled" + msgstr "Utente annullato" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137 +-#: ../camel/providers/imap4/camel-imap4-folder.c:796 ++# GNOME-2-24 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:135 ++#: ../camel/providers/imap4/camel-imap4-folder.c:817 + #: ../camel/providers/nntp/camel-nntp-folder.c:147 + #: ../camel/providers/nntp/camel-nntp-folder.c:149 + #: ../camel/providers/nntp/camel-nntp-folder.c:158 + #: ../camel/providers/nntp/camel-nntp-folder.c:234 +-#: ../camel/providers/pop3/camel-pop3-folder.c:521 +-#: ../camel/providers/pop3/camel-pop3-folder.c:582 +-#: ../camel/providers/pop3/camel-pop3-folder.c:589 +-#: ../camel/providers/pop3/camel-pop3-folder.c:600 ++#: ../camel/providers/pop3/camel-pop3-folder.c:386 ++#: ../camel/providers/pop3/camel-pop3-folder.c:562 ++#: ../camel/providers/pop3/camel-pop3-folder.c:623 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 ++#: ../camel/providers/pop3/camel-pop3-folder.c:641 + #, c-format + msgid "Cannot get message %s: %s" +-msgstr "Impossibile ricevere il messaggio: %s: %s" ++msgstr "Impossibile ottenere il messaggio: %s: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:154 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:162 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2141 +-#: ../camel/providers/imap4/camel-imap4-folder.c:814 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:152 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:160 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164 ++#: ../camel/providers/imap4/camel-imap4-folder.c:835 + msgid "This message is not available in offline mode." + msgstr "Questo messaggio non è disponibile in modalità fuori rete." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1690 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1737 ++# GNOME-2-24 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:172 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:179 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747 + msgid "Could not get message" +-msgstr "Impossibile ricevere il messaggio." ++msgstr "Impossibile ottenere il messaggio." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:816 +-#: ../camel/providers/imap/camel-imap-folder.c:265 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:818 ++#: ../camel/providers/imap/camel-imap-folder.c:248 + #, c-format + msgid "Could not load summary for %s" + msgstr "Impossibile caricare il sommario di %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1065 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071 + msgid "Trash Folder Full. Please Empty." + msgstr "Cestino pieno. Si prega di svuotarlo." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1242 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248 + #: ../camel/providers/groupwise/camel-groupwise-store.c:623 + #: ../camel/providers/groupwise/camel-groupwise-store.c:736 +-#: ../camel/providers/imap/camel-imap-folder.c:2538 +-#: ../camel/providers/imap/camel-imap-folder.c:2608 ++#: ../camel/providers/imap/camel-imap-folder.c:3193 ++#: ../camel/providers/imap/camel-imap-folder.c:3269 + #, c-format + msgid "Fetching summary information for new messages in %s" + msgstr "Recupero informazioni di sommario per nuovi messaggi in %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2008 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2050 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073 + #, c-format +-msgid "Cannot append message to folder `%s': %s" +-msgstr "Impossibile accodare il messaggio alla cartella \"%s\": %s" ++msgid "Cannot append message to folder '%s': %s" ++msgstr "Impossibile accodare il messaggio alla cartella «%s»: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2038 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061 + #, c-format + msgid "Cannot create message: %s" + msgstr "Impossibile creare il messaggio: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:284 ++# GNOME-2-24 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:285 + #, c-format + msgid "Cannot get folder container %s" +-msgstr "Impossibile ricevere il contenitore cartelle %s" ++msgstr "Impossibile ottenere il contenitore cartelle %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:348 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:349 + #: ../camel/providers/imap4/camel-imap4-journal.c:319 + msgid "Cannot append message in offline mode: cache unavailable" + msgstr "" + "Impossibile accodare messaggi in modalità fuori rete: cache non disponibile" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:364 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:365 + #: ../camel/providers/imap4/camel-imap4-journal.c:335 + #, c-format + msgid "Cannot append message in offline mode: %s" + msgstr "Impossibile accodare il messaggio in modalità fuori rete: %s" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:55 +-#: ../camel/providers/imap4/camel-imap4-provider.c:38 ++#: ../camel/providers/imap4/camel-imap4-provider.c:39 + msgid "Checking for new mail" + msgstr "Controllo nuova posta" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:57 + #: ../camel/providers/hula/camel-hula-provider.c:51 + #: ../camel/providers/imap/camel-imap-provider.c:46 +-#: ../camel/providers/imap4/camel-imap4-provider.c:40 ++#: ../camel/providers/imap4/camel-imap4-provider.c:41 + msgid "C_heck for new messages in all folders" + msgstr "Controllare la presen_za di nuovi messaggi in tutte le cartelle" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:60 +-#: ../camel/providers/imap/camel-imap-provider.c:66 +-#: ../camel/providers/imap4/camel-imap4-provider.c:51 ++#: ../camel/providers/imap/camel-imap-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:52 + #: ../camel/providers/local/camel-local-provider.c:46 + #: ../camel/providers/local/camel-local-provider.c:86 + #: ../camel/providers/local/camel-local-provider.c:106 +@@ -2872,7 +3000,7 @@ msgstr "Controllare contenuti in_desider + + # GNOME-2-22 + #: ../camel/providers/groupwise/camel-groupwise-provider.c:66 +-#: ../camel/providers/imap/camel-imap-provider.c:72 ++#: ../camel/providers/imap/camel-imap-provider.c:74 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Controllare i messa_ggi indesiderati sono nella cartella «In arrivo»" + +@@ -2898,8 +3026,8 @@ msgstr "Per accedere ai server GroupWise + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:106 + #: ../camel/providers/hula/camel-hula-provider.c:95 +-#: ../camel/providers/imap/camel-imap-provider.c:98 +-#: ../camel/providers/imap4/camel-imap4-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap4/camel-imap4-provider.c:84 + #: ../camel/providers/imapp/camel-imapp-provider.c:67 + #: ../camel/providers/nntp/camel-nntp-provider.c:74 + #: ../camel/providers/pop3/camel-pop3-provider.c:72 +@@ -2918,7 +3046,7 @@ msgid "Host or user not available in url + msgstr "Host o utente non disponibile nell'url" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:206 +-#: ../camel/providers/imap/camel-imap-store.c:1401 ++#: ../camel/providers/imap/camel-imap-store.c:1356 + msgid "You did not enter a password." + msgstr "Non è stata inserita alcuna password." + +@@ -2929,35 +3057,38 @@ msgstr "" + "versione del server corrente" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:532 +-#: ../camel/providers/imap/camel-imap-store.c:1912 +-#: ../camel/providers/imap/camel-imap-store.c:2103 ++#: ../camel/providers/imap/camel-imap-store.c:1846 ++#: ../camel/providers/imap/camel-imap-store.c:2044 + #, c-format + msgid "No such folder %s" + msgstr "Non è presente la cartella %s" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1217 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1219 + msgid "Cannot create GroupWise folders in offline mode." + msgstr "Impossibile creare cartelle GroupWise in modalità fuori rete." + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1231 +-#: ../camel/providers/imap/camel-imap-store.c:1987 +-#: ../camel/providers/imap/camel-imap-store.c:2356 ++# GNOME-2-24 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1233 ++#: ../camel/providers/imap/camel-imap-store.c:1921 ++#: ../camel/providers/imap/camel-imap-store.c:2301 + msgid "The parent folder is not allowed to contain subfolders" +-msgstr "Alla cartella madre non è permesso contenere sottocartelle" ++msgstr "" ++"Alla cartella di livello superiore non è permesso contenere sottocartelle" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1307 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328 ++# GNOME-2-24 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1309 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1330 + #, c-format +-msgid "Cannot rename Groupwise folder `%s' to `%s'" +-msgstr "Impossibile rinominare la cartella \"%s\" in \"%s\"" ++msgid "Cannot rename Groupwise folder '%s' to '%s'" ++msgstr "Impossibile rinominare la cartella Groupwise «%s» in «%s»" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1360 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:121 + #, c-format + msgid "GroupWise server %s" + msgstr "Server GroupWise %s" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1364 + #, c-format + msgid "GroupWise service for %s on %s" + msgstr "Servizio GroupWise per %s su %s" +@@ -2993,36 +3124,36 @@ msgid "Checking for New Mail" + msgstr "Controllo nuova posta" + + #: ../camel/providers/hula/camel-hula-provider.c:54 +-#: ../camel/providers/imap/camel-imap-provider.c:50 ++#: ../camel/providers/imap/camel-imap-provider.c:52 + msgid "Connection to Server" + msgstr "Connessione al server" + + #: ../camel/providers/hula/camel-hula-provider.c:56 +-#: ../camel/providers/imap/camel-imap-provider.c:52 ++#: ../camel/providers/imap/camel-imap-provider.c:54 + msgid "_Use custom command to connect to server" + msgstr "_Usare un comando personalizzato per connettersi al server" + + #: ../camel/providers/hula/camel-hula-provider.c:58 +-#: ../camel/providers/imap/camel-imap-provider.c:54 ++#: ../camel/providers/imap/camel-imap-provider.c:56 + msgid "Command:" + msgstr "Comando:" + + #: ../camel/providers/hula/camel-hula-provider.c:61 +-#: ../camel/providers/imap/camel-imap-provider.c:58 +-#: ../camel/providers/imap4/camel-imap4-provider.c:43 ++#: ../camel/providers/imap/camel-imap-provider.c:60 ++#: ../camel/providers/imap4/camel-imap4-provider.c:44 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Cartelle" + + #: ../camel/providers/hula/camel-hula-provider.c:63 +-#: ../camel/providers/imap/camel-imap-provider.c:60 +-#: ../camel/providers/imap4/camel-imap4-provider.c:45 ++#: ../camel/providers/imap/camel-imap-provider.c:62 ++#: ../camel/providers/imap4/camel-imap4-provider.c:46 + msgid "_Show only subscribed folders" + msgstr "Mostrare _solo le cartelle a cui si è effettuata la sottoscrizione" + + #: ../camel/providers/hula/camel-hula-provider.c:65 +-#: ../camel/providers/imap/camel-imap-provider.c:62 +-#: ../camel/providers/imap4/camel-imap4-provider.c:47 ++#: ../camel/providers/imap/camel-imap-provider.c:64 ++#: ../camel/providers/imap4/camel-imap4-provider.c:48 + msgid "O_verride server-supplied folder namespace" + msgstr "So_vrascrivere lo spazio nomi cartelle fornito dal server" + +@@ -3043,22 +3174,34 @@ msgid "This option will connect to the H + msgstr "" + "Opzione per connessioni al server Hula usando una password di testo semplice." + +-#: ../camel/providers/imap/camel-imap-command.c:224 +-#: ../camel/providers/imap/camel-imap-command.c:266 +-#: ../camel/providers/imap/camel-imap-command.c:472 +-#: ../camel/providers/imap/camel-imap-store.c:3058 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-command.c:183 ++#: ../camel/providers/imap/camel-imap-command.c:267 ++msgid "No output stream" ++msgstr "Nessuno stream di output" ++ ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-command.c:188 ++#: ../camel/providers/imap/camel-imap-command.c:272 ++msgid "No input stream" ++msgstr "Nessuno stream di input" ++ ++#: ../camel/providers/imap/camel-imap-command.c:231 ++#: ../camel/providers/imap/camel-imap-command.c:280 ++#: ../camel/providers/imap/camel-imap-command.c:494 ++#: ../camel/providers/imap/camel-imap-store.c:3034 + msgid "Operation cancelled" + msgstr "Operazione annullata" + +-#: ../camel/providers/imap/camel-imap-command.c:311 +-#: ../camel/providers/imap/camel-imap-store.c:3061 ++#: ../camel/providers/imap/camel-imap-command.c:333 ++#: ../camel/providers/imap/camel-imap-store.c:3037 + #, c-format + msgid "Server unexpectedly disconnected: %s" + msgstr "Disconnessione inattesa del server: %s" + + #. for imap ALERT codes, account user@host + #. we might get a ']' from a BAD response since we +12, but who cares? +-#: ../camel/providers/imap/camel-imap-command.c:332 ++#: ../camel/providers/imap/camel-imap-command.c:354 + #, c-format + msgid "" + "Alert from IMAP server %s@%s:\n" +@@ -3067,224 +3210,251 @@ msgstr "" + "Avvertenza dal server IMAP %s@%s:\n" + "%s" + +-#: ../camel/providers/imap/camel-imap-command.c:401 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-command.c:423 + #, c-format + msgid "Unexpected response from IMAP server: %s" +-msgstr "Risposta inaspettata dal server IMAP: %s" ++msgstr "Risposta inattesa dal server IMAP: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:411 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-command.c:433 + #, c-format + msgid "IMAP command failed: %s" +-msgstr "Comando IMAP fallito: %s" ++msgstr "Comando IMAP non riuscito: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:486 ++#: ../camel/providers/imap/camel-imap-command.c:508 + msgid "Server response ended too soon." + msgstr "La risposta del server è terminata troppo presto." + +-#: ../camel/providers/imap/camel-imap-command.c:693 ++#: ../camel/providers/imap/camel-imap-command.c:715 + #, c-format + msgid "IMAP server response did not contain %s information" + msgstr "La risposta del server IMAP non contiene informazione %s" + +-#: ../camel/providers/imap/camel-imap-command.c:729 ++#: ../camel/providers/imap/camel-imap-command.c:751 + #, c-format + msgid "Unexpected OK response from IMAP server: %s" + msgstr "Risposta OK inattesa dal server IMAP: %s" + + # GNOME-2-22 +-#: ../camel/providers/imap/camel-imap-folder.c:87 ++#: ../camel/providers/imap/camel-imap-folder.c:88 + 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:246 ++#: ../camel/providers/imap/camel-imap-folder.c:229 + #, c-format + msgid "Could not create directory %s: %s" + msgstr "Impossibile creare la directory %s: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:350 +-msgid "Folder was destroyed and recreated on server." +-msgstr "La cartella è stata distrutta e ricreata sul server." +- + #. Check UIDs and flags of all messages we already know of. +-#: ../camel/providers/imap/camel-imap-folder.c:682 ++#: ../camel/providers/imap/camel-imap-folder.c:844 + #, c-format + msgid "Scanning for changed messages in %s" + msgstr "Scansione per messaggi cambiati in %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2127 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-folder.c:1869 ++#, c-format ++msgid "Unexpected response status '%s' after APPEND command" ++msgstr "Stato di risposta «%s» inatteso dopo il comando APPEND" ++ ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-folder.c:1884 ++msgid "No response on continuation after APPEND command" ++msgstr "Nessuna risposta sulla continuazione dopo il comando APPEND" ++ ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-folder.c:1926 ++msgid "Unknown error occurred during APPEND command!" ++msgstr "Errore sconosciuto verificatosi durante il comando APPEND!" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2738 + #, c-format + msgid "Unable to retrieve message: %s" + msgstr "Impossibile recuperare il messaggio: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2206 +-#: ../camel/providers/imap/camel-imap-folder.c:2892 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-folder.c:2779 ++#, c-format ++msgid "Cannot get message with message ID %s: %s" ++msgstr "Impossibile ottenere il messaggio avente ID %s: %s" ++ ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-folder.c:2780 ++msgid "No such message available." ++msgstr "Nessun messaggio disponibile." ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2819 ++#: ../camel/providers/imap/camel-imap-folder.c:3571 + #: ../camel/providers/nntp/camel-nntp-folder.c:220 + msgid "This message is not currently available" + msgstr "Questo messaggio non è al momento disponibile" + +-#: ../camel/providers/imap/camel-imap-folder.c:2727 ++#: ../camel/providers/imap/camel-imap-folder.c:3398 + #, c-format + msgid "Incomplete server response: no information provided for message %d" + msgstr "" + "Risposta del server incompleta: non è stata fornita nessuna informazione per " + "il messaggio %d" + +-#: ../camel/providers/imap/camel-imap-folder.c:2735 ++#: ../camel/providers/imap/camel-imap-folder.c:3406 + #, c-format + msgid "Incomplete server response: no UID provided for message %d" + msgstr "" + "Risposta del server incompleta: non è stato fornito nessun UID per il " + "messaggio %d" + +-#: ../camel/providers/imap/camel-imap-folder.c:2748 +-#, c-format +-msgid "" +-"Unexpected server response: Identical UIDs provided for messages %d and %d" +-msgstr "" +-"Risposta del server inaspettata: UID identici forniti per i messaggi %d e %d" +- +-#: ../camel/providers/imap/camel-imap-folder.c:2930 ++#: ../camel/providers/imap/camel-imap-folder.c:3609 + 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:161 ++#: ../camel/providers/imap/camel-imap-message-cache.c:160 ++#: ../camel/providers/imap/camel-imap-message-cache.c:220 + #, c-format + msgid "Could not open cache directory: %s" + msgstr "Impossibile aprire la directory cache: %s" + +-# il primo %s è l'UID del messaggio ++# GNOME-2-24 + # +-#: ../camel/providers/imap/camel-imap-message-cache.c:267 +-#: ../camel/providers/imap/camel-imap-message-cache.c:324 +-#: ../camel/providers/imap/camel-imap-message-cache.c:355 +-#: ../camel/providers/imap/camel-imap-message-cache.c:387 ++# il primo %s è l'UID del messaggio ++#: ../camel/providers/imap/camel-imap-message-cache.c:307 ++#: ../camel/providers/imap/camel-imap-message-cache.c:364 ++#: ../camel/providers/imap/camel-imap-message-cache.c:395 ++#: ../camel/providers/imap/camel-imap-message-cache.c:427 + #, c-format + msgid "Failed to cache message %s: %s" +-msgstr "Inserimento del messaggio %s nella cache fallito: %s" ++msgstr "Inserimento del messaggio %s nella cache non riuscito: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:438 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-message-cache.c:478 + #, c-format + msgid "Failed to cache %s: %s" +-msgstr "Inserimento di %s nella cache fallito: %s" ++msgstr "Inserimento di %s nella cache non riuscito: %s" + +-#: ../camel/providers/imap/camel-imap-provider.c:64 +-#: ../camel/providers/imap4/camel-imap4-provider.c:49 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-provider.c:48 ++msgid "Ch_eck for new messages in subscribed folders" ++msgstr "Controllare la pr_esenza di nuovi messaggi nelle cartella sottoscritte" ++ ++#: ../camel/providers/imap/camel-imap-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:50 + msgid "Namespace:" + msgstr "Spazio dei nomi:" + + # GNOME-2-22 + # SYNC +-#: ../camel/providers/imap/camel-imap-provider.c:68 +-#: ../camel/providers/imap4/camel-imap4-provider.c:53 ++#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap4/camel-imap4-provider.c:54 + msgid "_Apply filters to new messages in INBOX on this server" + msgstr "A_pplicare filtri ai nuovi messaggi in «In arrivo» su questo server" + + # GNOME-2-22 + # SYNC +-#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap/camel-imap-provider.c:72 + msgid "Check new messages for Jun_k contents" + msgstr "Controllare contenuti in_desiderati nei nuovi messaggi" + +-#: ../camel/providers/imap/camel-imap-provider.c:74 +-#: ../camel/providers/imap4/camel-imap4-provider.c:59 ++#: ../camel/providers/imap/camel-imap-provider.c:76 ++#: ../camel/providers/imap4/camel-imap4-provider.c:60 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "Sincroniz_zare localmente la posta remota in modo automatico" + +-#: ../camel/providers/imap/camel-imap-provider.c:81 ++#: ../camel/providers/imap/camel-imap-provider.c:83 + msgid "IMAP" + msgstr "IMAP" + +-#: ../camel/providers/imap/camel-imap-provider.c:83 ++#: ../camel/providers/imap/camel-imap-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-provider.c:100 ++#: ../camel/providers/imap/camel-imap-provider.c:102 + #: ../camel/providers/imapp/camel-imapp-provider.c:69 + 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/providers/imap/camel-imap-store.c:457 +-#: ../camel/providers/imap4/camel-imap4-store.c:212 ++#: ../camel/providers/imap/camel-imap-store.c:436 ++#: ../camel/providers/imap4/camel-imap4-store.c:214 + #, c-format + msgid "IMAP server %s" + msgstr "Server IMAP %s" + +-#: ../camel/providers/imap/camel-imap-store.c:459 +-#: ../camel/providers/imap4/camel-imap4-store.c:214 ++#: ../camel/providers/imap/camel-imap-store.c:438 ++#: ../camel/providers/imap4/camel-imap4-store.c:216 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "Servizio IMAP per %s su %s" + +-#: ../camel/providers/imap/camel-imap-store.c:587 +-#: ../camel/providers/imap/camel-imap-store.c:602 +-#: ../camel/providers/imap4/camel-imap4-store.c:249 +-#: ../camel/providers/imap4/camel-imap4-store.c:264 ++#: ../camel/providers/imap/camel-imap-store.c:567 ++#: ../camel/providers/imap/camel-imap-store.c:582 ++#: ../camel/providers/imap4/camel-imap4-store.c:251 ++#: ../camel/providers/imap4/camel-imap4-store.c:266 + #: ../camel/providers/nntp/camel-nntp-store.c:183 + #: ../camel/providers/nntp/camel-nntp-store.c:198 +-#: ../camel/providers/pop3/camel-pop3-store.c:173 +-#: ../camel/providers/pop3/camel-pop3-store.c:187 +-#: ../camel/providers/smtp/camel-smtp-transport.c:258 +-#: ../camel/providers/smtp/camel-smtp-transport.c:273 ++#: ../camel/providers/pop3/camel-pop3-store.c:171 ++#: ../camel/providers/pop3/camel-pop3-store.c:185 ++#: ../camel/providers/smtp/camel-smtp-transport.c:260 ++#: ../camel/providers/smtp/camel-smtp-transport.c:275 + #, c-format + msgid "Could not connect to %s: %s" + msgstr "Impossibile connettersi a %s: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:588 +-#: ../camel/providers/imap4/camel-imap4-store.c:250 ++#: ../camel/providers/imap/camel-imap-store.c:568 ++#: ../camel/providers/imap4/camel-imap4-store.c:252 + #: ../camel/providers/nntp/camel-nntp-store.c:184 +-#: ../camel/providers/pop3/camel-pop3-store.c:174 +-#: ../camel/providers/smtp/camel-smtp-transport.c:259 ++#: ../camel/providers/pop3/camel-pop3-store.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:261 + msgid "SSL unavailable" + msgstr "SSL non disponibile" + +-#: ../camel/providers/imap/camel-imap-store.c:599 +-#: ../camel/providers/imap/camel-imap-store.c:881 ++#: ../camel/providers/imap/camel-imap-store.c:579 ++#: ../camel/providers/imap/camel-imap-store.c:861 + msgid "Connection cancelled" + msgstr "Connessione annullata" + +-#: ../camel/providers/imap/camel-imap-store.c:710 +-#: ../camel/providers/imap/camel-imap-store.c:729 +-#: ../camel/providers/imap/camel-imap-store.c:735 +-#: ../camel/providers/imap/camel-imap-store.c:761 +-#: ../camel/providers/imap4/camel-imap4-store.c:312 +-#: ../camel/providers/imap4/camel-imap4-store.c:327 +-#: ../camel/providers/imap4/camel-imap4-store.c:335 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-store.c:690 ++#: ../camel/providers/imap/camel-imap-store.c:709 ++#: ../camel/providers/imap/camel-imap-store.c:715 ++#: ../camel/providers/imap/camel-imap-store.c:741 ++#: ../camel/providers/imap4/camel-imap4-store.c:314 ++#: ../camel/providers/imap4/camel-imap4-store.c:329 ++#: ../camel/providers/imap4/camel-imap4-store.c:338 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" +-msgstr "Connessione al server IMAP %s in modalità sicura fallita: %s" ++msgstr "Connessione al server IMAP %s in modalità sicura non riuscita: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:711 +-#: ../camel/providers/smtp/camel-smtp-transport.c:331 ++#: ../camel/providers/imap/camel-imap-store.c:691 ++#: ../camel/providers/smtp/camel-smtp-transport.c:333 + msgid "STARTTLS not supported" + msgstr "STARTTLS non supportata" + +-#: ../camel/providers/imap/camel-imap-store.c:730 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-store.c:710 + msgid "SSL negotiations failed" +-msgstr "Negoziazioni SSL fallite" ++msgstr "Negoziazioni SSL non riuscite" + +-# ################## +-#: ../camel/providers/imap/camel-imap-store.c:736 +-#: ../camel/providers/imap4/camel-imap4-store.c:336 +-#: ../camel/providers/smtp/camel-smtp-transport.c:370 ++#: ../camel/providers/imap/camel-imap-store.c:716 ++#: ../camel/providers/imap4/camel-imap4-store.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:372 + msgid "SSL is not available in this build" + msgstr "SSL non è disponibile in questo eseguibile" + +-#: ../camel/providers/imap/camel-imap-store.c:884 ++#: ../camel/providers/imap/camel-imap-store.c:864 + #, c-format + msgid "Could not connect with command \"%s\": %s" +-msgstr "Impossibile connettersi con il comando \"%s\": %s" ++msgstr "Impossibile connettersi con il comando «%s»: %s" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imap/camel-imap-store.c:1069 +-#: ../camel/providers/imap/camel-imap-store.c:2452 +-#: ../camel/providers/imap4/camel-imap4-store-summary.c:367 +-#: ../camel/providers/imap4/camel-imap4-store.c:1326 ++#: ../camel/providers/imap/camel-imap-store.c:1052 ++#: ../camel/providers/imap/camel-imap-store.c:2397 ++#: ../camel/providers/imap4/camel-imap4-store-summary.c:368 ++#: ../camel/providers/imap4/camel-imap4-store.c:1408 + #: ../camel/providers/local/camel-maildir-folder.c:77 +-#: ../camel/providers/local/camel-maildir-store.c:218 +-#: ../camel/providers/local/camel-maildir-store.c:290 +-#: ../camel/providers/local/camel-maildir-store.c:514 +-#: ../camel/providers/local/camel-maildir-store.c:527 ++#: ../camel/providers/local/camel-maildir-store.c:219 ++#: ../camel/providers/local/camel-maildir-store.c:291 ++#: ../camel/providers/local/camel-maildir-store.c:517 ++#: ../camel/providers/local/camel-maildir-store.c:530 + #: ../camel/providers/local/camel-spool-store.c:464 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264 + msgid "Inbox" +@@ -3292,33 +3462,33 @@ msgstr "In arrivo" + + # Traduzione in outlook/echange + # +-#: ../camel/providers/imap/camel-imap-store.c:1071 ++#: ../camel/providers/imap/camel-imap-store.c:1054 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263 + msgid "Drafts" + msgstr "Bozze" + + # GNOME-2-22 +-#: ../camel/providers/imap/camel-imap-store.c:1073 ++#: ../camel/providers/imap/camel-imap-store.c:1056 + msgid "Sent" + msgstr "Inviata" + + # GNOME-2-22 +-#: ../camel/providers/imap/camel-imap-store.c:1075 ++#: ../camel/providers/imap/camel-imap-store.c:1058 + msgid "Templates" + msgstr "Modelli" + +-#: ../camel/providers/imap/camel-imap-store.c:1348 ++#: ../camel/providers/imap/camel-imap-store.c:1303 + #, c-format + msgid "IMAP server %s does not support requested authentication type %s" + msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s " + +-#: ../camel/providers/imap/camel-imap-store.c:1358 +-#: ../camel/providers/smtp/camel-smtp-transport.c:504 ++#: ../camel/providers/imap/camel-imap-store.c:1313 ++#: ../camel/providers/smtp/camel-smtp-transport.c:507 + #, c-format + msgid "No support for authentication type %s" + msgstr "Nessun supporto per il tipo di autenticazione %s" + +-#: ../camel/providers/imap/camel-imap-store.c:1430 ++#: ../camel/providers/imap/camel-imap-store.c:1385 + #, c-format + msgid "" + "Unable to authenticate to IMAP server.\n" +@@ -3329,205 +3499,246 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/imap/camel-imap-store.c:1924 +-#: ../camel/providers/imap/camel-imap-store.c:2294 +-#: ../camel/providers/imap4/camel-imap4-store.c:956 ++#: ../camel/providers/imap/camel-imap-store.c:1858 ++#: ../camel/providers/imap/camel-imap-store.c:2239 ++#: ../camel/providers/imap4/camel-imap4-store.c:959 + #, c-format + 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" +-"\"" ++"Il nome della cartella «%s» non è valido perché contiene il carattere \"%c\"" + +-#: ../camel/providers/imap/camel-imap-store.c:2041 +-#: ../camel/providers/local/camel-maildir-store.c:191 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-store.c:1975 ++#: ../camel/providers/local/camel-maildir-store.c:192 + #: ../camel/providers/local/camel-mbox-store.c:204 + #: ../camel/providers/local/camel-mh-store.c:249 + #, c-format +-msgid "Cannot create folder `%s': folder exists." +-msgstr "Impossibile creare la cartella: \"%s\": la cartella esiste." ++msgid "Cannot create folder '%s': folder exists." ++msgstr "Impossibile creare la cartella «%s¢: la cartella esiste." + +-#: ../camel/providers/imap/camel-imap-store.c:2305 ++# GNOME-2-24 ++#: ../camel/providers/imap/camel-imap-store.c:2250 + #, c-format + msgid "Unknown parent folder: %s" +-msgstr "Cartella madre sconosciuta: %s" ++msgstr "Cartella di livello superiore sconosciuta: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:550 +-#: ../camel/providers/imap4/camel-imap4-command.c:557 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-command.c:576 ++#: ../camel/providers/imap4/camel-imap4-command.c:583 + #, c-format + msgid "Failed sending command to IMAP server %s: %s" +-msgstr "Spedizione del comando al server IMAP %s fallita: %s" ++msgstr "Invio del comando al server IMAP %s non riuscito: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:660 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-command.c:686 + #, c-format + msgid "Unexpected response from IMAP4 server %s: %s" +-msgstr "Risposta inatteso dal server IMAP4 %s: %s" ++msgstr "Risposta inattesa dal server IMAP4 %s: %s" + + #: ../camel/providers/imap4/camel-imap4-engine.c:221 + #, c-format + msgid "Unexpected greeting from IMAP server %s." + msgstr "Messaggio di benvenuto inatteso dal server IMAP %s." + +-#: ../camel/providers/imap4/camel-imap4-engine.c:431 ++#: ../camel/providers/imap4/camel-imap4-engine.c:450 ++#, c-format ++msgid "Cannot select folder '%s': Invalid mailbox name" ++msgstr "Impossibile selezionare la cartella «%s»: nome mailbox non valido" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:456 + #, c-format +-msgid "Cannot select folder `%s': Invalid mailbox name" +-msgstr "Impossibile selezionare la cartella \"%s\": nome mailbox non valido" ++msgid "Cannot select folder '%s': Bad command" ++msgstr "Impossibile selezionare la cartella «%s»: comando errato" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:437 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1433 + #, c-format +-msgid "Cannot select folder `%s': Bad command" +-msgstr "Impossibile selezionare la cartella \"%s\": comando errato" ++msgid "Failed to send command to IMAP server %s: %s" ++msgstr "Invio del comando al server IMAP %s non riuscito: %s" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:1547 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1586 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1631 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1687 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1435 ++msgid "service unavailable" ++msgstr "servizio non disponibile" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:1569 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1608 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1653 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1709 + #, c-format + msgid "IMAP4 server %s unexpectedly disconnected: %s" + msgstr "Disconnessione inattesa del server IMAP4 %s: %s" + ++# GNOME-2-24 + #: ../camel/providers/imap4/camel-imap4-folder.c:89 + msgid "" +-"Enable Mailing-List detection required for some filter and vFolder rules" ++"Enable extended Mailing-List detection required for some filter and vFolder " ++"rules" + msgstr "" +-"Abilitazione del rilevamento mailing-list richiesto per alcune regole di " +-"filtri e cartelle virtuali" ++"È richiesta l'abilitazione del rilevamento mailing-list per alcune regole di " ++"filtri e di cartelle virtuali" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:402 +-#, c-format +-msgid "Cannot access folder `%s': %s" +-msgstr "Impossibile accedere alla cartella \"%s\": %s" ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:90 ++msgid "Expire cached messages that haven't been read in X seconds" ++msgstr "Rende scaduti i messaggi in cache non letti entro X secondi" ++ ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:91 ++msgid "Expire cached messages older than X seconds" ++msgstr "Rende scaduti i messaggi in cache più vecchi di X secondi" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:461 ++#: ../camel/providers/imap4/camel-imap4-folder.c:423 + #, c-format +-msgid "Cannot sync flags to folder `%s': Unknown" +-msgstr "Impossibile sincronizzare le flag sulla cartella \"%s\": sconosciuta" ++msgid "Cannot access folder '%s': %s" ++msgstr "Impossibile accedere alla cartella «%s»: %s" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:467 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:482 + #, c-format +-msgid "Cannot sync flags to folder `%s': Bad command" ++msgid "Cannot sync flags to folder '%s': Unknown error" + msgstr "" +-"Impossibile sincronizzare le flags alla cartella \"%s\": comando errato" ++"Impossibile sincronizzare le flag sulla cartella «%s»: errore sconosciuto" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:607 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:488 + #, c-format +-msgid "Cannot expunge folder `%s': Unknown" +-msgstr "Impossibile ripulire la cartella \"%s\": sconosciuto" ++msgid "Cannot sync flags to folder '%s': Bad command" ++msgstr "Impossibile sincronizzare le flags sulla cartella «%s»: comando errato" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:612 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:628 + #, c-format +-msgid "Cannot expunge folder `%s': Bad command" +-msgstr "Impossibile ripulire la cartella \"%s\": comando errato" ++msgid "Cannot expunge folder '%s': Unknown error" ++msgstr "Impossibile ripulire la cartella «%s»: errore sconosciuto" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:868 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:633 + #, c-format +-msgid "Cannot get message %s from folder `%s': No such message" ++msgid "Cannot expunge folder '%s': Bad command" ++msgstr "Impossibile ripulire la cartella «%s»: comando errato" ++ ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:889 ++#, c-format ++msgid "Cannot get message %s from folder '%s': No such message" + msgstr "" +-"Impossibile ricevere il messaggio %s dalla cartella \"%s\": nessun messaggio" ++"Impossibile ottenere il messaggio %s dalla cartella «%s»: nessun messaggio" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:873 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:894 + #, c-format +-msgid "Cannot get message %s from folder `%s': Bad command" ++msgid "Cannot get message %s from folder '%s': Bad command" + msgstr "" +-"Impossibile ricevere il messaggio %s dalla cartella \"%s\": comando errato" ++"Impossibile ottenere il messaggio %s dalla cartella «%s»: comando errato" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:917 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:938 + #, c-format +-msgid "Cannot append message to folder `%s': Folder is read-only" ++msgid "Cannot append message to folder '%s': Folder is read-only" + msgstr "" +-"Impossibile accodare il messaggio alla cartella \"%s\": la cartella è a sola " ++"Impossibile accodare il messaggio sulla cartella «%s»: la cartella è in sola " + "lettura" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1010 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1031 + #, c-format +-msgid "Cannot append message to folder `%s': Unknown error" ++msgid "Cannot append message to folder '%s': Unknown error" + msgstr "" +-"Impossibile accodare il messaggio alla cartella \"%s\": errore sconosciuto" ++"Impossibile accodare il messaggio sulla cartella «%s»: errore sconosciuto" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1040 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1061 + #, c-format +-msgid "Cannot append message to folder `%s': Bad command" +-msgstr "Impossibile accodare il messaggio alla cartella \"%s\": comando errato" ++msgid "Cannot append message to folder '%s': Bad command" ++msgstr "Impossibile accodare il messaggio sylla cartella «%s»: comando errato" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1160 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1181 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown" ++msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" + msgstr "" +-"Impossibile spostare messaggi dalla cartella \"%s\" alla cartella \"%s\": " +-"motivo sconosciuto" ++"Impossibile spostare messaggi dalla cartella «%s» alla cartella «%s»: motivo " ++"sconosciuto" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1164 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1185 + #, c-format +-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown" ++msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" + msgstr "" +-"Impossibile copiare messaggi dalla cartella \"%s\" alla cartella \"%s\": " +-"motivo sconosciuto" ++"Impossibile copiare messaggi dalla cartella «%s» alla cartella «%s»: motivo " ++"sconosciuto" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1172 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1193 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command" ++msgid "Cannot move messages from folder '%s' to folder '%s': Bad command" + msgstr "" +-"Impossibile spostare messaggi dalla cartella \"%s\" alla cartella \"%s\": " ++"Impossibile spostare messaggi dalla cartella «%s» alla cartella «%s»: " + "comando errato" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1176 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1197 + #, c-format +-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command" ++msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command" + msgstr "" +-"Impossibile copiare messaggi dalla cartella \"%s\" alla cartella \"%s\": " +-"comando errato" ++"Impossibile copiare messaggi dalla cartella «%s» alla cartella «%s»: comando " ++"errato" + + # GNOME-2-22 + # SYNC +-#: ../camel/providers/imap4/camel-imap4-provider.c:55 ++#: ../camel/providers/imap4/camel-imap4-provider.c:56 + msgid "Check new messages for _Junk contents" + msgstr "Controllare contenuti in_desiderati nei nuovi messaggi" + + # GNOME-2-22 + # SYNC +-#: ../camel/providers/imap4/camel-imap4-provider.c:57 ++#: ../camel/providers/imap4/camel-imap4-provider.c:58 + msgid "Only check for Junk messa_ges in the INBOX folder" + msgstr "Controllare i messa_ggi indesiderati sono nella cartella «In arrivo»" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:67 + msgid "IMAP4rev1" + msgstr "IMAP4rev1" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:69 + msgid "For reading and storing mail on IMAPv4rev1 servers." + msgstr "Per leggere e memorizzare la posta su server IMAPv4rev1." + +-#: ../camel/providers/imap4/camel-imap4-provider.c:85 ++#: ../camel/providers/imap4/camel-imap4-provider.c:86 + msgid "" + "This option will connect to the IMAPv4rev1 server using a plaintext password." + msgstr "" + "Opzione per connessioni al server IMAPv4rev1 usando una password in testo " + "semplice." + +-#: ../camel/providers/imap4/camel-imap4-store.c:261 ++#: ../camel/providers/imap4/camel-imap4-store.c:263 + #: ../camel/providers/imapp/camel-imapp-store.c:249 + #: ../camel/providers/nntp/camel-nntp-store.c:195 + #: ../camel/providers/nntp/camel-nntp-store.c:214 +-#: ../camel/providers/pop3/camel-pop3-store.c:184 +-#: ../camel/providers/smtp/camel-smtp-transport.c:270 ++#: ../camel/providers/pop3/camel-pop3-store.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:272 + msgid "Connection canceled" + msgstr "Connessione annullata" + +-#: ../camel/providers/imap4/camel-imap4-store.c:298 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:300 + #, c-format + msgid "" + "Failed to connect to IMAP server %s in secure mode: Server does not support " + "STARTTLS" + msgstr "" +-"Connessione al server IMAP %s in modalità sicura fallita: il server non " ++"Connessione al server IMAP %s in modalità sicura non riuscita: il server non " + "supporta STARTTLS" + +-#: ../camel/providers/imap4/camel-imap4-store.c:328 +-#: ../camel/providers/pop3/camel-pop3-store.c:252 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:330 ++#: ../camel/providers/pop3/camel-pop3-store.c:250 + msgid "TLS negotiations failed" +-msgstr "Negoziazioni TLS fallite" ++msgstr "Negoziazioni TLS non riuscite" + +-#: ../camel/providers/imap4/camel-imap4-store.c:412 ++#: ../camel/providers/imap4/camel-imap4-store.c:415 + #, c-format + msgid "" + "Cannot authenticate to IMAP server %s using the %s authentication mechanism" +@@ -3535,156 +3746,168 @@ msgstr "" + "Impossibile effettuare l'autenticazione sul server IMAP %s usando il " + "meccanismo di autenticazione %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:535 ++#: ../camel/providers/imap4/camel-imap4-store.c:538 + #, c-format + msgid "Cannot authenticate to IMAP server %s using %s" + msgstr "Impossibile autenticarsi al server IMAP %s usando %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:698 +-#: ../camel/providers/imap4/camel-imap4-store.c:966 ++#: ../camel/providers/imap4/camel-imap4-store.c:701 ++#: ../camel/providers/imap4/camel-imap4-store.c:969 + msgid "Cannot create IMAP folders in offline mode." + msgstr "Impossibile creare cartelle IMAP in modalità fuori rete." + +-#: ../camel/providers/imap4/camel-imap4-store.c:737 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:740 + #, c-format +-msgid "Cannot get folder `%s' on IMAP server %s: Unknown" ++msgid "Cannot get folder '%s' on IMAP server %s: Unknown error" + msgstr "" +-"Impossibile ricevere la cartella \"%s\" sul server IMAP %s: motivo " +-"sconosciuto" ++"Impossibile ottenere la cartella «%s» sul server IMAP %s: errore sconosciuto" + +-#: ../camel/providers/imap4/camel-imap4-store.c:818 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:821 + #, c-format +-msgid "Cannot get LIST information for `%s' on IMAP server %s: %s" ++msgid "Cannot get LIST information for '%s' on IMAP server %s: %s" + msgstr "" +-"Impossibile ricevere informazioni LIST per \"%s\" sul server IMAP %s: %s" ++"Impossibile ottenere le informazioni LIST per «%s» sul server IMAP %s: %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:820 +-#: ../camel/providers/imap4/camel-imap4-store.c:1495 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + msgid "Bad command" + msgstr "Comando errato" + +-#: ../camel/providers/imap4/camel-imap4-store.c:899 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:902 + #, c-format +-msgid "Cannot create folder `%s': Invalid mailbox name" +-msgstr "Impossibile creare la cartella \"%s\": nome mailbox non valido" ++msgid "Cannot create folder '%s': Invalid mailbox name" ++msgstr "Impossibile creare la cartella «%s»: nome mailbox non valido" + +-#: ../camel/providers/imap4/camel-imap4-store.c:904 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:907 + #, c-format +-msgid "Cannot create folder `%s': Bad command" +-msgstr "Impossibile creare la cartella \"%s\": comando errato" ++msgid "Cannot create folder '%s': Bad command" ++msgstr "Impossibile creare la cartella «%s»: comando errato" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1010 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1013 + #, c-format +-msgid "Cannot delete folder `%s': Special folder" +-msgstr "Impossibile eliminare la cartella \"%s\": cartella speciale" ++msgid "Cannot delete folder '%s': Special folder" ++msgstr "Impossibile eliminare la cartella «%s»: cartella speciale" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1017 ++#: ../camel/providers/imap4/camel-imap4-store.c:1020 + msgid "Cannot delete IMAP folders in offline mode." + msgstr "Impossibile eliminare cartelle IMAP in modalità fuori rete." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1076 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1079 + #, c-format +-msgid "Cannot delete folder `%s': Invalid mailbox name" +-msgstr "Impossibile eliminare la cartella \"%s\": nome mailbox non valido" ++msgid "Cannot delete folder '%s': Invalid mailbox name" ++msgstr "Impossibile eliminare la cartella «%s»: nome mailbox non valido" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1081 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1084 + #, c-format +-msgid "Cannot delete folder `%s': Bad command" +-msgstr "Impossibile eliminare la cartella \"%s\": comando errato" ++msgid "Cannot delete folder '%s': Bad command" ++msgstr "Impossibile eliminare la cartella «%s»: comando errato" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1101 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1104 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Special folder" +-msgstr "Impossibile rinominare la cartella \"%s\" in \"%s\": cartella speciale" ++msgid "Cannot rename folder '%s' to '%s': Special folder" ++msgstr "Impossibile rinominare la cartella «%s» in «%s»: cartella speciale" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1108 ++#: ../camel/providers/imap4/camel-imap4-store.c:1111 + msgid "Cannot rename IMAP folders in offline mode." + msgstr "Impossibile rinominare cartelle IMAP in modalità fuori rete." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1139 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1142 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name" ++msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name" + msgstr "" +-"Impossibile rinominare la cartella \"%s\" in \"%s\": nome mailbox non valido" ++"Impossibile rinominare la cartella «%s» in «%s»: nome mailbox non valido" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1144 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1147 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Bad command" +-msgstr "Impossibile rinominare la cartella \"%s\" in \"%s\": comando errato" ++msgid "Cannot rename folder '%s' to '%s': Bad command" ++msgstr "Impossibile rinominare la cartella «%s» in «%s»: comando errato" + +-# ############## +-# +-# andrebbe controllato cosa sono i singoli %s +-#: ../camel/providers/imap4/camel-imap4-store.c:1493 ++# GNOME-2-24 ++#. Translators: the first %s is an IMAP4 command, either LSUB or LIST. ++#. * The fourth one is an error message. ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 + #, c-format +-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s" ++msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" + msgstr "" +-"Impossibile ricevere %s informazioni per il pattern \"%s\" sul server IMAP %" +-"s: %s" ++"Impossibile ottenere informazioni %s per il pattern «%s» sul server IMAP %s: " ++"%s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1533 ++#: ../camel/providers/imap4/camel-imap4-store.c:1638 + msgid "Cannot subscribe to IMAP folders in offline mode." + msgstr "" + "Impossibile effettuare la sottoscrizione alla cartelle IMAP in modalità " + "fuori rete." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1578 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1683 + #, c-format +-msgid "Cannot subscribe to folder `%s': Invalid mailbox name" ++msgid "Cannot subscribe to folder '%s': Invalid mailbox name" + msgstr "" +-"Impossibile effettuare la sottoscrizione alla cartella \"%s\": nome mailbox " ++"Impossibile effettuare la sottoscrizione alla cartella «%s»: nome mailbox " + "non valido" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1583 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1688 + #, c-format +-msgid "Cannot subscribe to folder `%s': Bad command" ++msgid "Cannot subscribe to folder '%s': Bad command" + msgstr "" +-"Impossibile effettuare lo sottoscrizione alla cartella: \"%s\": comando " +-"errato" ++"Impossibile effettuare lo sottoscrizione alla cartella: «%s»: comando errato" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1605 ++#: ../camel/providers/imap4/camel-imap4-store.c:1710 + msgid "Cannot unsubscribe from IMAP folders in offline mode." + msgstr "" + "Impossibile annullare la sottoscrizione alle cartelle IMAP in modalità fuori " + "rete." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1650 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1755 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name" ++msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" + msgstr "" +-"Impossibile annullare la sottoscrizione alla cartella \"%s\": nome mailbox " +-"non valido" ++"Impossibile annullare la sottoscrizione alla cartella «%s»: nome mailbox non " ++"valido" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1655 ++# GNOME-2-24 ++#: ../camel/providers/imap4/camel-imap4-store.c:1760 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Bad command" ++msgid "Cannot unsubscribe from folder '%s': Bad command" + msgstr "" +-"Impossibile annullare la sottoscrizione alla cartella \"%s\": comando errato" ++"Impossibile annullare la sottoscrizione alla cartella «%s»: comando errato" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1451 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1596 + msgid "Scanning for changed messages" + msgstr "Scansione per messaggi cambiati" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1472 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1617 + #, c-format + msgid "IMAP server %s is in an inconsistent state." + msgstr "Il server IMAP %s è in uno stato non coerente." + + # buste ??? +-#: ../camel/providers/imap4/camel-imap4-summary.c:1499 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1644 + msgid "Fetching envelopes of new messages" + msgstr "Prelievo buste dei nuovi messaggi" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:370 ++#: ../camel/providers/imap4/camel-imap4-utils.c:437 + #, c-format + msgid "Unexpected token in response from IMAP server %s: " + msgstr "Token inatteso nella risposta del server IMAP %s:" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:393 ++#: ../camel/providers/imap4/camel-imap4-utils.c:460 + msgid "No data" + msgstr "Nessun dato" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:556 ++#: ../camel/providers/imap4/camel-imap4-utils.c:623 + #, c-format + msgid "IMAP server %s unexpectedly disconnected: %s" + msgstr "Disconnessione inattesa del server IMAP %s: %s" +@@ -3728,28 +3951,28 @@ msgid "Index message body data" + msgstr "Indicizzare i dati nel corpo del messaggio" + + #. $HOME relative path + protocol string +-#: ../camel/providers/local/camel-local-folder.c:382 ++#: ../camel/providers/local/camel-local-folder.c:390 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + + #. /var/spool/mail relative path + protocol +-#: ../camel/providers/local/camel-local-folder.c:386 +-#: ../camel/providers/local/camel-local-folder.c:389 ++#: ../camel/providers/local/camel-local-folder.c:394 ++#: ../camel/providers/local/camel-local-folder.c:397 + #, c-format + msgid "mailbox:%s (%s)" + msgstr "mailbox: %s (%s)" + + #. a full path + protocol +-#: ../camel/providers/local/camel-local-folder.c:393 ++#: ../camel/providers/local/camel-local-folder.c:401 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-# GNOME-2-22 ++# GNOME-2-24 + #: ../camel/providers/local/camel-local-provider.c:48 +-msgid "_Use the `.folders' folder summary file (exmh)" +-msgstr "_Usare il file sommario delle cartelle \".folders\" (exmh)" ++msgid "_Use the '.folders' folder summary file (exmh)" ++msgstr "_Usare il file sommario delle cartelle «.folders» (exmh)" + + #: ../camel/providers/local/camel-local-provider.c:55 + msgid "MH-format mail directories" +@@ -3785,10 +4008,10 @@ msgstr "Directory in formato Maildir" + msgid "For storing local mail in maildir directories." + msgstr "Per memorizzare la posta locale in directory maildir." + +-# GNOME-2-22 ++# GNOME-2-24 + #: ../camel/providers/local/camel-local-provider.c:108 + msgid "_Store status headers in Elm/Pine/Mutt format" +-msgstr "_Memorizzare le intestazioni di stato nel formato Elm/Pine/Mutt" ++msgstr "Arc_hiviare le intestazioni di stato nel formato Elm/Pine/Mutt" + + #: ../camel/providers/local/camel-local-provider.c:115 + msgid "Standard Unix mbox spool file" +@@ -3808,80 +4031,65 @@ msgstr "" + msgid "Standard Unix mbox spool directory" + msgstr "Directory spool mbox standard Unix" + +-#: ../camel/providers/local/camel-local-store.c:159 +-#: ../camel/providers/local/camel-local-store.c:270 ++#: ../camel/providers/local/camel-local-store.c:171 ++#: ../camel/providers/local/camel-local-store.c:282 + #: ../camel/providers/local/camel-mbox-store.c:359 + #: ../camel/providers/local/camel-spool-store.c:129 + #, c-format + msgid "Store root %s is not an absolute path" + msgstr "La radice di archiviazione %s non è un percorso assoluto" + +-#: ../camel/providers/local/camel-local-store.c:166 ++#: ../camel/providers/local/camel-local-store.c:178 + #, c-format + msgid "Store root %s is not a regular directory" + msgstr "La radice di archiviazione %s non è una cartella normale" + +-#: ../camel/providers/local/camel-local-store.c:175 +-#: ../camel/providers/local/camel-local-store.c:183 +-#: ../camel/providers/local/camel-local-store.c:281 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-local-store.c:187 ++#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:293 + #, c-format + msgid "Cannot get folder: %s: %s" +-msgstr "Impossibile ricevere la cartella %s: %s" ++msgstr "Impossibile ottenere la cartella %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:207 + msgid "Local stores do not have an inbox" + msgstr "Gli archivi locali non hanno una inbox" + +-#: ../camel/providers/local/camel-local-store.c:241 ++#: ../camel/providers/local/camel-local-store.c:253 + #, c-format + msgid "Local mail file %s" + msgstr "File di posta locale: %s" + + # GNOME-2-22 +-#: ../camel/providers/local/camel-local-store.c:359 ++#: ../camel/providers/local/camel-local-store.c:348 + #, c-format + msgid "Could not rename folder %s to %s: %s" + msgstr "Impossibile rinominare la cartella %s come %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:427 ++#: ../camel/providers/local/camel-local-store.c:416 + #, c-format + msgid "Could not rename '%s': %s" +-msgstr "Impossibile rinominare la cartella \"%s\": %s" +- +-# GNOME-2-22 +-#: ../camel/providers/local/camel-local-store.c:452 +-#: ../camel/providers/local/camel-local-store.c:462 +-#: ../camel/providers/local/camel-mbox-store.c:276 +-#: ../camel/providers/local/camel-mbox-store.c:288 +-#, c-format +-msgid "Could not delete folder summary file `%s': %s" +-msgstr "Impossibile eliminare il file sommario della cartella \"%s\": %s" ++msgstr "Impossibile rinominare la cartella «%s»: %s" + +-# GNOME-2-22 +-#: ../camel/providers/local/camel-local-store.c:472 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-local-store.c:441 + #: ../camel/providers/local/camel-mbox-store.c:300 + #, c-format +-msgid "Could not delete folder index file `%s': %s" +-msgstr "Impossibile eliminare il file indice della cartella \"%s\": %s" ++msgid "Could not delete folder index file '%s': %s" ++msgstr "Impossibile eliminare il file indice della cartella «%s»: %s" + +-# GNOME-2-22 +-#: ../camel/providers/local/camel-local-store.c:495 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-local-store.c:464 + #: ../camel/providers/local/camel-mbox-store.c:324 + #, c-format +-msgid "Could not delete folder meta file `%s': %s" +-msgstr "Impossibile eliminare il meta file della cartella \"%s\": %s" +- +-# GNOME-2-22 +-#: ../camel/providers/local/camel-local-summary.c:409 +-#, c-format +-msgid "Could not save summary: %s: %s" +-msgstr "Impossibile salvare il sommario: %s: %s" ++msgid "Could not delete folder meta file '%s': %s" ++msgstr "Impossibile eliminare il meta file della cartella «%s»: %s" + + # GNOME-2-22 +-#: ../camel/providers/local/camel-local-summary.c:467 ++#: ../camel/providers/local/camel-local-summary.c:506 + msgid "Unable to add message to summary: unknown reason" +-msgstr "" +-"Impossibile aggiungere il messaggio al sommario: motivo sconosciuto" ++msgstr "Impossibile aggiungere il messaggio al sommario: motivo sconosciuto" + + #: ../camel/providers/local/camel-maildir-folder.c:220 + msgid "Maildir append message canceled" +@@ -3892,6 +4100,7 @@ msgstr "Aggiunta di messaggio maildir an + msgid "Cannot append message to maildir folder: %s: %s" + msgstr "Impossibile accodare il messaggio alla cartella maildir: %s: %s" + ++# GNOME-2-24 + #: ../camel/providers/local/camel-maildir-folder.c:250 + #: ../camel/providers/local/camel-maildir-folder.c:264 + #: ../camel/providers/local/camel-maildir-folder.c:273 +@@ -3907,81 +4116,86 @@ msgid "" + "Cannot get message: %s from folder %s\n" + " %s" + msgstr "" +-"Impossibile ricevere il messaggio: %s dalla cartella: %s\n" ++"Impossibile ottenere il messaggio: %s dalla cartella: %s\n" + " %s" + + #: ../camel/providers/local/camel-maildir-folder.c:274 + msgid "Invalid message contents" + msgstr "Contenuto del messaggio non valido" + +-#: ../camel/providers/local/camel-maildir-store.c:147 +-#: ../camel/providers/local/camel-maildir-store.c:172 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-maildir-store.c:148 ++#: ../camel/providers/local/camel-maildir-store.c:173 + #: ../camel/providers/local/camel-mbox-store.c:176 + #: ../camel/providers/local/camel-mbox-store.c:188 + #, c-format +-msgid "Cannot create folder `%s': %s" +-msgstr "Impossibile creare la cartella \"%s\": %s" ++msgid "Cannot create folder '%s': %s" ++msgstr "Impossibile creare la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:160 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-maildir-store.c:161 + #: ../camel/providers/local/camel-mbox-store.c:147 + #: ../camel/providers/local/camel-mh-store.c:217 + #, c-format +-msgid "Cannot get folder `%s': %s" +-msgstr "Impossibile ricevere la cartella \"%s\": %s" ++msgid "Cannot get folder '%s': %s" ++msgstr "Impossibile ottenere la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:164 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-maildir-store.c:165 + #: ../camel/providers/local/camel-mbox-store.c:155 + #: ../camel/providers/local/camel-mh-store.c:224 + #, c-format +-msgid "Cannot get folder `%s': folder does not exist." +-msgstr "Impossibile ricevere la cartella \"%s\": non esiste." ++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:188 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-maildir-store.c:189 + #, c-format +-msgid "Cannot get folder `%s': not a maildir directory." +-msgstr "Impossibile ricevere la cartella \"%s\": non è una cartella maildir." ++msgid "Cannot get folder '%s': not a maildir directory." ++msgstr "Impossibile ottenere la cartella «%s»: non è una cartella maildir." + +-#: ../camel/providers/local/camel-maildir-store.c:233 +-#: ../camel/providers/local/camel-maildir-store.c:271 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-maildir-store.c:234 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mh-store.c:273 + #, c-format +-msgid "Could not delete folder `%s': %s" +-msgstr "Impossibile eliminare la cartella \"%s\": %s" ++msgid "Could not delete folder '%s': %s" ++msgstr "Impossibile eliminare la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:235 ++#: ../camel/providers/local/camel-maildir-store.c:236 + msgid "not a maildir directory" + msgstr "non è una directory maildir" + + # GNOME-2-22 +-#: ../camel/providers/local/camel-maildir-store.c:439 ++#: ../camel/providers/local/camel-maildir-store.c:440 + #: ../camel/providers/local/camel-spool-store.c:331 + #: ../camel/providers/local/camel-spool-store.c:345 + #, c-format +-msgid "Could not scan folder `%s': %s" +-msgstr "Impossibile scansionare la cartella \"%s\": %s" ++msgid "Could not scan folder '%s': %s" ++msgstr "Impossibile scansionare la cartella «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:433 +-#: ../camel/providers/local/camel-maildir-summary.c:567 ++#: ../camel/providers/local/camel-maildir-summary.c:434 ++#: ../camel/providers/local/camel-maildir-summary.c:553 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "Impossibile aprire il percorso della directory maildir: %s: %s" + + # GNOME-2-22 +-#: ../camel/providers/local/camel-maildir-summary.c:560 ++#: ../camel/providers/local/camel-maildir-summary.c:546 + msgid "Checking folder consistency" + msgstr "Controllo coerenza cartella" + + # GNOME-2-22 +-#: ../camel/providers/local/camel-maildir-summary.c:664 ++#: ../camel/providers/local/camel-maildir-summary.c:650 + msgid "Checking for new messages" + msgstr "Controllo nuovi messaggi" + + # GNOME-2-22 +-#: ../camel/providers/local/camel-maildir-summary.c:755 +-#: ../camel/providers/local/camel-mbox-summary.c:436 +-#: ../camel/providers/local/camel-mbox-summary.c:609 +-#: ../camel/providers/local/camel-mbox-summary.c:706 +-#: ../camel/providers/local/camel-spool-summary.c:140 ++#: ../camel/providers/local/camel-maildir-summary.c:736 ++#: ../camel/providers/local/camel-mbox-summary.c:534 ++#: ../camel/providers/local/camel-mbox-summary.c:714 ++#: ../camel/providers/local/camel-mbox-summary.c:810 ++#: ../camel/providers/local/camel-spool-summary.c:158 + msgid "Storing folder" + msgstr "Memorizzazione cartella" + +@@ -4005,51 +4219,60 @@ msgstr "Accodamento della posta annullat + msgid "Cannot append message to mbox file: %s: %s" + msgstr "Impossibile accodare il messaggio al file mbox: %s: %s" + +-# GNOME-2-22 ++# GNOME-2-24 + #: ../camel/providers/local/camel-mbox-folder.c:400 + msgid "The folder appears to be irrecoverably corrupted." +-msgstr "La cartella sembra essere irrimediabilmente corrotta." ++msgstr "La cartella sembra essere irrimediabilmente danneggiata." + ++# GNOME-2-24 + #: ../camel/providers/local/camel-mbox-folder.c:408 + #: ../camel/providers/local/camel-mh-folder.c:224 + msgid "Message construction failed." +-msgstr "Costruzione del messaggio fallita." ++msgstr "Costruzione del messaggio non riuscita." + + #: ../camel/providers/local/camel-mbox-store.c:166 + #: ../camel/providers/local/camel-mbox-store.c:365 + msgid "Cannot create a folder by this name." + msgstr "Impossibile creare una cartella con questo nome." + ++# GNOME-2-24 + #: ../camel/providers/local/camel-mbox-store.c:198 + #, c-format +-msgid "Cannot get folder `%s': not a regular file." +-msgstr "Impossibile ricevere la cartella \"%s\": non è un file regolare." ++msgid "Cannot get folder '%s': not a regular file." ++msgstr "Impossibile ottenere la cartella «%s»: non è un file regolare." + + #: ../camel/providers/local/camel-mbox-store.c:228 + #: ../camel/providers/local/camel-mbox-store.c:239 + #: ../camel/providers/local/camel-mbox-store.c:262 + #, c-format + msgid "" +-"Could not delete folder `%s':\n" ++"Could not delete folder '%s':\n" + "%s" + msgstr "" +-"Impossibile eliminare la cartella \"%s\":\n" ++"Impossibile eliminare la cartella «%s»:\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:247 + #, c-format +-msgid "`%s' is not a regular file." +-msgstr "\"%s\" non è un file regolare." ++msgid "'%s' is not a regular file." ++msgstr "«%s» non è un file regolare." + + #: ../camel/providers/local/camel-mbox-store.c:254 + #, c-format +-msgid "Folder `%s' is not empty. Not deleted." +-msgstr "La cartella \"%s\" non è vuota. Non è stata eliminata." ++msgid "Folder '%s' is not empty. Not deleted." ++msgstr "La cartella «%s» non è vuota. Non è stata eliminata." ++ ++# GNOME-2-22 ++#: ../camel/providers/local/camel-mbox-store.c:276 ++#: ../camel/providers/local/camel-mbox-store.c:288 ++#, c-format ++msgid "Could not delete folder summary file '%s': %s" ++msgstr "Impossibile eliminare il file sommario della cartella «%s»: %s" + + #: ../camel/providers/local/camel-mbox-store.c:378 + #, c-format +-msgid "Cannot create directory `%s': %s." +-msgstr "Impossibile creare la directory \"%s\": %s." ++msgid "Cannot create directory '%s': %s." ++msgstr "Impossibile creare la directory «%s»: %s." + + #: ../camel/providers/local/camel-mbox-store.c:392 + #, c-format +@@ -4066,101 +4289,104 @@ msgstr "La cartella esiste già" + msgid "The new folder name is illegal." + msgstr "Il nuovo nome della cartella non è lecito." + ++# GNOME-2-24 ++# ++# in base al codice è ++# vecchio: nuovo: errore ++# modificata in base a ciò + #: ../camel/providers/local/camel-mbox-store.c:498 + #, c-format +-msgid "Could not rename `%s': `%s': %s" +-msgstr "Impossibile rinominare \"%s\": \"%s\": %s" ++msgid "Could not rename '%s': '%s': %s" ++msgstr "Impossibile rinominare «%s» in «%s»: %s" + ++# GNOME-2-24 + #: ../camel/providers/local/camel-mbox-store.c:579 + #, c-format + msgid "Could not rename '%s' to %s: %s" +-msgstr "Impossibile rinominare \"%s\" in %s: %s" ++msgstr "Impossibile rinominare «%s» in «%s»: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:442 ++#: ../camel/providers/local/camel-mbox-summary.c:540 + #, 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:588 + #, c-format + msgid "Fatal mail parser error near position %ld in folder %s" + msgstr "" + "Errore irrimediabile di analisi della posta vicino alla posizione %ld nella " + "cartella %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:546 ++#: ../camel/providers/local/camel-mbox-summary.c:651 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Impossibile controllare la cartella: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:614 +-#: ../camel/providers/local/camel-mbox-summary.c:711 +-#: ../camel/providers/local/camel-spool-summary.c:145 ++#: ../camel/providers/local/camel-mbox-summary.c:719 ++#: ../camel/providers/local/camel-mbox-summary.c:815 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Impossibile aprire il file: %s: %s " + +-#: ../camel/providers/local/camel-mbox-summary.c:626 +-#: ../camel/providers/local/camel-spool-summary.c:158 ++#: ../camel/providers/local/camel-mbox-summary.c:731 ++#: ../camel/providers/local/camel-spool-summary.c:176 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Impossibile aprire la mailbox temporanea: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:639 +-#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:744 ++#: ../camel/providers/local/camel-mbox-summary.c:920 + #, 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:648 ++#: ../camel/providers/local/camel-mbox-summary.c:753 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Impossibile chiudere la cartella temporanea: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:663 ++#: ../camel/providers/local/camel-mbox-summary.c:768 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Impossibile rinominare la cartella: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:722 +-#: ../camel/providers/local/camel-mbox-summary.c:1046 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-mbox-summary.c:826 ++#: ../camel/providers/local/camel-mbox-summary.c:1050 + #, c-format + msgid "Could not store folder: %s" +-msgstr "Impossibile memorizzare la cartella: %s" ++msgstr "Impossibile archiviare la cartella: %s" + +-# GNOME-2-22 +-#: ../camel/providers/local/camel-mbox-summary.c:770 +-#: ../camel/providers/local/camel-mbox-summary.c:799 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-mbox-summary.c:862 ++#: ../camel/providers/local/camel-mbox-summary.c:870 ++#: ../camel/providers/local/camel-mbox-summary.c:1080 + #: ../camel/providers/local/camel-mbox-summary.c:1088 +-#: ../camel/providers/local/camel-mbox-summary.c:1117 +-msgid "Detected a corrupt mbox file or an invalid 'From' header" +-msgstr "Rilevato un file mbox danneggiato o un header \"From\" non valido" ++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:935 +-#: ../camel/providers/local/camel-spool-summary.c:326 ++#: ../camel/providers/local/camel-mbox-summary.c:1013 ++#: ../camel/providers/local/camel-spool-summary.c:344 + #, c-format + msgid "Unknown error: %s" + msgstr "Errore sconosciuto: %s" + +-# GNOME-2-22 +-#: ../camel/providers/local/camel-mbox-summary.c:971 +-#, c-format +-msgid "Folder %s cannot be opened: %s" +-msgstr "Impossibile aprire la cartella \"%s\": %s" +- ++# GNOME-2-24 ++#: ../camel/providers/local/camel-mbox-summary.c:1156 + #: ../camel/providers/local/camel-mbox-summary.c:1182 +-#: ../camel/providers/local/camel-mbox-summary.c:1208 + #, c-format + msgid "Writing to temporary mailbox failed: %s" +-msgstr "Scrittura su mailbox temporanea fallita: %s" ++msgstr "Scrittura su mailbox temporanea non riuscita: %s" + ++# GNOME-2-24 ++# + # il primo %s dovrebbe essere il nome, con percorso + # della mailbox in questione +-# +-#: ../camel/providers/local/camel-mbox-summary.c:1199 ++#: ../camel/providers/local/camel-mbox-summary.c:1173 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" +-msgstr "Scrittura su mailbox temporanea %s fallita: %s" ++msgstr "Scrittura su mailbox temporanea %s non riuscita: %s" + + #: ../camel/providers/local/camel-mh-folder.c:176 + msgid "MH append message canceled" +@@ -4173,61 +4399,62 @@ msgstr "Impossibile accodare il messaggi + + #: ../camel/providers/local/camel-mh-store.c:232 + #, c-format +-msgid "Could not create folder `%s': %s" +-msgstr "Impossibile creare la cartella \"%s\": %s" ++msgid "Could not create folder '%s': %s" ++msgstr "Impossibile creare la cartella «%s»: %s" + ++# GNOME-2-24 + #: ../camel/providers/local/camel-mh-store.c:244 + #, c-format +-msgid "Cannot get folder `%s': not a directory." +-msgstr "Impossibile ricevere la cartella \"%s\": non è una cartella" ++msgid "Cannot get folder '%s': not a directory." ++msgstr "Impossibile ottenere la cartella «%s»: non è una cartella" + +-#: ../camel/providers/local/camel-mh-summary.c:246 ++#: ../camel/providers/local/camel-mh-summary.c:248 + #, c-format + msgid "Cannot open MH directory path: %s: %s" + msgstr "Impossibile aprire il percorso della directory MH: %s: %s" + + #: ../camel/providers/local/camel-spool-store.c:135 + #, c-format +-msgid "Spool `%s' cannot be opened: %s" +-msgstr "Impossibile aprire lo spool \"%s\": %s" ++msgid "Spool '%s' cannot be opened: %s" ++msgstr "Impossibile aprire lo spool «%s»: %s" + + #: ../camel/providers/local/camel-spool-store.c:147 + #, c-format +-msgid "Spool `%s' is not a regular file or directory" +-msgstr "Lo spool \"%s\" non è un file o una directory normale" ++msgid "Spool '%s' is not a regular file or directory" ++msgstr "Lo spool «%s» non è un file o una directory normale" + + #: ../camel/providers/local/camel-spool-store.c:166 + #, c-format +-msgid "Folder `%s/%s' does not exist." +-msgstr "La cartella \"%s/%s\" non esiste." ++msgid "Folder '%s/%s' does not exist." ++msgstr "La cartella «%s/%s» non esiste." + + #: ../camel/providers/local/camel-spool-store.c:176 + #, c-format + msgid "" +-"Could not open folder `%s':\n" ++"Could not open folder '%s':\n" + "%s" + msgstr "" +-"Impossibile aprire la cartella \"%s\":\n" ++"Impossibile aprire la cartella «%s»:\n" + "%s " + + #: ../camel/providers/local/camel-spool-store.c:180 + #, c-format +-msgid "Folder `%s' does not exist." +-msgstr "La cartella \"%s\" non esiste." ++msgid "Folder '%s' does not exist." ++msgstr "La cartella «%s» non esiste." + + #: ../camel/providers/local/camel-spool-store.c:185 + #, c-format + msgid "" +-"Could not create folder `%s':\n" ++"Could not create folder '%s':\n" + "%s" + msgstr "" +-"Impossibile creare la cartella \"%s\":\n" ++"Impossibile creare la cartella «%s»:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:193 + #, c-format +-msgid "`%s' is not a mailbox file." +-msgstr "\"%s\" non è un file mailbox." ++msgid "'%s' is not a mailbox file." ++msgstr "«%s» non è un file mailbox." + + #: ../camel/providers/local/camel-spool-store.c:210 + msgid "Store does not support an INBOX" +@@ -4251,28 +4478,29 @@ msgstr "Le cartelle spool non possono es + msgid "Spool folders cannot be deleted" + msgstr "Le cartelle spool non possono essere eliminate" + +-#: ../camel/providers/local/camel-spool-summary.c:171 +-#: ../camel/providers/local/camel-spool-summary.c:181 +-#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:189 ++#: ../camel/providers/local/camel-spool-summary.c:199 ++#: ../camel/providers/local/camel-spool-summary.c:209 + #, c-format + msgid "Could not sync temporary folder %s: %s" + msgstr "Impossibile sincronizzare cartella temporanea %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:207 ++#: ../camel/providers/local/camel-spool-summary.c:225 + #, c-format + msgid "Could not sync spool folder %s: %s" + msgstr "Impossibile sincronizzare cartella spool %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:238 +-#: ../camel/providers/local/camel-spool-summary.c:255 +-#: ../camel/providers/local/camel-spool-summary.c:266 ++# GNOME-2-24 ++#: ../camel/providers/local/camel-spool-summary.c:256 ++#: ../camel/providers/local/camel-spool-summary.c:273 ++#: ../camel/providers/local/camel-spool-summary.c:284 + #, c-format + msgid "" + "Could not sync spool folder %s: %s\n" +-"Folder may be corrupt, copy saved in `%s'" ++"Folder may be corrupt, copy saved in '%s'" + msgstr "" + "Impossibile sincronizzare cartella spool %s: %s\n" +-"La cartella potrebbe essere corrotta, copia salvata in \"%s\"" ++"La cartella potrebbe essere danneggiata, copia salvata in «%s»" + + #: ../camel/providers/nntp/camel-nntp-folder.c:176 + #: ../camel/providers/nntp/camel-nntp-folder.c:208 +@@ -4280,22 +4508,23 @@ msgstr "" + 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:331 +-#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++# GNOME-2-24 ++#: ../camel/providers/nntp/camel-nntp-folder.c:330 ++#: ../camel/providers/nntp/camel-nntp-folder.c:333 + #: ../camel/providers/nntp/camel-nntp-folder.c:375 ++#: ../camel/providers/nntp/camel-nntp-folder.c:377 + #, c-format + msgid "Posting failed: %s" +-msgstr "Pubblicazione fallita: %s" ++msgstr "Pubblicazione non riuscita: %s" + + # to post -> pubblicare +-#: ../camel/providers/nntp/camel-nntp-folder.c:393 ++#: ../camel/providers/nntp/camel-nntp-folder.c:395 + msgid "You cannot post NNTP messages while working offline!" + msgstr "" + "Impossibile pubblicare messaggi NNTP durante una sessione di lavoro fuori " + "rete!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:404 ++#: ../camel/providers/nntp/camel-nntp-folder.c:406 + msgid "You cannot copy messages from a NNTP folder!" + msgstr "Impossibile copiare messaggi da una cartella NNTP!" + +@@ -4344,6 +4573,7 @@ msgstr "Il server NNTP %s ha restituito + msgid "USENET News via %s" + msgstr "News USENET via %s" + ++# usato . invece di : + #: ../camel/providers/nntp/camel-nntp-store.c:798 + #, c-format + msgid "" +@@ -4351,52 +4581,53 @@ msgid "" + "\n" + "%s" + msgstr "" +-"Errore nella ricezione dei gruppi:\n" ++"Errore nella ricezione dei gruppi.\n" + "\n" + "%s" + ++# GNOME-2-24 ++# usato . invece di : ++# + #: ../camel/providers/nntp/camel-nntp-store.c:892 + msgid "" + "You cannot subscribe to this newsgroup:\n" + "\n" + "No such newsgroup. The selected item is a probably a parent folder." + msgstr "" +-"Impossibile effettuare la sottoscrizione a questo newsgroup:\n" ++"Impossibile effettuare la sottoscrizione a questo newsgroup.\n" + "\n" +-"nessun newsgroup disponibile. La voce selezionata è probabilmente una " +-"cartella genitore." ++"Nessun newsgroup disponibile. L'elemento selezionato è probabilmente una " ++"cartella di livello superiore." + ++# usato . invece di : + #: ../camel/providers/nntp/camel-nntp-store.c:924 + msgid "" + "You cannot unsubscribe to this newsgroup:\n" + "\n" + "newsgroup does not exist!" + msgstr "" +-"Impossibile annullare la sottoscrizione a questo newsgroup:\n" ++"Impossibile annullare la sottoscrizione a questo newsgroup.\n" + "\n" +-"il newsgroup non esiste!" ++"Il newsgroup non esiste!" + +-# magazzino ?? +-# ++# GNOME-2-24 + #: ../camel/providers/nntp/camel-nntp-store.c:949 + msgid "You cannot create a folder in a News store: subscribe instead." + msgstr "" +-"Impossibile creare una cartella in un magazzino di news: piuttosto " +-"effettuare una sottoscrizione." ++"Impossibile creare una cartella in un archivio di news: piuttosto effettuare " ++"una sottoscrizione." + +-# magazzino ?? +-# ++# GNOME-2-24 + #: ../camel/providers/nntp/camel-nntp-store.c:957 + msgid "You cannot rename a folder in a News store." +-msgstr "Impossibile rinominare una cartella in un magazzino di news." ++msgstr "Impossibile rinominare una cartella in un archivio di news." + +-# magazzino ?? +-# ++# GNOME-2-24 + #: ../camel/providers/nntp/camel-nntp-store.c:965 + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "" +-"Impossibile rimuovere una cartella in un magazzino news: piuttosto annullare " +-"la sottoscrizione." ++"Impossibile rimuovere una cartella in un archivio di news: piuttosto " ++"annullare la sottoscrizione." + + #: ../camel/providers/nntp/camel-nntp-store.c:1154 + msgid "Authentication requested but no username provided" +@@ -4407,10 +4638,11 @@ msgstr "Autenticazione richiesta ma non + msgid "Cannot authenticate to server: %s" + msgstr "Impossibile autenticarsi al server: %s" + ++# GNOME-2-24 + #: ../camel/providers/nntp/camel-nntp-store.c:1283 + #, c-format + msgid "NNTP Command failed: %s" +-msgstr "Comando NNTP fallito: %s" ++msgstr "Comando NNTP non riuscito: %s" + + #: ../camel/providers/nntp/camel-nntp-store.c:1337 + msgid "Not connected." +@@ -4421,61 +4653,64 @@ msgstr "Non connesso." + msgid "No such folder: %s" + msgstr "Nessuna cartella: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:222 +-#: ../camel/providers/nntp/camel-nntp-summary.c:318 ++#: ../camel/providers/nntp/camel-nntp-summary.c:273 ++#: ../camel/providers/nntp/camel-nntp-summary.c:369 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: scansione nuovi messaggi" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:229 ++# GNOME-2-24 ++#: ../camel/providers/nntp/camel-nntp-summary.c:280 + #, c-format + msgid "Unexpected server response from xover: %s" +-msgstr "Risposta server inaspettata dallo xover: %s" ++msgstr "Risposta server inattesa dallo xover: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:332 ++# GNOME-2-24 ++#: ../camel/providers/nntp/camel-nntp-summary.c:383 + #, c-format + msgid "Unexpected server response from head: %s" +-msgstr "Risposta server inaspettata dall'intestazione: %s" ++msgstr "Risposta server inattesa dall'intestazione: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:372 ++#: ../camel/providers/nntp/camel-nntp-summary.c:423 + msgid "Use cancel" + msgstr "Usa annulla" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:374 ++#: ../camel/providers/nntp/camel-nntp-summary.c:425 + #, c-format + msgid "Operation failed: %s" +-msgstr "Operazione fallita: %s" ++msgstr "Operazione non riuscita: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:247 ++#: ../camel/providers/pop3/camel-pop3-folder.c:251 + msgid "Retrieving POP summary" + msgstr "Ricezione indice POP" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:265 ++# GNOME-2-24 ++#: ../camel/providers/pop3/camel-pop3-folder.c:269 + #, c-format + msgid "Cannot get POP summary: %s" +-msgstr "Impossibile ricevere l'indice POP: %s" ++msgstr "Impossibile ottenere l'indice POP: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:308 ++#: ../camel/providers/pop3/camel-pop3-folder.c:312 + msgid "Expunging old messages" + msgstr "Pulizia messaggi vecchi" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:316 ++#: ../camel/providers/pop3/camel-pop3-folder.c:320 + msgid "Expunging deleted messages" + msgstr "Pulizia messaggi cancellati" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:492 ++#: ../camel/providers/pop3/camel-pop3-folder.c:533 + #, c-format + msgid "No message with UID %s" + msgstr "Nessun messaggio con UID %s" + + #. Sigh, most of the crap in this function is so that the cancel button + #. returns the proper exception code. Sigh. +-#: ../camel/providers/pop3/camel-pop3-folder.c:499 ++#: ../camel/providers/pop3/camel-pop3-folder.c:540 + #, c-format + msgid "Retrieving POP message %d" + msgstr "Ricezione messaggio POP %d" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:589 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 + msgid "Unknown reason" + msgstr "Motivo sconosciuto" + +@@ -4521,34 +4756,37 @@ msgstr "" + "il protocollo APOP. Potrebbe non funzionare per tutti gli utenti anche su " + "server che affermano di supportarlo. " + +-#: ../camel/providers/pop3/camel-pop3-store.c:210 ++# GNOME-2-24 ++#: ../camel/providers/pop3/camel-pop3-store.c:208 + #, 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 fallita" ++msgstr "" ++"Lettura di un messaggio di benvenuto valido dal server POP %s non riuscita" + +-#: ../camel/providers/pop3/camel-pop3-store.c:227 +-#: ../camel/providers/pop3/camel-pop3-store.c:241 +-#: ../camel/providers/pop3/camel-pop3-store.c:251 +-#: ../camel/providers/pop3/camel-pop3-store.c:257 ++# GNOME-2-24 ++#: ../camel/providers/pop3/camel-pop3-store.c:225 ++#: ../camel/providers/pop3/camel-pop3-store.c:239 ++#: ../camel/providers/pop3/camel-pop3-store.c:249 ++#: ../camel/providers/pop3/camel-pop3-store.c:255 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" +-msgstr "Connessione al server POP %s in modalità sicura fallita: %s" ++msgstr "Connessione al server POP %s in modalità sicura non riuscita: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:228 ++#: ../camel/providers/pop3/camel-pop3-store.c:226 + msgid "STLS not supported by server" + msgstr "STLS non supportata dal server" + +-#: ../camel/providers/pop3/camel-pop3-store.c:258 ++#: ../camel/providers/pop3/camel-pop3-store.c:256 + msgid "TLS is not available in this build" + msgstr "TLS non è disponibile in questo eseguibile" + +-#: ../camel/providers/pop3/camel-pop3-store.c:364 ++#: ../camel/providers/pop3/camel-pop3-store.c:362 + #, c-format + msgid "Could not connect to POP server %s" + msgstr "Impossibile connettersi al server POP %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:405 +-#: ../camel/providers/pop3/camel-pop3-store.c:542 ++#: ../camel/providers/pop3/camel-pop3-store.c:403 ++#: ../camel/providers/pop3/camel-pop3-store.c:536 + #, c-format + msgid "" + "Unable to connect to POP server %s: No support for requested authentication " +@@ -4557,26 +4795,28 @@ msgstr "" + "Impossibile connettersi al server POP %s: non c'è alcun supporto per il " + "meccanismo di autenticazione richiesto." + +-#: ../camel/providers/pop3/camel-pop3-store.c:421 ++# GNOME-2-24 ++#: ../camel/providers/pop3/camel-pop3-store.c:419 + #, c-format +-msgid "SASL `%s' Login failed for POP server %s: %s" +-msgstr "Login SASL \"%s\" fallito per il server POP %s: %s" ++msgid "SASL '%s' Login failed for POP server %s: %s" ++msgstr "Accesso SASL «%s» non riuscito per il server POP %s: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:433 ++#: ../camel/providers/pop3/camel-pop3-store.c:431 + #, c-format + msgid "Cannot login to POP server %s: SASL Protocol error" + msgstr "" +-"Impossibile effettuare il login 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:452 ++# GNOME-2-24 ++#: ../camel/providers/pop3/camel-pop3-store.c:450 + #, c-format + msgid "Failed to authenticate on POP server %s: %s" +-msgstr "Autenticazione sul server POP %s fallita: %s" ++msgstr "Autenticazione sul server POP %s non riuscita: %s" + + # credo che sostituzione di persona sia un po' meglio di + # personificazione + # imitazione +-#: ../camel/providers/pop3/camel-pop3-store.c:512 ++#: ../camel/providers/pop3/camel-pop3-store.c:509 + #, c-format + msgid "" + "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation " +@@ -4586,8 +4826,8 @@ msgstr "" + "Possibile attacco di sostituzione di persona. Contattare il proprio " + "amministratore." + +-#: ../camel/providers/pop3/camel-pop3-store.c:556 +-#: ../camel/providers/pop3/camel-pop3-store.c:569 ++#: ../camel/providers/pop3/camel-pop3-store.c:550 ++#: ../camel/providers/pop3/camel-pop3-store.c:563 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" +@@ -4596,7 +4836,7 @@ msgstr "" + "Impossibile connettersi al server POP %s.\n" + "Errore nell'invio della password: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:563 ++#: ../camel/providers/pop3/camel-pop3-store.c:557 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" +@@ -4605,10 +4845,10 @@ msgstr "" + "Impossibile connettersi al server POP %s.\n" + "Errore nell'invio del nome utente: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:669 ++#: ../camel/providers/pop3/camel-pop3-store.c:663 + #, c-format +-msgid "No such folder `%s'." +-msgstr "Nessuna cartella \"%s\"." ++msgid "No such folder '%s'." ++msgstr "Nessuna cartella «%s»." + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:38 + msgid "Sendmail" +@@ -4668,130 +4908,133 @@ 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:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:168 + msgid "Syntax error, command unrecognized" + msgstr "Errore di sintassi, comando non riconosciuto" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:170 + msgid "Syntax error in parameters or arguments" + msgstr "Errore di sintassi nei parametri o negli argomenti" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:170 ++#: ../camel/providers/smtp/camel-smtp-transport.c:172 + msgid "Command not implemented" + msgstr "Comando non implementato" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:174 + msgid "Command parameter not implemented" + msgstr "Parametro del comando non implementato" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:174 ++#: ../camel/providers/smtp/camel-smtp-transport.c:176 + msgid "System status, or system help reply" + msgstr "Stato del sistema, o risposta di aiuto del sistema" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:176 ++#: ../camel/providers/smtp/camel-smtp-transport.c:178 + msgid "Help message" + msgstr "Messaggio di aiuto" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:180 + msgid "Service ready" + msgstr "Servizio pronto" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:180 ++#: ../camel/providers/smtp/camel-smtp-transport.c:182 + msgid "Service closing transmission channel" + msgstr "Il servizio sta chiudendo il canale di trasmissione" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:184 + msgid "Service not available, closing transmission channel" + msgstr "Servizio non disponibile, chiusura del canale di trasmissione" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:184 ++#: ../camel/providers/smtp/camel-smtp-transport.c:186 + msgid "Requested mail action okay, completed" + msgstr "L'azione di posta richiesta è corretta, completata" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:186 ++#: ../camel/providers/smtp/camel-smtp-transport.c:188 + msgid "User not local; will forward to " + msgstr "Utente non locale; verrà inoltrata a " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:188 ++#: ../camel/providers/smtp/camel-smtp-transport.c:190 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "Azione di posta richiesta non riuscita: mailbox non disponibile" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:190 ++#: ../camel/providers/smtp/camel-smtp-transport.c:192 + msgid "Requested action not taken: mailbox unavailable" + msgstr "Azione richiesta non riuscita: mailbox non disponibile" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:192 ++#: ../camel/providers/smtp/camel-smtp-transport.c:194 + msgid "Requested action aborted: error in processing" + msgstr "Azione richiesta interrotta: errore di processo" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:194 ++#: ../camel/providers/smtp/camel-smtp-transport.c:196 + msgid "User not local; please try " + msgstr "Utente non locale; tentare " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:196 ++#: ../camel/providers/smtp/camel-smtp-transport.c:198 + msgid "Requested action not taken: insufficient system storage" + msgstr "Azione richiesta non riuscita: storage di sistema non sufficiente" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:198 ++#: ../camel/providers/smtp/camel-smtp-transport.c:200 + 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:200 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "Azioni richiesta non riuscita: nome della mailbox non consentito" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:204 + msgid "Start mail input; end with ." + msgstr "Inizio dell'input della posta; terminare con ." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:204 ++#: ../camel/providers/smtp/camel-smtp-transport.c:206 + msgid "Transaction failed" + msgstr "Transazione non riuscita" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/providers/smtp/camel-smtp-transport.c:210 + msgid "A password transition is needed" + msgstr "È necessaria una password di transizione." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:210 ++#: ../camel/providers/smtp/camel-smtp-transport.c:212 + msgid "Authentication mechanism is too weak" + msgstr "Il meccanismo di autenticazione è troppo debole" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:212 ++#: ../camel/providers/smtp/camel-smtp-transport.c:214 + msgid "Encryption required for requested authentication mechanism" + msgstr "" + "È richiesta la crittografia per il meccanismo di autenticazione richiesto" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:214 ++#: ../camel/providers/smtp/camel-smtp-transport.c:216 + msgid "Temporary authentication failure" + msgstr "Fallimento nell'autenticazione temporanea" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:295 ++#: ../camel/providers/smtp/camel-smtp-transport.c:297 + msgid "Welcome response error" + msgstr "Errore nella risposta di benvenuto" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:330 +-#: ../camel/providers/smtp/camel-smtp-transport.c:363 +-#: ../camel/providers/smtp/camel-smtp-transport.c:369 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:332 ++#: ../camel/providers/smtp/camel-smtp-transport.c:365 ++#: ../camel/providers/smtp/camel-smtp-transport.c:371 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" +-msgstr "Connessione al server SMTP %s in modalità sicura fallita: %s" ++msgstr "Connessione al server SMTP %s in modalità sicura non riuscita: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:339 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:341 + #, c-format + msgid "STARTTLS command failed: %s" +-msgstr "Comando STARTTLS fallito: %s" ++msgstr "Comando STARTTLS non riuscito: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:354 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:356 + msgid "STARTTLS command failed" +-msgstr "Comando STARTTLP fallito" ++msgstr "Comando STARTTLP non riuscito" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:494 ++#: ../camel/providers/smtp/camel-smtp-transport.c:497 + #, c-format + msgid "SMTP server %s does not support requested authentication type %s." + msgstr "Il server SMTP %s non supporta il tipo di autenticazione richiesto %s." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:559 ++#: ../camel/providers/smtp/camel-smtp-transport.c:564 + #, c-format + msgid "" + "Unable to authenticate to SMTP server.\n" +@@ -4802,122 +5045,136 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:683 ++#: ../camel/providers/smtp/camel-smtp-transport.c:697 + #, c-format + msgid "SMTP server %s" + msgstr "Server SMTP %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:685 ++#: ../camel/providers/smtp/camel-smtp-transport.c:699 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "Posta SMTP consegnata attraverso %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:717 + msgid "Cannot send message: service not connected." + msgstr "Impossibile inviare il messaggio: servizio non connesso." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:709 ++#: ../camel/providers/smtp/camel-smtp-transport.c:723 + msgid "Cannot send message: sender address not valid." + msgstr "Impossibile inviare il messaggio: indirizzo mittente non valido." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:713 ++#: ../camel/providers/smtp/camel-smtp-transport.c:727 + msgid "Sending message" + msgstr "Invio messaggio" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:728 ++#: ../camel/providers/smtp/camel-smtp-transport.c:742 + msgid "Cannot send message: no recipients defined." + msgstr "Impossibile inviare il messaggio: nessun destinatario definito." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:753 + 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:968 ++#: ../camel/providers/smtp/camel-smtp-transport.c:982 + msgid "SMTP Greeting" + msgstr "Messaggio di benvenuto SMTP" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:993 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1007 + #, c-format + msgid "HELO command failed: %s" +-msgstr "Comando HELO fallito: %s" ++msgstr "Comando HELO non riuscito: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1010 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1024 + msgid "HELO command failed" +-msgstr "Comando HELO fallito" ++msgstr "Comando HELO non riuscito" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1073 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1090 + msgid "SMTP Authentication" + msgstr "Autenticazione SMTP" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1079 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1096 + msgid "Error creating SASL authentication object." + msgstr "Errore nel creare un oggetto di autenticazione SASL." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1096 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1107 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1124 + #, c-format + msgid "AUTH command failed: %s" +-msgstr "Comando AUTH fallito: %s" ++msgstr "Comando AUTH non riuscito: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1130 + msgid "AUTH command failed" +-msgstr "Comando AUTH fallito" ++msgstr "Comando AUTH non riuscito" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1177 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1200 + msgid "Bad authentication response from server.\n" + msgstr "Risposta di autenticazione errata dal server.\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1202 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1227 + #, c-format + msgid "MAIL FROM command failed: %s: mail not sent" +-msgstr "Comando MAIL FROM fallito: %s: posta non inviata" ++msgstr "Comando MAIL FROM non riuscito: %s: posta non inviata" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1219 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1244 + msgid "MAIL FROM command failed" +-msgstr "Comando MAIL FROM fallito" ++msgstr "Comando MAIL FROM non riuscito" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1243 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1268 + #, c-format + msgid "RCPT TO command failed: %s: mail not sent" +-msgstr "Comando RCPT TO fallito: %s: posta non inviata" ++msgstr "Comando RCPT TO non riuscito: %s: posta non inviata" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1262 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1287 + #, c-format + msgid "RCPT TO <%s> failed" +-msgstr "RCPT TO <%s> fallito" ++msgstr "RCPT TO <%s> non riuscito" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1301 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1359 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1378 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1327 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1396 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1415 + #, c-format + msgid "DATA command failed: %s: mail not sent" +-msgstr "Comando DATA fallito: %s: posta non inviata" ++msgstr "Comando DATA non riuscito: %s: posta non inviata" + ++# GNOME-2-24 + #. we should have gotten instructions on how to use the DATA command: + #. * 354 Enter mail, end with "." on a line by itself + #. +-#: ../camel/providers/smtp/camel-smtp-transport.c:1318 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1394 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1344 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1431 + msgid "DATA command failed" +-msgstr "Comando DATA fallito" ++msgstr "Comando DATA non riuscito" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1417 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1454 + #, c-format + msgid "RSET command failed: %s" +-msgstr "Comando RSET fallito: %s" ++msgstr "Comando RSET non riuscito: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1433 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1470 + msgid "RSET command failed" +-msgstr "Comando RSET fallito: %s" ++msgstr "Comando RSET non riuscito: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1456 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1493 + #, c-format + msgid "QUIT command failed: %s" +-msgstr "Comando QUIT fallito: %s" ++msgstr "Comando QUIT non riuscito: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1470 ++# GNOME-2-24 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1507 + msgid "QUIT command failed" +-msgstr "Comando QUIT fallito" ++msgstr "Comando QUIT non riuscito" + + #: ../libedataserver/e-categories.c:45 + msgid "Business" +@@ -4976,27 +5233,28 @@ msgstr "Personale" + msgid "Phone Calls" + msgstr "Chiamate telefoniche" + +-#: ../libedataserver/e-categories.c:60 ++#. Translators: "Status" is a category name; it can mean anything user wants to ++#: ../libedataserver/e-categories.c:61 + msgid "Status" + msgstr "Stato" + +-#: ../libedataserver/e-categories.c:61 ++#: ../libedataserver/e-categories.c:62 + msgid "Strategies" + msgstr "Strategie" + +-#: ../libedataserver/e-categories.c:62 ++#: ../libedataserver/e-categories.c:63 + msgid "Suppliers" + msgstr "Fornitori" + +-#: ../libedataserver/e-categories.c:63 ++#: ../libedataserver/e-categories.c:64 + msgid "Time & Expenses" + msgstr "Tempo e spese" + +-#: ../libedataserver/e-categories.c:64 ++#: ../libedataserver/e-categories.c:65 + msgid "VIP" + msgstr "VIP" + +-#: ../libedataserver/e-categories.c:65 ++#: ../libedataserver/e-categories.c:66 + msgid "Waiting" + msgstr "In attesa" + +@@ -5129,27 +5387,28 @@ msgstr "%k%M" + msgid "%I %p" + msgstr "%I %p" + +-#: ../libedataserverui/e-book-auth-util.c:89 ++#: ../libedataserverui/e-book-auth-util.c:90 + msgid "Accessing LDAP Server anonymously" + msgstr "Accesso anonimo al server LDAP" + +-#: ../libedataserverui/e-book-auth-util.c:193 ++# GNOME-2-24 ++#: ../libedataserverui/e-book-auth-util.c:192 + msgid "Failed to authenticate.\n" +-msgstr "Autenticazione fallita.\n" ++msgstr "Autenticazione non riuscita.\n" + +-#: ../libedataserverui/e-categories-dialog.c:274 ++#: ../libedataserverui/e-categories-dialog.c:261 + #, c-format + msgid "" + "There is already a category '%s' in the configuration. Please use another " + "name" + msgstr "" +-"Esiste già una categoria \"%s\" nella configurazione. Usare un'altro nome" ++"Esiste già una categoria «%s» nella configurazione. Usare un'altro nome" + +-#: ../libedataserverui/e-categories-dialog.c:475 ++#: ../libedataserverui/e-categories-dialog.c:466 + msgid "Icon" + msgstr "Icona" + +-#: ../libedataserverui/e-categories-dialog.c:480 ++#: ../libedataserverui/e-categories-dialog.c:471 + msgid "Category" + msgstr "Categoria" + +@@ -5185,19 +5444,19 @@ msgstr "_Modifica" + msgid "categories" + msgstr "categorie" + +-#: ../libedataserverui/e-name-selector-dialog.c:275 ++#: ../libedataserverui/e-name-selector-dialog.c:272 + msgid "Select Contacts from Address Book" + msgstr "Seleziona contatti dalla rubrica" + +-#: ../libedataserverui/e-name-selector-dialog.c:555 ++#: ../libedataserverui/e-name-selector-dialog.c:559 + msgid "_Add" + msgstr "A_ggiungi" + +-#: ../libedataserverui/e-name-selector-dialog.c:580 ++#: ../libedataserverui/e-name-selector-dialog.c:584 + msgid "_Remove" + msgstr "_Rimuovi" + +-#: ../libedataserverui/e-name-selector-dialog.c:753 ++#: ../libedataserverui/e-name-selector-dialog.c:761 + #: ../libedataserverui/e-name-selector-dialog.glade.h:6 + msgid "Any Category" + msgstr "Ogni categoria" +@@ -5243,7 +5502,7 @@ msgid "_Search:" + msgstr "C_erca:" + + #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2249 ++#: ../libedataserverui/e-name-selector-entry.c:2369 + #, c-format + msgid "E_xpand %s Inline" + msgstr "E_spandere %s in linea" +@@ -5251,7 +5510,7 @@ msgstr "E_spandere %s in linea" + # Controllare acceleratore !! + # + #. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2264 ++#: ../libedataserverui/e-name-selector-entry.c:2384 + #, c-format + msgid "Cop_y %s" + msgstr "Cop_ia %s" +@@ -5259,57 +5518,69 @@ msgstr "Cop_ia %s" + # Controllare acceleratore !! + # + #. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2274 ++#: ../libedataserverui/e-name-selector-entry.c:2394 + #, c-format + msgid "C_ut %s" + msgstr "_Taglia %s" + + #. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2291 ++#: ../libedataserverui/e-name-selector-entry.c:2411 + #, c-format + msgid "_Edit %s" + msgstr "_Modifica %s" + + # conflitto con sopra?? + # +-#: ../libedataserverui/e-name-selector-list.c:479 ++#: ../libedataserverui/e-name-selector-list.c:466 + #, c-format + msgid "_Delete %s" + msgstr "Eli_mina %s" + +-#: ../libedataserverui/e-passwords.c:941 ++# GNOME-2-24 ++#: ../libedataserverui/e-passwords.c:218 ++#, c-format ++msgid "Keyring key is unusable: no user or host name" ++msgstr "" ++"La chiave nel portachiavi è inutilizzabile: nessun nome utente o hostname" ++ ++# GNOME-2-24 ++#: ../libedataserverui/e-passwords.c:1055 ++msgid "You have the Caps Lock key on." ++msgstr "Il tasto BlocMaiusc è attivato." ++ ++#: ../libedataserverui/e-passwords.c:1175 + msgid "_Remember this passphrase" + msgstr "_Ricorda questa passphrase" + +-#: ../libedataserverui/e-passwords.c:942 ++#: ../libedataserverui/e-passwords.c:1176 + msgid "_Remember this passphrase for the remainder of this session" + msgstr "_Ricorda questa passphrase per il resto della sessione in corso" + +-#: ../libedataserverui/e-passwords.c:947 ++#: ../libedataserverui/e-passwords.c:1181 + msgid "_Remember this password" + msgstr "_Ricorda questa password" + +-#: ../libedataserverui/e-passwords.c:948 ++#: ../libedataserverui/e-passwords.c:1182 + msgid "_Remember this password for the remainder of this session" + msgstr "_Ricorda questa password per il resto della sessione in corso" + + #. prepare the dialog +-#: ../libedataserverui/e-source-selector-dialog.c:101 ++#: ../libedataserverui/e-source-selector-dialog.c:95 + msgid "Select destination" + msgstr "Seleziona la destinazione" + +-#: ../libedataserverui/e-source-selector-dialog.c:154 ++#: ../libedataserverui/e-source-selector-dialog.c:148 + msgid "_Destination" + msgstr "_Destinazione" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1660 +-#: ../servers/exchange/storage/exchange-account.c:939 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1683 ++#: ../servers/exchange/storage/exchange-account.c:953 + #, c-format + msgid "Enter password for %s" + msgstr "Inserire password per %s" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1661 +-#: ../servers/exchange/storage/exchange-account.c:944 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1684 ++#: ../servers/exchange/storage/exchange-account.c:958 + msgid "Enter password" + msgstr "Inserire password" + +@@ -5433,12 +5704,12 @@ msgstr "Questa operazione non può esser + + #. i18n: This is the title of an "other user's folders" + #. hierarchy. Eg, "John Doe's Folders". +-#: ../servers/exchange/storage/exchange-account.c:635 ++#: ../servers/exchange/storage/exchange-account.c:644 + #, c-format + msgid "%s's Folders" + msgstr "Cartelle di %s" + +-#: ../servers/exchange/storage/exchange-account.c:1245 ++#: ../servers/exchange/storage/exchange-account.c:1259 + msgid "Personal Folders" + msgstr "Cartelle personali" + +@@ -5452,21 +5723,21 @@ msgstr "Cartelle personali" + # + # PS spero di non infrangere il (C) di MS ricopiando qui le traduzioni :-( + # +-#: ../servers/exchange/storage/exchange-account.c:1260 ++#: ../servers/exchange/storage/exchange-account.c:1274 + msgid "Favorite Public Folders" + msgstr "Cartelle pubbliche preferite" + + # Traduzione di outlook/exchange + # + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1277 ++#: ../servers/exchange/storage/exchange-account.c:1291 + msgid "All Public Folders" + msgstr "Tutte le cartelle pubbliche" + + # Traduzione di outlook/exchange + # + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1291 ++#: ../servers/exchange/storage/exchange-account.c:1305 + msgid "Global Address List" + msgstr "Elenco indirizzi globale" + +@@ -5512,19 +5783,19 @@ msgstr "Posta inviata" + msgid "Tasks" + msgstr "Compiti" + +-#: ../servers/groupwise/e-gw-connection.c:191 ++#: ../servers/groupwise/e-gw-connection.c:225 + msgid "Invalid connection" + msgstr "Connessione non valida" + +-#: ../servers/groupwise/e-gw-connection.c:195 ++#: ../servers/groupwise/e-gw-connection.c:229 + msgid "Invalid response from server" + msgstr "Risposta non valida dal server" + +-#: ../servers/groupwise/e-gw-connection.c:197 ++#: ../servers/groupwise/e-gw-connection.c:231 + msgid "No response from the server" + msgstr "Nessuna risposta dal server" + +-#: ../servers/groupwise/e-gw-connection.c:203 ++#: ../servers/groupwise/e-gw-connection.c:237 + msgid "Bad parameter" + msgstr "Parametro errato" + +@@ -5545,7 +5816,7 @@ msgid "Evolution Data Server logging ser + msgstr "Servizio di log di Evolution Data Server" + + #. dialog display isn't working out +-#: ../src/server.c:110 ++#: ../src/server.c:109 + #, c-format + msgid "Multiple segmentation faults occurred; cannot display error dialog\n" + msgstr "" +@@ -5561,3 +5832,27 @@ msgstr "Informazioni colore" + #: ../libedataserverui/e-cell-renderer-color.c:211 + msgid "The color to render" + msgstr "Il colore da rendere" ++ ++#~ msgid "Folder was destroyed and recreated on server." ++#~ msgstr "La cartella è stata distrutta e ricreata sul server." ++ ++# GNOME-2-22 ++#~ msgid "Detected a corrupt mbox file or an invalid 'From' header" ++#~ msgstr "Rilevato un file mbox danneggiato o un header \"From\" non valido" ++ ++# GNOME-2-22 ++#~ msgid "Folder %s cannot be opened: %s" ++#~ msgstr "Impossibile aprire la cartella \"%s\": %s" ++ ++#~ msgid "Cannot find certificate for `%s'" ++#~ msgstr "Impossibile trovare certificato per \"%s\"" ++ ++#~ msgid "" ++#~ "Unexpected server response: Identical UIDs provided for messages %d and %d" ++#~ msgstr "" ++#~ "Risposta del server inaspettata: UID identici forniti per i messaggi %d e " ++#~ "%d" ++ ++# GNOME-2-22 ++#~ msgid "Could not save summary: %s: %s" ++#~ msgstr "Impossibile salvare il sommario: %s: %s" +Index: evolution-data-server-2.23.92/po/mr.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/mr.po ++++ evolution-data-server-2.23.92/po/mr.po +@@ -1,4 +1,4 @@ +-# translation of evolution-data-server.HEAD.mr.po to marathi ++# translation of mr.po to marathi + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. + # +@@ -6,10 +6,10 @@ + # Sandeep Shedmake , 2008. + msgid "" + msgstr "" +-"Project-Id-Version: evolution-data-server.HEAD.mr\n" ++"Project-Id-Version: mr\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-03-03 03:51+0000\n" +-"PO-Revision-Date: 2008-03-03 20:27+0530\n" ++"POT-Creation-Date: 2008-08-18 05:26+0000\n" ++"PO-Revision-Date: 2008-09-14 19:17+0530\n" + "Last-Translator: Sandeep Shedmake \n" + "Language-Team: marathi\n" + "MIME-Version: 1.0\n" +@@ -18,63 +18,63 @@ msgstr "" + "X-Generator: KBabel 1.11.4\n" + "Plural-Forms: nplurals=2; plural=(n!=1);\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:554 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2317 ++#: ../addressbook/backends/file/e-book-backend-file.c:555 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475 + msgid "Loading..." + msgstr "दाखल करीत आहे..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:557 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2276 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2296 ++#: ../addressbook/backends/file/e-book-backend-file.c:558 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4169 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4282 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477 + msgid "Searching..." + msgstr "शोधत आहे..." + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2677 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4328 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4446 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "संपर्क डाउनलोड करत आहे (%d)... " + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2832 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3023 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3067 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103 + #, c-format + msgid "Updating contacts cache (%d)... " + msgstr "संपर्क कॅश अद्यतन करत आहे (%d)... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:742 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751 + msgid "Using Distinguished Name (DN)" + msgstr "निराळे नाव वापरत आहे (DN)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754 + msgid "Using Email Address" + msgstr "ईमेल पत्ता वापरत आहे" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1002 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017 + msgid "Reconnecting to LDAP server..." + msgstr "LDAP सेवकास पुन्हा जोडत आहे..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1598 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1613 + msgid "Adding contact to LDAP server..." + msgstr "संपर्क LDAP सेवकावर जमा करत आहे..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1726 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1747 + msgid "Removing contact from LDAP server..." + msgstr "संपर्क LDAP सेवकावरून काढत आहे..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2031 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2058 + msgid "Modifying contact from LDAP server..." + msgstr "LDAP सर्वरवरून संपर्क रूपांतरित करत आहे..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4040 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4142 + msgid "Receiving LDAP search results..." + msgstr "LDAP शोध परिणाम मिळवत आहे..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4189 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4304 + msgid "Error performing search" + msgstr "शोधण्यात त्रुटि" + +@@ -82,107 +82,107 @@ msgstr "शोधण्यात त् + #. * function names, e.g. + #. * "e_book_add_contact" on book before + #. * "e_book_open +-#: ../addressbook/libebook/e-book.c:254 ../addressbook/libebook/e-book.c:258 +-#: ../addressbook/libebook/e-book.c:470 ../addressbook/libebook/e-book.c:474 +-#: ../addressbook/libebook/e-book.c:615 ../addressbook/libebook/e-book.c:619 +-#: ../addressbook/libebook/e-book.c:708 ../addressbook/libebook/e-book.c:712 +-#: ../addressbook/libebook/e-book.c:1022 ../addressbook/libebook/e-book.c:1027 +-#: ../addressbook/libebook/e-book.c:1214 ../addressbook/libebook/e-book.c:1218 +-#: ../addressbook/libebook/e-book.c:1375 ../addressbook/libebook/e-book.c:1379 +-#: ../addressbook/libebook/e-book.c:1588 ../addressbook/libebook/e-book.c:1592 +-#: ../addressbook/libebook/e-book.c:1833 ../addressbook/libebook/e-book.c:1837 +-#: ../addressbook/libebook/e-book.c:2078 ../addressbook/libebook/e-book.c:2082 +-#: ../addressbook/libebook/e-book.c:2294 ../addressbook/libebook/e-book.c:2298 +-#: ../addressbook/libebook/e-book.c:3433 ++#: ../addressbook/libebook/e-book.c:252 ../addressbook/libebook/e-book.c:256 ++#: ../addressbook/libebook/e-book.c:461 ../addressbook/libebook/e-book.c:465 ++#: ../addressbook/libebook/e-book.c:604 ../addressbook/libebook/e-book.c:608 ++#: ../addressbook/libebook/e-book.c:695 ../addressbook/libebook/e-book.c:699 ++#: ../addressbook/libebook/e-book.c:995 ../addressbook/libebook/e-book.c:1000 ++#: ../addressbook/libebook/e-book.c:1179 ../addressbook/libebook/e-book.c:1183 ++#: ../addressbook/libebook/e-book.c:1338 ../addressbook/libebook/e-book.c:1342 ++#: ../addressbook/libebook/e-book.c:1544 ../addressbook/libebook/e-book.c:1548 ++#: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791 ++#: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029 ++#: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238 ++#: ../addressbook/libebook/e-book.c:3339 + #, c-format + msgid "\"%s\" on book before \"%s\"" + msgstr "\"%s\" वर \"%s\" च्या आधी बुक" + +-#: ../addressbook/libebook/e-book.c:267 ../addressbook/libebook/e-book.c:483 +-#: ../addressbook/libebook/e-book.c:628 ../addressbook/libebook/e-book.c:721 +-#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1228 +-#: ../addressbook/libebook/e-book.c:1389 ../addressbook/libebook/e-book.c:1601 +-#: ../addressbook/libebook/e-book.c:1846 ../addressbook/libebook/e-book.c:2092 +-#: ../addressbook/libebook/e-book.c:2307 ../addressbook/libebook/e-book.c:2673 +-#: ../addressbook/libebook/e-book.c:2879 ++#: ../addressbook/libebook/e-book.c:265 ../addressbook/libebook/e-book.c:474 ++#: ../addressbook/libebook/e-book.c:617 ../addressbook/libebook/e-book.c:708 ++#: ../addressbook/libebook/e-book.c:1010 ../addressbook/libebook/e-book.c:1193 ++#: ../addressbook/libebook/e-book.c:1352 ../addressbook/libebook/e-book.c:1557 ++#: ../addressbook/libebook/e-book.c:1800 ../addressbook/libebook/e-book.c:2039 ++#: ../addressbook/libebook/e-book.c:2247 ../addressbook/libebook/e-book.c:2593 ++#: ../addressbook/libebook/e-book.c:2792 + #, c-format + msgid "book busy" + msgstr "पुस्तक व्यस्त" + +-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:304 +-#: ../addressbook/libebook/e-book.c:516 ../addressbook/libebook/e-book.c:520 +-#: ../addressbook/libebook/e-book.c:657 ../addressbook/libebook/e-book.c:661 +-#: ../addressbook/libebook/e-book.c:750 ../addressbook/libebook/e-book.c:754 +-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069 +-#: ../addressbook/libebook/e-book.c:1260 ../addressbook/libebook/e-book.c:1263 +-#: ../addressbook/libebook/e-book.c:1418 ../addressbook/libebook/e-book.c:1422 +-#: ../addressbook/libebook/e-book.c:1639 ../addressbook/libebook/e-book.c:1643 +-#: ../addressbook/libebook/e-book.c:1895 ../addressbook/libebook/e-book.c:1899 +-#: ../addressbook/libebook/e-book.c:2124 ../addressbook/libebook/e-book.c:2128 +-#: ../addressbook/libebook/e-book.c:2335 ../addressbook/libebook/e-book.c:2339 +-#: ../addressbook/libebook/e-book.c:2614 ../addressbook/libebook/e-book.c:2701 +-#: ../addressbook/libebook/e-book.c:2705 ../addressbook/libebook/e-book.c:2907 +-#: ../addressbook/libebook/e-book.c:2911 ../addressbook/libebook/e-book.c:3442 ++#: ../addressbook/libebook/e-book.c:296 ../addressbook/libebook/e-book.c:300 ++#: ../addressbook/libebook/e-book.c:505 ../addressbook/libebook/e-book.c:509 ++#: ../addressbook/libebook/e-book.c:644 ../addressbook/libebook/e-book.c:648 ++#: ../addressbook/libebook/e-book.c:735 ../addressbook/libebook/e-book.c:739 ++#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1040 ++#: ../addressbook/libebook/e-book.c:1223 ../addressbook/libebook/e-book.c:1226 ++#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1383 ++#: ../addressbook/libebook/e-book.c:1593 ../addressbook/libebook/e-book.c:1597 ++#: ../addressbook/libebook/e-book.c:1847 ../addressbook/libebook/e-book.c:1851 ++#: ../addressbook/libebook/e-book.c:2069 ../addressbook/libebook/e-book.c:2073 ++#: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277 ++#: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619 ++#: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818 ++#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3348 + #, c-format + msgid "CORBA exception making \"%s\" call" + msgstr "CORBA अपवाद \"%s\" कॉल करण्यात" + +-#: ../addressbook/libebook/e-book.c:2595 ++#: ../addressbook/libebook/e-book.c:2523 + #, c-format + msgid "%s: there is no current operation" + msgstr "%s: कोणतेही चालू ऑपरेशन नाही" + +-#: ../addressbook/libebook/e-book.c:2630 ++#: ../addressbook/libebook/e-book.c:2552 + #, c-format + msgid "%s: could not cancel" + msgstr "%s: रद्द करता आले नाही" + +-#: ../addressbook/libebook/e-book.c:2659 ../addressbook/libebook/e-book.c:2663 ++#: ../addressbook/libebook/e-book.c:2579 ../addressbook/libebook/e-book.c:2583 + #, c-format + msgid "\"%s\" on book after \"%s\"" + msgstr "\"%s\" वर \"%s\" नंतर बुक करावे" + +-#: ../addressbook/libebook/e-book.c:2729 ++#: ../addressbook/libebook/e-book.c:2647 + #, c-format + msgid "%s: canceled" + msgstr "%s: रद्द केले" + +-#: ../addressbook/libebook/e-book.c:3297 ++#: ../addressbook/libebook/e-book.c:3203 + #, c-format + msgid "%s: Invalid source." + msgstr "%s: अवैध स्त्रोत." + +-#: ../addressbook/libebook/e-book.c:3305 ../addressbook/libebook/e-book.c:3371 ++#: ../addressbook/libebook/e-book.c:3211 ../addressbook/libebook/e-book.c:3277 + #, c-format + msgid "%s: no factories available for URI `%s'" + msgstr "%s: URI `%s' करीता फॅक्टरी उपलब्ध नाही" + +-#: ../addressbook/libebook/e-book.c:3317 ++#: ../addressbook/libebook/e-book.c:3223 + #, c-format + msgid "%s: Could not create EBookListener" + msgstr "%s: EBookListener बनवता आले नाही" + +-#: ../addressbook/libebook/e-book.c:3584 ++#: ../addressbook/libebook/e-book.c:3490 + #, c-format + msgid "%s: there was no self contact UID stored in gconf" + msgstr "%s: gconf मध्ये स्व संपर्क UID आढळला नाही" + +-#: ../addressbook/libebook/e-book.c:3717 ++#: ../addressbook/libebook/e-book.c:3623 + #, c-format + msgid "%s: there was no source for uid `%s' stored in gconf." + msgstr "%s: gconf में भंडारित uid `%s' साठी कोणताही स्त्रोत नाही होता." + + #. Dummy row as EContactField starts from 1 +-#: ../addressbook/libebook/e-contact.c:114 ++#: ../addressbook/libebook/e-contact.c:113 + msgid "Unique ID" + msgstr "अद्वितीय ID" + +-#: ../addressbook/libebook/e-contact.c:115 ++#: ../addressbook/libebook/e-contact.c:114 + msgid "File Under" + msgstr "अंतर्गत फाइल " + + #. URI of the book to which the contact belongs to +-#: ../addressbook/libebook/e-contact.c:117 ++#: ../addressbook/libebook/e-contact.c:116 + msgid "Book URI" + msgstr "पुस्तक URI" + +@@ -190,535 +190,540 @@ msgstr "पुस्तक URI" + #. 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:123 ++#: ../addressbook/libebook/e-contact.c:122 + msgid "Full Name" + msgstr "पूर्ण नाव" + +-#: ../addressbook/libebook/e-contact.c:124 ++#: ../addressbook/libebook/e-contact.c:123 + msgid "Given Name" + msgstr "दिलेले नाव" + +-#: ../addressbook/libebook/e-contact.c:125 ++#: ../addressbook/libebook/e-contact.c:124 + msgid "Family Name" + msgstr "कुटूंब नाव" + +-#: ../addressbook/libebook/e-contact.c:126 ++#: ../addressbook/libebook/e-contact.c:125 + msgid "Nickname" + msgstr "टोपणनाव" + + #. Email fields +-#: ../addressbook/libebook/e-contact.c:129 ++#: ../addressbook/libebook/e-contact.c:128 + msgid "Email 1" + msgstr "ईमेल 1" + +-#: ../addressbook/libebook/e-contact.c:130 ++#: ../addressbook/libebook/e-contact.c:129 + msgid "Email 2" + msgstr "ईमेल २" + +-#: ../addressbook/libebook/e-contact.c:131 ++#: ../addressbook/libebook/e-contact.c:130 + msgid "Email 3" + msgstr "ईमेल ३" + +-#: ../addressbook/libebook/e-contact.c:132 ++#: ../addressbook/libebook/e-contact.c:131 + msgid "Email 4" + msgstr "ईमेल 4" + +-#: ../addressbook/libebook/e-contact.c:134 ++#: ../addressbook/libebook/e-contact.c:133 + msgid "Mailer" + msgstr "मेलर" + + #. Address Labels +-#: ../addressbook/libebook/e-contact.c:137 ++#: ../addressbook/libebook/e-contact.c:136 + msgid "Home Address Label" + msgstr "घर पत्ता लेबल" + +-#: ../addressbook/libebook/e-contact.c:138 ++#: ../addressbook/libebook/e-contact.c:137 + msgid "Work Address Label" + msgstr "कार्य पत्ता लेबल" + +-#: ../addressbook/libebook/e-contact.c:139 ++#: ../addressbook/libebook/e-contact.c:138 + msgid "Other Address Label" + msgstr "इतर पत्ता लेबल" + + #. Phone fields +-#: ../addressbook/libebook/e-contact.c:142 ++#: ../addressbook/libebook/e-contact.c:141 + msgid "Assistant Phone" + msgstr "सहाय्यक दूरध्वनी" + +-#: ../addressbook/libebook/e-contact.c:143 ++#: ../addressbook/libebook/e-contact.c:142 + msgid "Business Phone" + msgstr "बिजनेस दूरध्वनी" + +-#: ../addressbook/libebook/e-contact.c:144 ++#: ../addressbook/libebook/e-contact.c:143 + msgid "Business Phone 2" + msgstr "बिजनेस दूरध्वनी २" + +-#: ../addressbook/libebook/e-contact.c:145 ++#: ../addressbook/libebook/e-contact.c:144 + msgid "Business Fax" + msgstr "बिजनेस फॅक्स" + +-#: ../addressbook/libebook/e-contact.c:146 ++#: ../addressbook/libebook/e-contact.c:145 + msgid "Callback Phone" + msgstr "कॉलबॅक दूरध्वनी" + +-#: ../addressbook/libebook/e-contact.c:147 ++#: ../addressbook/libebook/e-contact.c:146 + msgid "Car Phone" + msgstr "कार दूरध्वनी" + +-#: ../addressbook/libebook/e-contact.c:148 ++#: ../addressbook/libebook/e-contact.c:147 + msgid "Company Phone" + msgstr "कंपनी दूरध्वनी" + +-#: ../addressbook/libebook/e-contact.c:149 ++#: ../addressbook/libebook/e-contact.c:148 + msgid "Home Phone" + msgstr "घरचा दूरध्वनी" + +-#: ../addressbook/libebook/e-contact.c:150 ++#: ../addressbook/libebook/e-contact.c:149 + msgid "Home Phone 2" + msgstr "घरचा दूरध्वनी२" + +-#: ../addressbook/libebook/e-contact.c:151 ++#: ../addressbook/libebook/e-contact.c:150 + msgid "Home Fax" + msgstr "घरचा फॅक्स" + +-#: ../addressbook/libebook/e-contact.c:152 ++#: ../addressbook/libebook/e-contact.c:151 + msgid "ISDN" + msgstr "ISDN" + +-#: ../addressbook/libebook/e-contact.c:153 ++#: ../addressbook/libebook/e-contact.c:152 + msgid "Mobile Phone" + msgstr "मोबाईल फोन" + +-#: ../addressbook/libebook/e-contact.c:154 ++#: ../addressbook/libebook/e-contact.c:153 + msgid "Other Phone" + msgstr "इतर फोन" + +-#: ../addressbook/libebook/e-contact.c:155 ++#: ../addressbook/libebook/e-contact.c:154 + msgid "Other Fax" + msgstr "इतर फॅक्स" + +-#: ../addressbook/libebook/e-contact.c:156 ++#: ../addressbook/libebook/e-contact.c:155 + msgid "Pager" + msgstr "पेजर" + +-#: ../addressbook/libebook/e-contact.c:157 ++#: ../addressbook/libebook/e-contact.c:156 + msgid "Primary Phone" + msgstr "प्राथमिक दूरध्वनी" + +-#: ../addressbook/libebook/e-contact.c:158 ++#: ../addressbook/libebook/e-contact.c:157 + msgid "Radio" + msgstr "रेडिओ" + +-#: ../addressbook/libebook/e-contact.c:159 ++#: ../addressbook/libebook/e-contact.c:158 + msgid "Telex" + msgstr "टेलेक्स" + + #. To translators: TTY is Teletypewriter +-#: ../addressbook/libebook/e-contact.c:161 ++#: ../addressbook/libebook/e-contact.c:160 + msgid "TTY" + msgstr "TTY" + + #. Organizational fields +-#: ../addressbook/libebook/e-contact.c:164 ++#: ../addressbook/libebook/e-contact.c:163 + msgid "Organization" + msgstr "संस्था" + +-#: ../addressbook/libebook/e-contact.c:165 ++#: ../addressbook/libebook/e-contact.c:164 + msgid "Organizational Unit" + msgstr "संस्थात्मक एकक" + +-#: ../addressbook/libebook/e-contact.c:166 ++#: ../addressbook/libebook/e-contact.c:165 + msgid "Office" + msgstr "कार्यालय" + +-#: ../addressbook/libebook/e-contact.c:167 ++#: ../addressbook/libebook/e-contact.c:166 + msgid "Title" + msgstr "शिर्षक" + +-#: ../addressbook/libebook/e-contact.c:168 ++#: ../addressbook/libebook/e-contact.c:167 + msgid "Role" + msgstr "भुमिका" + +-#: ../addressbook/libebook/e-contact.c:169 ++#: ../addressbook/libebook/e-contact.c:168 + msgid "Manager" + msgstr "व्यवस्थापक" + +-#: ../addressbook/libebook/e-contact.c:170 ++#: ../addressbook/libebook/e-contact.c:169 + msgid "Assistant" + msgstr "सहाय्यक" + + #. Web fields +-#: ../addressbook/libebook/e-contact.c:173 ++#: ../addressbook/libebook/e-contact.c:172 + msgid "Homepage URL" + msgstr "होमपेज URL" + +-#: ../addressbook/libebook/e-contact.c:174 ++#: ../addressbook/libebook/e-contact.c:173 + msgid "Weblog URL" + msgstr "वेब्लाग URL" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:177 +-#: ../libedataserverui/e-categories-dialog.c:439 ++#: ../addressbook/libebook/e-contact.c:176 ++#: ../libedataserverui/e-categories-dialog.c:426 + msgid "Categories" + msgstr "प्रवर्ग" + + #. Collaboration fields +-#: ../addressbook/libebook/e-contact.c:180 ++#: ../addressbook/libebook/e-contact.c:179 + msgid "Calendar URI" + msgstr "दिनदर्शिका URI" + +-#: ../addressbook/libebook/e-contact.c:181 ++#: ../addressbook/libebook/e-contact.c:180 + msgid "Free/Busy URL" + msgstr "रिक्त/व्यस्त URL" + +-#: ../addressbook/libebook/e-contact.c:182 ++#: ../addressbook/libebook/e-contact.c:181 + msgid "ICS Calendar" + msgstr "ICS दिनदर्शिका" + +-#: ../addressbook/libebook/e-contact.c:183 ++#: ../addressbook/libebook/e-contact.c:182 + msgid "Video Conferencing URL" + msgstr "वीडियो सम्मेलन URL" + + #. Misc fields +-#: ../addressbook/libebook/e-contact.c:186 ++#: ../addressbook/libebook/e-contact.c:185 + msgid "Spouse's Name" + msgstr "पत्नीचे नाव" + +-#: ../addressbook/libebook/e-contact.c:187 ++#: ../addressbook/libebook/e-contact.c:186 + msgid "Note" + msgstr "नोंद" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:190 ++#: ../addressbook/libebook/e-contact.c:189 + msgid "AIM Home Screen Name 1" + msgstr "AIM होम स्क्रीन नाव 1" + +-#: ../addressbook/libebook/e-contact.c:191 ++#: ../addressbook/libebook/e-contact.c:190 + msgid "AIM Home Screen Name 2" + msgstr "AIM होम स्क्रीन नाव 2" + +-#: ../addressbook/libebook/e-contact.c:192 ++#: ../addressbook/libebook/e-contact.c:191 + msgid "AIM Home Screen Name 3" + msgstr "AIM होम स्क्रीन नाव 3" + +-#: ../addressbook/libebook/e-contact.c:193 ++#: ../addressbook/libebook/e-contact.c:192 + msgid "AIM Work Screen Name 1" + msgstr "AIM कार्य स्क्रीन नाव 1" + +-#: ../addressbook/libebook/e-contact.c:194 ++#: ../addressbook/libebook/e-contact.c:193 + msgid "AIM Work Screen Name 2" + msgstr "AIM कार्य स्क्रीन नाव 2" + +-#: ../addressbook/libebook/e-contact.c:195 ++#: ../addressbook/libebook/e-contact.c:194 + msgid "AIM Work Screen Name 3" + msgstr "AIM कार्य स्क्रीन नाव 3" + +-#: ../addressbook/libebook/e-contact.c:196 ++#: ../addressbook/libebook/e-contact.c:195 + msgid "GroupWise Home Screen Name 1" + msgstr "समूह अनुसार होम स्क्रीन नाव 1" + +-#: ../addressbook/libebook/e-contact.c:197 ++#: ../addressbook/libebook/e-contact.c:196 + msgid "GroupWise Home Screen Name 2" + msgstr "समूह अनुसार होम स्क्रीन नाव 2" + +-#: ../addressbook/libebook/e-contact.c:198 ++#: ../addressbook/libebook/e-contact.c:197 + msgid "GroupWise Home Screen Name 3" + msgstr "समूह अनुसार होम स्क्रीन नाव 3" + +-#: ../addressbook/libebook/e-contact.c:199 ++#: ../addressbook/libebook/e-contact.c:198 + msgid "GroupWise Work Screen Name 1" + msgstr "समूह अनुसार कार्य स्क्रीन नाव 1" + +-#: ../addressbook/libebook/e-contact.c:200 ++#: ../addressbook/libebook/e-contact.c:199 + msgid "GroupWise Work Screen Name 2" + msgstr "समूह अनुसार कार्य स्क्रीन नाव 2" + +-#: ../addressbook/libebook/e-contact.c:201 ++#: ../addressbook/libebook/e-contact.c:200 + msgid "GroupWise Work Screen Name 3" + msgstr "समूह अनुसार कार्य स्क्रीन नाव 3" + +-#: ../addressbook/libebook/e-contact.c:202 ++#: ../addressbook/libebook/e-contact.c:201 + msgid "Jabber Home Id 1" + msgstr "Gadu-Gadu होम Id 1" + +-#: ../addressbook/libebook/e-contact.c:203 ++#: ../addressbook/libebook/e-contact.c:202 + msgid "Jabber Home Id 2" + msgstr "Gadu-Gadu होम Id 2" + +-#: ../addressbook/libebook/e-contact.c:204 ++#: ../addressbook/libebook/e-contact.c:203 + msgid "Jabber Home Id 3" + msgstr "Gadu-Gadu होम Id 3" + +-#: ../addressbook/libebook/e-contact.c:205 ++#: ../addressbook/libebook/e-contact.c:204 + msgid "Jabber Work Id 1" + msgstr "Gadu-Gadu कार्य Id 1" + +-#: ../addressbook/libebook/e-contact.c:206 ++#: ../addressbook/libebook/e-contact.c:205 + msgid "Jabber Work Id 2" + msgstr "Gadu-Gadu कार्य Id 2" + +-#: ../addressbook/libebook/e-contact.c:207 ++#: ../addressbook/libebook/e-contact.c:206 + msgid "Jabber Work Id 3" + msgstr "Gadu-Gadu कार्य Id 3" + +-#: ../addressbook/libebook/e-contact.c:208 ++#: ../addressbook/libebook/e-contact.c:207 + msgid "Yahoo! Home Screen Name 1" + msgstr "Yahoo! होम स्क्रीन नाव 1" + +-#: ../addressbook/libebook/e-contact.c:209 ++#: ../addressbook/libebook/e-contact.c:208 + msgid "Yahoo! Home Screen Name 2" + msgstr "Yahoo! होम स्क्रीन नाव 2" + +-#: ../addressbook/libebook/e-contact.c:210 ++#: ../addressbook/libebook/e-contact.c:209 + msgid "Yahoo! Home Screen Name 3" + msgstr "Yahoo! होम स्क्रीन नाव 3" + +-#: ../addressbook/libebook/e-contact.c:211 ++#: ../addressbook/libebook/e-contact.c:210 + msgid "Yahoo! Work Screen Name 1" + msgstr "Yahoo! कार्य स्क्रीन नाव 1" + +-#: ../addressbook/libebook/e-contact.c:212 ++#: ../addressbook/libebook/e-contact.c:211 + msgid "Yahoo! Work Screen Name 2" + msgstr "Yahoo! कार्य स्क्रीन नाव 2" + +-#: ../addressbook/libebook/e-contact.c:213 ++#: ../addressbook/libebook/e-contact.c:212 + msgid "Yahoo! Work Screen Name 3" + msgstr "Yahoo! कार्य स्क्रीन नाव 3" + +-#: ../addressbook/libebook/e-contact.c:214 ++#: ../addressbook/libebook/e-contact.c:213 + msgid "MSN Home Screen Name 1" + msgstr "MSN होम स्क्रीन नाव 1" + +-#: ../addressbook/libebook/e-contact.c:215 ++#: ../addressbook/libebook/e-contact.c:214 + msgid "MSN Home Screen Name 2" + msgstr "MSN होम स्क्रीन नाव 2" + +-#: ../addressbook/libebook/e-contact.c:216 ++#: ../addressbook/libebook/e-contact.c:215 + msgid "MSN Home Screen Name 3" + msgstr "MSN होम स्क्रीन नाव 3" + +-#: ../addressbook/libebook/e-contact.c:217 ++#: ../addressbook/libebook/e-contact.c:216 + msgid "MSN Work Screen Name 1" + msgstr "MSN कार्य स्क्रीन नाव 1" + +-#: ../addressbook/libebook/e-contact.c:218 ++#: ../addressbook/libebook/e-contact.c:217 + msgid "MSN Work Screen Name 2" + msgstr "MSN कार्य स्क्रीन नाव 2" + +-#: ../addressbook/libebook/e-contact.c:219 ++#: ../addressbook/libebook/e-contact.c:218 + msgid "MSN Work Screen Name 3" + msgstr "MSN कार्य स्क्रीन नाव 3" + +-#: ../addressbook/libebook/e-contact.c:220 ++#: ../addressbook/libebook/e-contact.c:219 + msgid "ICQ Home Id 1" + msgstr "ICQ होम Id 1" + +-#: ../addressbook/libebook/e-contact.c:221 ++#: ../addressbook/libebook/e-contact.c:220 + msgid "ICQ Home Id 2" + msgstr "ICQ होम Id 2" + +-#: ../addressbook/libebook/e-contact.c:222 ++#: ../addressbook/libebook/e-contact.c:221 + msgid "ICQ Home Id 3" + msgstr "ICQ होम Id 3" + +-#: ../addressbook/libebook/e-contact.c:223 ++#: ../addressbook/libebook/e-contact.c:222 + msgid "ICQ Work Id 1" + msgstr "ICQ कार्य Id 1" + +-#: ../addressbook/libebook/e-contact.c:224 ++#: ../addressbook/libebook/e-contact.c:223 + msgid "ICQ Work Id 2" + msgstr "ICQ कार्य Id 2" + +-#: ../addressbook/libebook/e-contact.c:225 ++#: ../addressbook/libebook/e-contact.c:224 + msgid "ICQ Work Id 3" + msgstr "ICQ कार्य Id 3" + + #. Last modified time +-#: ../addressbook/libebook/e-contact.c:228 ++#: ../addressbook/libebook/e-contact.c:227 + msgid "Last Revision" + msgstr "अंतिम पुनरीक्षण" + +-#: ../addressbook/libebook/e-contact.c:229 ++#: ../addressbook/libebook/e-contact.c:228 + msgid "Name or Org" + msgstr "नाव किंवा संगठन" + + #. Address fields +-#: ../addressbook/libebook/e-contact.c:232 ++#: ../addressbook/libebook/e-contact.c:231 + msgid "Address List" + msgstr "पत्ता यादी" + +-#: ../addressbook/libebook/e-contact.c:233 ++#: ../addressbook/libebook/e-contact.c:232 + msgid "Home Address" + msgstr "घरचा पत्ता" + +-#: ../addressbook/libebook/e-contact.c:234 ++#: ../addressbook/libebook/e-contact.c:233 + msgid "Work Address" + msgstr "ऑफिसचा पत्ता" + +-#: ../addressbook/libebook/e-contact.c:235 ++#: ../addressbook/libebook/e-contact.c:234 + msgid "Other Address" + msgstr "इतर पत्ता" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:238 ++#: ../addressbook/libebook/e-contact.c:237 + msgid "Category List" + msgstr "श्रेणी यादी" + + #. Photo/Logo +-#: ../addressbook/libebook/e-contact.c:241 ++#: ../addressbook/libebook/e-contact.c:240 + msgid "Photo" + msgstr "फोटो" + +-#: ../addressbook/libebook/e-contact.c:242 ++#: ../addressbook/libebook/e-contact.c:241 + msgid "Logo" + msgstr "चिन्ह" + +-#: ../addressbook/libebook/e-contact.c:244 ++#: ../addressbook/libebook/e-contact.c:243 + msgid "Name" + msgstr "नाव" + +-#: ../addressbook/libebook/e-contact.c:245 ++#: ../addressbook/libebook/e-contact.c:244 + msgid "Email List" + msgstr "ईमेल यादी" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:248 ++#: ../addressbook/libebook/e-contact.c:247 + msgid "AIM Screen Name List" + msgstr "AIM स्क्रीन नाव यादी" + +-#: ../addressbook/libebook/e-contact.c:249 ++#: ../addressbook/libebook/e-contact.c:248 + msgid "GroupWise Id List" + msgstr "समूह अनुसार Id यादी" + +-#: ../addressbook/libebook/e-contact.c:250 ++#: ../addressbook/libebook/e-contact.c:249 + msgid "Jabber Id List" + msgstr "Gadu-Gadu Id यादी" + +-#: ../addressbook/libebook/e-contact.c:251 ++#: ../addressbook/libebook/e-contact.c:250 + msgid "Yahoo! Screen Name List" + msgstr "Yahoo! स्क्रीन नाव यादी" + +-#: ../addressbook/libebook/e-contact.c:252 ++#: ../addressbook/libebook/e-contact.c:251 + msgid "MSN Screen Name List" + msgstr "MSN स्क्रीन नाव यादी" + +-#: ../addressbook/libebook/e-contact.c:253 ++#: ../addressbook/libebook/e-contact.c:252 + msgid "ICQ Id List" + msgstr "ICQ Id यादी" + +-#: ../addressbook/libebook/e-contact.c:255 ++#: ../addressbook/libebook/e-contact.c:254 + msgid "Wants HTML Mail" + msgstr "HTML मेल पाहिजे" + +-#: ../addressbook/libebook/e-contact.c:257 ++#: ../addressbook/libebook/e-contact.c:256 + msgid "List" + msgstr "यादी" + +-#: ../addressbook/libebook/e-contact.c:258 ++#: ../addressbook/libebook/e-contact.c:257 + msgid "List Show Addresses" + msgstr "दिखवा पत्ता यादी" + +-#: ../addressbook/libebook/e-contact.c:260 ++#: ../addressbook/libebook/e-contact.c:259 + msgid "Birth Date" + msgstr "जन्मदिन" + +-#: ../addressbook/libebook/e-contact.c:261 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:462 ++#: ../addressbook/libebook/e-contact.c:260 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461 + #: ../libedataserver/e-categories.c:43 + msgid "Anniversary" + msgstr "वाढदिवस" + + #. Security fields +-#: ../addressbook/libebook/e-contact.c:264 ++#: ../addressbook/libebook/e-contact.c:263 + msgid "X.509 Certificate" + msgstr "X.509 प्रमाणपत्र" + +-#: ../addressbook/libebook/e-contact.c:266 ++#: ../addressbook/libebook/e-contact.c:265 + msgid "Gadu-Gadu Home Id 1" + msgstr "Gadu-Gadu कार्य Id 1" + +-#: ../addressbook/libebook/e-contact.c:267 ++#: ../addressbook/libebook/e-contact.c:266 + msgid "Gadu-Gadu Home Id 2" + msgstr "Gadu-Gadu कार्य Id 2" + +-#: ../addressbook/libebook/e-contact.c:268 ++#: ../addressbook/libebook/e-contact.c:267 + msgid "Gadu-Gadu Home Id 3" + msgstr "Gadu-Gadu कार्य Id 3" + +-#: ../addressbook/libebook/e-contact.c:269 ++#: ../addressbook/libebook/e-contact.c:268 + msgid "Gadu-Gadu Work Id 1" + msgstr "Gadu-Gadu कार्य Id 1" + +-#: ../addressbook/libebook/e-contact.c:270 ++#: ../addressbook/libebook/e-contact.c:269 + msgid "Gadu-Gadu Work Id 2" + msgstr "Gadu-Gadu कार्य Id 2" + +-#: ../addressbook/libebook/e-contact.c:271 ++#: ../addressbook/libebook/e-contact.c:270 + msgid "Gadu-Gadu Work Id 3" + msgstr "Gadu-Gadu कार्य Id 3" + +-#: ../addressbook/libebook/e-contact.c:272 ++#: ../addressbook/libebook/e-contact.c:271 + msgid "Gadu-Gadu Id List" + msgstr "Gadu-Gadu Id यादी" + + #. Geo information +-#: ../addressbook/libebook/e-contact.c:275 ++#: ../addressbook/libebook/e-contact.c:274 + msgid "Geographic Information" + msgstr "भूगोलीक माहिती" + +-#: ../addressbook/libebook/e-contact.c:277 ++#: ../addressbook/libebook/e-contact.c:276 + msgid "Telephone" + msgstr "दूरध्वनी" + +-#: ../addressbook/libebook/e-contact.c:1494 ++#: ../addressbook/libebook/e-contact.c:1493 + #: ../addressbook/libebook/e-destination.c:761 + msgid "Unnamed List" + msgstr "निनावी यादी" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:464 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463 + #: ../libedataserver/e-categories.c:44 + msgid "Birthday" + msgstr "जन्मदिवस" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:490 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489 + #, c-format + msgid "Birthday: %s" + msgstr "जन्मदिन: %s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:514 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513 + #, c-format + msgid "Anniversary: %s" + msgstr "वाढदिवस: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:203 ++#: ../calendar/backends/file/e-cal-backend-file.c:214 + msgid "Cannot save calendar data: Malformed URI." + msgstr "दिनदर्शिका डेटा संग्रहू शकत नाही: बिघडलेला URI." + ++#: ../calendar/backends/file/e-cal-backend-file.c:221 ++#: ../calendar/backends/file/e-cal-backend-file.c:227 ++msgid "Cannot save calendar data" ++msgstr "दिनदर्शिका माहिती संचयीत करू शकले नाही" ++ + #: ../calendar/backends/google/e-cal-backend-google-utils.c:335 + msgid "Could not create thread for getting deltas" + msgstr "डेल्टासाठी थ्रेड नाही बनवता आला" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:367 +-#: ../calendar/backends/google/e-cal-backend-google.c:1175 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1039 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1338 ++#: ../calendar/backends/google/e-cal-backend-google.c:1194 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352 + #: ../calendar/backends/http/e-cal-backend-http.c:569 + #: ../calendar/backends/weather/e-cal-backend-weather.c:466 + msgid "Could not create cache file" + msgstr "कॅश फाइल नाही बनवता आली" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:380 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1051 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065 + msgid "Could not create thread for populating cache" + msgstr "कॅश भरण्यासाठी थ्रेड नाही बनवता आला" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1028 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1784 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795 + msgid "Reply Requested: by " + msgstr "उत्तर निवेदित: द्वारा" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1033 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1789 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800 + msgid "Reply Requested: When convenient" + msgstr "उत्तर निवेदित: जेव्हा सुविधा असेल" + +@@ -727,22 +732,23 @@ msgstr "उत्तर निवेद + msgid "Loading %s items" + msgstr "%s बाब लोड करत आहे" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:875 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260 + msgid "Calendar" + msgstr "दिनदर्शिका" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:933 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947 + msgid "Invalid server URI" + msgstr "अवैध सर्वर URI" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:952 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:961 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1057 +-#: ../calendar/libecal/e-cal.c:5031 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1069 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1101 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1139 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071 ++#: ../calendar/libecal/e-cal.c:5082 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:109 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145 + #: ../camel/providers/groupwise/camel-groupwise-store.c:594 + #: ../camel/providers/groupwise/camel-groupwise-store.c:746 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:157 +@@ -955,7 +961,7 @@ msgstr "%.1f-%.1fcm बर्फ\n" + msgid "%.1f-%.1fin snow\n" + msgstr "%.1f-%.1fin बर्फ\n" + +-#: ../calendar/libecal/e-cal-component.c:1315 ++#: ../calendar/libecal/e-cal-component.c:1322 + msgid "Untitled appointment" + msgstr "शीर्षकहीन नियुक्ती" + +@@ -1083,24 +1089,24 @@ msgstr "३०वा" + msgid "31st" + msgstr "३१वा" + +-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712 ++#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713 + msgid "High" + msgstr "उंच" + +-#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714 ++#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715 + msgid "Normal" + msgstr "सामान्य" + +-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:716 ++#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717 + msgid "Low" + msgstr "खाली" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:710 ++#: ../calendar/libecal/e-cal-util.c:711 + msgid "Undefined" + msgstr "अव्याख्यीत" + +-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:200 ++#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199 + #, c-format + msgid "Enter password for %s (user %s)" + msgstr "%s (उपयोक्ता %s)साठी गुप्तशब्द दाखल करा" +@@ -1114,90 +1120,109 @@ msgstr "%s (उपयोक्ता %s) + msgid "Enter password for %s to enable proxy for user %s" + msgstr "%s साठी गुप्तशब्द दाखल करा उपयोक्ता %sसाठी प्रॉक्सी समर्थ करण्यासाठी" + +-#: ../calendar/libecal/e-cal.c:5003 ++#: ../calendar/libecal/e-cal.c:5054 + msgid "Invalid argument" + msgstr "अवैध तर्क" + +-#: ../calendar/libecal/e-cal.c:5005 ++#: ../calendar/libecal/e-cal.c:5056 + msgid "Backend is busy" + msgstr "बॅकएंड व्यस्त" + +-#: ../calendar/libecal/e-cal.c:5007 ++#: ../calendar/libecal/e-cal.c:5058 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:97 + msgid "Repository is offline" + msgstr "अभिलेखागार ऑफलाइन" + +-#: ../calendar/libecal/e-cal.c:5009 ++#: ../calendar/libecal/e-cal.c:5060 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:121 + msgid "No such calendar" + msgstr "अशी दिनदर्शिका नाही" + +-#: ../calendar/libecal/e-cal.c:5011 ../servers/groupwise/e-gw-connection.c:199 ++#: ../calendar/libecal/e-cal.c:5062 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:103 ++#: ../servers/groupwise/e-gw-connection.c:233 + msgid "Object not found" + msgstr "वस्तु नाही मिळाली" + +-#: ../calendar/libecal/e-cal.c:5013 ../servers/groupwise/e-gw-connection.c:193 ++#: ../calendar/libecal/e-cal.c:5064 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:105 ++#: ../servers/groupwise/e-gw-connection.c:227 + msgid "Invalid object" + msgstr "अवैध वस्तु" + +-#: ../calendar/libecal/e-cal.c:5015 ++#: ../calendar/libecal/e-cal.c:5066 + msgid "URI not loaded" + msgstr "URI भारित नाही" + +-#: ../calendar/libecal/e-cal.c:5017 ++#: ../calendar/libecal/e-cal.c:5068 + msgid "URI already loaded" + msgstr "URI आधिच लोड" + +-#: ../calendar/libecal/e-cal.c:5019 ++#: ../calendar/libecal/e-cal.c:5070 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:99 + #: ../servers/exchange/storage/e-storage.c:571 + msgid "Permission denied" + msgstr "परवानगी नाकारली" + +-#: ../calendar/libecal/e-cal.c:5021 ../servers/groupwise/e-gw-connection.c:201 ++#: ../calendar/libecal/e-cal.c:5072 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:123 ++#: ../servers/groupwise/e-gw-connection.c:235 + msgid "Unknown User" +-msgstr "अज्ञात उपयोक्ता" ++msgstr "अपरिचीत उपयोक्ता" + +-#: ../calendar/libecal/e-cal.c:5023 ++#: ../calendar/libecal/e-cal.c:5074 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:107 + msgid "Object ID already exists" + msgstr "वस्तु ID आधिच अस्तित्वात" + +-#: ../calendar/libecal/e-cal.c:5025 ++#: ../calendar/libecal/e-cal.c:5076 + msgid "Protocol not supported" + msgstr "प्रोटोकॉल समर्थनीय नाही" + +-#: ../calendar/libecal/e-cal.c:5027 ++#: ../calendar/libecal/e-cal.c:5078 + msgid "Operation has been canceled" + msgstr "ऑपरेशन रद्द करण्यात आले आहे" + +-#: ../calendar/libecal/e-cal.c:5029 ++#: ../calendar/libecal/e-cal.c:5080 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:135 + msgid "Could not cancel operation" + msgstr "ऑपरेशन रद्द नाही करता आले" + +-#: ../calendar/libecal/e-cal.c:5033 +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 ++#: ../calendar/libecal/e-cal.c:5084 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:111 ++#: ../camel/providers/smtp/camel-smtp-transport.c:218 + msgid "Authentication required" + msgstr "अधिप्रमाणन आवश्यक" + +-#: ../calendar/libecal/e-cal.c:5035 ++#: ../calendar/libecal/e-cal.c:5086 + msgid "A CORBA exception has occurred" + msgstr "CORBA अपवाद उद्भवला" + +-#: ../calendar/libecal/e-cal.c:5037 ++#: ../calendar/libecal/e-cal.c:5088 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:138 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 +-#: ../camel/providers/imap/camel-imap-command.c:312 +-#: ../camel/providers/imap/camel-imap-command.c:412 +-#: ../camel/providers/imap/camel-imap-store.c:762 +-#: ../camel/providers/imap4/camel-imap4-store.c:313 +-#: ../camel/providers/pop3/camel-pop3-store.c:559 ++#: ../camel/providers/imap/camel-imap-command.c:434 ++#: ../camel/providers/imap/camel-imap-store.c:742 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1570 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1609 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1654 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1710 ++#: ../camel/providers/imap4/camel-imap4-store.c:315 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/providers/pop3/camel-pop3-store.c:560 + #: ../camel/providers/pop3/camel-pop3-store.c:566 +-#: ../camel/providers/pop3/camel-pop3-store.c:572 + #: ../servers/exchange/storage/e-storage.c:585 +-#: ../servers/groupwise/e-gw-connection.c:207 ++#: ../servers/groupwise/e-gw-connection.c:241 + msgid "Unknown error" +-msgstr "अपरिचित चूक" ++msgstr "अपरिचित त्रुटी" + +-#: ../calendar/libecal/e-cal.c:5039 ++#: ../calendar/libecal/e-cal.c:5090 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:95 + #: ../servers/exchange/storage/e-storage.c:553 + msgid "No error" +-msgstr "काही चूक नाही" ++msgstr "काही त्रुटी नाही" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:67 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:674 +@@ -1276,8 +1301,8 @@ msgid "" + "\"description\", or \"location\", or \"attendee\", or \"organizer\", or " + "\"classification\"" + msgstr "" +-"\"%s\" पहिले आर्ग्यूमेंट \"कोणतेही\", \"सारांश\", किंवा \"वर्णन\", किंवा \"ठिकाण" +-"\" यांपैकी एखादे असण्याची अपेक्षा करतो" ++"\"%s\" पहिले आर्ग्यूमेंट \"कोणतेही\", \"सारांश\", किंवा \"वर्णन\", किंवा \"ठिकाण\" " ++"यांपैकी एखादे असण्याची अपेक्षा करतो" + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:925 + #, c-format +@@ -1290,8 +1315,52 @@ msgid "" + "\"%s\" expects all arguments to be strings or one and only one argument to " + "be a boolean false (#f)" + msgstr "" +-"\"%s\" सारे तर्क को स्ट्रिंग होने की आशा करता है या एक व सिर्फ एक तर्क बुलियन " +-"गलत (#f) होनेसाठी" ++"\"%s\" सारे तर्क को स्ट्रिंग होने की आशा करता है या एक व सिर्फ एक तर्क बुलियन गलत (#f) " ++"होनेसाठी" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:101 ++msgid "Invalid range" ++msgstr "अवैध क्षेत्र" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:113 ++msgid "Unsupported field" ++msgstr "गुणविशेष समर्थीत नाही" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:115 ++msgid "Unsupported method" ++msgstr "पद्धती समर्थीत नाही" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:117 ++msgid "Unsupported authentication method" ++msgstr "अधिप्रमाणन पद्धती समर्थीत नाही" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:119 ++msgid "TLS not available" ++msgstr "TLS अनुपलब्ध" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:125 ++msgid "Offline unavailable" ++msgstr "ऑफलाइन अनुपलब्ध" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:127 ++msgid "Search size limit exceeded" ++msgstr "शोध आकार मर्यादा मध्ये वाढ झाली" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:129 ++msgid "Search time limit exceeded" ++msgstr "शोध वेळ मर्यादा मध्ये वाढ झाली" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:131 ++msgid "Invalid query" ++msgstr "अवैध विनंती" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:133 ++msgid "Query refused" ++msgstr "विनंती फेटाळली" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:140 ++msgid "Invalid server version" ++msgstr "अवैध सर्वर आवृत्ती" + + #: ../camel/camel-cipher-context.c:102 + msgid "Signing is not supported by this cipher" +@@ -1333,15 +1402,19 @@ msgstr "या सिफरद्वा + msgid "You may not export keys with this cipher" + msgstr "या सिफरद्वारे तुम्ही कळ निर्यात करणार नाही" + +-#: ../camel/camel-data-cache.c:137 ++#: ../camel/camel-data-cache.c:136 + msgid "Unable to create cache path" + msgstr "कॅश पथ निर्माण करण्यात अक्षम" + +-#: ../camel/camel-data-cache.c:384 ++#: ../camel/camel-data-cache.c:381 + #, c-format + msgid "Could not remove cache entry: %s: %s" + msgstr "कॅश प्रविष्टि नाही हटवू शकत: %s: %s" + ++#: ../camel/camel-db.c:107 ++msgid "Insufficient memory" ++msgstr "अपूरी स्मृती" ++ + #: ../camel/camel-disco-diary.c:198 + #, c-format + msgid "" +@@ -1354,15 +1427,16 @@ msgstr "" + "संजाळाशी पुनर्संबंध जोडत नाही." + + #: ../camel/camel-disco-diary.c:261 ++#: ../camel/providers/imap/camel-imap-journal.c:299 + #, c-format + msgid "" +-"Could not open `%s':\n" ++"Could not open '%s':\n" + "%s\n" + "Changes made to this folder will not be resynchronized." + msgstr "" +-"`%s' नाही खोलता आले :\n" ++"'%s' उघडता आले नाही:\n" + "%s\n" +-"या फोल्डर मध्ये केलेली परिवर्तने पुन्हा सिंक्रनाइझ नाही होणार." ++"या संचयीका अंतर्गत केलेले बदल पुन्हा समजुळवणी होणार नाही." + + #: ../camel/camel-disco-diary.c:297 + msgid "Resynchronizing with server" +@@ -1376,97 +1450,100 @@ msgstr "ऑफलाइन संक् + msgid "Downloading new messages for offline mode" + msgstr "ऑफलाइन मोडसाठी निवन संदेश डाउनलोड करत आहे" + +-#: ../camel/camel-disco-folder.c:468 ++#: ../camel/camel-disco-folder.c:469 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "ऑफलाइनसाठी '%s' फोल्डर तयार करत आहे" + + #: ../camel/camel-disco-store.c:403 +-#: ../camel/providers/imap/camel-imap-store.c:3018 ++#: ../camel/providers/imap/camel-imap-store.c:1002 ++#: ../camel/providers/imap/camel-imap-store.c:1810 ++#: ../camel/providers/imap/camel-imap-store.c:2226 ++#: ../camel/providers/imap/camel-imap-store.c:2989 + msgid "You must be working online to complete this operation" + msgstr "या संक्रिया को समाप्त करने के लिए आपको निश्चित रूप से ऑनलाइन काम करना पड़ेगा" + +-#: ../camel/camel-exception.c:264 ++#: ../camel/camel-exception.c:262 + msgid "No description available" + msgstr "वर्णन उपलब्ध नाही" + +-#: ../camel/camel-filter-driver.c:786 ++#: ../camel/camel-filter-driver.c:785 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "'%s' अपत्य प्रक्रिया बनवण्यात असफल: %s" + +-#: ../camel/camel-filter-driver.c:828 ++#: ../camel/camel-filter-driver.c:827 + #, c-format + msgid "Invalid message stream received from %s: %s" + msgstr "%s कडून अवैध संदेश धारा प्राप्त: %s" + +-#: ../camel/camel-filter-driver.c:1017 ../camel/camel-filter-driver.c:1026 ++#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025 + msgid "Syncing folders" + msgstr "फोल्डर सिंक्रनाइझ करत आहे" + +-#: ../camel/camel-filter-driver.c:1115 ../camel/camel-filter-driver.c:1495 ++#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1494 + #, c-format + msgid "Error parsing filter: %s: %s" +-msgstr "गाळक विश्लेषणात चूक: %s: %s" ++msgstr "गाळक विश्लेषणात त्रुटी: %s: %s" + +-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1504 ++#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1503 + #, c-format + msgid "Error executing filter: %s: %s" +-msgstr "गाळक चालवण्यात चूक: %s: %s" ++msgstr "गाळक चालवण्यात त्रुटी: %s: %s" + +-#: ../camel/camel-filter-driver.c:1192 ++#: ../camel/camel-filter-driver.c:1191 + msgid "Unable to open spool folder" + msgstr "स्पूल फोल्डर खोलण्यास अक्षम" + +-#: ../camel/camel-filter-driver.c:1201 ++#: ../camel/camel-filter-driver.c:1200 + msgid "Unable to process spool folder" + msgstr "स्पूल फोल्डर वर प्रक्रिया करण्यास अक्षम" + +-#: ../camel/camel-filter-driver.c:1216 ++#: ../camel/camel-filter-driver.c:1215 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "%d (%d%%) संदेश प्राप्त करत आहे" + +-#: ../camel/camel-filter-driver.c:1220 ++#: ../camel/camel-filter-driver.c:1219 + msgid "Cannot open message" + msgstr "संदेश नाही उघडू शकत" + +-#: ../camel/camel-filter-driver.c:1221 ../camel/camel-filter-driver.c:1234 ++#: ../camel/camel-filter-driver.c:1220 ../camel/camel-filter-driver.c:1233 + #, c-format + msgid "Failed on message %d" + msgstr "%d संदेशावर असफल" + +-#: ../camel/camel-filter-driver.c:1248 ../camel/camel-filter-driver.c:1339 ++#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1338 + msgid "Syncing folder" + msgstr "फोल्डर सिंकिंग करत आहे" + +-#: ../camel/camel-filter-driver.c:1252 ../camel/camel-filter-driver.c:1344 ++#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1343 + msgid "Complete" + msgstr "संपन्न" + +-#: ../camel/camel-filter-driver.c:1309 ++#: ../camel/camel-filter-driver.c:1308 + #, c-format + msgid "Getting message %d of %d" + msgstr "%d चा %d संदेश प्राप्त करत आहे" + +-#: ../camel/camel-filter-driver.c:1324 ++#: ../camel/camel-filter-driver.c:1323 + #, c-format + msgid "Failed at message %d of %d" + msgstr "%d चा %d संदेशा वर असफल" + +-#: ../camel/camel-filter-search.c:139 ++#: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" + msgstr "संदेश प्राप्त करण्यात असफल" + +-#: ../camel/camel-filter-search.c:402 ++#: ../camel/camel-filter-search.c:401 + msgid "Invalid arguments to (system-flag)" + msgstr "(सिस्टम-ध्वजा) स अवैध तर्क " + +-#: ../camel/camel-filter-search.c:417 ++#: ../camel/camel-filter-search.c:416 + msgid "Invalid arguments to (user-tag)" + msgstr "(उपयोक्ता-टैग) ला अवैध तर्क" + +-#: ../camel/camel-filter-search.c:582 ++#: ../camel/camel-filter-search.c:581 + #, c-format + msgid "Failed to create create child process '%s': %s" + msgstr "'%s' अपत्य प्रक्रिया बनवण्यात असफल: %s" +@@ -1475,9 +1552,9 @@ msgstr "'%s' अपत्य प्र + #: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745 + #, c-format + msgid "Error executing filter search: %s: %s" +-msgstr "गाळक शोध चालवण्यात चूक: %s: %s" ++msgstr "गाळक शोध चालवण्यात त्रुटी: %s: %s" + +-#: ../camel/camel-folder-search.c:358 ../camel/camel-folder-search.c:480 ++#: ../camel/camel-folder-search.c:332 ../camel/camel-folder-search.c:444 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -1486,81 +1563,81 @@ msgstr "" + "शोध अभिव्यक्ति चे विश्लेषण नाही करू शकत: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:368 ../camel/camel-folder-search.c:490 ++#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:454 + #, c-format + msgid "" + "Error executing search expression: %s:\n" + "%s" + msgstr "" +-"शोध अभिव्यक्ति चालवण्यात चूक: %s:\n" ++"शोध अभिव्यक्ति चालवण्यात त्रुटी: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:677 ../camel/camel-folder-search.c:712 ++#: ../camel/camel-folder-search.c:643 ../camel/camel-folder-search.c:685 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) ला bool परिणामची आवश्यकता आहे" + +-#: ../camel/camel-folder-search.c:765 ++#: ../camel/camel-folder-search.c:738 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "%s च्या आत (%s) ला परवानगी नाही" + +-#: ../camel/camel-folder-search.c:771 ../camel/camel-folder-search.c:778 ++#: ../camel/camel-folder-search.c:744 ../camel/camel-folder-search.c:751 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) ला जुळवणी प्रकार अक्षरमाळाची आवश्यकता आहे" + +-#: ../camel/camel-folder-search.c:805 ++#: ../camel/camel-folder-search.c:778 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) ला श्रृंखला परिणामची अपेक्षा आहे" + +-#: ../camel/camel-folder-search.c:814 ++#: ../camel/camel-folder-search.c:787 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) साठी फोल्डर संच जरूरी आहे" + +-#: ../camel/camel-folder-search.c:909 ++#: ../camel/camel-folder-search.c:882 + #, c-format + msgid "Performing query on unknown header: %s" +-msgstr "अज्ञात शीर्षकावर प्रश्न चालवा: %s" ++msgstr "अपरिचीत शीर्षकावर प्रश्न चालवा: %s" + +-#: ../camel/camel-folder.c:618 ++#: ../camel/camel-folder.c:693 + #, c-format + msgid "Unsupported operation: append message: for %s" + msgstr "असमर्थित संक्रिया: संदेश जोडा: %s साठी" + +-#: ../camel/camel-folder.c:1240 ++#: ../camel/camel-folder.c:1349 + #, c-format + msgid "Unsupported operation: search by expression: for %s" + msgstr "असमर्थित संक्रिया: अभिव्यक्तीने शोधा: %s साठी" + +-#: ../camel/camel-folder.c:1281 ++#: ../camel/camel-folder.c:1390 + #, c-format + msgid "Unsupported operation: search by UIDs: for %s" + msgstr "असमर्थीत कार्यपध्दती: UID द्वारे शोधा: %s करीता" + +-#: ../camel/camel-folder.c:1397 ++#: ../camel/camel-folder.c:1506 + msgid "Moving messages" + msgstr "संदेश प्रतिस्थापित करत आहे" + +-#: ../camel/camel-folder.c:1397 ++#: ../camel/camel-folder.c:1506 + msgid "Copying messages" + msgstr "संदेश प्रतिलिपी करत आहे" + +-#: ../camel/camel-folder.c:1651 ++#: ../camel/camel-folder.c:1852 + msgid "Learning junk" + msgstr "जंक समजून घेत आहे" + +-#: ../camel/camel-folder.c:1668 ++#: ../camel/camel-folder.c:1869 + msgid "Learning non-junk" + msgstr "गैर-जंक समजून घेत आहे" + +-#: ../camel/camel-folder.c:1687 ++#: ../camel/camel-folder.c:1888 + msgid "Filtering new message(s)" + msgstr "नविन संदेश गाळत आहे" + +-#: ../camel/camel-gpg-context.c:754 ++#: ../camel/camel-gpg-context.c:755 + #, c-format + msgid "" + "Unexpected GnuPG status message encountered:\n" +@@ -1571,15 +1648,15 @@ msgstr "" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:769 ++#: ../camel/camel-gpg-context.c:770 + msgid "Failed to parse gpg userid hint." + msgstr "gpg userid इशाऱ्याच्या विश्लेषणात असफल." + +-#: ../camel/camel-gpg-context.c:793 ../camel/camel-gpg-context.c:807 ++#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808 + msgid "Failed to parse gpg passphrase request." + msgstr "gpg गुप्तशब्द विनंतीच्या विश्लेषणात असफल." + +-#: ../camel/camel-gpg-context.c:827 ++#: ../camel/camel-gpg-context.c:828 + #, c-format + msgid "" + "You need a PIN to unlock the key for your\n" +@@ -1588,7 +1665,7 @@ msgstr "" + "तुमच्या स्मार्टकार्डची कळ अनलॉक करण्यासाठी तुम्हास PIN\n" + "ची गरज आहे: \"%s\"" + +-#: ../camel/camel-gpg-context.c:831 ++#: ../camel/camel-gpg-context.c:832 + #, c-format + msgid "" + "You need a passphrase to unlock the key for\n" +@@ -1597,103 +1674,95 @@ msgstr "" + "तुम्हांस उपयोक्त्यासाठी कळ खोलण्यासाठी \n" + "गुप्तशब्दाची गरज आहे: \"%s\"" + +-#: ../camel/camel-gpg-context.c:836 ++#: ../camel/camel-gpg-context.c:837 + #, c-format +-msgid "Unexpected request from GnuPG for `%s'" +-msgstr "`%s' साठी GnuPG कडून अनपेक्षित विनंती" ++msgid "Unexpected request from GnuPG for '%s'" ++msgstr "'%s' साठी GnuPG कडून अनपेक्षित विनंती" + +-#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:1066 ++#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068 + #: ../camel/providers/nntp/camel-nntp-store.c:1281 + msgid "Canceled." + msgstr "रद्द केले." + +-#: ../camel/camel-gpg-context.c:875 ++#: ../camel/camel-gpg-context.c:876 + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "गुप्त कळ खोलण्यात असफल:३ चुकीचे गुप्तशब्द दिले गेले." + +-#: ../camel/camel-gpg-context.c:883 ++#: ../camel/camel-gpg-context.c:884 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "GnuPG कडून अनपेक्षित प्रतिसाद: %s" + +-#: ../camel/camel-gpg-context.c:936 ++#: ../camel/camel-gpg-context.c:937 + msgid "Failed to encrypt: No valid recipients specified." + msgstr "एनक्रिप्ट करण्यात असफल: काही वैध प्राप्तकर्ता नाही." + + #. always called on an i/o error +-#: ../camel/camel-gpg-context.c:1204 ../camel/camel-gpg-context.c:1332 +-#: ../camel/camel-gpg-context.c:1826 ../camel/camel-gpg-context.c:1871 ++#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1334 ++#: ../camel/camel-gpg-context.c:1829 ../camel/camel-gpg-context.c:1874 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "gpg चालवण्यास असफल: %s" + +-#: ../camel/camel-gpg-context.c:1300 ../camel/camel-smime-context.c:392 ++#: ../camel/camel-gpg-context.c:1302 ../camel/camel-smime-context.c:392 + #, c-format + msgid "Could not generate signing data: %s" + msgstr "स्वाक्षरी डेटा उत्पन्न करता आला नाही: %s" + +-#: ../camel/camel-gpg-context.c:1347 ../camel/camel-gpg-context.c:1531 +-#: ../camel/camel-gpg-context.c:1616 ../camel/camel-gpg-context.c:1631 +-#: ../camel/camel-gpg-context.c:1748 ../camel/camel-gpg-context.c:1763 +-#: ../camel/camel-gpg-context.c:1842 ../camel/camel-gpg-context.c:1887 ++#: ../camel/camel-gpg-context.c:1349 ../camel/camel-gpg-context.c:1534 ++#: ../camel/camel-gpg-context.c:1619 ../camel/camel-gpg-context.c:1634 ++#: ../camel/camel-gpg-context.c:1750 ../camel/camel-gpg-context.c:1765 ++#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1890 + msgid "Failed to execute gpg." + msgstr "gpg चालवण्यात असफल." + +-#: ../camel/camel-gpg-context.c:1366 ++#: ../camel/camel-gpg-context.c:1368 + msgid "This is a digitally signed message part" + msgstr "हा डिजिटली स्वाक्षरीत संदेशाचा आहे" + +-#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457 +-#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1479 ++#: ../camel/camel-gpg-context.c:1453 ../camel/camel-gpg-context.c:1459 ++#: ../camel/camel-gpg-context.c:1465 ../camel/camel-gpg-context.c:1480 + #: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706 + #: ../camel/camel-smime-context.c:713 + msgid "Cannot verify message signature: Incorrect message format" + msgstr "संदेश स्वाक्षरीची पडताळणी नाही करू शकत: अशुद्ध संदेश स्वरूप" + +-#: ../camel/camel-gpg-context.c:1516 ++#: ../camel/camel-gpg-context.c:1519 + #, c-format + msgid "Cannot verify message signature: could not create temp file: %s" +-msgstr "" +-"संदेश स्वाक्षरीची पडताळणी नाही करू शकत: अस्थायी फाइल निर्माण करता आली नाही: " +-"%s" ++msgstr "संदेश स्वाक्षरीची पडताळणी नाही करू शकत: अस्थायी फाइल निर्माण करता आली नाही: %s" + +-#: ../camel/camel-gpg-context.c:1599 ++#: ../camel/camel-gpg-context.c:1602 + #, c-format + msgid "Could not generate encrypting data: %s" + msgstr "एनक्रिप्टींग डेटा उत्पन्न नाही करता आला: %s" + +-#: ../camel/camel-gpg-context.c:1649 ++#: ../camel/camel-gpg-context.c:1652 + msgid "This is a digitally encrypted message part" + msgstr "हा डिजिटली एनक्रिप्टेड संदेशाचा भाग आहे" + +-#: ../camel/camel-gpg-context.c:1702 ../camel/camel-gpg-context.c:1710 +-#: ../camel/camel-gpg-context.c:1730 ++#: ../camel/camel-gpg-context.c:1705 ../camel/camel-gpg-context.c:1713 ++#: ../camel/camel-gpg-context.c:1732 + msgid "Cannot decrypt message: Incorrect message format" + msgstr "संदेश स्वाक्षरी ची पडताळणी नाही करू शकत: अशुद्ध संदेश स्वरूप" + +-#: ../camel/camel-gpg-context.c:1719 ++#: ../camel/camel-gpg-context.c:1722 + msgid "Failed to decrypt MIME part: protocol error" +-msgstr "MIME भागास डिक्रिप्ट करण्यात असफल: प्रोटोकॉल चूक" ++msgstr "MIME भागास डिक्रिप्ट करण्यात असफल: प्रोटोकॉल त्रुटी" + +-#: ../camel/camel-gpg-context.c:1784 ../camel/camel-smime-context.c:969 ++#: ../camel/camel-gpg-context.c:1787 ../camel/camel-smime-context.c:969 + msgid "Encrypted content" + msgstr "एनक्रिप्टेड समाविष्ट" + +-#: ../camel/camel-gpg-context.c:1803 ++#: ../camel/camel-gpg-context.c:1806 + msgid "Unable to parse message content" + msgstr "संदेश मजकुर विश्लेषण करण्यास अक्षम" + +-#: ../camel/camel-gpg-context.c:1827 ../camel/camel-gpg-context.c:1872 ++#: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875 + #: ../camel/camel-tcp-stream-openssl.c:635 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1548 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1587 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1632 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1688 +-#: ../camel/providers/imap4/camel-imap4-store.c:820 +-#: ../camel/providers/imap4/camel-imap4-store.c:1495 +-#: ../camel/providers/imap4/camel-imap4-utils.c:557 +-#: ../camel/providers/smtp/camel-smtp-transport.c:164 +-#: ../camel/providers/smtp/camel-smtp-transport.c:219 ++#: ../camel/providers/imap4/camel-imap4-utils.c:624 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:221 + msgid "Unknown" + msgstr "अपरिचित" + +@@ -1774,61 +1843,61 @@ msgstr "Movemail कार्यक् + + #: ../camel/camel-movemail.c:237 + msgid "(Unknown error)" +-msgstr "(अज्ञात त्रुटि)" ++msgstr "(अपरिचीत त्रुटि)" + + #: ../camel/camel-movemail.c:260 + #, c-format + msgid "Error reading mail file: %s" +-msgstr "मेल फाइल वाचण्यात चूक: %s" ++msgstr "मेल फाइल वाचण्यात त्रुटी: %s" + + #: ../camel/camel-movemail.c:271 + #, c-format + msgid "Error writing mail temp file: %s" +-msgstr "मेल अस्थायी फाइल लिहीण्यात चूक: %s" ++msgstr "मेल अस्थायी फाइल लिहीण्यात त्रुटी: %s" + + #: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531 + #, c-format + msgid "Error copying mail temp file: %s" +-msgstr "मेल अस्थायी फाइल प्रतिलिपी करण्यात चूक: %s" ++msgstr "मेल अस्थायी फाइल प्रतिलिपी करण्यात त्रुटी: %s" + +-#: ../camel/camel-multipart-signed.c:595 ++#: ../camel/camel-multipart-signed.c:593 + msgid "parse error" + msgstr "त्रुटि विश्लेषण करा" + +-#: ../camel/camel-net-utils.c:506 ../camel/camel-net-utils.c:668 +-#: ../camel/camel-net-utils.c:800 +-#: ../camel/providers/pop3/camel-pop3-store.c:449 +-#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667 ++#: ../camel/camel-net-utils.c:799 ++#: ../camel/providers/pop3/camel-pop3-store.c:447 ++#: ../camel/providers/pop3/camel-pop3-store.c:547 + msgid "Canceled" + msgstr "रद्द केले" + +-#: ../camel/camel-net-utils.c:525 ++#: ../camel/camel-net-utils.c:524 + msgid "cannot create thread" + msgstr "थ्रेड नाही निर्मित करू शकत" + +-#: ../camel/camel-net-utils.c:672 ++#: ../camel/camel-net-utils.c:671 + #, c-format + msgid "Resolving: %s" + msgstr "सोडवत आहे: %s" + +-#: ../camel/camel-net-utils.c:694 ++#: ../camel/camel-net-utils.c:693 + msgid "Host lookup failed" + msgstr "यजमान शोधण्यात असफलता" + +-#: ../camel/camel-net-utils.c:696 ++#: ../camel/camel-net-utils.c:695 + #, c-format + msgid "Host lookup failed: %s: %s" + msgstr "यजमान शोध असफल: %s: %s" + +-#: ../camel/camel-net-utils.c:804 ++#: ../camel/camel-net-utils.c:803 + msgid "Resolving address" + msgstr "पत्ता सोडवत आहे" + +-#: ../camel/camel-net-utils.c:824 ++#: ../camel/camel-net-utils.c:823 + msgid "Name lookup failed" + msgstr "नाव पाहणे विफल" + +-#: ../camel/camel-net-utils.c:827 ++#: ../camel/camel-net-utils.c:826 + #, c-format + msgid "Name lookup failed: %s" + msgstr "नाव पाहणे विफल: %s" +@@ -1840,36 +1909,36 @@ msgstr "%s फोल्डर मधू + + #: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187 + #, c-format +-msgid "Cannot write offline journal for folder `%s': %s" +-msgstr "`%s' फोल्डरसाठी ऑफलाइन जर्नल लिहू नाही शकत: %s" ++msgid "Cannot write offline journal for folder '%s': %s" ++msgstr "संचयीका '%s' करीता ऑफलाइन जर्नल लिहू शकत नाही: %s" + +-#: ../camel/camel-provider.c:62 ++#: ../camel/camel-provider.c:60 + msgid "Virtual folder email provider" + msgstr "आभासी फोल्डर ईमेल दाता" + +-#: ../camel/camel-provider.c:64 ++#: ../camel/camel-provider.c:62 + msgid "For reading mail as a query of another set of folders" + msgstr "इतर फोल्डर संचाच्या प्रश्न रूपात मेल वाचण्यासाठी" + +-#: ../camel/camel-provider.c:187 ++#: ../camel/camel-provider.c:184 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." + msgstr "%s भारित नाही करता आले: या सिस्टम वर मोड्यूल अधिभारण को समर्थन नाही है." + +-#: ../camel/camel-provider.c:196 ++#: ../camel/camel-provider.c:193 + #, c-format + msgid "Could not load %s: %s" + msgstr "%s को अधिभारित नाही करता आले: %s" + +-#: ../camel/camel-provider.c:204 ++#: ../camel/camel-provider.c:201 + #, c-format + msgid "Could not load %s: No initialization code in module." + msgstr "%s ला भारित नाही करता आले: मोड्यूल मध्ये कोणताही आरंभीकरण कोड नाही आहे." + +-#: ../camel/camel-provider.c:376 ../camel/camel-session.c:177 ++#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177 + #, c-format +-msgid "No provider available for protocol `%s'" +-msgstr "`%s' प्रोटोकॉलसाठी कोणताही दाता उपलब्ध नाही" ++msgid "No provider available for protocol '%s'" ++msgstr "शिष्टाचार '%s' करीता कोणताही पुरवठाकर्ता उपलब्ध नाही" + + #: ../camel/camel-sasl-anonymous.c:37 + msgid "Anonymous" +@@ -1910,51 +1979,51 @@ msgstr "" + "अवैध अनुरेखी सूचना:\n" + "%s" + +-#: ../camel/camel-sasl-cram-md5.c:40 ++#: ../camel/camel-sasl-cram-md5.c:38 + msgid "CRAM-MD5" + msgstr "CRAM-MD5" + +-#: ../camel/camel-sasl-cram-md5.c:42 ++#: ../camel/camel-sasl-cram-md5.c:40 + 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:50 ++#: ../camel/camel-sasl-digest-md5.c:48 + msgid "DIGEST-MD5" + msgstr "DIGEST-MD5" + +-#: ../camel/camel-sasl-digest-md5.c:52 ++#: ../camel/camel-sasl-digest-md5.c:50 + msgid "" + "This option will connect to the server using a secure DIGEST-MD5 password, " + "if the server supports it." + msgstr "" +-"सुरक्षित DIGEST-MD5 गुप्तशब्दाचा उपयोग करून हा पर्याय सर्वरशी जोडेल, जर सर्वर " +-"यास समर्थन देत असेल." ++"सुरक्षित DIGEST-MD5 गुप्तशब्दाचा उपयोग करून हा पर्याय सर्वरशी जोडेल, जर सर्वर यास " ++"समर्थन देत असेल." + +-#: ../camel/camel-sasl-digest-md5.c:820 ++#: ../camel/camel-sasl-digest-md5.c:845 + msgid "Server challenge too long (>2048 octets)" + msgstr "सर्वर आव्हान खूप लांब आहे (>2048 octets)" + +-#: ../camel/camel-sasl-digest-md5.c:829 ++#: ../camel/camel-sasl-digest-md5.c:854 + msgid "Server challenge invalid\n" + msgstr "सर्वर आव्हान अवैध आहे\n" + +-#: ../camel/camel-sasl-digest-md5.c:835 ++#: ../camel/camel-sasl-digest-md5.c:860 + msgid "Server challenge contained invalid \"Quality of Protection\" token" + msgstr "सर्वर आव्हानाजवळ अवैध \"सुरक्षेची गुणवत्ता \" टोकन आहे" + +-#: ../camel/camel-sasl-digest-md5.c:865 ++#: ../camel/camel-sasl-digest-md5.c:890 + msgid "Server response did not contain authorization data" + msgstr "सर्वर प्रतिसादामध्ये प्राधिकार डेटा नाही" + +-#: ../camel/camel-sasl-digest-md5.c:883 ++#: ../camel/camel-sasl-digest-md5.c:908 + msgid "Server response contained incomplete authorization data" + msgstr "सर्वर प्रतिसादामध्ये अपूर्ण प्राधिकार डेटा आहे" + +-#: ../camel/camel-sasl-digest-md5.c:893 ++#: ../camel/camel-sasl-digest-md5.c:918 + msgid "Server response does not match" + msgstr "सर्वर प्रतिसाद मेळ नाही खात आहे" + +@@ -1970,11 +2039,13 @@ msgstr "Kerberos 5 अधिप्रम + msgid "" + "The specified mechanism is not supported by the provided credential, or is " + "unrecognized by the implementation." +-msgstr "निर्धारीत पध्दती श्रेय पुरविणाऱ्या तर्फे समर्थीत नाही, किंवा कार्यान्वीत करतेवेळी अधिकृतरित्या ओळखले गेले नाही." ++msgstr "" ++"निर्धारीत पध्दती श्रेय पुरविणाऱ्या तर्फे समर्थीत नाही, किंवा कार्यान्वीत करतेवेळी " ++"अधिकृतरित्या ओळखले गेले नाही." + + #: ../camel/camel-sasl-gssapi.c:169 + msgid "The provided target_name parameter was ill-formed." +-msgstr "दिलेले लक्ष्यनाव पॅरामीटर बिघडलेले होते." ++msgstr "प्रविष्ट लक्ष्य नाव सदोषीत होते (_n)." + + #: ../camel/camel-sasl-gssapi.c:172 + msgid "" +@@ -1986,9 +2057,7 @@ msgstr "ठरवून दिलेल + msgid "" + "The input_token contains different channel bindings to those specified via " + "the input_chan_bindings parameter." +-msgstr "" +-"इनपुट_टोकनमध्ये विविध चॅनेल बाईंडिग्ज आहेत जे इनपुट_चॅन_बाईजिग्ज पॅरामीटरद्वारे " +-"दर्शविले आहेत." ++msgstr "इनपुट_टोकनमध्ये विविध चॅनेल बाईंडिग्ज आहेत जे इनपुट_चॅन_बाईजिग्ज पॅरामीटरद्वारे दर्शविले आहेत." + + #: ../camel/camel-sasl-gssapi.c:181 + msgid "" +@@ -2001,8 +2070,8 @@ 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:190 + msgid "The supplied context handle did not refer to a valid context." +@@ -2023,7 +2092,7 @@ msgstr "संदर्भ महत् + #: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253 + #: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304 + #: ../camel/camel-sasl-kerberos4.c:231 +-#: ../camel/providers/imap/camel-imap-store.c:1317 ++#: ../camel/providers/imap/camel-imap-store.c:1272 + msgid "Bad authentication response from server." + msgstr "सर्वर कडून चुकीचा अधिप्रमाणन प्रतिसाद." + +@@ -2058,7 +2127,7 @@ msgstr "हा विकल्प सर + + #: ../camel/camel-sasl-login.c:135 + msgid "Unknown authentication state." +-msgstr "अज्ञात अधिप्रमाणन स्थिति." ++msgstr "अपरिचीत अधिप्रमाणन स्थिति." + + #: ../camel/camel-sasl-ntlm.c:34 + msgid "NTLM / SPA" +@@ -2069,8 +2138,8 @@ msgid "" + "This option will connect to a Windows-based server using NTLM / Secure " + "Password Authentication." + msgstr "" +-"NTLM / सुरक्षित परवलीशब्द ऑथेन्टिकेशन वापरून हा विकल्प विंडोजबेस सेवासंगणकाशी " +-"जोडला जाऊ शकेल." ++"NTLM / सुरक्षित परवलीशब्द अधिप्रमाणन वापरून हा विकल्प विंडोजबेस सेवासंगणकाशी जोडला जाऊ " ++"शकेल." + + #: ../camel/camel-sasl-plain.c:36 + msgid "PLAIN" +@@ -2090,28 +2159,28 @@ msgstr "POP स्त्रोत URI" + + #: ../camel/camel-sasl-popb4smtp.c:109 + msgid "POP Before SMTP auth using an unknown transport" +-msgstr "SMTP आधी POP ऑथेराइस अज्ञात वाहक वापरत आहे" ++msgstr "SMTP आधी POP ऑथेराइस अपरिचीत वाहक वापरत आहे" + + #: ../camel/camel-sasl-popb4smtp.c:114 + msgid "POP Before SMTP auth using a non-pop source" + msgstr "SMTP आधी POP ऑथ नॉन पॉप स्त्रोत आहे" + +-#: ../camel/camel-search-private.c:150 ++#: ../camel/camel-search-private.c:149 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "सामान्या एक्स्रेषन कंपाइलेशन विफल: %s: %s" + +-#: ../camel/camel-service.c:272 ++#: ../camel/camel-service.c:270 + #, c-format + msgid "URL '%s' needs a username component" + msgstr "'%s' ही URL करता युजरनेम भागाची गरज आहे" + +-#: ../camel/camel-service.c:276 ++#: ../camel/camel-service.c:274 + #, c-format + msgid "URL '%s' needs a host component" + msgstr "'%s' ही URL करता होस्ट भागाची गरज आहे" + +-#: ../camel/camel-service.c:280 ++#: ../camel/camel-service.c:278 + #, c-format + msgid "URL '%s' needs a path component" + msgstr "'%s' ही URL करता मार्ग भागाची गरज आहे" +@@ -2122,7 +2191,7 @@ msgid "" + "Could not create directory %s:\n" + "%s" + msgstr "" +-"निर्देशिका तयार करू शकत नाही %s:\n" ++"संचयीका बनवू शकत नाही %s:\n" + "%s" + + #: ../camel/camel-session.c:478 +@@ -2130,7 +2199,7 @@ msgstr "" + msgid "Please enter the %s password for %s on host %s." + msgstr "यजमान %3$s वरील %2$s करीता %1$s गुप्तशब्द प्रविष्ट करा." + +-#: ../camel/camel-smime-context.c:234 ++#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "'%s'साठी प्रमाणपत्र नाही मिळवता आले" +@@ -2234,7 +2303,7 @@ msgstr "बिघडलेली स् + + #: ../camel/camel-smime-context.c:505 + msgid "Processing error" +-msgstr "प्रक्रिया चूक" ++msgstr "प्रक्रिया त्रुटी" + + #: ../camel/camel-smime-context.c:542 + msgid "No signed data in signature" +@@ -2279,11 +2348,6 @@ msgstr "स्वाक्षरीक + msgid "Decoder failed" + msgstr "डिकोडर विफल" + +-#: ../camel/camel-smime-context.c:778 +-#, c-format +-msgid "Cannot find certificate for `%s'" +-msgstr "`%s'साठी प्रमाणपत्र नाही मिळवू शकत" +- + #: ../camel/camel-smime-context.c:785 + msgid "Cannot find common bulk encryption algorithm" + msgstr "समान बल्क इनक्रीप्शन आल्गोरिदम सापडत नाही" +@@ -2299,7 +2363,7 @@ msgstr "CMS संदेश नाही + + #: ../camel/camel-smime-context.c:811 + msgid "Cannot create CMS Enveloped data" +-msgstr "CMS पाकीट माहिती तयार करू शकत नाही" ++msgstr "CMS पाकीट माहिती बनवू शकत नाही" + + #: ../camel/camel-smime-context.c:817 + msgid "Cannot attach CMS Enveloped data" +@@ -2307,11 +2371,11 @@ msgstr "CMS पाकीट माहि + + #: ../camel/camel-smime-context.c:823 + msgid "Cannot attach CMS data object" +-msgstr "CMS माहिती तयार करू शकत नाही" ++msgstr "CMS माहिती बनवू शकत नाही" + + #: ../camel/camel-smime-context.c:832 + msgid "Cannot create CMS Recipient information" +-msgstr "CMS मिळणाऱ्याची माहिती तयार करू शकत नाही" ++msgstr "CMS मिळणाऱ्याची माहिती बनवू शकत नाही" + + #: ../camel/camel-smime-context.c:837 + msgid "Cannot add CMS Recipient information" +@@ -2324,7 +2388,7 @@ msgstr "एनकोडरवर मा + #: ../camel/camel-smime-context.c:949 + #, c-format + msgid "Decoder failed, error %d" +-msgstr "डिकोडर अयशस्वी, %d चूक" ++msgstr "डिकोडर अयशस्वी, %d त्रुटी" + + #: ../camel/camel-smime-context.c:956 + msgid "S/MIME Decrypt: No encrypted content found" +@@ -2338,45 +2402,45 @@ msgstr "कळी आयात करा + msgid "export keys: unimplemented" + msgstr "कळी निर्यात करा: न वापरल्या गेलेल्या" + +-#: ../camel/camel-store.c:219 ++#: ../camel/camel-store.c:272 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:174 + msgid "Cannot get folder: Invalid operation on this store" +-msgstr "कप्पे मिळू शकत नाहीत: हया दुकानावर अयोग्य प्रक्रिया" ++msgstr "कप्पे प्राप्त करू शकत नाहीत: हया दुकानावर अयोग्य प्रक्रिया" + +-#: ../camel/camel-store.c:252 ++#: ../camel/camel-store.c:305 + #, c-format +-msgid "Cannot create folder `%s': folder exists" +-msgstr "संचिका तयार करू शकत नाही`%s': संचिका अस्तित्वात आहे" ++msgid "Cannot create folder '%s': folder exists" ++msgstr "संचयीका '%s' बनवू शकत नाही: संचयीका अस्तित्वात आहे" + +-#: ../camel/camel-store.c:316 ++#: ../camel/camel-store.c:369 + msgid "Cannot create folder: Invalid operation on this store" + msgstr "कप्पे निर्माण करु शकत नाहीत: हया दुकानावर अयोग्य प्रक्रिया" + +-#: ../camel/camel-store.c:344 ++#: ../camel/camel-store.c:397 + #, c-format + msgid "Cannot create folder: %s: folder exists" +-msgstr "संचिका तयार करू शकत नाही: %s: संचिका अस्तित्वात आहे" ++msgstr "संचयीका बनवू शकत नाही: %s: संचयीका अस्तित्वात आहे" + +-#: ../camel/camel-store.c:408 ../camel/camel-vee-store.c:369 +-#: ../camel/providers/local/camel-maildir-store.c:218 ++#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384 ++#: ../camel/providers/local/camel-maildir-store.c:219 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" +-msgstr "संचिका कमी करू शकत नाही: %s: अवैध प्रक्रिया" ++msgstr "संचयीका कमी करू शकत नाही: %s: अवैध प्रक्रिया" + +-#: ../camel/camel-store.c:458 ../camel/camel-vee-store.c:406 +-#: ../camel/providers/local/camel-maildir-store.c:290 ++#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421 ++#: ../camel/providers/local/camel-maildir-store.c:291 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "संचिकेला परत नाव देऊ शकत नाही: %s: अवैध प्रक्रिया" + + #. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:799 ../camel/camel-vtrash-folder.c:52 +-#: ../camel/providers/imap/camel-imap-store.c:1077 ++#: ../camel/camel-store.c:854 ../camel/camel-vtrash-folder.c:53 ++#: ../camel/providers/imap/camel-imap-store.c:1060 + msgid "Trash" + msgstr "कचरा" + + #. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:802 ../camel/camel-vtrash-folder.c:54 ++#: ../camel/camel-store.c:857 ../camel/camel-vtrash-folder.c:55 + msgid "Junk" + msgstr "जंक" + +@@ -2426,7 +2490,7 @@ msgstr "CRL मुदत संपली + + #: ../camel/camel-tcp-stream-openssl.c:597 + msgid "Error in CRL" +-msgstr "CRL मध्ये चूक" ++msgstr "CRL मध्ये त्रुटी" + + #: ../camel/camel-tcp-stream-openssl.c:599 + msgid "Out of memory" +@@ -2494,9 +2558,9 @@ msgstr "कळीचा वापर स + + #: ../camel/camel-tcp-stream-openssl.c:633 + msgid "Error in application verification" +-msgstr "ऍ़प्लीकेशन तपासणीत चूक" ++msgstr "ऍ़प्लीकेशन तपासणीत त्रुटी" + +-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:871 ++#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880 + #, c-format + msgid "" + "Issuer: %s\n" +@@ -2509,11 +2573,11 @@ msgstr "" + "फिंगरप्रिंट: %s\n" + "स्वाक्षरी: %s" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "GOOD" + msgstr "GOOD" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "BAD" + msgstr "BAD" + +@@ -2537,7 +2601,7 @@ msgstr "" + "तुम्ही तरीही स्वीकार करु इच्छिता?" + + #. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:881 ++#: ../camel/camel-tcp-stream-ssl.c:890 + #, c-format + msgid "" + "SSL Certificate check for %s:\n" +@@ -2552,7 +2616,7 @@ msgstr "" + "\n" + "तुम्ही स्वीकार करु इच्छिता?" + +-#: ../camel/camel-tcp-stream-ssl.c:925 ++#: ../camel/camel-tcp-stream-ssl.c:934 + #, c-format + msgid "" + "Certificate problem: %s\n" +@@ -2561,7 +2625,7 @@ msgstr "" + "प्रमाणपत्र समस्या: %s\n" + "निर्गमक: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:977 ++#: ../camel/camel-tcp-stream-ssl.c:986 + #, c-format + msgid "" + "Bad certificate domain: %s\n" +@@ -2570,7 +2634,7 @@ msgstr "" + "वाईट प्रमाणपत्र डोमेन: %s\n" + "निर्गमक: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:995 ++#: ../camel/camel-tcp-stream-ssl.c:1004 + #, c-format + msgid "" + "Certificate expired: %s\n" +@@ -2579,7 +2643,7 @@ msgstr "" + "प्रमाणपत्र बाद झाले: %s\n" + "निर्गमक: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1012 ++#: ../camel/camel-tcp-stream-ssl.c:1021 + #, c-format + msgid "" + "Certificate revocation list expired: %s\n" +@@ -2590,164 +2654,164 @@ msgstr "" + + #: ../camel/camel-url.c:313 + #, c-format +-msgid "Could not parse URL `%s'" +-msgstr "`%s' URL चे विश्लेषण नाही करता आले" ++msgid "Could not parse URL '%s'" ++msgstr "URL '%s' वाचू शकले नाही" + +-#: ../camel/camel-vee-folder.c:482 ++#: ../camel/camel-vee-folder.c:585 + #, c-format +-msgid "Error storing `%s': %s" +-msgstr "`%s': %s साठवताना चूक" ++msgid "Error storing '%s': %s" ++msgstr "'%s' संचयनवेळी त्रुटी: %s" + +-#: ../camel/camel-vee-folder.c:524 ++#: ../camel/camel-vee-folder.c:631 + #, c-format + msgid "No such message %s in %s" + msgstr "%s मध्ये असा कोणताही निरोप नाही %s" + +-#: ../camel/camel-vee-folder.c:649 ../camel/camel-vee-folder.c:655 ++#: ../camel/camel-vee-folder.c:754 ../camel/camel-vee-folder.c:760 + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "व्हर्च्यूअल कप्प्यात संदेश प्रतिेेकृत करु शकत नाही" + +-#: ../camel/camel-vee-store.c:102 ../camel/camel-vee-store.c:345 ++#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115 ++#: ../camel/camel-vee-store.c:360 + msgid "Unmatched" + msgstr "न जुळलेले" + +-#: ../camel/camel-vee-store.c:392 ++#: ../camel/camel-vee-store.c:407 + #, c-format + msgid "Cannot delete folder: %s: No such folder" +-msgstr "संचिका कमी करू शकत नाही: %s: असा निरोप नाही" ++msgstr "संचयीका कमी करू शकत नाही: %s: असा निरोप नाही" + +-#: ../camel/camel-vee-store.c:414 ++#: ../camel/camel-vee-store.c:429 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "संचिकेला परत नाव देऊ शकत नाही: %s: असा निरोप नाही" + +-#: ../camel/camel-vtrash-folder.c:53 ++#: ../camel/camel-vtrash-folder.c:54 + msgid "Cannot copy messages to the Trash folder" + msgstr "कचरा कप्प्यात संदेश प्रातिकृत करु शकत नाही" + +-#: ../camel/camel-vtrash-folder.c:55 ++#: ../camel/camel-vtrash-folder.c:56 + msgid "Cannot copy messages to the Junk folder" + msgstr "रद्दी कप्प्यात संदेश प्रातिकृत करु शकत नाही" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2167 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #, c-format + msgid "" + "Cannot get message: %s\n" + " %s" + msgstr "" +-"निरोप मिळू शकत नाही: %s\n" ++"निरोप प्राप्त करू शकत नाही: %s\n" + " %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2167 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #: ../camel/providers/local/camel-maildir-folder.c:251 + #: ../camel/providers/local/camel-mbox-folder.c:348 + #: ../camel/providers/local/camel-mh-folder.c:204 + msgid "No such message" + msgstr "असा निरोप नाही" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:130 +-#: ../camel/providers/imap4/camel-imap4-folder.c:791 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:128 ++#: ../camel/providers/imap4/camel-imap4-folder.c:812 + #: ../camel/providers/nntp/camel-nntp-folder.c:156 + #: ../camel/providers/nntp/camel-nntp-folder.c:232 +-#: ../camel/providers/nntp/camel-nntp-folder.c:371 +-#: ../camel/providers/pop3/camel-pop3-folder.c:262 +-#: ../camel/providers/pop3/camel-pop3-folder.c:518 +-#: ../camel/providers/pop3/camel-pop3-folder.c:579 +-#: ../camel/providers/pop3/camel-pop3-folder.c:597 ++#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/pop3/camel-pop3-folder.c:266 ++#: ../camel/providers/pop3/camel-pop3-folder.c:560 ++#: ../camel/providers/pop3/camel-pop3-folder.c:621 ++#: ../camel/providers/pop3/camel-pop3-folder.c:639 + msgid "User canceled" + msgstr "वापरकर्ता रद्द केला गेला" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137 +-#: ../camel/providers/imap4/camel-imap4-folder.c:796 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:135 ++#: ../camel/providers/imap4/camel-imap4-folder.c:817 + #: ../camel/providers/nntp/camel-nntp-folder.c:147 + #: ../camel/providers/nntp/camel-nntp-folder.c:149 + #: ../camel/providers/nntp/camel-nntp-folder.c:158 + #: ../camel/providers/nntp/camel-nntp-folder.c:234 +-#: ../camel/providers/pop3/camel-pop3-folder.c:521 +-#: ../camel/providers/pop3/camel-pop3-folder.c:582 +-#: ../camel/providers/pop3/camel-pop3-folder.c:589 +-#: ../camel/providers/pop3/camel-pop3-folder.c:600 ++#: ../camel/providers/pop3/camel-pop3-folder.c:388 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 ++#: ../camel/providers/pop3/camel-pop3-folder.c:624 ++#: ../camel/providers/pop3/camel-pop3-folder.c:631 ++#: ../camel/providers/pop3/camel-pop3-folder.c:642 + #, c-format + msgid "Cannot get message %s: %s" +-msgstr "निरोप मिळू शकत नाही %s: %s" ++msgstr "निरोप प्राप्त करू शकत नाही %s: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:154 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:162 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2141 +-#: ../camel/providers/imap4/camel-imap4-folder.c:814 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:152 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:160 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164 ++#: ../camel/providers/imap4/camel-imap4-folder.c:835 + msgid "This message is not available in offline mode." + msgstr "ऑफलाईन पद्धतीत हा संदेश उपलब्ध नाही." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1690 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1737 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:172 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:179 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747 + msgid "Could not get message" +-msgstr "निरोप मिळू शकत नाही" ++msgstr "निरोप प्राप्त करू शकत नाही" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:816 +-#: ../camel/providers/imap/camel-imap-folder.c:265 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:818 ++#: ../camel/providers/imap/camel-imap-folder.c:248 + #, c-format + msgid "Could not load summary for %s" + msgstr "%s साठी सारांश प्रस्थापित करू शकत नाही" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1065 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071 + msgid "Trash Folder Full. Please Empty." + msgstr "ट्रॅश संचयीका मध्ये जागा नाही. कृपया रिकामे करा." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1242 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248 + #: ../camel/providers/groupwise/camel-groupwise-store.c:623 + #: ../camel/providers/groupwise/camel-groupwise-store.c:736 +-#: ../camel/providers/imap/camel-imap-folder.c:2538 +-#: ../camel/providers/imap/camel-imap-folder.c:2608 ++#: ../camel/providers/imap/camel-imap-folder.c:3161 ++#: ../camel/providers/imap/camel-imap-folder.c:3238 + #, c-format + msgid "Fetching summary information for new messages in %s" + msgstr "%s मधील नविन संदेश करीता सारांश माहिती प्राप्त करीत आहे" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2008 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2050 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073 + #, c-format +-msgid "Cannot append message to folder `%s': %s" +-msgstr "संचिकेमध्ये निरोप मिळवू शकत नाही `%s': %s" ++msgid "Cannot append message to folder '%s': %s" ++msgstr "संचिका '%s' करीता संदेश जोडू शकत नाही: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2038 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061 + #, c-format + msgid "Cannot create message: %s" +-msgstr "निरोप तयार करू शकत नाही: %s" ++msgstr "निरोप बनवू शकत नाही: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:284 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:285 + #, c-format + msgid "Cannot get folder container %s" +-msgstr "%s कप्पा कंटेनर मिळू शकत नाही" ++msgstr "%s कप्पा कंटेनर प्राप्त करू शकत नाही" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:348 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:349 + #: ../camel/providers/imap4/camel-imap4-journal.c:319 + msgid "Cannot append message in offline mode: cache unavailable" + msgstr "ऑफलाइन पद्धतीत संदेश अपेंड करता येत नाही: कॅश उपलब्ध नाही" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:364 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:365 + #: ../camel/providers/imap4/camel-imap4-journal.c:335 + #, c-format + msgid "Cannot append message in offline mode: %s" + msgstr "ऑफलाइन पद्धतीत संदेश अपेंड करता येत नाही: %s" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:55 +-#: ../camel/providers/imap4/camel-imap4-provider.c:38 ++#: ../camel/providers/imap4/camel-imap4-provider.c:39 + msgid "Checking for new mail" + msgstr "नविन मेलसाठी तपासत आहे" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:57 + #: ../camel/providers/hula/camel-hula-provider.c:51 + #: ../camel/providers/imap/camel-imap-provider.c:46 +-#: ../camel/providers/imap4/camel-imap4-provider.c:40 ++#: ../camel/providers/imap4/camel-imap4-provider.c:41 + msgid "C_heck for new messages in all folders" +-msgstr "सर्व संचिकेमध्ये नवीन निरोप तपासा" ++msgstr "सर्व संचिका मध्ये नवीन संदेश करीता तपासा (_h)" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:60 +-#: ../camel/providers/imap/camel-imap-provider.c:66 +-#: ../camel/providers/imap4/camel-imap4-provider.c:51 ++#: ../camel/providers/imap/camel-imap-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:52 + #: ../camel/providers/local/camel-local-provider.c:46 + #: ../camel/providers/local/camel-local-provider.c:86 + #: ../camel/providers/local/camel-local-provider.c:106 +@@ -2763,13 +2827,13 @@ msgid "Check new messages for J_unk cont + msgstr "जंक अनुक्रम करीता नविन संदेश तपासा (_u)" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:66 +-#: ../camel/providers/imap/camel-imap-provider.c:72 ++#: ../camel/providers/imap/camel-imap-provider.c:74 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "इंबॉक्स संचयीका मध्ये जंक संदेश करीता तपास करा (_B)" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:68 + msgid "Automatically synchroni_ze account locally" +-msgstr "स्वयंचलीतपणे स्थानियरीत्या खाते समकालीक करा" ++msgstr "स्वयंचलीतपणे स्थानियरीत्या खाते समजुळवणी करा (_z)" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:73 + msgid "SOAP Settings" +@@ -2789,8 +2853,8 @@ msgstr "नॉव्हेल ग्र + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:106 + #: ../camel/providers/hula/camel-hula-provider.c:95 +-#: ../camel/providers/imap/camel-imap-provider.c:98 +-#: ../camel/providers/imap4/camel-imap4-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap4/camel-imap4-provider.c:84 + #: ../camel/providers/imapp/camel-imapp-provider.c:67 + #: ../camel/providers/nntp/camel-nntp-provider.c:74 + #: ../camel/providers/pop3/camel-pop3-provider.c:72 +@@ -2799,16 +2863,14 @@ msgstr "गुप्तशब्द" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:108 + msgid "This option will connect to the GroupWise server using a plaintext password." +-msgstr "" +-"नुसत्या मजकुरासाठी परवलीशब्द वापरून हा विकल्प गटाप्रमाणे सेवासंगणकाशी जोडला " +-"जाऊ शकेल." ++msgstr "नुसत्या मजकुरासाठी परवलीशब्द वापरून हा विकल्प गटाप्रमाणे सेवासंगणकाशी जोडला जाऊ शकेल." + + #: ../camel/providers/groupwise/camel-groupwise-store.c:103 + msgid "Host or user not available in url" + msgstr "url मध्ये होस्ट आणि युजर उपलब्ध नाही" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:206 +-#: ../camel/providers/imap/camel-imap-store.c:1401 ++#: ../camel/providers/imap/camel-imap-store.c:1356 + msgid "You did not enter a password." + msgstr "तुम्ही गुप्तशब्द प्रविष्ट केले नाही." + +@@ -2817,35 +2879,35 @@ msgid "Some features may not work correc + msgstr "तुमच्या सध्याच्या सर्व्हर आवृत्ती बरोबर काही गुणधर्म नीट काम करु शकणार नाही" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:532 +-#: ../camel/providers/imap/camel-imap-store.c:1912 +-#: ../camel/providers/imap/camel-imap-store.c:2103 ++#: ../camel/providers/imap/camel-imap-store.c:1846 ++#: ../camel/providers/imap/camel-imap-store.c:2044 + #, c-format + msgid "No such folder %s" + msgstr "%s असा फोल्डर नाही" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1217 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1219 + msgid "Cannot create GroupWise folders in offline mode." + msgstr "ऑफलाइन पद्धतीत ग्रुपवाईज कप्पे निर्माण करता येत नाही." + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1231 +-#: ../camel/providers/imap/camel-imap-store.c:1987 +-#: ../camel/providers/imap/camel-imap-store.c:2356 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1233 ++#: ../camel/providers/imap/camel-imap-store.c:1921 ++#: ../camel/providers/imap/camel-imap-store.c:2301 + msgid "The parent folder is not allowed to contain subfolders" +-msgstr "मूळ संचिकेत उपसंचिका असण्याला परवानगी नाही" ++msgstr "मूळ संचिकेत उपसंचयीका असण्याला परवानगी नाही" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1307 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1309 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1330 + #, c-format +-msgid "Cannot rename Groupwise folder `%s' to `%s'" +-msgstr "`%s' ग्रुपवाईज कप्प्याचे नाव `%s' हे बदलता येत नाही" ++msgid "Cannot rename Groupwise folder '%s' to '%s'" ++msgstr "Groupwise संचयीका '%s' ला '%s' असे पुन्हनामांकन शक्य नाही" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1360 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:121 + #, c-format + msgid "GroupWise server %s" + msgstr "GroupWise सर्वर %s" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1364 + #, c-format + msgid "GroupWise service for %s on %s" + msgstr "%s वर %s करता ग्रुपवाईज सर्विस" +@@ -2864,7 +2926,9 @@ 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" ++msgstr "" ++"संचयन मर्यादा पलीकडे खातेचे आकार गेले आहे. तुमचे संदेश आउटबॉक्स मध्ये क्रमात लागवले गेले आहे. मेल " ++"मधून काहीक संदेश पाठविल्यास/प्राप्त झाल्यास पुन्हा पाठवा.\n" + + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 + #: ../camel/providers/sendmail/camel-sendmail-transport.c:209 +@@ -2878,38 +2942,38 @@ msgid "Checking for New Mail" + msgstr "नवीन पत्रासाठी तपासत आहे" + + #: ../camel/providers/hula/camel-hula-provider.c:54 +-#: ../camel/providers/imap/camel-imap-provider.c:50 ++#: ../camel/providers/imap/camel-imap-provider.c:52 + msgid "Connection to Server" + msgstr "सर्वरला जोडा" + + #: ../camel/providers/hula/camel-hula-provider.c:56 +-#: ../camel/providers/imap/camel-imap-provider.c:52 ++#: ../camel/providers/imap/camel-imap-provider.c:54 + msgid "_Use custom command to connect to server" +-msgstr "सर्व्हरशी संपर्काकरता कस्टम सूचना वापरा" ++msgstr "सर्व्हरशी संपर्का करीता इच्छिक आदेश वापरा (_U)" + + #: ../camel/providers/hula/camel-hula-provider.c:58 +-#: ../camel/providers/imap/camel-imap-provider.c:54 ++#: ../camel/providers/imap/camel-imap-provider.c:56 + msgid "Command:" + msgstr "आदेश:" + + #: ../camel/providers/hula/camel-hula-provider.c:61 +-#: ../camel/providers/imap/camel-imap-provider.c:58 +-#: ../camel/providers/imap4/camel-imap4-provider.c:43 ++#: ../camel/providers/imap/camel-imap-provider.c:60 ++#: ../camel/providers/imap4/camel-imap4-provider.c:44 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "फोल्डर्स" + + #: ../camel/providers/hula/camel-hula-provider.c:63 +-#: ../camel/providers/imap/camel-imap-provider.c:60 +-#: ../camel/providers/imap4/camel-imap4-provider.c:45 ++#: ../camel/providers/imap/camel-imap-provider.c:62 ++#: ../camel/providers/imap4/camel-imap4-provider.c:46 + msgid "_Show only subscribed folders" +-msgstr "सबस्काईब केलेले कप्पेच दाखवा" ++msgstr "फक्त सबस्काईब केलेले संचयीका दर्शवा (_S)" + + #: ../camel/providers/hula/camel-hula-provider.c:65 +-#: ../camel/providers/imap/camel-imap-provider.c:62 +-#: ../camel/providers/imap4/camel-imap4-provider.c:47 ++#: ../camel/providers/imap/camel-imap-provider.c:64 ++#: ../camel/providers/imap4/camel-imap4-provider.c:48 + msgid "O_verride server-supplied folder namespace" +-msgstr "सबस्काईब कप्पा नावाची जागेवरुन जा" ++msgstr "सर्वर द्वारे पुरविलेले संचयीका नावक्षेत्र पुन्हा वापरा (_v)" + + #: ../camel/providers/hula/camel-hula-provider.c:67 + msgid "Namespace" +@@ -2927,22 +2991,32 @@ msgstr "Hula सर्वरसाठी + msgid "This option will connect to the Hula server using a plaintext password." + msgstr "पाठ्य गुप्तशब्दचा वापर करून हा पर्याय Hula सर्वरशी जुळवणी करेल." + +-#: ../camel/providers/imap/camel-imap-command.c:224 +-#: ../camel/providers/imap/camel-imap-command.c:266 +-#: ../camel/providers/imap/camel-imap-command.c:472 +-#: ../camel/providers/imap/camel-imap-store.c:3058 ++#: ../camel/providers/imap/camel-imap-command.c:183 ++#: ../camel/providers/imap/camel-imap-command.c:267 ++msgid "No output stream" ++msgstr "आऊटपुट स्ट्रीम नाही" ++ ++#: ../camel/providers/imap/camel-imap-command.c:188 ++#: ../camel/providers/imap/camel-imap-command.c:272 ++msgid "No input stream" ++msgstr "इनपुट स्ट्रीम नाही" ++ ++#: ../camel/providers/imap/camel-imap-command.c:231 ++#: ../camel/providers/imap/camel-imap-command.c:280 ++#: ../camel/providers/imap/camel-imap-command.c:494 ++#: ../camel/providers/imap/camel-imap-store.c:3029 + msgid "Operation cancelled" + msgstr "ऑपरेशन रद्द" + +-#: ../camel/providers/imap/camel-imap-command.c:311 +-#: ../camel/providers/imap/camel-imap-store.c:3061 ++#: ../camel/providers/imap/camel-imap-command.c:333 ++#: ../camel/providers/imap/camel-imap-store.c:3032 + #, c-format + msgid "Server unexpectedly disconnected: %s" + msgstr "%s: अनअपेक्षित पणे सर्व्हरचा संपर्क तुटले" + + #. for imap ALERT codes, account user@host + #. we might get a ']' from a BAD response since we +12, but who cares? +-#: ../camel/providers/imap/camel-imap-command.c:332 ++#: ../camel/providers/imap/camel-imap-command.c:354 + #, c-format + msgid "" + "Alert from IMAP server %s@%s:\n" +@@ -2951,239 +3025,257 @@ msgstr "" + "%s@%s: IMAP सर्व्हरहून जागृत करा\n" + "%s" + +-#: ../camel/providers/imap/camel-imap-command.c:401 ++#: ../camel/providers/imap/camel-imap-command.c:423 + #, c-format + msgid "Unexpected response from IMAP server: %s" + msgstr "IMAP सर्व्हरकडून अनपेक्षित प्रतिसाद: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:411 ++#: ../camel/providers/imap/camel-imap-command.c:433 + #, c-format + msgid "IMAP command failed: %s" + msgstr "IMAP आदेश असफल: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:486 ++#: ../camel/providers/imap/camel-imap-command.c:508 + msgid "Server response ended too soon." + msgstr "सर्व्हर प्रतिसाद खूप लवकर संपला." + +-#: ../camel/providers/imap/camel-imap-command.c:693 ++#: ../camel/providers/imap/camel-imap-command.c:715 + #, c-format + msgid "IMAP server response did not contain %s information" + msgstr "%s माहिती IMAP सर्व्हरला प्रतिसादात नव्हती " + +-#: ../camel/providers/imap/camel-imap-command.c:729 ++#: ../camel/providers/imap/camel-imap-command.c:751 + #, c-format + msgid "Unexpected OK response from IMAP server: %s" + msgstr "IMAP सर्व्हरकडून अनपेक्षित OK प्रतिसाद: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:87 ++#: ../camel/providers/imap/camel-imap-folder.c:88 + msgid "Always check for new mail in this folder" + msgstr "संचयीका मधील नविन मेल करीता नेहमी तपास करा" + +-#: ../camel/providers/imap/camel-imap-folder.c:246 ++#: ../camel/providers/imap/camel-imap-folder.c:229 + #, c-format + msgid "Could not create directory %s: %s" +-msgstr "निर्देशिका तयार करू शकत नाही%s: %s" +- +-#: ../camel/providers/imap/camel-imap-folder.c:350 +-msgid "Folder was destroyed and recreated on server." +-msgstr "सर्व्हवर कप्पा नष्ट केला व पुन्हाबनविले केला." ++msgstr "संचयीका बनवू शकत नाही%s: %s" + + #. Check UIDs and flags of all messages we already know of. +-#: ../camel/providers/imap/camel-imap-folder.c:682 ++#: ../camel/providers/imap/camel-imap-folder.c:843 + #, c-format + msgid "Scanning for changed messages in %s" + msgstr "%s मधिल बदलाव केलेल्या संदेश करीता स्कॅन करीत आहे" + +-#: ../camel/providers/imap/camel-imap-folder.c:2127 ++#: ../camel/providers/imap/camel-imap-folder.c:1838 ++#, c-format ++msgid "Unexpected response status '%s' after APPEND command" ++msgstr "APPEND आदेश नतंर आढळलेली अनपेक्षीत प्रतिसाद स्थिती '%s'" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1853 ++msgid "No response on continuation after APPEND command" ++msgstr "APPEND आदेश चालविल्यानंतर पुढचा प्रतिसाद आढळला नाही" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1895 ++msgid "Unknown error occurred during APPEND command!" ++msgstr "APPEND आदेश चालवितेवेळी अपरिचीत त्रुटी आढळली!" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2707 + #, c-format + msgid "Unable to retrieve message: %s" + msgstr "संदेश पुनर्प्राप्त करने में असमर्थ: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2206 +-#: ../camel/providers/imap/camel-imap-folder.c:2892 ++#: ../camel/providers/imap/camel-imap-folder.c:2748 ++#, c-format ++msgid "Cannot get message with message ID %s: %s" ++msgstr "संदेश ID %s असलेले संदेश प्राप्त करू शकत नाही: %s" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2749 ++msgid "No such message available." ++msgstr "यानुरूप संदेश उपलब्ध नाही." ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2788 ++#: ../camel/providers/imap/camel-imap-folder.c:3540 + #: ../camel/providers/nntp/camel-nntp-folder.c:220 + msgid "This message is not currently available" + msgstr "हा निरोप सध्या उपलब्ध नाही" + +-#: ../camel/providers/imap/camel-imap-folder.c:2727 ++#: ../camel/providers/imap/camel-imap-folder.c:3367 + #, c-format + msgid "Incomplete server response: no information provided for message %d" + msgstr "अपूर्ण सर्व्हर प्रतिसाद: %d संदेशाकरता काहीही माहिती दिलेली नाही" + +-#: ../camel/providers/imap/camel-imap-folder.c:2735 ++#: ../camel/providers/imap/camel-imap-folder.c:3375 + #, c-format + msgid "Incomplete server response: no UID provided for message %d" + msgstr "अपूर्ण सर्व्हर प्रतिसाद: %d संदेशाकरता काहीही UID दिलेली नाही" + +-#: ../camel/providers/imap/camel-imap-folder.c:2748 +-#, c-format +-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d" +-msgstr "अनपेक्षित सेवासंगमकाचा प्रतिसाद: %d आणि %d करता समान UIDs देण्यात आल्या आहेत" +- +-#: ../camel/providers/imap/camel-imap-folder.c:2930 ++#: ../camel/providers/imap/camel-imap-folder.c:3578 + msgid "Could not find message body in FETCH response." + msgstr "FETCH प्रतिसादात संदेशाचे धड सापडले नाही." + +-#: ../camel/providers/imap/camel-imap-message-cache.c:161 ++#: ../camel/providers/imap/camel-imap-message-cache.c:160 ++#: ../camel/providers/imap/camel-imap-message-cache.c:220 + #, c-format + msgid "Could not open cache directory: %s" + msgstr "%s: कॅश फॅक्टरी उघडता येत नाही" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:267 +-#: ../camel/providers/imap/camel-imap-message-cache.c:324 +-#: ../camel/providers/imap/camel-imap-message-cache.c:355 +-#: ../camel/providers/imap/camel-imap-message-cache.c:387 ++#: ../camel/providers/imap/camel-imap-message-cache.c:307 ++#: ../camel/providers/imap/camel-imap-message-cache.c:364 ++#: ../camel/providers/imap/camel-imap-message-cache.c:395 ++#: ../camel/providers/imap/camel-imap-message-cache.c:427 + #, c-format + msgid "Failed to cache message %s: %s" + msgstr "%s: %s कॅश संदेश अयशस्वी" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:438 ++#: ../camel/providers/imap/camel-imap-message-cache.c:478 + #, c-format + msgid "Failed to cache %s: %s" + msgstr "%s: %s कॅश अयशस्वी" + +-#: ../camel/providers/imap/camel-imap-provider.c:64 +-#: ../camel/providers/imap4/camel-imap4-provider.c:49 ++#: ../camel/providers/imap/camel-imap-provider.c:48 ++msgid "Ch_eck for new messages in subscribed folders" ++msgstr "नविन संदेश करीता सबस्क्राइब संचयीका अंतर्गत तपास घ्या (_e)" ++ ++#: ../camel/providers/imap/camel-imap-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:50 + msgid "Namespace:" + msgstr "नामक्षेत्र:" + +-#: ../camel/providers/imap/camel-imap-provider.c:68 +-#: ../camel/providers/imap4/camel-imap4-provider.c:53 ++#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap4/camel-imap4-provider.c:54 + msgid "_Apply filters to new messages in INBOX on this server" +-msgstr "हया सर्व्हरवरील इनबॉक्समधील संदेशाकरता गाळणी लावा" ++msgstr "या सर्वर वरील इनबॉक्स वरील संदेश करीता फिल्टर चालवा (_A)" + +-#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap/camel-imap-provider.c:72 + msgid "Check new messages for Jun_k contents" + msgstr "निउपयोगी अनुक्रम करीता नविन संदेश तपासा (_k)" + +-#: ../camel/providers/imap/camel-imap-provider.c:74 +-#: ../camel/providers/imap4/camel-imap4-provider.c:59 ++#: ../camel/providers/imap/camel-imap-provider.c:76 ++#: ../camel/providers/imap4/camel-imap4-provider.c:60 + msgid "Automatically synchroni_ze remote mail locally" +-msgstr "दुरस्थ मेल स्थानिक ठिकाणी आपोआप संलग्न होते" ++msgstr "दुरस्थ मेल स्थानीयरित्या आपोआप समजुळवणी करा (_z)" + +-#: ../camel/providers/imap/camel-imap-provider.c:81 ++#: ../camel/providers/imap/camel-imap-provider.c:83 + msgid "IMAP" + msgstr "IMAP" + +-#: ../camel/providers/imap/camel-imap-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:85 + msgid "For reading and storing mail on IMAP servers." + msgstr "IMAP सर्वर वरील मेल वाचण्याकरिता आणि संचयीत करण्या करीता." + +-#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap/camel-imap-provider.c:102 + #: ../camel/providers/imapp/camel-imapp-provider.c:69 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "नुसता मजकूर परवलीशब्दाचा वापर करून हा विकल्प IMAP सेवासंगणकाशी जोडला जाईल." + +-#: ../camel/providers/imap/camel-imap-store.c:457 +-#: ../camel/providers/imap4/camel-imap4-store.c:212 ++#: ../camel/providers/imap/camel-imap-store.c:436 ++#: ../camel/providers/imap4/camel-imap4-store.c:214 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP सेवासंगमक %s" + +-#: ../camel/providers/imap/camel-imap-store.c:459 +-#: ../camel/providers/imap4/camel-imap4-store.c:214 ++#: ../camel/providers/imap/camel-imap-store.c:438 ++#: ../camel/providers/imap4/camel-imap4-store.c:216 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "%s वर %s करिता IMAP सुविधा" + +-#: ../camel/providers/imap/camel-imap-store.c:587 +-#: ../camel/providers/imap/camel-imap-store.c:602 +-#: ../camel/providers/imap4/camel-imap4-store.c:249 +-#: ../camel/providers/imap4/camel-imap4-store.c:264 ++#: ../camel/providers/imap/camel-imap-store.c:567 ++#: ../camel/providers/imap/camel-imap-store.c:582 ++#: ../camel/providers/imap4/camel-imap4-store.c:251 ++#: ../camel/providers/imap4/camel-imap4-store.c:266 + #: ../camel/providers/nntp/camel-nntp-store.c:183 + #: ../camel/providers/nntp/camel-nntp-store.c:198 +-#: ../camel/providers/pop3/camel-pop3-store.c:173 +-#: ../camel/providers/pop3/camel-pop3-store.c:187 +-#: ../camel/providers/smtp/camel-smtp-transport.c:258 +-#: ../camel/providers/smtp/camel-smtp-transport.c:273 ++#: ../camel/providers/pop3/camel-pop3-store.c:171 ++#: ../camel/providers/pop3/camel-pop3-store.c:185 ++#: ../camel/providers/smtp/camel-smtp-transport.c:260 ++#: ../camel/providers/smtp/camel-smtp-transport.c:275 + #, c-format + msgid "Could not connect to %s: %s" + msgstr "ला जोडू शकत नाही %s: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:588 +-#: ../camel/providers/imap4/camel-imap4-store.c:250 ++#: ../camel/providers/imap/camel-imap-store.c:568 ++#: ../camel/providers/imap4/camel-imap4-store.c:252 + #: ../camel/providers/nntp/camel-nntp-store.c:184 +-#: ../camel/providers/pop3/camel-pop3-store.c:174 +-#: ../camel/providers/smtp/camel-smtp-transport.c:259 ++#: ../camel/providers/pop3/camel-pop3-store.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:261 + msgid "SSL unavailable" + msgstr "SSL अनुपलब्ध" + +-#: ../camel/providers/imap/camel-imap-store.c:599 +-#: ../camel/providers/imap/camel-imap-store.c:881 ++#: ../camel/providers/imap/camel-imap-store.c:579 ++#: ../camel/providers/imap/camel-imap-store.c:861 + msgid "Connection cancelled" + msgstr "जोडणी रद्द" + +-#: ../camel/providers/imap/camel-imap-store.c:710 +-#: ../camel/providers/imap/camel-imap-store.c:729 +-#: ../camel/providers/imap/camel-imap-store.c:735 +-#: ../camel/providers/imap/camel-imap-store.c:761 +-#: ../camel/providers/imap4/camel-imap4-store.c:312 +-#: ../camel/providers/imap4/camel-imap4-store.c:327 +-#: ../camel/providers/imap4/camel-imap4-store.c:335 ++#: ../camel/providers/imap/camel-imap-store.c:690 ++#: ../camel/providers/imap/camel-imap-store.c:709 ++#: ../camel/providers/imap/camel-imap-store.c:715 ++#: ../camel/providers/imap/camel-imap-store.c:741 ++#: ../camel/providers/imap4/camel-imap4-store.c:314 ++#: ../camel/providers/imap4/camel-imap4-store.c:329 ++#: ../camel/providers/imap4/camel-imap4-store.c:338 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "%s सुरक्षित पध्दतीत IMAP सेवासंगणकाशी संपर्क साधण्यात अपयश आले: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:711 +-#: ../camel/providers/smtp/camel-smtp-transport.c:331 ++#: ../camel/providers/imap/camel-imap-store.c:691 ++#: ../camel/providers/smtp/camel-smtp-transport.c:333 + msgid "STARTTLS not supported" + msgstr "STARTTLS समर्थित नाही" + +-#: ../camel/providers/imap/camel-imap-store.c:730 ++#: ../camel/providers/imap/camel-imap-store.c:710 + msgid "SSL negotiations failed" + msgstr "SSL बोलणी फिस्कटली" + +-#: ../camel/providers/imap/camel-imap-store.c:736 +-#: ../camel/providers/imap4/camel-imap4-store.c:336 +-#: ../camel/providers/smtp/camel-smtp-transport.c:370 ++#: ../camel/providers/imap/camel-imap-store.c:716 ++#: ../camel/providers/imap4/camel-imap4-store.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:372 + msgid "SSL is not available in this build" + msgstr "ह्या बांधणीमध्ये SSL उपलब्ध नाही" + +-#: ../camel/providers/imap/camel-imap-store.c:884 ++#: ../camel/providers/imap/camel-imap-store.c:864 + #, c-format + msgid "Could not connect with command \"%s\": %s" + msgstr "\"%s\" ह्या सुचनेचा संपर्क साधता येत नाही: %s" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imap/camel-imap-store.c:1069 +-#: ../camel/providers/imap/camel-imap-store.c:2452 +-#: ../camel/providers/imap4/camel-imap4-store-summary.c:367 +-#: ../camel/providers/imap4/camel-imap4-store.c:1326 ++#: ../camel/providers/imap/camel-imap-store.c:1052 ++#: ../camel/providers/imap/camel-imap-store.c:2397 ++#: ../camel/providers/imap4/camel-imap4-store-summary.c:368 ++#: ../camel/providers/imap4/camel-imap4-store.c:1408 + #: ../camel/providers/local/camel-maildir-folder.c:77 +-#: ../camel/providers/local/camel-maildir-store.c:218 +-#: ../camel/providers/local/camel-maildir-store.c:290 +-#: ../camel/providers/local/camel-maildir-store.c:514 +-#: ../camel/providers/local/camel-maildir-store.c:527 ++#: ../camel/providers/local/camel-maildir-store.c:219 ++#: ../camel/providers/local/camel-maildir-store.c:291 ++#: ../camel/providers/local/camel-maildir-store.c:517 ++#: ../camel/providers/local/camel-maildir-store.c:530 + #: ../camel/providers/local/camel-spool-store.c:464 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264 + msgid "Inbox" + msgstr "इनबॉक्स" + +-#: ../camel/providers/imap/camel-imap-store.c:1071 ++#: ../camel/providers/imap/camel-imap-store.c:1054 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263 + msgid "Drafts" + msgstr "मसुदे" + +-#: ../camel/providers/imap/camel-imap-store.c:1073 ++#: ../camel/providers/imap/camel-imap-store.c:1056 + msgid "Sent" + msgstr "पाठवलेले" + +-#: ../camel/providers/imap/camel-imap-store.c:1075 ++#: ../camel/providers/imap/camel-imap-store.c:1058 + msgid "Templates" + msgstr "प्रारूप" + +-#: ../camel/providers/imap/camel-imap-store.c:1348 ++#: ../camel/providers/imap/camel-imap-store.c:1303 + #, c-format + msgid "IMAP server %s does not support requested authentication type %s" +-msgstr "%s IMAP सेवासंगणक विनंती केलेल्या ऑथेन्टिकेशन प्रकाराला सहाय्य करत नाही %s" ++msgstr "%s IMAP सेवासंगणक विनंती केलेल्या अधिप्रमाणन प्रकाराला सहाय्य करत नाही %s" + +-#: ../camel/providers/imap/camel-imap-store.c:1358 +-#: ../camel/providers/smtp/camel-smtp-transport.c:504 ++#: ../camel/providers/imap/camel-imap-store.c:1313 ++#: ../camel/providers/smtp/camel-smtp-transport.c:507 + #, c-format + msgid "No support for authentication type %s" +-msgstr "ऑथेन्टिकेशन प्रकाराला सहाय्य नाही %s" ++msgstr "अधिप्रमाणन प्रकाराला सहाय्य नाही %s" + +-#: ../camel/providers/imap/camel-imap-store.c:1430 ++#: ../camel/providers/imap/camel-imap-store.c:1385 + #, c-format + msgid "" + "Unable to authenticate to IMAP server.\n" +@@ -3194,33 +3286,33 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/imap/camel-imap-store.c:1924 +-#: ../camel/providers/imap/camel-imap-store.c:2294 +-#: ../camel/providers/imap4/camel-imap4-store.c:956 ++#: ../camel/providers/imap/camel-imap-store.c:1858 ++#: ../camel/providers/imap/camel-imap-store.c:2239 ++#: ../camel/providers/imap4/camel-imap4-store.c:959 + #, 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:2041 +-#: ../camel/providers/local/camel-maildir-store.c:191 ++#: ../camel/providers/imap/camel-imap-store.c:1975 ++#: ../camel/providers/local/camel-maildir-store.c:192 + #: ../camel/providers/local/camel-mbox-store.c:204 + #: ../camel/providers/local/camel-mh-store.c:249 + #, c-format +-msgid "Cannot create folder `%s': folder exists." +-msgstr "संचिका तयार करू शकत नाही `%s': संचिका अस्तित्वात आहे." ++msgid "Cannot create folder '%s': folder exists." ++msgstr "संचयीका '%s' बनवू शकत नाही: संचयीका अस्तित्वात आहे." + +-#: ../camel/providers/imap/camel-imap-store.c:2305 ++#: ../camel/providers/imap/camel-imap-store.c:2250 + #, c-format + msgid "Unknown parent folder: %s" +-msgstr "अज्ञात पितृ फोल्डर: %s" ++msgstr "अपरिचीत पितृ फोल्डर: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:550 +-#: ../camel/providers/imap4/camel-imap4-command.c:557 ++#: ../camel/providers/imap4/camel-imap4-command.c:576 ++#: ../camel/providers/imap4/camel-imap4-command.c:583 + #, c-format + msgid "Failed sending command to IMAP server %s: %s" +-msgstr "IMAP सेवासंगमकावर सूचना पाठविण्यात अपयश आले %s: %s" ++msgstr "IMAP सर्वर येथे सूचना पाठविण्यात अपयश आले %s: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:660 ++#: ../camel/providers/imap4/camel-imap4-command.c:686 + #, c-format + msgid "Unexpected response from IMAP4 server %s: %s" + msgstr "IMAP4 सर्वर %s कडून अनपेक्षित प्रतिसाद: %s" +@@ -3230,273 +3322,292 @@ msgstr "IMAP4 सर्वर %s कड + msgid "Unexpected greeting from IMAP server %s." + msgstr "यादी सर्वर %s कडून अनपेक्षित शुभकामना." + +-#: ../camel/providers/imap4/camel-imap4-engine.c:431 ++#: ../camel/providers/imap4/camel-imap4-engine.c:450 + #, c-format +-msgid "Cannot select folder `%s': Invalid mailbox name" +-msgstr "संचिका निवडू शकत नाही `%s': अयोग्य पत्रपेटीचे नाव" ++msgid "Cannot select folder '%s': Invalid mailbox name" ++msgstr "संचयीका '%s' निवडू शकत नाही: अयोग्य पत्रपेटीचे नाव" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:437 ++#: ../camel/providers/imap4/camel-imap4-engine.c:456 + #, c-format +-msgid "Cannot select folder `%s': Bad command" +-msgstr "संचिका निवडू शकत नाही `%s': चूकीची आज्ञा" ++msgid "Cannot select folder '%s': Bad command" ++msgstr "संचयीका '%s' निवडू शकत नाही: चुकीचा आदेश" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:1433 ++#, c-format ++msgid "Failed to send command to IMAP server %s: %s" ++msgstr "IMAP सर्वर %s येथे आदेश पाठविण्यास अपयशी: %s" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:1435 ++msgid "service unavailable" ++msgstr "सेवा अनुपलब्ध" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:1547 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1586 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1631 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1687 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1569 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1608 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1653 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1709 + #, c-format + msgid "IMAP4 server %s unexpectedly disconnected: %s" + msgstr "IMAP4 सेवासंगणकाचा %s अनपेक्षितपणे संपर्क तुटला: %s" + + #: ../camel/providers/imap4/camel-imap4-folder.c:89 +-msgid "Enable Mailing-List detection required for some filter and vFolder rules" +-msgstr "पत्राची यादी शोधणे सुरू करम्याकरता काही गाळण्या आणि संचिकेने नियम हवेत " ++msgid "" ++"Enable extended Mailing-List detection required for some filter and vFolder " ++"rules" ++msgstr "काहिक फिल्टर व व्हीसंचयीका नियम करीता विस्तारीत मेलींग-यादी आढळणी कार्यान्वीत करणे आवश्यक आहे" ++ ++#: ../camel/providers/imap4/camel-imap4-folder.c:90 ++msgid "Expire cached messages that haven't been read in X seconds" ++msgstr "X सेकंदात न वाचलेले कॅश संदेश कालबाह्य करा" ++ ++#: ../camel/providers/imap4/camel-imap4-folder.c:91 ++msgid "Expire cached messages older than X seconds" ++msgstr "X सेकंद पेक्षा जास्त जुणे कॅश संदेश कालबाह्य करा" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:402 ++#: ../camel/providers/imap4/camel-imap4-folder.c:423 + #, c-format +-msgid "Cannot access folder `%s': %s" +-msgstr "संचिकेचा वापर करू शकत नाही `%s': %s" ++msgid "Cannot access folder '%s': %s" ++msgstr "संचयीका '%s' करीता प्रवेश नाही: %s" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:461 ++#: ../camel/providers/imap4/camel-imap4-folder.c:482 + #, c-format +-msgid "Cannot sync flags to folder `%s': Unknown" +-msgstr "संचिकेवर झेंडे संलग्न करू शकत नाही `%s': अज्ञात" ++msgid "Cannot sync flags to folder '%s': Unknown error" ++msgstr "संचयीका '%s' शी बाबची जुळवणी करू शकत नाही: अपरिचीत त्रुटी" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:467 ++#: ../camel/providers/imap4/camel-imap4-folder.c:488 + #, c-format +-msgid "Cannot sync flags to folder `%s': Bad command" +-msgstr "संचिकेवर झेंडे संलग्न करू शकत नाही `%s': चुकीची आज्ञा" ++msgid "Cannot sync flags to folder '%s': Bad command" ++msgstr "संचिका '%s' सह बाब समजुळवणी करू शकत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:607 ++#: ../camel/providers/imap4/camel-imap4-folder.c:628 + #, c-format +-msgid "Cannot expunge folder `%s': Unknown" +-msgstr "संचिका एक्सपंग करता येत नाही `%s': अज्ञात" ++msgid "Cannot expunge folder '%s': Unknown error" ++msgstr "संचयीका '%s' काढून टाकता येत नाही: अपरिचीत त्रुटी" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:612 ++#: ../camel/providers/imap4/camel-imap4-folder.c:633 + #, c-format +-msgid "Cannot expunge folder `%s': Bad command" +-msgstr "संचिका एक्सपंग करता येत नाही `%s': चुकीची आज्ञा" ++msgid "Cannot expunge folder '%s': Bad command" ++msgstr "संचयीका '%s' काढून टाकता येत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:868 ++#: ../camel/providers/imap4/camel-imap4-folder.c:889 + #, c-format +-msgid "Cannot get message %s from folder `%s': No such message" +-msgstr "संचिकेतून निरोप %s मिळू शकत नाही `%s': असा संदेश नाही" ++msgid "Cannot get message %s from folder '%s': No such message" ++msgstr "संचिका '%s' पासून संदेश %s प्राप्त करू शकत नाही: असा संदेश नाही" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:873 ++#: ../camel/providers/imap4/camel-imap4-folder.c:894 + #, c-format +-msgid "Cannot get message %s from folder `%s': Bad command" +-msgstr "संचिकेतून निरोप %s मिळू शकत नाही `%s': चुकीची आज्ञा" ++msgid "Cannot get message %s from folder '%s': Bad command" ++msgstr "संचिका '%s' पासून संदेश %s प्राप्त करू शकत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:917 ++#: ../camel/providers/imap4/camel-imap4-folder.c:938 + #, c-format +-msgid "Cannot append message to folder `%s': Folder is read-only" +-msgstr "संचिकेत निरोप मिळवू शकत नाही `%s': संचिका फक्त वाचण्यायोग्य आहे" ++msgid "Cannot append message to folder '%s': Folder is read-only" ++msgstr "संचिका '%s' ला संदेश जोडू शकत नाही: संचयीका फक्त वाचणजोगी आहे" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1010 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1031 + #, c-format +-msgid "Cannot append message to folder `%s': Unknown error" +-msgstr "संचिकेत निरोप मिळवू शकत नाही `%s': अनोळखी चूक" ++msgid "Cannot append message to folder '%s': Unknown error" ++msgstr "संचिका '%s' ला संदेश जोडू शकत नाही: अपरिचीत त्रुटी" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1040 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1061 + #, c-format +-msgid "Cannot append message to folder `%s': Bad command" +-msgstr "संचिकेवर संदेश अपेन्ड करता येत नाही`%s': चुकीची आज्ञा" ++msgid "Cannot append message to folder '%s': Bad command" ++msgstr "संचिका '%s' ला संदेश जोडू शकत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1160 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1181 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown" +-msgstr "`%s' निरोप एक संचिकेतून दुसऱ्या संचिकेत हलवू शकत नाही`%s': अनोळखी" ++msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" ++msgstr "संचयीका '%s' पासून संचयीका '%s' येथे संदेश हलवू शकत नाही: अपरिचीत त्रुटी" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1164 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1185 + #, c-format +-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown" +-msgstr "`%s' निरोपाची एका संचिकेतून दुसऱ्या संचिकेत नक्कल करू शकत नाही`%s': अनोळखी" ++msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" ++msgstr "संचयीका '%s' पासून संचयीका '%s' येथे संदेश प्रतिकृत करू शकत नाही: अपरिचीत त्रुटी" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1172 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1193 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command" +-msgstr "`%s' निरोप एक संचिकेतून दुसऱ्या संचिकेत हलवू शकत नाही`%s': चुकीची आज्ञा" ++msgid "Cannot move messages from folder '%s' to folder '%s': Bad command" ++msgstr "संचयीका '%s' पासून संचयीका '%s' येथे संदेश हलवू शकत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1176 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1197 + #, c-format +-msgid "Cannot copy 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' येथे संदेश प्रतिकृत करू शकत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:55 ++#: ../camel/providers/imap4/camel-imap4-provider.c:56 + msgid "Check new messages for _Junk contents" +-msgstr "रद्दी संदर्भाकरता नवीन संदेश तपासा" ++msgstr "जंक अनुक्रम करीता नविन संदेशची तपासणी करा (_J)" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:57 ++#: ../camel/providers/imap4/camel-imap4-provider.c:58 + msgid "Only check for Junk messa_ges in the INBOX folder" +-msgstr "इनबॉक्स संचिकेत फक्त रद्दी संदेशच तपासा" ++msgstr "इनबॉक्स संचयीका मध्ये फक्त जंक संदेश करीता तपास घ्या (_g)" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:67 + msgid "IMAP4rev1" + msgstr "IMAP4rev1" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:69 + msgid "For reading and storing mail on IMAPv4rev1 servers." +-msgstr "IMAPv4rev1 सेवासंगणकावर पत्र वाचण्यासाठी किंवा संग्रहीत करण्यासाठी." ++msgstr "IMAPv4rev1 सर्वर येथे पत्र वाचण्यासाठी किंवा संग्रहीत करण्यासाठी." + +-#: ../camel/providers/imap4/camel-imap4-provider.c:85 ++#: ../camel/providers/imap4/camel-imap4-provider.c:86 + msgid "This option will connect to the IMAPv4rev1 server using a plaintext password." + msgstr "नुसता मजकूर परवलीशब्द वापरून हा विकल्प IMAPv4rev1 शी संपर्क साधेल." + +-#: ../camel/providers/imap4/camel-imap4-store.c:261 ++#: ../camel/providers/imap4/camel-imap4-store.c:263 + #: ../camel/providers/imapp/camel-imapp-store.c:249 + #: ../camel/providers/nntp/camel-nntp-store.c:195 + #: ../camel/providers/nntp/camel-nntp-store.c:214 +-#: ../camel/providers/pop3/camel-pop3-store.c:184 +-#: ../camel/providers/smtp/camel-smtp-transport.c:270 ++#: ../camel/providers/pop3/camel-pop3-store.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:272 + msgid "Connection canceled" + msgstr "जुळवणी रद्द झाली" + +-#: ../camel/providers/imap4/camel-imap4-store.c:298 ++#: ../camel/providers/imap4/camel-imap4-store.c:300 + #, c-format + msgid "" + "Failed to connect to IMAP server %s in secure mode: Server does not support " + "STARTTLS" + msgstr "सुरक्षा पध्दतीत IMAP सर्वर %s शी जुळवणी अपयशी: सर्वर STARTTLS ला समर्थन देत नाही" + +-#: ../camel/providers/imap4/camel-imap4-store.c:328 +-#: ../camel/providers/pop3/camel-pop3-store.c:252 ++#: ../camel/providers/imap4/camel-imap4-store.c:330 ++#: ../camel/providers/pop3/camel-pop3-store.c:250 + msgid "TLS negotiations failed" + msgstr "TLS मध्यस्थी अपयशी" + +-#: ../camel/providers/imap4/camel-imap4-store.c:412 ++#: ../camel/providers/imap4/camel-imap4-store.c:415 + #, c-format + msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism" + msgstr "%s शी ऑथेन्टीकेशनची पध्दत वापरून IMAP सेवासंगणकाशी %s ऑथेन्टिकेट करता येत नाही" + +-#: ../camel/providers/imap4/camel-imap4-store.c:535 ++#: ../camel/providers/imap4/camel-imap4-store.c:538 + #, c-format + msgid "Cannot authenticate to IMAP server %s using %s" +-msgstr "%s चा वापर करून %s IMAP सेवासंगणकावर ऑथेन्टिकेट करता येत नाही" ++msgstr "%s चा वापर करून %s IMAP सर्वर येथे ऑथेन्टिकेट करता येत नाही" + +-#: ../camel/providers/imap4/camel-imap4-store.c:698 +-#: ../camel/providers/imap4/camel-imap4-store.c:966 ++#: ../camel/providers/imap4/camel-imap4-store.c:701 ++#: ../camel/providers/imap4/camel-imap4-store.c:969 + msgid "Cannot create IMAP folders in offline mode." +-msgstr "ऑफलाईन पध्दतीत IMAP संचिका निर्माण करता येत नाही." ++msgstr "ऑफलाईन पध्दतीत IMAP संचयीका निर्माण करता येत नाही." + +-#: ../camel/providers/imap4/camel-imap4-store.c:737 ++#: ../camel/providers/imap4/camel-imap4-store.c:740 + #, c-format +-msgid "Cannot get folder `%s' on IMAP server %s: Unknown" +-msgstr "`%s' IMAP सेवासंगणकावर %s संचिका मिळू शकत नाही: अज्ञात" ++msgid "Cannot get folder '%s' on IMAP server %s: Unknown error" ++msgstr "IMAP सर्वर %s येथे संचयीका '%s' प्राप्त करू शकत नाही: अपरिचीत त्रुटी" + +-#: ../camel/providers/imap4/camel-imap4-store.c:818 ++#: ../camel/providers/imap4/camel-imap4-store.c:821 + #, c-format +-msgid "Cannot get LIST information for `%s' on IMAP server %s: %s" +-msgstr "getIMAP सर्वर %s वरील `%s' करीता यादी विषयक माहिती प्राप्त करू शकत नाही: %s" ++msgid "Cannot get LIST information for '%s' on IMAP server %s: %s" ++msgstr "IMAP सर्वर %s वरील '%s' करीता यादी विषयक माहिती प्राप्त करू शकत नाही: %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:820 +-#: ../camel/providers/imap4/camel-imap4-store.c:1495 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 + msgid "Bad command" +-msgstr "चुकीची आज्ञा" ++msgstr "चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-store.c:899 ++#: ../camel/providers/imap4/camel-imap4-store.c:902 + #, c-format +-msgid "Cannot create folder `%s': Invalid mailbox name" +-msgstr "संचिका तयार करू शकत नाही `%s': अवैध पत्रपेटीचे नाव" ++msgid "Cannot create folder '%s': Invalid mailbox name" ++msgstr "संचयीका '%s' बनवू शकत नाही: अवैध पत्रपेटीचे नाव" + +-#: ../camel/providers/imap4/camel-imap4-store.c:904 ++#: ../camel/providers/imap4/camel-imap4-store.c:907 + #, c-format +-msgid "Cannot create folder `%s': Bad command" +-msgstr "संचिका तयार करू शकत नाही `%s': चुकीची आज्ञा" ++msgid "Cannot create folder '%s': Bad command" ++msgstr "संचयीका '%s' बनवू शकत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1010 ++#: ../camel/providers/imap4/camel-imap4-store.c:1013 + #, c-format +-msgid "Cannot delete folder `%s': Special folder" +-msgstr "`%s' काढू शकत नाही: विशेष संचयीका" ++msgid "Cannot delete folder '%s': Special folder" ++msgstr "संचयीका '%s' काढून टाकू शकत नाही: विशेष संचयीका" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1017 ++#: ../camel/providers/imap4/camel-imap4-store.c:1020 + msgid "Cannot delete IMAP folders in offline mode." +-msgstr "ऑफलाईन पध्दतीत IMAP संचिका काढता येत नाही." ++msgstr "ऑफलाईन पध्दतीत IMAP संचयीका काढता येत नाही." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1076 ++#: ../camel/providers/imap4/camel-imap4-store.c:1079 + #, c-format +-msgid "Cannot delete folder `%s': Invalid mailbox name" +-msgstr "संचिका काढू शकत नाही `%s': अवैध पत्रपेटीचे नाव" ++msgid "Cannot delete folder '%s': Invalid mailbox name" ++msgstr "संचयीका '%s' काढून टाकू शकत नाही: अवैध पत्रपेटीचे नाव" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1081 ++#: ../camel/providers/imap4/camel-imap4-store.c:1084 + #, c-format +-msgid "Cannot delete folder `%s': Bad command" +-msgstr "संचिका काढू शकत नाही `%s': चुकीची आज्ञा" ++msgid "Cannot delete folder '%s': Bad command" ++msgstr "संचयीका '%s' काढून टाकू शकत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1101 ++#: ../camel/providers/imap4/camel-imap4-store.c:1104 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Special folder" +-msgstr "`%s' संचिका परत नाव देऊ शकत नाही `%s': महत्वाची संचिका" ++msgid "Cannot rename folder '%s' to '%s': Special folder" ++msgstr "संचयीका '%s' ला '%s' असे पुन्हनामांकन करू शकत नाही: महत्वाची संचयीका" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1108 ++#: ../camel/providers/imap4/camel-imap4-store.c:1111 + msgid "Cannot rename IMAP folders in offline mode." +-msgstr "ऑफलाईन पध्दतीत IMAP संचिकांना नवीन नाव देता येत नाही." ++msgstr "ऑफलाईन पध्दतीत IMAP संचयीकांना नवीन नाव देता येत नाही." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1139 ++#: ../camel/providers/imap4/camel-imap4-store.c:1142 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name" +-msgstr "`%s' संचिका परत नाव देऊ शकत नाही `%s': अवैध पत्रपेटीचे नाव" ++msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name" ++msgstr "संचयीका '%s' ला '%s' असे पुन्हनामांकन करू शकत नाही: अवैध पत्रपेटीचे नाव" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1144 ++#: ../camel/providers/imap4/camel-imap4-store.c:1147 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Bad command" +-msgstr "`%s' संचिका परत नाव देऊ शकत नाही `%s': चुकीची आज्ञा" ++msgid "Cannot rename folder '%s' to '%s': Bad command" ++msgstr "संचयीका '%s' ला '%s' असे पुन्हनामांकन करू शकत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1493 ++#: ../camel/providers/imap4/camel-imap4-store.c:1575 + #, c-format +-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s" +-msgstr "%s पध्दती करता `%s' माहिती IMAP सेवासंगणकावर मिळत नाही %s: %s" ++msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" ++msgstr "IMAP सर्वर %s येथे रचना '%s' करीता %s माहिती आढळली नाही: %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1533 ++#: ../camel/providers/imap4/camel-imap4-store.c:1636 + msgid "Cannot subscribe to IMAP folders in offline mode." +-msgstr "ऑफलाईन पध्दतीत IMAP संचिका सबस्क्राइब करता येत नाही." ++msgstr "ऑफलाईन पध्दतीत IMAP संचयीका सबस्क्राइब करता येत नाही." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1578 ++#: ../camel/providers/imap4/camel-imap4-store.c:1681 + #, c-format +-msgid "Cannot subscribe to folder `%s': Invalid mailbox name" +-msgstr "संचिका सबस्क्राईब करता येत नाही `%s': अवैध पत्रपेटीचे नाव" ++msgid "Cannot subscribe to folder '%s': Invalid mailbox name" ++msgstr "संचयीका '%s' करीता सबस्क्राईब शक्य नाही: अवैध पत्रपेटीचे नाव" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1583 ++#: ../camel/providers/imap4/camel-imap4-store.c:1686 + #, c-format +-msgid "Cannot subscribe to folder `%s': Bad command" +-msgstr "संचिका सबस्क्राईब करता येत नाही `%s': चुकीची आज्ञा" ++msgid "Cannot subscribe to folder '%s': Bad command" ++msgstr "संचयीका '%s' करीता सबस्क्राईब शक्य नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1605 ++#: ../camel/providers/imap4/camel-imap4-store.c:1708 + msgid "Cannot unsubscribe from IMAP folders in offline mode." + msgstr "ऑफलाईन पध्दतीत IMAP संचिकेहून अनसबस्क्राईब करता येत नाही." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1650 ++#: ../camel/providers/imap4/camel-imap4-store.c:1753 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name" +-msgstr "संचिकेतून सबस्क्राईब करता येत नाही `%s': अवैध पत्रपेटी नाव" ++msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" ++msgstr "संचयीका '%s' पासून पंजीकरण काढून टाकता येत नाही: अवैध पत्रपेटी नाव" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1655 ++#: ../camel/providers/imap4/camel-imap4-store.c:1758 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Bad command" +-msgstr "संचिकेतून सबस्क्राईब करता येत नाही `%s': चुकीची आज्ञा" ++msgid "Cannot unsubscribe from folder '%s': Bad command" ++msgstr "संचयीका '%s' पासून पंजीकरण वगळू शकत नाही: चुकीचा आदेश" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1451 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1596 + msgid "Scanning for changed messages" + msgstr "बदलेल्या संदेशाकरता छाननी करत आहे" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1472 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1617 + #, c-format + msgid "IMAP server %s is in an inconsistent state." + msgstr "IMAP सर्वर %s अस्थीर स्थितीत आहे." + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1499 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1644 + msgid "Fetching envelopes of new messages" + msgstr "नविन संदेशचे पाकीट प्राप्त करीत आहे" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:370 ++#: ../camel/providers/imap4/camel-imap4-utils.c:437 + #, c-format + msgid "Unexpected token in response from IMAP server %s: " + msgstr "सेवासंगणक IMAP सेवासंगणकाकडूव प्रतिसाद म्हणून अनपेक्षित टोकन %s: " + +-#: ../camel/providers/imap4/camel-imap4-utils.c:393 ++#: ../camel/providers/imap4/camel-imap4-utils.c:460 + msgid "No data" + msgstr "माहीती नाही" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:556 ++#: ../camel/providers/imap4/camel-imap4-utils.c:623 + #, c-format + msgid "IMAP server %s unexpectedly disconnected: %s" + msgstr "IMAP सेवासंगणकाचा %s अनपेक्षितपते संपर्क तुटला: %s" +@@ -3518,8 +3629,8 @@ msgid "" + " !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n" + msgstr "" + "प्रायोगीक IMAP 4(.1) ग्राहक\n" +-"हा मदतीशिवाय व न तपासलेला सांकेतीक आहे, तुम्हाला त्याऐवजी साधा IMAP " +-"वापरायचा आहे का.\n" ++"हा मदतीशिवाय व न तपासलेला सांकेतीक आहे, तुम्हाला त्याऐवजी साधा IMAP वापरायचा आहे " ++"का.\n" + "\n" + " !!! हे उत्पादीत पत्राकरिता वापरू नका !!!\n" + +@@ -3538,27 +3649,27 @@ msgid "Index message body data" + msgstr "यादी संदेश बॉडी पाठ" + + #. $HOME relative path + protocol string +-#: ../camel/providers/local/camel-local-folder.c:382 ++#: ../camel/providers/local/camel-local-folder.c:390 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + + #. /var/spool/mail relative path + protocol +-#: ../camel/providers/local/camel-local-folder.c:386 +-#: ../camel/providers/local/camel-local-folder.c:389 ++#: ../camel/providers/local/camel-local-folder.c:394 ++#: ../camel/providers/local/camel-local-folder.c:397 + #, c-format + msgid "mailbox:%s (%s)" + msgstr "मेलपेटी:%s (%s)" + + #. a full path + protocol +-#: ../camel/providers/local/camel-local-folder.c:393 ++#: ../camel/providers/local/camel-local-folder.c:401 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + + #: ../camel/providers/local/camel-local-provider.c:48 +-msgid "_Use the `.folders' folder summary file (exmh)" +-msgstr "`.folders' संचयीका सारांश फाइल वापरा (exmh) (_U)" ++msgid "_Use the '.folders' folder summary file (exmh)" ++msgstr "'.folders' संचयीका सारांश फाइल वापरा (exmh) (_U)" + + #: ../camel/providers/local/camel-local-provider.c:55 + msgid "MH-format mail directories" +@@ -3576,7 +3687,9 @@ 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:88 + #: ../camel/providers/local/camel-local-provider.c:107 +@@ -3589,7 +3702,7 @@ msgstr "Maildir- स्वरूप म + + #: ../camel/providers/local/camel-local-provider.c:96 + msgid "For storing local mail in maildir directories." +-msgstr "पत्रसंचिका संचिकेत साठविण्यासाठी स्थानिक पत्र." ++msgstr "पत्रसंचयीका संचिकेत साठविण्यासाठी स्थानिक पत्र." + + #: ../camel/providers/local/camel-local-provider.c:108 + msgid "_Store status headers in Elm/Pine/Mutt format" +@@ -3605,81 +3718,67 @@ 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 "" +-"बाहेरील साधारण एमबॉक्स स्पूल फाईल्समध्ये वाचण्यासाठी व स्थानिक मेल " +-"साठविण्यासाठी.\n" +-"एका पाईन व मट शैली संचिका वाचविण्यासाठी ही वापरली जाऊ शकेल." ++"बाहेरील साधारण एमबॉक्स स्पूल फाइल ्समध्ये वाचण्यासाठी व स्थानिक मेल साठविण्यासाठी.\n" ++"एका पाईन व मट शैली संचयीका वाचविण्यासाठी ही वापरली जाऊ शकेल." + + #: ../camel/providers/local/camel-local-provider.c:126 + msgid "Standard Unix mbox spool directory" + msgstr "मानक Unix mbox स्पूल संचयीका" + +-#: ../camel/providers/local/camel-local-store.c:159 +-#: ../camel/providers/local/camel-local-store.c:270 ++#: ../camel/providers/local/camel-local-store.c:171 ++#: ../camel/providers/local/camel-local-store.c:282 + #: ../camel/providers/local/camel-mbox-store.c:359 + #: ../camel/providers/local/camel-spool-store.c:129 + #, c-format + msgid "Store root %s is not an absolute path" + msgstr "मूळमार्ग %s हा नेहमीचा मार्ग नाही" + +-#: ../camel/providers/local/camel-local-store.c:166 ++#: ../camel/providers/local/camel-local-store.c:178 + #, c-format + msgid "Store root %s is not a regular directory" +-msgstr "मूळ मार्ग %s ही नेहमीची संचिका नाही" ++msgstr "मूळ मार्ग %s ही नेहमीची संचयीका नाही" + +-#: ../camel/providers/local/camel-local-store.c:175 +-#: ../camel/providers/local/camel-local-store.c:183 +-#: ../camel/providers/local/camel-local-store.c:281 ++#: ../camel/providers/local/camel-local-store.c:187 ++#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:293 + #, c-format + msgid "Cannot get folder: %s: %s" +-msgstr "संचिका मिळू शकत नाही: %s: %s" ++msgstr "संचयीका प्राप्त करू शकत नाही: %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:207 + msgid "Local stores do not have an inbox" + msgstr "स्थानिक दुकानांना पत्रपेटी नाही" + +-#: ../camel/providers/local/camel-local-store.c:241 ++#: ../camel/providers/local/camel-local-store.c:253 + #, c-format + msgid "Local mail file %s" + msgstr "स्थानीय मेल फाइल %s" + +-#: ../camel/providers/local/camel-local-store.c:359 ++#: ../camel/providers/local/camel-local-store.c:348 + #, c-format + msgid "Could not rename folder %s to %s: %s" + msgstr "%s ते %s संचिकेला परत नाव देऊ शकत नाही: %s" + +-#: ../camel/providers/local/camel-local-store.c:427 ++#: ../camel/providers/local/camel-local-store.c:416 + #, c-format + msgid "Could not rename '%s': %s" + msgstr "परत नाव देऊ शकत नाही '%s': %s" + +-#: ../camel/providers/local/camel-local-store.c:452 +-#: ../camel/providers/local/camel-local-store.c:462 +-#: ../camel/providers/local/camel-mbox-store.c:276 +-#: ../camel/providers/local/camel-mbox-store.c:288 +-#, c-format +-msgid "Could not delete folder summary file `%s': %s" +-msgstr "संचिका सारांश फाईल काढून टाकू शकत नाही `%s': %s" +- +-#: ../camel/providers/local/camel-local-store.c:472 ++#: ../camel/providers/local/camel-local-store.c:441 + #: ../camel/providers/local/camel-mbox-store.c:300 + #, c-format +-msgid "Could not delete folder index file `%s': %s" +-msgstr "संचिका अनुक्रमणिका फाईल काढून टाकू शकत नाही `%s': %s" ++msgid "Could not delete folder index file '%s': %s" ++msgstr "संचयीका अनुक्रमणिका फाइल '%s' काढून टाकू शकत नाही: %s" + +-#: ../camel/providers/local/camel-local-store.c:495 ++#: ../camel/providers/local/camel-local-store.c:464 + #: ../camel/providers/local/camel-mbox-store.c:324 + #, c-format +-msgid "Could not delete folder meta file `%s': %s" +-msgstr "संचिका मेटा फाईल काढून टाकता येत नाही `%s': %s" ++msgid "Could not delete folder meta file '%s': %s" ++msgstr "संचयीका मेटा फाइल '%s' काढून टाकता येत नाही: %s" + +-#: ../camel/providers/local/camel-local-summary.c:409 +-#, c-format +-msgid "Could not save summary: %s: %s" +-msgstr "सारांश संग्रहीत केला जाऊ शकत नाही: %s: %s" +- +-#: ../camel/providers/local/camel-local-summary.c:467 ++#: ../camel/providers/local/camel-local-summary.c:506 + msgid "Unable to add message to summary: unknown reason" +-msgstr "सारांशात संदेश मिळविला जाऊ शकला नाही: अज्ञात कारण" ++msgstr "सारांशात संदेश मिळविला जाऊ शकला नाही: अपरिचीत कारण" + + #: ../camel/providers/local/camel-maildir-folder.c:220 + msgid "Maildir append message canceled" +@@ -3705,77 +3804,77 @@ msgid "" + "Cannot get message: %s from folder %s\n" + " %s" + msgstr "" +-"संचिकेतून: %s संदेश मिळू शकत नाही %s\n" ++"संचिकेतून: %s संदेश प्राप्त करू शकत नाही %s\n" + " %s" + + #: ../camel/providers/local/camel-maildir-folder.c:274 + msgid "Invalid message contents" + msgstr "अयोग्य निरोप" + +-#: ../camel/providers/local/camel-maildir-store.c:147 +-#: ../camel/providers/local/camel-maildir-store.c:172 ++#: ../camel/providers/local/camel-maildir-store.c:148 ++#: ../camel/providers/local/camel-maildir-store.c:173 + #: ../camel/providers/local/camel-mbox-store.c:176 + #: ../camel/providers/local/camel-mbox-store.c:188 + #, c-format +-msgid "Cannot create folder `%s': %s" +-msgstr "संचिका तयार करू शकत नाही `%s': %s" ++msgid "Cannot create folder '%s': %s" ++msgstr "संचयीका '%s' बनवू शकत नाही: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:160 ++#: ../camel/providers/local/camel-maildir-store.c:161 + #: ../camel/providers/local/camel-mbox-store.c:147 + #: ../camel/providers/local/camel-mh-store.c:217 + #, c-format +-msgid "Cannot get folder `%s': %s" +-msgstr "संचिका मिळू शकत नाही `%s': %s" ++msgid "Cannot get folder '%s': %s" ++msgstr "संचयीका '%s' प्राप्त करू शकत नाही: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:164 ++#: ../camel/providers/local/camel-maildir-store.c:165 + #: ../camel/providers/local/camel-mbox-store.c:155 + #: ../camel/providers/local/camel-mh-store.c:224 + #, c-format +-msgid "Cannot get folder `%s': folder does not exist." +-msgstr "संचिका मिळू शकत नाही `%s': संचिका अस्तित्वात आहे." ++msgid "Cannot get folder '%s': folder does not exist." ++msgstr "संचयीका '%s' प्राप्त करू शकत नाही: संचयीका अस्तित्वात नाही." + +-#: ../camel/providers/local/camel-maildir-store.c:188 ++#: ../camel/providers/local/camel-maildir-store.c:189 + #, c-format +-msgid "Cannot get folder `%s': not a maildir directory." +-msgstr "संचिका मुळू शकत नाही `%s': पत्रसूची संचिका नाही." ++msgid "Cannot get folder '%s': not a maildir directory." ++msgstr "संचयीका '%s' प्राप्त करू शकत नाही: पत्र संचयीका नाही." + +-#: ../camel/providers/local/camel-maildir-store.c:233 +-#: ../camel/providers/local/camel-maildir-store.c:271 ++#: ../camel/providers/local/camel-maildir-store.c:234 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mh-store.c:273 + #, c-format +-msgid "Could not delete folder `%s': %s" +-msgstr "संचिका काढू शकत नाही `%s': %s" ++msgid "Could not delete folder '%s': %s" ++msgstr "संचयीका '%s' काढून टाकू शकत नाही: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:235 ++#: ../camel/providers/local/camel-maildir-store.c:236 + msgid "not a maildir directory" +-msgstr "पत्रसूची संचिका नाही" ++msgstr "पत्रसूची संचयीका नाही" + +-#: ../camel/providers/local/camel-maildir-store.c:439 ++#: ../camel/providers/local/camel-maildir-store.c:440 + #: ../camel/providers/local/camel-spool-store.c:331 + #: ../camel/providers/local/camel-spool-store.c:345 + #, c-format +-msgid "Could not scan folder `%s': %s" +-msgstr "संचिकेची छाननी करता येत नाही `%s': %s" ++msgid "Could not scan folder '%s': %s" ++msgstr "संचयीका '%s' चे स्कॅन शक्य नाही: %s" + + #: ../camel/providers/local/camel-maildir-summary.c:433 + #: ../camel/providers/local/camel-maildir-summary.c:567 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" +-msgstr "मेलसूचीसंचिका मार्ग उघडू शकत नाही: %s: %s" ++msgstr "मेलसूचीसंचयीका मार्ग उघडू शकत नाही: %s: %s" + + #: ../camel/providers/local/camel-maildir-summary.c:560 + msgid "Checking folder consistency" +-msgstr "संचिका सतत तपासली जात आहे" ++msgstr "संचयीका सतत तपासली जात आहे" + + #: ../camel/providers/local/camel-maildir-summary.c:664 + msgid "Checking for new messages" + msgstr "नवीन संदेशाकरता तपासणी होत आहे" + +-#: ../camel/providers/local/camel-maildir-summary.c:755 +-#: ../camel/providers/local/camel-mbox-summary.c:436 +-#: ../camel/providers/local/camel-mbox-summary.c:609 +-#: ../camel/providers/local/camel-mbox-summary.c:706 +-#: ../camel/providers/local/camel-spool-summary.c:140 ++#: ../camel/providers/local/camel-maildir-summary.c:756 ++#: ../camel/providers/local/camel-mbox-summary.c:517 ++#: ../camel/providers/local/camel-mbox-summary.c:690 ++#: ../camel/providers/local/camel-mbox-summary.c:786 ++#: ../camel/providers/local/camel-spool-summary.c:141 + msgid "Storing folder" + msgstr "कप्पा साठवून ठेवले जात आहे" + +@@ -3783,7 +3882,7 @@ msgstr "कप्पा साठवू + #: ../camel/providers/local/camel-spool-folder.c:150 + #, c-format + msgid "Cannot create folder lock on %s: %s" +-msgstr "%s वर संचिका लॉक निर्माण करू शकत नाही: %s" ++msgstr "%s वर संचयीका लॉक निर्माण करू शकत नाही: %s" + + #: ../camel/providers/local/camel-mbox-folder.c:217 + #, c-format +@@ -3797,11 +3896,11 @@ msgstr "मेल जोडा रद् + #: ../camel/providers/local/camel-mbox-folder.c:281 + #, c-format + msgid "Cannot append message to mbox file: %s: %s" +-msgstr "पत्रपेटी फाईलवर संदेश अपेन्ड करू शकत नाही: %s: %s" ++msgstr "पत्रपेटी फाइलवर संदेश अपेन्ड करू शकत नाही: %s: %s" + + #: ../camel/providers/local/camel-mbox-folder.c:400 + msgid "The folder appears to be irrecoverably corrupted." +-msgstr "संचिका न सुधारण्याइतपत खराब झालेला वाटतो." ++msgstr "संचयीका न सुधारण्याइतपत खराब झालेला वाटतो." + + #: ../camel/providers/local/camel-mbox-folder.c:408 + #: ../camel/providers/local/camel-mh-folder.c:224 +@@ -3811,47 +3910,53 @@ msgstr "संदेश निर्म + #: ../camel/providers/local/camel-mbox-store.c:166 + #: ../camel/providers/local/camel-mbox-store.c:365 + msgid "Cannot create a folder by this name." +-msgstr "ह्या नावाने संचिका निर्माण करू शकत नाही." ++msgstr "ह्या नावाने संचयीका निर्माण करू शकत नाही." + + #: ../camel/providers/local/camel-mbox-store.c:198 + #, c-format +-msgid "Cannot get folder `%s': not a regular file." +-msgstr "संचिका मिळविता येत नाही `%s': ही नेहमीची फाईल नाही." ++msgid "Cannot get folder '%s': not a regular file." ++msgstr "संचयीका '%s' प्राप्त करू शकत नाही: ही रेग्यूलर फाइल नाही." + + #: ../camel/providers/local/camel-mbox-store.c:228 + #: ../camel/providers/local/camel-mbox-store.c:239 + #: ../camel/providers/local/camel-mbox-store.c:262 + #, c-format + msgid "" +-"Could not delete folder `%s':\n" ++"Could not delete folder '%s':\n" + "%s" + msgstr "" +-"संचिका काढू शकत नाही `%s':\n" ++"संचयीका '%s' काढून टाकू शकत नाही:\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:247 + #, c-format +-msgid "`%s' is not a regular file." +-msgstr "`%s' ही नेहमीची फाईल नाही." ++msgid "'%s' is not a regular file." ++msgstr "'%s' ही रेग्यूलर फाइल नाही." + + #: ../camel/providers/local/camel-mbox-store.c:254 + #, c-format +-msgid "Folder `%s' is not empty. Not deleted." +-msgstr "संचिका `%s' रिकामी नाही. काढून टाकले नाही." ++msgid "Folder '%s' is not empty. Not deleted." ++msgstr "संचयीका '%s' रिकामी नाही. काढून टाकले नाही." ++ ++#: ../camel/providers/local/camel-mbox-store.c:276 ++#: ../camel/providers/local/camel-mbox-store.c:288 ++#, c-format ++msgid "Could not delete folder summary file '%s': %s" ++msgstr "संचयीका सारांश फाइल '%s' काढून टाकू शकत नाही: %s" + + #: ../camel/providers/local/camel-mbox-store.c:378 + #, c-format +-msgid "Cannot create directory `%s': %s." +-msgstr "निर्देशिका तयार करू शकत नाही `%s': %s." ++msgid "Cannot create directory '%s': %s." ++msgstr "संचयीका '%s' बनवू शकत नाही: %s." + + #: ../camel/providers/local/camel-mbox-store.c:392 + #, c-format + msgid "Cannot create folder: %s: %s" +-msgstr "संचिका तयार करू शकत नाही: %s: %s" ++msgstr "संचयीका बनवू शकत नाही: %s: %s" + + #: ../camel/providers/local/camel-mbox-store.c:394 + msgid "Folder already exists" +-msgstr "संचिका अगोदरच अस्तित्वात आहे" ++msgstr "संचयीका अगोदरच अस्तित्वात आहे" + + #: ../camel/providers/local/camel-mbox-store.c:485 + msgid "The new folder name is illegal." +@@ -3859,89 +3964,84 @@ msgstr "नविन संचिके + + #: ../camel/providers/local/camel-mbox-store.c:498 + #, c-format +-msgid "Could not rename `%s': `%s': %s" +-msgstr "`%s' ला परत नाव देऊ शकत नाही: `%s': %s" ++msgid "Could not rename '%s': '%s': %s" ++msgstr "'%s' ला पुन्हनामांकन करू शकत नाही: '%s': %s" + + #: ../camel/providers/local/camel-mbox-store.c:579 + #, c-format + msgid "Could not rename '%s' to %s: %s" +-msgstr "`%s' ते `%s' ला परत नाव देऊ शकत नाही: %s" ++msgstr "'%s' ते '%s' ला परत नाव देऊ शकत नाही: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:442 ++#: ../camel/providers/local/camel-mbox-summary.c:523 + #, c-format + msgid "Could not open folder: %s: %s" +-msgstr "संचिका उघडू शकत नाही: %s: %s" ++msgstr "संचयीका उघडू शकत नाही: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:490 ++#: ../camel/providers/local/camel-mbox-summary.c:571 + #, c-format + msgid "Fatal mail parser error near position %ld in folder %s" +-msgstr "घातक पत्र पार्सर चूक %ld ओळखक्रमांकाच्या स्थितीजवळ %s संचिकेत नाही" ++msgstr "घातक पत्र पार्सर त्रुटी %ld ओळखक्रमांकाच्या स्थितीजवळ %s संचिकेत नाही" + +-#: ../camel/providers/local/camel-mbox-summary.c:546 ++#: ../camel/providers/local/camel-mbox-summary.c:627 + #, c-format + msgid "Cannot check folder: %s: %s" +-msgstr "संचिका तपासू शकत नाही: %s: %s" ++msgstr "संचयीका तपासू शकत नाही: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:614 +-#: ../camel/providers/local/camel-mbox-summary.c:711 +-#: ../camel/providers/local/camel-spool-summary.c:145 ++#: ../camel/providers/local/camel-mbox-summary.c:695 ++#: ../camel/providers/local/camel-mbox-summary.c:791 ++#: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" +-msgstr "संचिका उघडू शकत नाही: %s: %s" ++msgstr "संचयीका उघडू शकत नाही: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:626 +-#: ../camel/providers/local/camel-spool-summary.c:158 ++#: ../camel/providers/local/camel-mbox-summary.c:707 ++#: ../camel/providers/local/camel-spool-summary.c:159 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "अस्थायी पत्रपेटी उघडू शकत नाही: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:639 +-#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:720 ++#: ../camel/providers/local/camel-mbox-summary.c:896 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "स्त्रोत कप्पा बंद करता येत नाही %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:648 ++#: ../camel/providers/local/camel-mbox-summary.c:729 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "तात्पुरती संचयीका बंद करू शकले नाही: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:663 ++#: ../camel/providers/local/camel-mbox-summary.c:744 + #, c-format + msgid "Could not rename folder: %s" + msgstr "संचिकेला परत नाव देऊ शकत नाही: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:722 +-#: ../camel/providers/local/camel-mbox-summary.c:1046 ++#: ../camel/providers/local/camel-mbox-summary.c:802 ++#: ../camel/providers/local/camel-mbox-summary.c:1024 + #, c-format + msgid "Could not store folder: %s" +-msgstr "संचिका साठवू शकत नाही: %s" ++msgstr "संचयीका साठवू शकत नाही: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:770 +-#: ../camel/providers/local/camel-mbox-summary.c:799 +-#: ../camel/providers/local/camel-mbox-summary.c:1088 +-#: ../camel/providers/local/camel-mbox-summary.c:1117 +-msgid "Detected a corrupt mbox file or an invalid 'From' header" +-msgstr "सदोषीत mbox फाइल किंवा अवैध 'प्रषेक' शिर्षक" ++#: ../camel/providers/local/camel-mbox-summary.c:838 ++#: ../camel/providers/local/camel-mbox-summary.c:846 ++#: ../camel/providers/local/camel-mbox-summary.c:1055 ++#: ../camel/providers/local/camel-mbox-summary.c:1063 ++msgid "Summary and folder mismatch, even after a sync" ++msgstr "समजुळवणी स्थापीत झाल्यावरही, सारांश व न जुळलेल, संचयीका" + +-#: ../camel/providers/local/camel-mbox-summary.c:935 +-#: ../camel/providers/local/camel-spool-summary.c:326 ++#: ../camel/providers/local/camel-mbox-summary.c:989 ++#: ../camel/providers/local/camel-spool-summary.c:327 + #, c-format + msgid "Unknown error: %s" +-msgstr "अनोळखी चूक: %s" ++msgstr "अपरिचीत त्रुटी: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:971 +-#, c-format +-msgid "Folder %s cannot be opened: %s" +-msgstr "संचयीका %s उघडू शकत नाही: %s" +- +-#: ../camel/providers/local/camel-mbox-summary.c:1182 +-#: ../camel/providers/local/camel-mbox-summary.c:1208 ++#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:1153 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "तात्पुरते मेलबॉक्स करीता लिहण्यास अपयशी: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1199 ++#: ../camel/providers/local/camel-mbox-summary.c:1144 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "तात्पुरते मेलबॉक्स करीता लिहण्यास अपयशी: %s: %s" +@@ -3957,61 +4057,61 @@ msgstr "एमएच संचिके + + #: ../camel/providers/local/camel-mh-store.c:232 + #, c-format +-msgid "Could not create folder `%s': %s" +-msgstr "संचिका तयार करू शकत नाही `%s': %s" ++msgid "Could not create folder '%s': %s" ++msgstr "संचयीका '%s' बनवू शकत नाही: %s" + + #: ../camel/providers/local/camel-mh-store.c:244 + #, c-format +-msgid "Cannot get folder `%s': not a directory." +-msgstr "संचिका मिळू शकत नाही `%s': निर्देशिका नाही." ++msgid "Cannot get folder '%s': not a directory." ++msgstr "संचयीका '%s' प्राप्त करू शकत नाही: संचयीका नाही." + + #: ../camel/providers/local/camel-mh-summary.c:246 + #, c-format + msgid "Cannot open MH directory path: %s: %s" +-msgstr "MH संचिका मार्ग उघडू शकत नाही: %s: %s" ++msgstr "MH संचयीका मार्ग उघडू शकत नाही: %s: %s" + + #: ../camel/providers/local/camel-spool-store.c:135 + #, c-format +-msgid "Spool `%s' cannot be opened: %s" +-msgstr "स्पूल `%s' उघडू शकत नाही: %s" ++msgid "Spool '%s' cannot be opened: %s" ++msgstr "स्पूल '%s' उघडू शकत नाही: %s" + + #: ../camel/providers/local/camel-spool-store.c:147 + #, c-format +-msgid "Spool `%s' is not a regular file or directory" +-msgstr "स्पूल `%s' ही नेहमीची फाईल किंवा संचिका नाही" ++msgid "Spool '%s' is not a regular file or directory" ++msgstr "स्पूल '%s' ही रेग्यूलर फाइल किंवा संचयीका नाही" + + #: ../camel/providers/local/camel-spool-store.c:166 + #, c-format +-msgid "Folder `%s/%s' does not exist." +-msgstr "संचिका `%s/%s' अस्तित्वात नाही." ++msgid "Folder '%s/%s' does not exist." ++msgstr "संचयीका '%s/%s' अस्तित्वात नाही." + + #: ../camel/providers/local/camel-spool-store.c:176 + #, c-format + msgid "" +-"Could not open folder `%s':\n" ++"Could not open folder '%s':\n" + "%s" + msgstr "" +-"संचिका उघडू शकत नाही `%s':\n" ++"संचयीका '%s' उघडू शकत नाही:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:180 + #, c-format +-msgid "Folder `%s' does not exist." +-msgstr "संचिका `%s' अस्तित्वात नाही." ++msgid "Folder '%s' does not exist." ++msgstr "संचयीका '%s' अस्तित्वात नाही." + + #: ../camel/providers/local/camel-spool-store.c:185 + #, c-format + msgid "" +-"Could not create folder `%s':\n" ++"Could not create folder '%s':\n" + "%s" + msgstr "" +-"संचिका तयार करू शकत नाही `%s':\n" ++"संचयीका '%s' बनवू शकत नाही:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:193 + #, c-format +-msgid "`%s' is not a mailbox file." +-msgstr "`%s' ही पत्रपेटी फाईल नाही." ++msgid "'%s' is not a mailbox file." ++msgstr "'%s' पत्रपेटी फाइल नाही." + + #: ../camel/providers/local/camel-spool-store.c:210 + msgid "Store does not support an INBOX" +@@ -4020,12 +4120,12 @@ msgstr "इनबॉक्सला स + #: ../camel/providers/local/camel-spool-store.c:222 + #, c-format + msgid "Spool mail file %s" +-msgstr "स्पूल पत्र फाईल %s" ++msgstr "स्पूल पत्र फाइल %s" + + #: ../camel/providers/local/camel-spool-store.c:222 + #, c-format + msgid "Spool folder tree %s" +-msgstr "स्पूल संचिका वृक्ष %s" ++msgstr "स्पूल संचयीका वृक्ष %s" + + #: ../camel/providers/local/camel-spool-store.c:230 + msgid "Spool folders cannot be renamed" +@@ -4035,28 +4135,28 @@ msgstr "स्पूल संचिक + msgid "Spool folders cannot be deleted" + msgstr "स्पूल संचिकेना काढून टाकता येणार नाही" + +-#: ../camel/providers/local/camel-spool-summary.c:171 +-#: ../camel/providers/local/camel-spool-summary.c:181 +-#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:172 ++#: ../camel/providers/local/camel-spool-summary.c:182 ++#: ../camel/providers/local/camel-spool-summary.c:192 + #, c-format + msgid "Could not sync temporary folder %s: %s" +-msgstr "तात्पुरती संचिका सीक्रोनाईझ करू शकत नाही %s: %s" ++msgstr "तात्पुरती संचयीका सीक्रोनाईझ करू शकत नाही %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:207 ++#: ../camel/providers/local/camel-spool-summary.c:208 + #, c-format + msgid "Could not sync spool folder %s: %s" +-msgstr "स्पूल संचिका सीक्रोनाईझ करू शकत नाही %s: %s" ++msgstr "स्पूल संचयीका सीक्रोनाईझ करू शकत नाही %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:238 +-#: ../camel/providers/local/camel-spool-summary.c:255 +-#: ../camel/providers/local/camel-spool-summary.c:266 ++#: ../camel/providers/local/camel-spool-summary.c:239 ++#: ../camel/providers/local/camel-spool-summary.c:256 ++#: ../camel/providers/local/camel-spool-summary.c:267 + #, c-format + msgid "" + "Could not sync spool folder %s: %s\n" +-"Folder may be corrupt, copy saved in `%s'" ++"Folder may be corrupt, copy saved in '%s'" + msgstr "" +-"स्पूल संचिका सिक्रोनाईझ करता येत नाही %s: %s\n" +-"संचिका खराब झाली असेल, `%s' मध्ये प्रत संग्रहीत करा" ++"स्पूल संचयीका %s समजुळवणी करू शकले नाही: %s\n" ++"संचयीका सदोषीत असावी, प्रत '%s' येथे संग्रहीत आहे" + + #: ../camel/providers/nntp/camel-nntp-folder.c:176 + #: ../camel/providers/nntp/camel-nntp-folder.c:208 +@@ -4064,19 +4164,19 @@ msgstr "" + 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:331 +-#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/nntp/camel-nntp-folder.c:330 ++#: ../camel/providers/nntp/camel-nntp-folder.c:333 + #: ../camel/providers/nntp/camel-nntp-folder.c:375 ++#: ../camel/providers/nntp/camel-nntp-folder.c:377 + #, c-format + msgid "Posting failed: %s" + msgstr "बदली अपयशी ठरली: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:393 ++#: ../camel/providers/nntp/camel-nntp-folder.c:395 + msgid "You cannot post NNTP messages while working offline!" + msgstr "ऑफलाईन काम करताना NNTP संदेश पोस्ट करू शकत नाही!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:404 ++#: ../camel/providers/nntp/camel-nntp-folder.c:406 + msgid "You cannot copy messages from a NNTP folder!" + msgstr "NNTP संचिकेतून तुम्ही संदेश प्रतिकृत करू शकत नाही!" + +@@ -4110,7 +4210,7 @@ msgstr "%s वरून शुभेच + #: ../camel/providers/nntp/camel-nntp-store.c:229 + #, c-format + msgid "NNTP server %s returned error code %d: %s" +-msgstr "NNTP सेवासंगणकाने %s हा चूकीचा सांकेतीक परत केला %d: %s" ++msgstr "NNTP सेवासंगणकाने %s हा त्रुटीीचा सांकेतीक परत केला %d: %s" + + #: ../camel/providers/nntp/camel-nntp-store.c:406 + #, c-format +@@ -4124,7 +4224,7 @@ msgid "" + "\n" + "%s" + msgstr "" +-"बातम्यांचा संच परत मिळविताना चूक झाली:\n" ++"बातम्यांचा संच परत मिळविताना त्रुटी झाली:\n" + "\n" + "%s" + +@@ -4136,7 +4236,7 @@ msgid "" + msgstr "" + "हा बातमीगट तुम्ही घेऊ शकत नाहीत:\n" + "\n" +-"असा बातमीग्रुप अस्तित्वात नाही. निवडलेली गोष्ट ही कदाचित मूळ संचिका असेल." ++"असा बातमीग्रुप अस्तित्वात नाही. निवडलेली गोष्ट ही कदाचित मूळ संचयीका असेल." + + #: ../camel/providers/nntp/camel-nntp-store.c:924 + msgid "" +@@ -4150,7 +4250,7 @@ msgstr "" + + #: ../camel/providers/nntp/camel-nntp-store.c:949 + msgid "You cannot create a folder in a News store: subscribe instead." +-msgstr "बातम्यांच्या संग्रहात तुम्ही संचिका निर्माण करू शकत नाही: त्याऐवजी सबस्क्राइब करा." ++msgstr "बातम्यांच्या संग्रहात तुम्ही संचयीका निर्माण करू शकत नाही: त्याऐवजी सबस्क्राइब करा." + + #: ../camel/providers/nntp/camel-nntp-store.c:957 + msgid "You cannot rename a folder in a News store." +@@ -4158,16 +4258,16 @@ msgstr "बातमी साठ्य + + #: ../camel/providers/nntp/camel-nntp-store.c:965 + msgid "You cannot remove a folder in a News store: unsubscribe instead." +-msgstr "बातमी साठ्यामधून तुम्ही संचिका काढू शकत नाही." ++msgstr "बातमी साठ्यामधून तुम्ही संचयीका काढू शकत नाही." + + #: ../camel/providers/nntp/camel-nntp-store.c:1154 + msgid "Authentication requested but no username provided" +-msgstr "ऑथेन्टिकेशनची विनंती केली पण वापरकर्त्यांचे नाव दिले" ++msgstr "अधिप्रमाणनची विनंती केली पण वापरकर्त्यांचे नाव दिले" + + #: ../camel/providers/nntp/camel-nntp-store.c:1166 + #, c-format + msgid "Cannot authenticate to server: %s" +-msgstr "सेवासंगणकावर ऑथेन्टिकेट करू शकत नाही: %s" ++msgstr "सर्वर येथे ऑथेन्टिकेट करू शकत नाही: %s" + + #: ../camel/providers/nntp/camel-nntp-store.c:1283 + #, c-format +@@ -4181,65 +4281,65 @@ msgstr "जोडले नाही." + #: ../camel/providers/nntp/camel-nntp-store.c:1390 + #, c-format + msgid "No such folder: %s" +-msgstr "अशी संचिका नाही: %s" ++msgstr "अशी संचयीका नाही: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:222 +-#: ../camel/providers/nntp/camel-nntp-summary.c:318 ++#: ../camel/providers/nntp/camel-nntp-summary.c:273 ++#: ../camel/providers/nntp/camel-nntp-summary.c:369 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: नवीन निरोप तपासत आहे" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:229 ++#: ../camel/providers/nntp/camel-nntp-summary.c:280 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "एक्सओव्हहून अनपेक्षित सेवासंगणक प्रतिसाद: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:332 ++#: ../camel/providers/nntp/camel-nntp-summary.c:383 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "मूळठिकाणाहून अवपेक्षित सेवासंगणक प्रतिसाद: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:372 ++#: ../camel/providers/nntp/camel-nntp-summary.c:423 + msgid "Use cancel" + msgstr "रद्द करा बटण वापरा" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:374 ++#: ../camel/providers/nntp/camel-nntp-summary.c:425 + #, c-format + msgid "Operation failed: %s" + msgstr "प्रक्रिया अपयशी: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:247 ++#: ../camel/providers/pop3/camel-pop3-folder.c:251 + msgid "Retrieving POP summary" + msgstr "पॉप सारांश परत मिळविला जात आहे" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:265 ++#: ../camel/providers/pop3/camel-pop3-folder.c:269 + #, c-format + msgid "Cannot get POP summary: %s" + msgstr "पॉप सारांश मिळत नाही: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:308 ++#: ../camel/providers/pop3/camel-pop3-folder.c:312 + msgid "Expunging old messages" + msgstr "जुने संदेश काढण टाकत आहे" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:316 ++#: ../camel/providers/pop3/camel-pop3-folder.c:320 + msgid "Expunging deleted messages" + msgstr "काढून टाकलेले संदेश एक्सपंज केले जात आहेत" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:492 ++#: ../camel/providers/pop3/camel-pop3-folder.c:534 + #, c-format + msgid "No message with UID %s" + msgstr "UID %s सह संदेश नाही" + + #. Sigh, most of the crap in this function is so that the cancel button + #. returns the proper exception code. Sigh. +-#: ../camel/providers/pop3/camel-pop3-folder.c:499 ++#: ../camel/providers/pop3/camel-pop3-folder.c:541 + #, c-format + msgid "Retrieving POP message %d" + msgstr "पॉप संदेश परत मिळविला जात आहे %d" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:589 ++#: ../camel/providers/pop3/camel-pop3-folder.c:631 + msgid "Unknown reason" +-msgstr "अनोळखी कारण" ++msgstr "अपरिचीत कारण" + + #: ../camel/providers/pop3/camel-pop3-provider.c:43 + msgid "_Leave messages on server" +@@ -4267,8 +4367,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:84 + msgid "" +@@ -4276,91 +4376,92 @@ msgid "" + "the APOP protocol. This may not work for all users even on servers that " + "claim to support it." + msgstr "" +-"APOP प्रोटोकॉलद्वारे इनक्रिप्टेड परवलीशब्द वापरून हा विकल्प POP सेवासंगणकाशी " +-"जोजला जातो. हे सर्व वापरकर्त्याकरता नाही जे सेवासंगणकास मदत करतात असा दावा " +-"करतात." ++"APOP प्रोटोकॉलद्वारे इनक्रिप्टेड परवलीशब्द वापरून हा विकल्प POP सेवासंगणकाशी जोजला " ++"जातो. हे सर्व वापरकर्त्याकरता नाही जे सेवासंगणकास मदत करतात असा दावा करतात." + +-#: ../camel/providers/pop3/camel-pop3-store.c:210 ++#: ../camel/providers/pop3/camel-pop3-store.c:208 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" +-msgstr "पॉप सेवासंगणकावरून वैध शुभेच्छा वाचण्यात अपयश आले %s" ++msgstr "पॉप सर्वर येथेून वैध शुभेच्छा वाचण्यात अपयश आले %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:227 +-#: ../camel/providers/pop3/camel-pop3-store.c:241 +-#: ../camel/providers/pop3/camel-pop3-store.c:251 +-#: ../camel/providers/pop3/camel-pop3-store.c:257 ++#: ../camel/providers/pop3/camel-pop3-store.c:225 ++#: ../camel/providers/pop3/camel-pop3-store.c:239 ++#: ../camel/providers/pop3/camel-pop3-store.c:249 ++#: ../camel/providers/pop3/camel-pop3-store.c:255 + #, c-format + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "ह्या सुरक्षित पध्दतीत ह्या पॉप सेवासंगणकाशी %s संपर्क साधण्यात अपयश आले : %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:228 ++#: ../camel/providers/pop3/camel-pop3-store.c:226 + msgid "STLS not supported by server" + msgstr "STLS या सर्वर द्वारे समर्थीत नाही" + +-#: ../camel/providers/pop3/camel-pop3-store.c:258 ++#: ../camel/providers/pop3/camel-pop3-store.c:256 + msgid "TLS is not available in this build" + msgstr "TLS या मांडणी मध्ये उपलब्ध नाही" + +-#: ../camel/providers/pop3/camel-pop3-store.c:364 ++#: ../camel/providers/pop3/camel-pop3-store.c:362 + #, c-format + msgid "Could not connect to POP server %s" + msgstr "POP सेवासंगणकाशी संपर्क साधता येत नाही %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:405 +-#: ../camel/providers/pop3/camel-pop3-store.c:542 ++#: ../camel/providers/pop3/camel-pop3-store.c:403 ++#: ../camel/providers/pop3/camel-pop3-store.c:536 + #, c-format + msgid "" + "Unable to connect to POP server %s: No support for requested authentication " + "mechanism." + msgstr "" +-"POP सेवासंगणकाशी संबंध जोडण्यात अपयश %s: विनंती केलेल्या ऑथेन्टिकेशन मॅकेनिझमला ही " +-"काही मदत नाही." ++"POP सेवासंगणकाशी संबंध जोडण्यात अपयश %s: विनंती केलेल्या अधिप्रमाणन मॅकेनिझमला ही काही " ++"मदत नाही." + +-#: ../camel/providers/pop3/camel-pop3-store.c:421 ++#: ../camel/providers/pop3/camel-pop3-store.c:419 + #, c-format +-msgid "SASL `%s' Login failed for POP server %s: %s" +-msgstr "SASL `%s' POP सेवासंगणकासाठी प्रवेश अपयशी %s: %s" ++msgid "SASL '%s' Login failed for POP server %s: %s" ++msgstr "SASL '%s' POP सर्वर %s करीता दाखलन अपयशी: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:433 ++#: ../camel/providers/pop3/camel-pop3-store.c:431 + #, 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:452 ++#: ../camel/providers/pop3/camel-pop3-store.c:450 + #, c-format + msgid "Failed to authenticate on POP server %s: %s" +-msgstr "POP सेवासंगणकावर ऑथेन्टिकेट होऊ शकले नाही %s: %s" ++msgstr "POP सर्वर येथे ऑथेन्टिकेट होऊ शकले नाही %s: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:512 ++#: ../camel/providers/pop3/camel-pop3-store.c:509 + #, 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:556 +-#: ../camel/providers/pop3/camel-pop3-store.c:569 ++#: ../camel/providers/pop3/camel-pop3-store.c:550 ++#: ../camel/providers/pop3/camel-pop3-store.c:563 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" + "Error sending password: %s" + msgstr "" + "पॉप सेवासंगणकाशी जोडणी करता आली नाही %s.\n" +-"परवलीशब्द पाठविताना चूक झाली: %s" ++"परवलीशब्द पाठविताना त्रुटी झाली: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:563 ++#: ../camel/providers/pop3/camel-pop3-store.c:557 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" + "Error sending username: %s" + msgstr "" + "पॉप सेवासंगणकाशी जोडणी करता आली नाही %s.\n" +-"वापरकर्त्यांचे नाव पाठविताना चूक झाली: %s" ++"वापरकर्त्यांचे नाव पाठविताना त्रुटी झाली: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:669 ++#: ../camel/providers/pop3/camel-pop3-store.c:663 + #, c-format +-msgid "No such folder `%s'." +-msgstr "अशी संचिका नाही `%s'." ++msgid "No such folder '%s'." ++msgstr "'%s' अशी संचयीका नाही." + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:38 + msgid "Sendmail" +@@ -4417,128 +4518,128 @@ msgstr "SMTP" + msgid "For delivering mail by connecting to a remote mailhub using SMTP." + msgstr "SMTP वापरून दुरस्थ पत्रहबशी संपर्क जोडून पत्र पाठविले जात आहे." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:168 + msgid "Syntax error, command unrecognized" +-msgstr "सिनटॅक्स चूक, सूचना ओळखता आली नाही" ++msgstr "सिनटॅक्स त्रुटी, सूचना ओळखता आली नाही" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:170 + msgid "Syntax error in parameters or arguments" +-msgstr "गुणधर्मात वा विधानात सिनटॅक्सचा चूक" ++msgstr "गुणधर्मात वा विधानात सिनटॅक्सचा त्रुटी" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:170 ++#: ../camel/providers/smtp/camel-smtp-transport.c:172 + msgid "Command not implemented" + msgstr "सूचना अमलात आणली गेली नाही" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:174 + msgid "Command parameter not implemented" + msgstr "सूचना गुणधर्म अमलात आणला गेला नाही" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:174 ++#: ../camel/providers/smtp/camel-smtp-transport.c:176 + msgid "System status, or system help reply" + msgstr "यंत्रणा स्थिती किंवा यंत्रणा मदत उत्तर" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:176 ++#: ../camel/providers/smtp/camel-smtp-transport.c:178 + msgid "Help message" + msgstr "मदत निरोप" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:180 + msgid "Service ready" + msgstr "सेवा तयार" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:180 ++#: ../camel/providers/smtp/camel-smtp-transport.c:182 + msgid "Service closing transmission channel" + msgstr "सुविधा प्रसारण चॅनल बंद करत नाही" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:184 + msgid "Service not available, closing transmission channel" + msgstr "सुविधा उपलब्ध नाही, त्यामुळे प्रसारण चॅनेल बंद होत आहे" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:184 ++#: ../camel/providers/smtp/camel-smtp-transport.c:186 + msgid "Requested mail action okay, completed" + msgstr "विनंती केलेली मेल कृती बरोबर, पूर्ण झाली" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:186 ++#: ../camel/providers/smtp/camel-smtp-transport.c:188 + msgid "User not local; will forward to " + msgstr "वापरकर्ता स्थानिक नाही; <पुढील-मार्गावर> पुढे केले जाईल" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:188 ++#: ../camel/providers/smtp/camel-smtp-transport.c:190 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "विनंती केलली मेलकृती घेतली गेली नाही: पत्रपेटी उपलब्ध नाही" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:190 ++#: ../camel/providers/smtp/camel-smtp-transport.c:192 + msgid "Requested action not taken: mailbox unavailable" + msgstr "विनंती केलेली कृती घेतली गेली नाही: पत्रपेटी उपलब्ध नाही" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:192 ++#: ../camel/providers/smtp/camel-smtp-transport.c:194 + msgid "Requested action aborted: error in processing" +-msgstr "विनंती केलेली कृती अबोर्ट केली: प्रक्रियेत चूक झाली" ++msgstr "विनंती केलेली कृती अबोर्ट केली: प्रक्रियेत त्रुटी झाली" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:194 ++#: ../camel/providers/smtp/camel-smtp-transport.c:196 + msgid "User not local; please try " + msgstr "वापरकर्ता स्थानिक नाही; <पुढील-मार्गावर> कृपया प्रयत्न करा" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:196 ++#: ../camel/providers/smtp/camel-smtp-transport.c:198 + msgid "Requested action not taken: insufficient system storage" + msgstr "विनंती केलेली कृती घेतली नाही: अपूरी यंत्रणा साठवणी सुविधा" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:198 ++#: ../camel/providers/smtp/camel-smtp-transport.c:200 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "विनंती केलेली मेल कृती अबोर्ट केली: साठवणीच्या सुविधेपेक्षा जास्त झाली" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:200 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "विनंती केलेली कृती झाली नाही: पत्रपेटीच्या नावाला परवानगी नाही" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:204 + msgid "Start mail input; end with ." + msgstr "पत्र इनपुट सुरू करा; . च्याबरोबर संपवा" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:204 ++#: ../camel/providers/smtp/camel-smtp-transport.c:206 + msgid "Transaction failed" + msgstr "कृती अपयशी" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/providers/smtp/camel-smtp-transport.c:210 + msgid "A password transition is needed" + msgstr "परवलीशब्दाच्या कृती आवश्यक आहे" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:210 ++#: ../camel/providers/smtp/camel-smtp-transport.c:212 + msgid "Authentication mechanism is too weak" +-msgstr "ऑथेन्टिकेशन पध्दत खूपच अशक्त आहे" ++msgstr "अधिप्रमाणन पध्दत खूपच अशक्त आहे" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:212 ++#: ../camel/providers/smtp/camel-smtp-transport.c:214 + msgid "Encryption required for requested authentication mechanism" +-msgstr "विनंती केलेल्या ऑथेन्टिकेशन पध्दतीसाठी इन्स्क्रिप्शन आवश्यक आहे" ++msgstr "विनंती केलेल्या अधिप्रमाणन पध्दतीसाठी इन्स्क्रिप्शन आवश्यक आहे" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:214 ++#: ../camel/providers/smtp/camel-smtp-transport.c:216 + msgid "Temporary authentication failure" +-msgstr "तात्पुरते ऑथेन्टिकेशनचे अपयश" ++msgstr "तात्पुरते अधिप्रमाणनचे अपयश" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:295 ++#: ../camel/providers/smtp/camel-smtp-transport.c:297 + msgid "Welcome response error" +-msgstr "स्वागत प्रतिसाद चूक" ++msgstr "स्वागत प्रतिसाद त्रुटी" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:330 +-#: ../camel/providers/smtp/camel-smtp-transport.c:363 +-#: ../camel/providers/smtp/camel-smtp-transport.c:369 ++#: ../camel/providers/smtp/camel-smtp-transport.c:332 ++#: ../camel/providers/smtp/camel-smtp-transport.c:365 ++#: ../camel/providers/smtp/camel-smtp-transport.c:371 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "ह्या सुरक्षित पध्दतीत %s SMTP सेवासंगणकाशी संपर्क साधता आला नाही : %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:341 + #, c-format + msgid "STARTTLS command failed: %s" + msgstr "STARTTLS सूचना अयशस्वी: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:354 ++#: ../camel/providers/smtp/camel-smtp-transport.c:356 + msgid "STARTTLS command failed" + msgstr "STARTTLS आदेश असफल" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:494 ++#: ../camel/providers/smtp/camel-smtp-transport.c:497 + #, c-format + msgid "SMTP server %s does not support requested authentication type %s." +-msgstr "विनंती केलेल्या %s ऑथेन्टिकेशन प्रकाराला SMTP सेवासंगणक सहाय्य करत नाही %s." ++msgstr "विनंती केलेल्या %s अधिप्रमाणन प्रकाराला SMTP सेवासंगणक सहाय्य करत नाही %s." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:559 ++#: ../camel/providers/smtp/camel-smtp-transport.c:564 + #, c-format + msgid "" + "Unable to authenticate to SMTP server.\n" +@@ -4549,93 +4650,93 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:683 ++#: ../camel/providers/smtp/camel-smtp-transport.c:697 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP सर्वर %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:685 ++#: ../camel/providers/smtp/camel-smtp-transport.c:699 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "%s द्वारे SMTP पत्र डिलिव्हरी" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:717 + msgid "Cannot send message: service not connected." + msgstr "निरोप पाठवू नका: सेवा जोडलेली नाही." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:709 ++#: ../camel/providers/smtp/camel-smtp-transport.c:723 + msgid "Cannot send message: sender address not valid." + msgstr "निरोप पाठवू नका: पाठवणाऱ्याचा पत्ता अयोग्य." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:713 ++#: ../camel/providers/smtp/camel-smtp-transport.c:727 + msgid "Sending message" + msgstr "संदेश पाठवत आहे" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:728 ++#: ../camel/providers/smtp/camel-smtp-transport.c:742 + msgid "Cannot send message: no recipients defined." + msgstr "संदेश पाठवू शकत नाही: ग्राहक ठरविलेले नाहीत." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:753 + msgid "Cannot send message: one or more invalid recipients" + msgstr "संदेश पाठवूशकत नाही: एक किंवा जास्त अयोग्य ग्राहक" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:968 ++#: ../camel/providers/smtp/camel-smtp-transport.c:982 + msgid "SMTP Greeting" + msgstr "SMTP ग्रीटिंग" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:993 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1007 + #, c-format + msgid "HELO command failed: %s" + msgstr "HELO आदेश असफल: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1010 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1024 + msgid "HELO command failed" + msgstr "HELO आज्ञा अयशस्वी" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1073 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1090 + msgid "SMTP Authentication" +-msgstr "SMTP ऑथेन्टिकेशन" ++msgstr "SMTP अधिप्रमाणन" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1079 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1096 + msgid "Error creating SASL authentication object." +-msgstr "SASL ऑथेन्टिकेशन हेतू तयार करताना चूक." ++msgstr "SASL अधिप्रमाणन हेतू तयार करताना त्रुटी." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1096 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1107 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1124 + #, c-format + msgid "AUTH command failed: %s" + msgstr "AUTH आज्ञा अयशस्वी: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1130 + msgid "AUTH command failed" + msgstr "AUTH आदेश असफल" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1177 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1200 + msgid "Bad authentication response from server.\n" +-msgstr "सेवासंगणकावरून चूकीच्या ऑथेन्टीकेशनचा प्रतिसाद.\n" ++msgstr "सर्वर येथेून त्रुटीीच्या ऑथेन्टीकेशनचा प्रतिसाद.\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1227 + #, c-format + msgid "MAIL FROM command failed: %s: mail not sent" + msgstr "MAIL FROM आदेश असफल: %s: मेल नाही पाठवला" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1219 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1244 + msgid "MAIL FROM command failed" + msgstr "MAIL FROM आदेश असफल" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1243 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1268 + #, c-format + msgid "RCPT TO command failed: %s: mail not sent" + msgstr "RCPT TO आदेश असफल: %s: मेल नाही पाठवला" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1262 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1287 + #, c-format + msgid "RCPT TO <%s> failed" + msgstr "RCPT TO <%s> असफल" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1301 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1359 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1378 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1327 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1396 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1415 + #, c-format + msgid "DATA command failed: %s: mail not sent" + msgstr "DATA आदेश असफल: %s: मेल नाही पाठवला" +@@ -4643,26 +4744,26 @@ msgstr "DATA आदेश असफल: + #. we should have gotten instructions on how to use the DATA command: + #. * 354 Enter mail, end with "." on a line by itself + #. +-#: ../camel/providers/smtp/camel-smtp-transport.c:1318 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1394 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1344 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1431 + msgid "DATA command failed" + msgstr "DATA आदेश असफल" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1417 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1454 + #, c-format + msgid "RSET command failed: %s" + msgstr "RSET आदेश असफल: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1433 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1470 + msgid "RSET command failed" + msgstr "RSET आदेश असफल" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1456 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1493 + #, c-format + msgid "QUIT command failed: %s" + msgstr "QUIT आदेश असफल: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1470 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1507 + msgid "QUIT command failed" + msgstr "QUIT आदेश असफल" + +@@ -4723,27 +4824,28 @@ msgstr "खाजगी" + msgid "Phone Calls" + msgstr "फोन काल्स" + +-#: ../libedataserver/e-categories.c:60 ++#. Translators: "Status" is a category name; it can mean anything user wants to ++#: ../libedataserver/e-categories.c:61 + msgid "Status" + msgstr "स्थिती" + +-#: ../libedataserver/e-categories.c:61 ++#: ../libedataserver/e-categories.c:62 + msgid "Strategies" + msgstr "रणनीति" + +-#: ../libedataserver/e-categories.c:62 ++#: ../libedataserver/e-categories.c:63 + msgid "Suppliers" + msgstr "सप्लायर्स" + +-#: ../libedataserver/e-categories.c:63 ++#: ../libedataserver/e-categories.c:64 + msgid "Time & Expenses" + msgstr "वेळ व खर्च" + +-#: ../libedataserver/e-categories.c:64 ++#: ../libedataserver/e-categories.c:65 + msgid "VIP" + msgstr "VIP" + +-#: ../libedataserver/e-categories.c:65 ++#: ../libedataserver/e-categories.c:66 + msgid "Waiting" + msgstr "प्रतीक्षारत" + +@@ -4875,26 +4977,26 @@ msgstr "%H%M" + msgid "%I %p" + msgstr "%I %p" + +-#: ../libedataserverui/e-book-auth-util.c:89 ++#: ../libedataserverui/e-book-auth-util.c:90 + msgid "Accessing LDAP Server anonymously" + msgstr "LDAP सर्वर निनावी पद्धतीने मिळवत आहे" + +-#: ../libedataserverui/e-book-auth-util.c:193 ++#: ../libedataserverui/e-book-auth-util.c:192 + msgid "Failed to authenticate.\n" + msgstr "अधिप्रमाणन करण्यास अपयशी.\n" + +-#: ../libedataserverui/e-categories-dialog.c:274 ++#: ../libedataserverui/e-categories-dialog.c:261 + #, c-format + msgid "" + "There is already a category '%s' in the configuration. Please use another " + "name" + msgstr "ह्या संरचनेमध्ये आधीच '%s' ही वर्गवारी आहे. कृपया दुसरे नाव द्या" + +-#: ../libedataserverui/e-categories-dialog.c:475 ++#: ../libedataserverui/e-categories-dialog.c:462 + msgid "Icon" + msgstr "चिन्ह" + +-#: ../libedataserverui/e-categories-dialog.c:480 ++#: ../libedataserverui/e-categories-dialog.c:467 + msgid "Category" + msgstr "प्रवर्ग" + +@@ -4916,7 +5018,7 @@ msgstr "श्रेणी नाव (_N + + #: ../libedataserverui/e-categories-dialog.glade.h:5 + msgid "Item(s) belong to these _categories:" +-msgstr "वस्तू(s) ह्या विभागाशी संबधीत आहेत:" ++msgstr "घटक या विभागाशी संबधित आहेत (_c):" + + #: ../libedataserverui/e-categories-dialog.glade.h:6 + msgid "_Available Categories:" +@@ -4930,19 +5032,19 @@ msgstr "संपादन (_E)" + msgid "categories" + msgstr "प्रवर्ग" + +-#: ../libedataserverui/e-name-selector-dialog.c:275 ++#: ../libedataserverui/e-name-selector-dialog.c:266 + msgid "Select Contacts from Address Book" + msgstr "पत्त्याच्या पुस्तकातून संपर्क निवडा" + +-#: ../libedataserverui/e-name-selector-dialog.c:555 ++#: ../libedataserverui/e-name-selector-dialog.c:546 + msgid "_Add" + msgstr "जोडा(_A)" + +-#: ../libedataserverui/e-name-selector-dialog.c:580 ++#: ../libedataserverui/e-name-selector-dialog.c:571 + msgid "_Remove" + msgstr "काढून टाका(_R)" + +-#: ../libedataserverui/e-name-selector-dialog.c:753 ++#: ../libedataserverui/e-name-selector-dialog.c:744 + #: ../libedataserverui/e-name-selector-dialog.glade.h:6 + msgid "Any Category" + msgstr "कुठलेही प्रवर्ग" +@@ -4985,69 +5087,78 @@ msgid "_Search:" + msgstr "शोधा(_S):" + + #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2249 ++#: ../libedataserverui/e-name-selector-entry.c:2240 + #, c-format + msgid "E_xpand %s Inline" + msgstr "%s ओळीमध्ये विस्तारा(_x)" + + #. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2264 ++#: ../libedataserverui/e-name-selector-entry.c:2255 + #, c-format + msgid "Cop_y %s" + msgstr "%s चे प्रत बनवा (_y)" + + #. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2274 ++#: ../libedataserverui/e-name-selector-entry.c:2265 + #, c-format + msgid "C_ut %s" + msgstr "%s कापा (_u)" + + #. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2291 ++#: ../libedataserverui/e-name-selector-entry.c:2282 + #, c-format + msgid "_Edit %s" + msgstr "संपादन (_E) %s" + +-#: ../libedataserverui/e-name-selector-list.c:479 ++#: ../libedataserverui/e-name-selector-list.c:466 + #, c-format + msgid "_Delete %s" + msgstr "%s नष्ट करा(_D)" + +-#: ../libedataserverui/e-passwords.c:986 ++#: ../libedataserverui/e-passwords.c:218 ++#, c-format ++msgid "Keyring key is unusable: no user or host name" ++msgstr "किरींग कि वापरण्याजोगी नाही: वापरकर्ता किंवा यजमान नाव नाही" ++ ++#: ../libedataserverui/e-passwords.c:1055 ++msgid "You have the Caps Lock key on." ++msgstr "Caps Lock कि चालू आहे." ++ ++#: ../libedataserverui/e-passwords.c:1175 + msgid "_Remember this passphrase" +-msgstr "ही गुप्तवाक्यरचना स्मर्णात ठेवा (_R)" ++msgstr "ही गुप्तवाक्यरचना लक्षात ठेवा (_R)" + +-#: ../libedataserverui/e-passwords.c:987 ++#: ../libedataserverui/e-passwords.c:1176 + msgid "_Remember this passphrase for the remainder of this session" +-msgstr "या सत्राच्या उर्वरीत भागाकरीता गुप्तवाक्यरचना लक्षात ठेवा" ++msgstr "या सत्राच्या उर्वरीत भागाकरीता गुप्तवाक्रचना लक्षात ठेवा (_R)" + +-#: ../libedataserverui/e-passwords.c:992 ++#: ../libedataserverui/e-passwords.c:1181 + msgid "_Remember this password" + msgstr "गुप्तशब्द लक्षात ठेवा(_R)" + +-#: ../libedataserverui/e-passwords.c:993 ++#: ../libedataserverui/e-passwords.c:1182 + msgid "_Remember this password for the remainder of this session" +-msgstr "ह्या सत्राच्या आठवणीसाठी हा परवली शब्द लक्षात ठेवा" ++msgstr "या सत्राच्या उर्वरीत भागाकरीता हा गुप्तशब्द लक्षात ठेवा (_R)" + + #. prepare the dialog +-#: ../libedataserverui/e-source-selector-dialog.c:101 ++#: ../libedataserverui/e-source-selector-dialog.c:95 + msgid "Select destination" +-msgstr "गंतव्य निवडा" ++msgstr "लक्ष्य निवडा" + +-#: ../libedataserverui/e-source-selector-dialog.c:154 ++#: ../libedataserverui/e-source-selector-dialog.c:148 + msgid "_Destination" +-msgstr "गंतव्य (_D)" ++msgstr "लक्ष्य (_D)" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1660 +-#: ../servers/exchange/storage/exchange-account.c:939 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1683 ++#: ../servers/exchange/storage/exchange-account.c:953 + #, c-format + msgid "Enter password for %s" +-msgstr "%sसाठी गुप्तशब्द दाखल करा" ++msgstr "%s करीता गुप्तशब्द प्रविष्ट करा" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1661 +-#: ../servers/exchange/storage/exchange-account.c:944 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1684 ++#: ../servers/exchange/storage/exchange-account.c:958 + msgid "Enter password" +-msgstr "गुप्तशब्द दाखल करा" ++msgstr "गुप्तशब्द प्रविष्ट करा" + + #. i18n: These are Outlook's words for the default roles in + #. the folder permissions dialog. +@@ -5097,7 +5208,7 @@ msgstr "जेनेरिक त्र + + #: ../servers/exchange/storage/e-storage.c:557 + msgid "A folder with the same name already exists" +-msgstr "ह्या नावाची संचिका आधीच आहे" ++msgstr "ह्या नावाची संचयीका आधीच आहे" + + #: ../servers/exchange/storage/e-storage.c:559 + msgid "The specified folder type is not valid" +@@ -5109,15 +5220,15 @@ msgstr "I/O त्रुटि" + + #: ../servers/exchange/storage/e-storage.c:563 + msgid "Not enough space to create the folder" +-msgstr "संचिका तयार करण्यासाठी पुरेशी जागा नाही" ++msgstr "संचयीका तयार करण्यासाठी पुरेशी जागा नाही" + + #: ../servers/exchange/storage/e-storage.c:565 + msgid "The folder is not empty" +-msgstr "संचिका रिकामी नाही" ++msgstr "संचयीका रिकामी नाही" + + #: ../servers/exchange/storage/e-storage.c:567 + msgid "The specified folder was not found" +-msgstr "ठराविक संचिका मिळाली नव्हती" ++msgstr "ठराविक संचयीका मिळाली नव्हती" + + #: ../servers/exchange/storage/e-storage.c:569 + msgid "Function not implemented in this storage" +@@ -5133,7 +5244,7 @@ msgstr "ह्या साठ्या + + #: ../servers/exchange/storage/e-storage.c:577 + msgid "The specified folder cannot be modified or removed" +-msgstr "ठरविलेली संचिका सुधारता वा काढून टाकता येणार नाही" ++msgstr "ठरविलेली संचयीका सुधारता वा काढून टाकता येणार नाही" + + #: ../servers/exchange/storage/e-storage.c:579 + msgid "Cannot make a folder a child of one of its descendants" +@@ -5141,7 +5252,7 @@ msgstr "संचयीकेस उप + + #: ../servers/exchange/storage/e-storage.c:581 + msgid "Cannot create a folder with that name" +-msgstr "त्या नावाने संचिका तयार करू शकत नाही" ++msgstr "त्या नावाने संचयीका बनवू शकत नाही" + + #: ../servers/exchange/storage/e-storage.c:583 + msgid "This operation cannot be performed in off-line mode" +@@ -5149,26 +5260,26 @@ msgstr "ऑफलाईन पध्द + + #. i18n: This is the title of an "other user's folders" + #. hierarchy. Eg, "John Doe's Folders". +-#: ../servers/exchange/storage/exchange-account.c:635 ++#: ../servers/exchange/storage/exchange-account.c:644 + #, c-format + msgid "%s's Folders" + msgstr "%s' चा फोल्डर" + +-#: ../servers/exchange/storage/exchange-account.c:1245 ++#: ../servers/exchange/storage/exchange-account.c:1259 + msgid "Personal Folders" + msgstr "व्यक्तिगत फ़ोल्डर" + +-#: ../servers/exchange/storage/exchange-account.c:1260 ++#: ../servers/exchange/storage/exchange-account.c:1274 + msgid "Favorite Public Folders" + msgstr "आवडीचा सार्वजनिक फ़ोल्डर" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1277 ++#: ../servers/exchange/storage/exchange-account.c:1291 + msgid "All Public Folders" + msgstr "सर्व सार्वजनिक फ़ोल्डर" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1291 ++#: ../servers/exchange/storage/exchange-account.c:1305 + msgid "Global Address List" + msgstr "वैश्विक पत्ता यादी" + +@@ -5196,19 +5307,19 @@ msgstr "पाठवलेल्या + msgid "Tasks" + msgstr "कामे" + +-#: ../servers/groupwise/e-gw-connection.c:191 ++#: ../servers/groupwise/e-gw-connection.c:225 + msgid "Invalid connection" + msgstr "अवैध जुळवणीक" + +-#: ../servers/groupwise/e-gw-connection.c:195 ++#: ../servers/groupwise/e-gw-connection.c:229 + msgid "Invalid response from server" + msgstr "सर्वरकडून अवैध प्रतिसाद" + +-#: ../servers/groupwise/e-gw-connection.c:197 ++#: ../servers/groupwise/e-gw-connection.c:231 + msgid "No response from the server" + msgstr "सर्वरकडून प्रतिसाद नाही" + +-#: ../servers/groupwise/e-gw-connection.c:203 ++#: ../servers/groupwise/e-gw-connection.c:237 + msgid "Bad parameter" + msgstr "खराब पैरामीटर" + +@@ -5229,7 +5340,7 @@ msgid "Evolution Data Server logging ser + msgstr "इवोल्यूशन दिनदर्शिका सर्वर लॉगिंग सेवा" + + #. dialog display isn't working out +-#: ../src/server.c:110 ++#: ../src/server.c:109 + #, c-format + msgid "Multiple segmentation faults occurred; cannot display error dialog\n" + msgstr "बहु विभागीय त्रुटी आढळले; त्रुटी संवाद दर्शवू शकत नाही\n" +Index: evolution-data-server-2.23.92/po/nl.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/nl.po ++++ evolution-data-server-2.23.92/po/nl.po +@@ -1,6 +1,7 @@ + # Dutch translation for evolution-data-server + # +-# Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. ++# This file is distrbuted under the same license as the evolution-data-server ++# package. + # + # Arjan Scherpenisse , 2000 + # Gerard Oskamp , 2000 +@@ -24,10 +25,10 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: Evolution\n" ++"Project-Id-Version: evolution-data-server\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-05-19 15:07+0000\n" +-"PO-Revision-Date: 2008-05-23 01:18+0200\n" ++"POT-Creation-Date: 2008-09-16 11:01+0200\n" ++"PO-Revision-Date: 2008-09-16 00:09+0200\n" + "Last-Translator: Tino Meinen \n" + "Language-Team: Dutch \n" + "MIME-Version: 1.0\n" +@@ -38,59 +39,59 @@ msgstr "" + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475 + msgid "Loading..." +-msgstr "Laden..." ++msgstr "Laden…" + + #: ../addressbook/backends/file/e-book-backend-file.c:558 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4220 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477 + msgid "Searching..." +-msgstr "Zoeken..." ++msgstr "Zoeken…" + + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4384 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452 + #, c-format + msgid "Downloading contacts (%d)... " +-msgstr "Downloaden van contacten (%d)..." ++msgstr "Downloaden van contacten (%d)…" + + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103 + #, c-format + msgid "Updating contacts cache (%d)... " +-msgstr "Bijwerken van contactenbuffer (%d)..." ++msgstr "Bijwerken van contactenbuffer (%d)…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:742 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751 + msgid "Using Distinguished Name (DN)" + msgstr "Unieke naam (DN) wordt gebruikt" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754 + msgid "Using Email Address" + msgstr "Gebruik E-mailadres" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1005 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019 + msgid "Reconnecting to LDAP server..." +-msgstr "Verbinding met LDAP server wordt opnieuw opgezet..." ++msgstr "Verbinding met LDAP server wordt opnieuw opgezet…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1598 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617 + msgid "Adding contact to LDAP server..." +-msgstr "Kaart wordt toegevoegd aan LDAP-server..." ++msgstr "Kaart wordt toegevoegd aan LDAP-server…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1732 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Removing contact from LDAP server..." +-msgstr "Kaart wordt verwijderd van LDAP-server..." ++msgstr "Kaart wordt verwijderd van LDAP-server…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2043 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064 + msgid "Modifying contact from LDAP server..." +-msgstr "Kaart van LDAP-server wordt aangepast..." ++msgstr "Kaart van LDAP-server wordt aangepast…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4087 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148 + msgid "Receiving LDAP search results..." +-msgstr "LDAP-zoekresultaten worden ingelezen..." ++msgstr "LDAP-zoekresultaten worden ingelezen…" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4242 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310 + msgid "Error performing search" + msgstr "Fout bij het zoeken" + +@@ -109,7 +110,7 @@ msgstr "Fout bij het zoeken" + #: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791 + #: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029 + #: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238 +-#: ../addressbook/libebook/e-book.c:3339 ++#: ../addressbook/libebook/e-book.c:3364 + #, c-format + msgid "\"%s\" on book before \"%s\"" + msgstr "‘%s’ op boek voor ‘%s’" +@@ -138,7 +139,7 @@ msgstr "boek bezig" + #: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277 + #: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619 + #: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818 +-#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3348 ++#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3373 + #, c-format + msgid "CORBA exception making \"%s\" call" + msgstr "CORBA-uitzondering roept ‘%s’ aan" +@@ -164,27 +165,27 @@ msgstr "‘%s’ op boek na ‘%s’" + msgid "%s: canceled" + msgstr "%s: geannuleerd" + +-#: ../addressbook/libebook/e-book.c:3203 ++#: ../addressbook/libebook/e-book.c:3228 + #, c-format + msgid "%s: Invalid source." + msgstr "%s: Ongeldige bron" + +-#: ../addressbook/libebook/e-book.c:3211 ../addressbook/libebook/e-book.c:3277 ++#: ../addressbook/libebook/e-book.c:3236 ../addressbook/libebook/e-book.c:3302 + #, c-format + msgid "%s: no factories available for URI `%s'" + msgstr "%s: geen fabrieken beschikbaar voor URI ‘%s’" + +-#: ../addressbook/libebook/e-book.c:3223 ++#: ../addressbook/libebook/e-book.c:3248 + #, c-format + msgid "%s: Could not create EBookListener" + msgstr "%s: Kon EBookListener niet aanmaken" + +-#: ../addressbook/libebook/e-book.c:3490 ++#: ../addressbook/libebook/e-book.c:3515 + #, c-format + msgid "%s: there was no self contact UID stored in gconf" + msgstr "%s: er is geen zelfcontact-UID opgeslagen in gconf" + +-#: ../addressbook/libebook/e-book.c:3623 ++#: ../addressbook/libebook/e-book.c:3648 + #, c-format + msgid "%s: there was no source for uid `%s' stored in gconf." + msgstr "%s: er is geen bron voor uid ‘%s’ opgeslagen in gconf." +@@ -377,7 +378,7 @@ msgstr "Weblog URL" + + #. Contact categories + #: ../addressbook/libebook/e-contact.c:176 +-#: ../libedataserverui/e-categories-dialog.c:439 ++#: ../libedataserverui/e-categories-dialog.c:426 + msgid "Categories" + msgstr "Categoriën" + +@@ -693,7 +694,7 @@ msgid "Telephone" + msgstr "Telefoonnummers" + + # Naamloze lijst? +-#: ../addressbook/libebook/e-contact.c:1493 ++#: ../addressbook/libebook/e-contact.c:1499 + #: ../addressbook/libebook/e-destination.c:761 + msgid "Unnamed List" + msgstr "Lijst van onbenoemden" +@@ -713,12 +714,12 @@ msgstr "Geboortedatum: %s" + msgid "Anniversary: %s" + msgstr "Verjaardag: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:213 ++#: ../calendar/backends/file/e-cal-backend-file.c:212 + msgid "Cannot save calendar data: Malformed URI." + msgstr "Kan agendagegevens niet opslaan: ongeldige URI." + +-#: ../calendar/backends/file/e-cal-backend-file.c:220 +-#: ../calendar/backends/file/e-cal-backend-file.c:226 ++#: ../calendar/backends/file/e-cal-backend-file.c:219 ++#: ../calendar/backends/file/e-cal-backend-file.c:225 + msgid "Cannot save calendar data" + msgstr "Kan agendagegevens niet opslaan" + +@@ -727,47 +728,48 @@ msgid "Could not create thread for getti + msgstr "Kon geen 'thread' maken voor het ophalen van verschillen" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:367 +-#: ../calendar/backends/google/e-cal-backend-google.c:1190 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1049 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1348 +-#: ../calendar/backends/http/e-cal-backend-http.c:569 ++#: ../calendar/backends/google/e-cal-backend-google.c:1191 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #: ../calendar/backends/weather/e-cal-backend-weather.c:466 + msgid "Could not create cache file" + msgstr "Kan bufferbestand niet aanmaken" + + #: ../calendar/backends/google/e-cal-backend-google-utils.c:380 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1061 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065 + msgid "Could not create thread for populating cache" + msgstr "Kon geen thread aanmaken voor het vullen van de buffer." + + #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1801 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795 + msgid "Reply Requested: by " + msgstr "Antwoord gevraagd: door " + + #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1806 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800 + msgid "Reply Requested: When convenient" + msgstr "Antwoord gevraagd: wanneer het schikt" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:275 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277 + #, c-format + msgid "Loading %s items" + msgstr "Laden van %s items" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:885 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260 + msgid "Calendar" + msgstr "Agenda" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:943 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947 + msgid "Invalid server URI" + msgstr "Ongeldige server-URI" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:962 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:971 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1067 +-#: ../calendar/libecal/e-cal.c:5035 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071 ++#: ../calendar/libecal/e-cal.c:5082 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:109 + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1075 + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1107 + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1145 +@@ -778,15 +780,15 @@ msgstr "Ongeldige server-URI" + msgid "Authentication failed" + msgstr "Aanmelding mislukt" + +-#: ../calendar/backends/http/e-cal-backend-http.c:269 ++#: ../calendar/backends/http/e-cal-backend-http.c:267 + msgid "Redirected to Invalid URI" + msgstr "Geredigeerd naar ongeldige URI" + +-#: ../calendar/backends/http/e-cal-backend-http.c:290 ++#: ../calendar/backends/http/e-cal-backend-http.c:288 + msgid "Bad file format." + msgstr "Foutief bestandsformaat." + +-#: ../calendar/backends/http/e-cal-backend-http.c:296 ++#: ../calendar/backends/http/e-cal-backend-http.c:294 + msgid "Not a calendar." + msgstr "Geen agenda." + +@@ -995,7 +997,7 @@ msgstr "%.1f-%.1fcm sneeuw\n" + msgid "%.1f-%.1fin snow\n" + msgstr "%.1f-%.1fin sneeuw\n" + +-#: ../calendar/libecal/e-cal-component.c:1316 ++#: ../calendar/libecal/e-cal-component.c:1322 + msgid "Untitled appointment" + msgstr "Afspraak zonder titel" + +@@ -1123,24 +1125,24 @@ msgstr "30e" + msgid "31st" + msgstr "31e" + +-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712 ++#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713 + msgid "High" + msgstr "Hoog" + +-#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714 ++#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715 + msgid "Normal" + msgstr "Normaal" + +-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:716 ++#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717 + msgid "Low" + msgstr "Laag" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:710 ++#: ../calendar/libecal/e-cal-util.c:711 + msgid "Undefined" + msgstr "Onbepaald" + +-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:200 ++#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199 + #, c-format + msgid "Enter password for %s (user %s)" + msgstr "Wachtwoord invoeren voor %s (gebruiker %s)" +@@ -1155,87 +1157,106 @@ msgid "Enter password for %s to enable p + msgstr "" + "Voer wachtwoord in van %s om de proxy voor gebruiker %s in te schakelen" + +-#: ../calendar/libecal/e-cal.c:5007 ++#: ../calendar/libecal/e-cal.c:5054 + msgid "Invalid argument" + msgstr "Ongeldige argument" + +-#: ../calendar/libecal/e-cal.c:5009 ++#: ../calendar/libecal/e-cal.c:5056 + msgid "Backend is busy" + msgstr "Backend is bezig" + +-#: ../calendar/libecal/e-cal.c:5011 ++#: ../calendar/libecal/e-cal.c:5058 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:97 + msgid "Repository is offline" + msgstr "Opslagplaats offline" + +-#: ../calendar/libecal/e-cal.c:5013 ++#: ../calendar/libecal/e-cal.c:5060 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:121 + msgid "No such calendar" + msgstr "Agenda bestaat niet" + +-#: ../calendar/libecal/e-cal.c:5015 ../servers/groupwise/e-gw-connection.c:232 ++#: ../calendar/libecal/e-cal.c:5062 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:103 ++#: ../servers/groupwise/e-gw-connection.c:233 + msgid "Object not found" + msgstr "Object niet gevonden" + +-#: ../calendar/libecal/e-cal.c:5017 ../servers/groupwise/e-gw-connection.c:226 ++#: ../calendar/libecal/e-cal.c:5064 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:105 ++#: ../servers/groupwise/e-gw-connection.c:227 + msgid "Invalid object" + msgstr "Ongeldig object" + +-#: ../calendar/libecal/e-cal.c:5019 ++#: ../calendar/libecal/e-cal.c:5066 + msgid "URI not loaded" + msgstr "URI niet geladen" + +-#: ../calendar/libecal/e-cal.c:5021 ++#: ../calendar/libecal/e-cal.c:5068 + msgid "URI already loaded" + msgstr "URI is reeds geladen" + +-#: ../calendar/libecal/e-cal.c:5023 ++#: ../calendar/libecal/e-cal.c:5070 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:99 + #: ../servers/exchange/storage/e-storage.c:571 + msgid "Permission denied" + msgstr "Operatie niet toegestaan" + +-#: ../calendar/libecal/e-cal.c:5025 ../servers/groupwise/e-gw-connection.c:234 ++#: ../calendar/libecal/e-cal.c:5072 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:123 ++#: ../servers/groupwise/e-gw-connection.c:235 + msgid "Unknown User" + msgstr "Onbekende gebruiker" + +-#: ../calendar/libecal/e-cal.c:5027 ++#: ../calendar/libecal/e-cal.c:5074 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:107 + msgid "Object ID already exists" + msgstr "Object-ID bestaat reeds" + +-#: ../calendar/libecal/e-cal.c:5029 ++#: ../calendar/libecal/e-cal.c:5076 + msgid "Protocol not supported" + msgstr "Protocol niet ondersteund" + +-#: ../calendar/libecal/e-cal.c:5031 ++#: ../calendar/libecal/e-cal.c:5078 + msgid "Operation has been canceled" + msgstr "Opdracht is geannuleerd" + +-#: ../calendar/libecal/e-cal.c:5033 ++#: ../calendar/libecal/e-cal.c:5080 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:136 + msgid "Could not cancel operation" + msgstr "Kon de opdracht niet annuleren" + +-#: ../calendar/libecal/e-cal.c:5037 +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 ++#: ../calendar/libecal/e-cal.c:5084 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:111 ++#: ../camel/providers/smtp/camel-smtp-transport.c:218 + msgid "Authentication required" + msgstr "Aanmelding is vereist" + +-#: ../calendar/libecal/e-cal.c:5039 ++#: ../calendar/libecal/e-cal.c:5086 + msgid "A CORBA exception has occurred" + msgstr "Er is een CORBA uitzondering opgetreden" + +-#: ../calendar/libecal/e-cal.c:5041 ++#: ../calendar/libecal/e-cal.c:5088 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:139 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 +-#: ../camel/providers/imap/camel-imap-command.c:312 +-#: ../camel/providers/imap/camel-imap-command.c:412 +-#: ../camel/providers/imap/camel-imap-store.c:763 ++#: ../camel/providers/imap/camel-imap-command.c:434 ++#: ../camel/providers/imap/camel-imap-store.c:742 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1570 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1609 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1654 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1710 + #: ../camel/providers/imap4/camel-imap4-store.c:315 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + #: ../camel/providers/pop3/camel-pop3-store.c:553 + #: ../camel/providers/pop3/camel-pop3-store.c:560 + #: ../camel/providers/pop3/camel-pop3-store.c:566 + #: ../servers/exchange/storage/e-storage.c:585 +-#: ../servers/groupwise/e-gw-connection.c:240 ++#: ../servers/groupwise/e-gw-connection.c:241 + msgid "Unknown error" + msgstr "Onbekende fout" + +-#: ../calendar/libecal/e-cal.c:5043 ++#: ../calendar/libecal/e-cal.c:5090 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:95 + #: ../servers/exchange/storage/e-storage.c:553 + msgid "No error" + msgstr "Geen fout" +@@ -1337,6 +1358,52 @@ msgstr "" + "‘%s’ verwacht dat alle argumenten tekenreeksen zijn, of dat slechts één " + "argument een boolese: 'onwaar' is (#f)" + ++#: ../calendar/libedata-cal/e-cal-backend-util.c:101 ++msgid "Invalid range" ++msgstr "Ongeldig bereik" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:113 ++msgid "Unsupported field" ++msgstr "Niet ondersteund veld" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:115 ++msgid "Unsupported method" ++msgstr "Niet ondersteunde methode" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:117 ++msgid "Unsupported authentication method" ++msgstr "Niet ondersteunde aanmeldingscontrolemethode" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:119 ++msgid "TLS not available" ++msgstr "TLS is niet beschikbaar" ++ ++#. Translators: This means "Offline mode unavailable" ++#: ../calendar/libedata-cal/e-cal-backend-util.c:126 ++msgid "Offline unavailable" ++msgstr "Offline is niet beschikbaar" ++ ++# lengte/grootte ++#: ../calendar/libedata-cal/e-cal-backend-util.c:128 ++msgid "Search size limit exceeded" ++msgstr "Zoekgroottelimiet overschreden" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:130 ++msgid "Search time limit exceeded" ++msgstr "Zoektijdlimiet overschreden" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:132 ++msgid "Invalid query" ++msgstr "Ongeldige zoekopdracht" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:134 ++msgid "Query refused" ++msgstr "Zoekopdracht geweigerd" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:141 ++msgid "Invalid server version" ++msgstr "Ongeldige serverversie" ++ + #: ../camel/camel-cipher-context.c:102 + msgid "Signing is not supported by this cipher" + msgstr "Ondertekening wordt niet ondersteund door deze sleutel" +@@ -1377,15 +1444,20 @@ msgstr "U mag geen sleutels importeren m + msgid "You may not export keys with this cipher" + msgstr "U mag geen sleutels exporteren met deze sleutel" + +-#: ../camel/camel-data-cache.c:137 ++#: ../camel/camel-data-cache.c:136 + msgid "Unable to create cache path" + msgstr "Kon bufferpad niet aanmaken" + +-#: ../camel/camel-data-cache.c:384 ++#: ../camel/camel-data-cache.c:381 + #, c-format + msgid "Could not remove cache entry: %s: %s" + msgstr "Kon bufferitem: %s niet verwijderen: %s" + ++# 'vrij' toegevoegd ++#: ../camel/camel-db.c:102 ++msgid "Insufficient memory" ++msgstr "Onvoldoende vrij geheugen" ++ + #: ../camel/camel-disco-diary.c:198 + #, c-format + msgid "" +@@ -1398,6 +1470,7 @@ msgstr "" + "opnieuw met het netwerk verbinding maakt." + + #: ../camel/camel-disco-diary.c:261 ++#: ../camel/providers/imap/camel-imap-journal.c:299 + #, c-format + msgid "" + "Could not open '%s':\n" +@@ -1420,98 +1493,101 @@ msgstr "De inhoud van de map lokaal kopi + msgid "Downloading new messages for offline mode" + msgstr "Bezig met binnenhalen van berichten voor offline gebruik" + +-#: ../camel/camel-disco-folder.c:468 ++#: ../camel/camel-disco-folder.c:469 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "Map '%s' wordt voorbereid voor offline gebruik" + + #: ../camel/camel-disco-store.c:403 +-#: ../camel/providers/imap/camel-imap-store.c:3026 ++#: ../camel/providers/imap/camel-imap-store.c:1002 ++#: ../camel/providers/imap/camel-imap-store.c:1810 ++#: ../camel/providers/imap/camel-imap-store.c:2226 ++#: ../camel/providers/imap/camel-imap-store.c:2994 + msgid "You must be working online to complete this operation" + msgstr "U moet online werken om deze bewerking te voltooien" + +-#: ../camel/camel-exception.c:264 ++#: ../camel/camel-exception.c:262 + msgid "No description available" + msgstr "Geen omschrijving beschikbaar" + +-#: ../camel/camel-filter-driver.c:786 ++#: ../camel/camel-filter-driver.c:785 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "Starten van kindproces '%s' mislukt: %s" + +-#: ../camel/camel-filter-driver.c:828 ++#: ../camel/camel-filter-driver.c:827 + #, c-format + msgid "Invalid message stream received from %s: %s" + msgstr "Ongeldige berichtenstroom ontvangen van %s: %s" + +-#: ../camel/camel-filter-driver.c:1017 ../camel/camel-filter-driver.c:1026 ++#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025 + msgid "Syncing folders" + msgstr "Map wordt gesynchroniseerd" + +-#: ../camel/camel-filter-driver.c:1115 ../camel/camel-filter-driver.c:1495 ++#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1520 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "Fout bij interpreten bestand: %s: %s" + +-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1504 ++#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1529 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "Fout bij uitvoeren filter: %s: %s" + +-#: ../camel/camel-filter-driver.c:1192 ++#: ../camel/camel-filter-driver.c:1211 + msgid "Unable to open spool folder" + msgstr "Kan de spoolmap niet openen" + +-#: ../camel/camel-filter-driver.c:1201 ++#: ../camel/camel-filter-driver.c:1220 + msgid "Unable to process spool folder" + msgstr "Kan de spoolmap niet verwerken" + +-#: ../camel/camel-filter-driver.c:1216 ++#: ../camel/camel-filter-driver.c:1236 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "Ophalen bericht %d(%d%%)" + +-#: ../camel/camel-filter-driver.c:1220 ++#: ../camel/camel-filter-driver.c:1240 + msgid "Cannot open message" + msgstr "Kan bericht niet opnemen" + +-#: ../camel/camel-filter-driver.c:1221 ../camel/camel-filter-driver.c:1234 ++#: ../camel/camel-filter-driver.c:1241 ../camel/camel-filter-driver.c:1259 + #, c-format + msgid "Failed on message %d" + msgstr "Faalde bij bericht %d" + +-#: ../camel/camel-filter-driver.c:1248 ../camel/camel-filter-driver.c:1339 ++#: ../camel/camel-filter-driver.c:1273 ../camel/camel-filter-driver.c:1364 + msgid "Syncing folder" + msgstr "Map wordt gesynchroniseerd" + +-#: ../camel/camel-filter-driver.c:1252 ../camel/camel-filter-driver.c:1344 ++#: ../camel/camel-filter-driver.c:1277 ../camel/camel-filter-driver.c:1369 + msgid "Complete" + msgstr "Voltooid" + + # dit moet kort, anders zie je de aantallen niet meer +-#: ../camel/camel-filter-driver.c:1309 ++#: ../camel/camel-filter-driver.c:1334 + #, c-format + msgid "Getting message %d of %d" + msgstr "Ophalen bericht %d van %d" + +-#: ../camel/camel-filter-driver.c:1324 ++#: ../camel/camel-filter-driver.c:1349 + #, c-format + msgid "Failed at message %d of %d" + msgstr "Faalde bij bericht %d van %d" + +-#: ../camel/camel-filter-search.c:139 ++#: ../camel/camel-filter-search.c:138 + msgid "Failed to retrieve message" + msgstr "Ophalen bericht mislukt" + +-#: ../camel/camel-filter-search.c:402 ++#: ../camel/camel-filter-search.c:401 + msgid "Invalid arguments to (system-flag)" + msgstr "Ongeldige argumenten voor (systeemvlag)" + +-#: ../camel/camel-filter-search.c:417 ++#: ../camel/camel-filter-search.c:416 + msgid "Invalid arguments to (user-tag)" + msgstr "Ongeldige argumenten voor (gebruiker)" + +-#: ../camel/camel-filter-search.c:582 ++#: ../camel/camel-filter-search.c:581 + #, c-format + msgid "Failed to create create child process '%s': %s" + msgstr "Starten van dochterproces '%s' mislukt: %s" +@@ -1523,7 +1599,7 @@ msgid "Error executing filter search: %s + msgstr "Fout bij uitvoeren filterzoekactie: %s: %s" + + # zoekvraag/zoekuitdrukking/zoekopdracht +-#: ../camel/camel-folder-search.c:358 ../camel/camel-folder-search.c:480 ++#: ../camel/camel-folder-search.c:335 ../camel/camel-folder-search.c:447 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -1532,7 +1608,7 @@ msgstr "" + "Kan zoekexpressie niet interpreteren: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:368 ../camel/camel-folder-search.c:490 ++#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:457 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -1542,68 +1618,68 @@ msgstr "" + "%s" + + # boolees/bools +-#: ../camel/camel-folder-search.c:677 ../camel/camel-folder-search.c:712 ++#: ../camel/camel-folder-search.c:649 ../camel/camel-folder-search.c:692 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) vereist enkelvoudig bools resultaat" + +-#: ../camel/camel-folder-search.c:765 ++#: ../camel/camel-folder-search.c:745 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) niet toegestaan binnen %s" + +-#: ../camel/camel-folder-search.c:771 ../camel/camel-folder-search.c:778 ++#: ../camel/camel-folder-search.c:751 ../camel/camel-folder-search.c:758 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) vereist type tekenreeks" + +-#: ../camel/camel-folder-search.c:805 ++#: ../camel/camel-folder-search.c:785 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) vereist een array als resultaat" + +-#: ../camel/camel-folder-search.c:814 ++#: ../camel/camel-folder-search.c:794 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) vereist ingestelde map" + +-#: ../camel/camel-folder-search.c:909 ++#: ../camel/camel-folder-search.c:889 + #, c-format + msgid "Performing query on unknown header: %s" + msgstr "Bezig met zoeken naar onbekende kopregels: %s" + +-#: ../camel/camel-folder.c:628 ++#: ../camel/camel-folder.c:693 + #, c-format + msgid "Unsupported operation: append message: for %s" + msgstr "Opdracht is niet mogelijk: bericht achteraan toevoegen: voor %s" + +-#: ../camel/camel-folder.c:1250 ++#: ../camel/camel-folder.c:1349 + #, c-format + msgid "Unsupported operation: search by expression: for %s" + msgstr "Opdracht is niet mogelijk: zoeken op expressie: voor %s" + +-#: ../camel/camel-folder.c:1291 ++#: ../camel/camel-folder.c:1390 + #, c-format + msgid "Unsupported operation: search by UIDs: for %s" + msgstr "Opdracht is niet mogelijk: zoeken op UIDs: voor %s" + +-#: ../camel/camel-folder.c:1407 ++#: ../camel/camel-folder.c:1506 + msgid "Moving messages" + msgstr "Verplaatsen van berichten" + +-#: ../camel/camel-folder.c:1407 ++#: ../camel/camel-folder.c:1506 + msgid "Copying messages" + msgstr "Berichten worden gekopieerd" + +-#: ../camel/camel-folder.c:1750 ++#: ../camel/camel-folder.c:1852 + msgid "Learning junk" + msgstr "Leren wat spam is" + +-#: ../camel/camel-folder.c:1767 ++#: ../camel/camel-folder.c:1869 + msgid "Learning non-junk" + msgstr "Leren wat geen spam is" + +-#: ../camel/camel-folder.c:1786 ++#: ../camel/camel-folder.c:1888 + msgid "Filtering new message(s)" + msgstr "Nieuwe berichten worden door de filter gehaald" + +@@ -1735,15 +1811,9 @@ msgstr "Kan de inhoud van het bericht ni + + #: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875 + #: ../camel/camel-tcp-stream-openssl.c:635 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1570 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1609 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1654 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1710 +-#: ../camel/providers/imap4/camel-imap4-store.c:823 +-#: ../camel/providers/imap4/camel-imap4-store.c:1577 + #: ../camel/providers/imap4/camel-imap4-utils.c:624 +-#: ../camel/providers/smtp/camel-smtp-transport.c:164 +-#: ../camel/providers/smtp/camel-smtp-transport.c:219 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:221 + msgid "Unknown" + msgstr "Onbekend" + +@@ -1895,30 +1965,30 @@ msgstr "Synchroniseren van berichten in + msgid "Cannot write offline journal for folder '%s': %s" + msgstr "Kan het offline journaal voor de map ‘%s’ niet schrijven: %s" + +-#: ../camel/camel-provider.c:62 ++#: ../camel/camel-provider.c:60 + msgid "Virtual folder email provider" + msgstr "Virtuele map e-mail aanbieder" + +-#: ../camel/camel-provider.c:64 ++#: ../camel/camel-provider.c:62 + msgid "For reading mail as a query of another set of folders" + msgstr "Voor het lezen van post als een zoekopdracht op een verzameling mappen" + +-#: ../camel/camel-provider.c:187 ++#: ../camel/camel-provider.c:184 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." + msgstr "Kon %s niet laden. Module laden niet ondersteund door dit systeem" + +-#: ../camel/camel-provider.c:196 ++#: ../camel/camel-provider.c:193 + #, c-format + msgid "Could not load %s: %s" + msgstr "Kon %s niet laden: %s" + +-#: ../camel/camel-provider.c:204 ++#: ../camel/camel-provider.c:201 + #, c-format + msgid "Could not load %s: No initialization code in module." + msgstr "Kon %s niet laden: Geen initialisatie code in de module." + +-#: ../camel/camel-provider.c:376 ../camel/camel-session.c:177 ++#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177 + #, c-format + msgid "No provider available for protocol '%s'" + msgstr "Geen aanbieder beschikbaar voor protocol ‘%s’" +@@ -2083,7 +2153,7 @@ msgstr "De referentie-informatie is verl + #: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253 + #: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304 + #: ../camel/camel-sasl-kerberos4.c:231 +-#: ../camel/providers/imap/camel-imap-store.c:1318 ++#: ../camel/providers/imap/camel-imap-store.c:1272 + msgid "Bad authentication response from server." + msgstr "Foutief antwoord van de server bij aanmelding." + +@@ -2162,22 +2232,22 @@ msgstr "POP voor SMTP gebruikmakend van + msgid "POP Before SMTP auth using a non-pop source" + msgstr "POP voor SMTP gebruikmakend van een niet-POP bron" + +-#: ../camel/camel-search-private.c:150 ++#: ../camel/camel-search-private.c:149 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "Compileren van reguliere expressie mislukt: %s: %s" + +-#: ../camel/camel-service.c:272 ++#: ../camel/camel-service.c:270 + #, c-format + msgid "URL '%s' needs a username component" + msgstr "URL '%s' heeft een gebruikersnaamcomponent nodig" + +-#: ../camel/camel-service.c:276 ++#: ../camel/camel-service.c:274 + #, c-format + msgid "URL '%s' needs a host component" + msgstr "URL '%s' heeft een machinenaamcomponent nodig" + +-#: ../camel/camel-service.c:280 ++#: ../camel/camel-service.c:278 + #, c-format + msgid "URL '%s' needs a path component" + msgstr "URL '%s' heeft een padcomponent nodig" +@@ -2403,45 +2473,45 @@ msgstr "sleutels importeren: niet geï + msgid "export keys: unimplemented" + msgstr "sleutels exporteren: niet geimplementeerd" + +-#: ../camel/camel-store.c:219 ++#: ../camel/camel-store.c:272 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:174 + msgid "Cannot get folder: Invalid operation on this store" + msgstr "Kan map niet verkrijgen: Ongeldige opdracht op deze opslag" + +-#: ../camel/camel-store.c:252 ++#: ../camel/camel-store.c:305 + #, c-format + msgid "Cannot create folder '%s': folder exists" + msgstr "Kan map ‘%s’ niet aanmaken: map bestaat al" + +-#: ../camel/camel-store.c:316 ++#: ../camel/camel-store.c:369 + msgid "Cannot create folder: Invalid operation on this store" + msgstr "Kan map niet maken: Ongeldige opdracht op deze opslag" + +-#: ../camel/camel-store.c:344 ++#: ../camel/camel-store.c:397 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "Kan map niet aanmaken: %s: map bestaat reeds" + +-#: ../camel/camel-store.c:408 ../camel/camel-vee-store.c:369 +-#: ../camel/providers/local/camel-maildir-store.c:218 ++#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384 ++#: ../camel/providers/local/camel-maildir-store.c:219 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Kon map: %s niet verwijderen: Ongeldige opdracht" + +-#: ../camel/camel-store.c:458 ../camel/camel-vee-store.c:406 +-#: ../camel/providers/local/camel-maildir-store.c:290 ++#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421 ++#: ../camel/providers/local/camel-maildir-store.c:291 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige opdracht" + + #. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:799 ../camel/camel-vtrash-folder.c:52 +-#: ../camel/providers/imap/camel-imap-store.c:1078 ++#: ../camel/camel-store.c:856 ../camel/camel-vtrash-folder.c:53 ++#: ../camel/providers/imap/camel-imap-store.c:1060 + msgid "Trash" + msgstr "Prullenbak" + + #. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:802 ../camel/camel-vtrash-folder.c:54 ++#: ../camel/camel-store.c:859 ../camel/camel-vtrash-folder.c:55 + msgid "Junk" + msgstr "Spam" + +@@ -2561,7 +2631,7 @@ msgstr "Sleutelgebruik ondersteunt geen + msgid "Error in application verification" + msgstr "Fout bij toepassingsverificatie" + +-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:879 ++#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880 + #, c-format + msgid "" + "Issuer: %s\n" +@@ -2574,11 +2644,11 @@ msgstr "" + "Vingerafdruk: %s\n" + "Handtekening: %s" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "GOOD" + msgstr "GOED" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "BAD" + msgstr "FOUTIEF" + +@@ -2602,7 +2672,7 @@ msgstr "" + "Wilt u het alsnog accepteren?" + + #. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:889 ++#: ../camel/camel-tcp-stream-ssl.c:890 + #, c-format + msgid "" + "SSL Certificate check for %s:\n" +@@ -2617,7 +2687,7 @@ msgstr "" + "\n" + "Wilt u dit accepteren?" + +-#: ../camel/camel-tcp-stream-ssl.c:933 ++#: ../camel/camel-tcp-stream-ssl.c:934 + #, c-format + msgid "" + "Certificate problem: %s\n" +@@ -2626,7 +2696,7 @@ msgstr "" + "Certificaatprobleem: %s\n" + "Eigenaar: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:985 ++#: ../camel/camel-tcp-stream-ssl.c:986 + #, c-format + msgid "" + "Bad certificate domain: %s\n" +@@ -2635,7 +2705,7 @@ msgstr "" + "Foutieve certificaatomgeving: %s\n" + "Eigenaar: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1003 ++#: ../camel/camel-tcp-stream-ssl.c:1004 + #, c-format + msgid "" + "Certificate expired: %s\n" +@@ -2644,7 +2714,7 @@ msgstr "" + "Certificaat verlopen op: %s\n" + "Eigenaar: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1020 ++#: ../camel/camel-tcp-stream-ssl.c:1021 + #, c-format + msgid "" + "Certificate revocation list expired: %s\n" +@@ -2658,44 +2728,44 @@ msgstr "" + msgid "Could not parse URL '%s'" + msgstr "Kon URL ‘%s’ niet verwerken" + +-#: ../camel/camel-vee-folder.c:486 ++#: ../camel/camel-vee-folder.c:584 + #, c-format + msgid "Error storing '%s': %s" + msgstr "Fout bij opslaan van ‘%s’: %s" + +-#: ../camel/camel-vee-folder.c:528 ++#: ../camel/camel-vee-folder.c:638 + #, c-format + msgid "No such message %s in %s" + msgstr "Dergelijk bericht %s bestaat niet in %s" + +-#: ../camel/camel-vee-folder.c:653 ../camel/camel-vee-folder.c:659 ++#: ../camel/camel-vee-folder.c:761 ../camel/camel-vee-folder.c:767 + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "Kan berichten niet naar een VMap verplaatsen of kopiëren" + +-#: ../camel/camel-vee-store.c:102 ../camel/camel-vee-store.c:345 ++#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115 ++#: ../camel/camel-vee-store.c:360 + msgid "Unmatched" + msgstr "Niet passend" + +-#: ../camel/camel-vee-store.c:392 ++#: ../camel/camel-vee-store.c:407 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Kon map: %s niet verwijderen: map bestaat niet" + +-#: ../camel/camel-vee-store.c:414 ++#: ../camel/camel-vee-store.c:429 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet" + +-#: ../camel/camel-vtrash-folder.c:53 ++#: ../camel/camel-vtrash-folder.c:54 + msgid "Cannot copy messages to the Trash folder" + msgstr "Kan het bericht niet naar de Trash map kopiëren" + +-#: ../camel/camel-vtrash-folder.c:55 ++#: ../camel/camel-vtrash-folder.c:56 + msgid "Cannot copy messages to the Junk folder" + msgstr "Kan berichten niet kopiëren naar spam-map" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2486 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #, c-format + msgid "" + "Cannot get message: %s\n" +@@ -2704,57 +2774,56 @@ msgstr "" + "Kan bericht niet verkrijgen: %s\n" + " %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118 +-#: ../camel/providers/imap/camel-imap-folder.c:2486 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #: ../camel/providers/local/camel-maildir-folder.c:251 + #: ../camel/providers/local/camel-mbox-folder.c:348 + #: ../camel/providers/local/camel-mh-folder.c:204 + msgid "No such message" + msgstr "Een dergelijk bericht bestaat niet" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:130 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:128 + #: ../camel/providers/imap4/camel-imap4-folder.c:812 + #: ../camel/providers/nntp/camel-nntp-folder.c:156 + #: ../camel/providers/nntp/camel-nntp-folder.c:232 +-#: ../camel/providers/nntp/camel-nntp-folder.c:371 ++#: ../camel/providers/nntp/camel-nntp-folder.c:373 + #: ../camel/providers/pop3/camel-pop3-folder.c:266 +-#: ../camel/providers/pop3/camel-pop3-folder.c:560 +-#: ../camel/providers/pop3/camel-pop3-folder.c:621 +-#: ../camel/providers/pop3/camel-pop3-folder.c:639 ++#: ../camel/providers/pop3/camel-pop3-folder.c:559 ++#: ../camel/providers/pop3/camel-pop3-folder.c:620 ++#: ../camel/providers/pop3/camel-pop3-folder.c:638 + msgid "User canceled" + msgstr "Gebruiker geannuleerd" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:135 + #: ../camel/providers/imap4/camel-imap4-folder.c:817 + #: ../camel/providers/nntp/camel-nntp-folder.c:147 + #: ../camel/providers/nntp/camel-nntp-folder.c:149 + #: ../camel/providers/nntp/camel-nntp-folder.c:158 + #: ../camel/providers/nntp/camel-nntp-folder.c:234 +-#: ../camel/providers/pop3/camel-pop3-folder.c:388 +-#: ../camel/providers/pop3/camel-pop3-folder.c:563 +-#: ../camel/providers/pop3/camel-pop3-folder.c:624 +-#: ../camel/providers/pop3/camel-pop3-folder.c:631 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/pop3/camel-pop3-folder.c:386 ++#: ../camel/providers/pop3/camel-pop3-folder.c:562 ++#: ../camel/providers/pop3/camel-pop3-folder.c:623 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 ++#: ../camel/providers/pop3/camel-pop3-folder.c:641 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Kan bericht: %s niet verkrijgen: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:154 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:162 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2169 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:152 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:160 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164 + #: ../camel/providers/imap4/camel-imap4-folder.c:835 + msgid "This message is not available in offline mode." + msgstr "Dit bericht is niet beschikbaar in offline modus." + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:174 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1702 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1753 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:172 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:179 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747 + msgid "Could not get message" + msgstr "Kon bericht niet verkrijgen" + + #: ../camel/providers/groupwise/camel-groupwise-folder.c:818 +-#: ../camel/providers/imap/camel-imap-folder.c:268 ++#: ../camel/providers/imap/camel-imap-folder.c:248 + #, c-format + msgid "Could not load summary for %s" + msgstr "Kon samenvatting voor %s niet laden" +@@ -2766,34 +2835,34 @@ msgstr "U moet de prullenbak legen, hij + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1248 + #: ../camel/providers/groupwise/camel-groupwise-store.c:623 + #: ../camel/providers/groupwise/camel-groupwise-store.c:736 +-#: ../camel/providers/imap/camel-imap-folder.c:2858 +-#: ../camel/providers/imap/camel-imap-folder.c:2932 ++#: ../camel/providers/imap/camel-imap-folder.c:3193 ++#: ../camel/providers/imap/camel-imap-folder.c:3269 + #, c-format + msgid "Fetching summary information for new messages in %s" + msgstr "Ophalen van samenvattingsinformatie van nieuwe berichten in %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2036 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073 + #, c-format + msgid "Cannot append message to folder '%s': %s" + msgstr "Kan bericht niet toevoegen aan map ‘%s’: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2066 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061 + #, c-format + msgid "Cannot create message: %s" + msgstr "Aanmaken van bericht mislukt: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:284 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:285 + #, c-format + msgid "Cannot get folder container %s" + msgstr "Kan mappen container %s niet verkrijgen" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:348 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:349 + #: ../camel/providers/imap4/camel-imap4-journal.c:319 + msgid "Cannot append message in offline mode: cache unavailable" + msgstr "Kan bericht niet toevoegen in offline modus: cache niet beschikbaar" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:364 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:365 + #: ../camel/providers/imap4/camel-imap4-journal.c:335 + #, c-format + msgid "Cannot append message in offline mode: %s" +@@ -2812,7 +2881,7 @@ msgid "C_heck for new messages in all fo + msgstr "_Controleer op nieuwe berichten in alle mappen" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:60 +-#: ../camel/providers/imap/camel-imap-provider.c:66 ++#: ../camel/providers/imap/camel-imap-provider.c:68 + #: ../camel/providers/imap4/camel-imap4-provider.c:52 + #: ../camel/providers/local/camel-local-provider.c:46 + #: ../camel/providers/local/camel-local-provider.c:86 +@@ -2829,7 +2898,7 @@ msgid "Check new messages for J_unk cont + msgstr "Nieuwe berichten op spam _controleren" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:66 +-#: ../camel/providers/imap/camel-imap-provider.c:72 ++#: ../camel/providers/imap/camel-imap-provider.c:74 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Alleen de In_box op spam controleren" + +@@ -2855,7 +2924,7 @@ msgstr "Voor het benaderen van Novell Gr + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:106 + #: ../camel/providers/hula/camel-hula-provider.c:95 +-#: ../camel/providers/imap/camel-imap-provider.c:98 ++#: ../camel/providers/imap/camel-imap-provider.c:100 + #: ../camel/providers/imap4/camel-imap4-provider.c:84 + #: ../camel/providers/imapp/camel-imapp-provider.c:67 + #: ../camel/providers/nntp/camel-nntp-provider.c:74 +@@ -2875,7 +2944,7 @@ msgid "Host or user not available in url + msgstr "Hostcomputer of gebruiker niet beschikbaar in url" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:206 +-#: ../camel/providers/imap/camel-imap-store.c:1402 ++#: ../camel/providers/imap/camel-imap-store.c:1356 + msgid "You did not enter a password." + msgstr "U heeft geen wachtwoord ingevoerd." + +@@ -2885,35 +2954,35 @@ msgstr "" + "Bepaalde functies werken mogelijk niet correct met uw huidige server-versie" + + #: ../camel/providers/groupwise/camel-groupwise-store.c:532 +-#: ../camel/providers/imap/camel-imap-store.c:1913 +-#: ../camel/providers/imap/camel-imap-store.c:2111 ++#: ../camel/providers/imap/camel-imap-store.c:1846 ++#: ../camel/providers/imap/camel-imap-store.c:2044 + #, c-format + msgid "No such folder %s" + msgstr "Map ‘%s’ bestaat niet" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1217 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1219 + msgid "Cannot create GroupWise folders in offline mode." + msgstr "Kan geen GroupWise mappen in offline modus aanmaken." + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1231 +-#: ../camel/providers/imap/camel-imap-store.c:1988 +-#: ../camel/providers/imap/camel-imap-store.c:2364 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1233 ++#: ../camel/providers/imap/camel-imap-store.c:1921 ++#: ../camel/providers/imap/camel-imap-store.c:2301 + msgid "The parent folder is not allowed to contain subfolders" + msgstr "De map kan geen submappen bevatten" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1307 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1309 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1330 + #, c-format + msgid "Cannot rename Groupwise folder '%s' to '%s'" + msgstr "Kan de GroupWise map ‘%s’ niet hernoemen naar ‘%s’" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1360 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:121 + #, c-format + msgid "GroupWise server %s" + msgstr "GroupWise server %s" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1364 + #, c-format + msgid "GroupWise service for %s on %s" + msgstr "GroupWise service voor %s op %s" +@@ -2949,35 +3018,35 @@ msgid "Checking for New Mail" + msgstr "Controleren op nieuwe e-mail" + + #: ../camel/providers/hula/camel-hula-provider.c:54 +-#: ../camel/providers/imap/camel-imap-provider.c:50 ++#: ../camel/providers/imap/camel-imap-provider.c:52 + msgid "Connection to Server" + msgstr "Verbinden met server" + + #: ../camel/providers/hula/camel-hula-provider.c:56 +-#: ../camel/providers/imap/camel-imap-provider.c:52 ++#: ../camel/providers/imap/camel-imap-provider.c:54 + msgid "_Use custom command to connect to server" + msgstr "_Gebruik een aangepaste opdracht om met de server te verbinden" + + #: ../camel/providers/hula/camel-hula-provider.c:58 +-#: ../camel/providers/imap/camel-imap-provider.c:54 ++#: ../camel/providers/imap/camel-imap-provider.c:56 + msgid "Command:" + msgstr "Opdracht:" + + #: ../camel/providers/hula/camel-hula-provider.c:61 +-#: ../camel/providers/imap/camel-imap-provider.c:58 ++#: ../camel/providers/imap/camel-imap-provider.c:60 + #: ../camel/providers/imap4/camel-imap4-provider.c:44 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Mappen" + + #: ../camel/providers/hula/camel-hula-provider.c:63 +-#: ../camel/providers/imap/camel-imap-provider.c:60 ++#: ../camel/providers/imap/camel-imap-provider.c:62 + #: ../camel/providers/imap4/camel-imap4-provider.c:46 + msgid "_Show only subscribed folders" + msgstr "_Laat alleen de aangemelde mappen zien" + + #: ../camel/providers/hula/camel-hula-provider.c:65 +-#: ../camel/providers/imap/camel-imap-provider.c:62 ++#: ../camel/providers/imap/camel-imap-provider.c:64 + #: ../camel/providers/imap4/camel-imap4-provider.c:48 + msgid "O_verride server-supplied folder namespace" + msgstr "O_verschrijf door server gegeven mappen-naamruimte" +@@ -3000,22 +3069,32 @@ msgstr "" + "Deze optie zal bij het verbinden met de Hula-server het wachtwoord versturen " + "als platte tekst." + +-#: ../camel/providers/imap/camel-imap-command.c:224 +-#: ../camel/providers/imap/camel-imap-command.c:266 +-#: ../camel/providers/imap/camel-imap-command.c:472 +-#: ../camel/providers/imap/camel-imap-store.c:3066 ++#: ../camel/providers/imap/camel-imap-command.c:183 ++#: ../camel/providers/imap/camel-imap-command.c:267 ++msgid "No output stream" ++msgstr "Geen uitvoerstroom" ++ ++#: ../camel/providers/imap/camel-imap-command.c:188 ++#: ../camel/providers/imap/camel-imap-command.c:272 ++msgid "No input stream" ++msgstr "Geen invoerstroom" ++ ++#: ../camel/providers/imap/camel-imap-command.c:231 ++#: ../camel/providers/imap/camel-imap-command.c:280 ++#: ../camel/providers/imap/camel-imap-command.c:494 ++#: ../camel/providers/imap/camel-imap-store.c:3034 + msgid "Operation cancelled" + msgstr "Opdracht geannuleerd" + +-#: ../camel/providers/imap/camel-imap-command.c:311 +-#: ../camel/providers/imap/camel-imap-store.c:3069 ++#: ../camel/providers/imap/camel-imap-command.c:333 ++#: ../camel/providers/imap/camel-imap-store.c:3037 + #, c-format + msgid "Server unexpectedly disconnected: %s" + msgstr "Server verbrak onverwacht de verbinding: %s" + + #. for imap ALERT codes, account user@host + #. we might get a ']' from a BAD response since we +12, but who cares? +-#: ../camel/providers/imap/camel-imap-command.c:332 ++#: ../camel/providers/imap/camel-imap-command.c:354 + #, c-format + msgid "" + "Alert from IMAP server %s@%s:\n" +@@ -3024,26 +3103,26 @@ msgstr "" + "Alarm van IMAP-server %s@%s:\n" + "%s" + +-#: ../camel/providers/imap/camel-imap-command.c:401 ++#: ../camel/providers/imap/camel-imap-command.c:423 + #, c-format + msgid "Unexpected response from IMAP server: %s" + msgstr "Onverwacht antwoord van IMAP-server: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:411 ++#: ../camel/providers/imap/camel-imap-command.c:433 + #, c-format + msgid "IMAP command failed: %s" + msgstr "IMAP-opdracht is mislukt: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:486 ++#: ../camel/providers/imap/camel-imap-command.c:508 + msgid "Server response ended too soon." + msgstr "Het antwoord van de server eindigde te snel." + +-#: ../camel/providers/imap/camel-imap-command.c:693 ++#: ../camel/providers/imap/camel-imap-command.c:715 + #, c-format + msgid "IMAP server response did not contain %s information" + msgstr "Het antwoord van de IMAP-server bevatte geen %s-informatie" + +-#: ../camel/providers/imap/camel-imap-command.c:729 ++#: ../camel/providers/imap/camel-imap-command.c:751 + #, c-format + msgid "Unexpected OK response from IMAP server: %s" + msgstr "De IMAP-server gaf onverwacht ‘OK’ als antwoord: %s" +@@ -3052,149 +3131,168 @@ msgstr "De IMAP-server gaf onverwacht + msgid "Always check for new mail in this folder" + msgstr "In deze map altijd op nieuwe berichten controleren" + +-#: ../camel/providers/imap/camel-imap-folder.c:249 ++#: ../camel/providers/imap/camel-imap-folder.c:229 + #, c-format + msgid "Could not create directory %s: %s" + msgstr "Kon de map %s niet aanmaken: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:353 +-msgid "Folder was destroyed and recreated on server." +-msgstr "Map is vernietigd en opnieuw gemaakt op de server." +- + #. Check UIDs and flags of all messages we already know of. +-#: ../camel/providers/imap/camel-imap-folder.c:839 ++#: ../camel/providers/imap/camel-imap-folder.c:844 + #, c-format + msgid "Scanning for changed messages in %s" + msgstr "Zoeken naar gewijzigde berichten in %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2446 ++# reactiestatus/antwoordstatus ++#: ../camel/providers/imap/camel-imap-folder.c:1869 ++#, c-format ++msgid "Unexpected response status '%s' after APPEND command" ++msgstr "Onverwachte reactiestatus ‘%s’ na APPEND-opdracht" ++ ++# antwoord/reactie ++#: ../camel/providers/imap/camel-imap-folder.c:1884 ++msgid "No response on continuation after APPEND command" ++msgstr "Geen reactie bij voorzetting na APPEND-opdracht" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1926 ++msgid "Unknown error occurred during APPEND command!" ++msgstr "Onbekende fout opgetreden tijdens APPEND-opdracht!" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2738 + #, c-format + msgid "Unable to retrieve message: %s" + msgstr "Ophalen van bericht mislukt: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2525 +-#: ../camel/providers/imap/camel-imap-folder.c:3226 ++#: ../camel/providers/imap/camel-imap-folder.c:2779 ++#, c-format ++msgid "Cannot get message with message ID %s: %s" ++msgstr "Kan bericht met bericht-ID: %s niet verkrijgen: %s" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2780 ++msgid "No such message available." ++msgstr "Een dergelijk bericht bestaat niet." ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2819 ++#: ../camel/providers/imap/camel-imap-folder.c:3571 + #: ../camel/providers/nntp/camel-nntp-folder.c:220 + msgid "This message is not currently available" + msgstr "Dit bericht is nu niet beschikbaar" + +-#: ../camel/providers/imap/camel-imap-folder.c:3061 ++#: ../camel/providers/imap/camel-imap-folder.c:3398 + #, c-format + msgid "Incomplete server response: no information provided for message %d" + msgstr "" + "Het antwoord van de server is niet compleet: geen informatie ontvangen voor " + "bericht %d" + +-#: ../camel/providers/imap/camel-imap-folder.c:3069 ++#: ../camel/providers/imap/camel-imap-folder.c:3406 + #, c-format + msgid "Incomplete server response: no UID provided for message %d" + msgstr "Het antwoord van de server is niet compleet: geen UID voor bericht %d" + +-#: ../camel/providers/imap/camel-imap-folder.c:3082 +-#, c-format +-msgid "" +-"Unexpected server response: Identical UIDs provided for messages %d and %d" +-msgstr "Onverwacht server antwoord: Identieke UIDs voor bericht %d en %d " +- +-#: ../camel/providers/imap/camel-imap-folder.c:3264 ++#: ../camel/providers/imap/camel-imap-folder.c:3609 + msgid "Could not find message body in FETCH response." + msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord." + +-#: ../camel/providers/imap/camel-imap-message-cache.c:161 ++#: ../camel/providers/imap/camel-imap-message-cache.c:160 ++#: ../camel/providers/imap/camel-imap-message-cache.c:220 + #, c-format + msgid "Could not open cache directory: %s" + msgstr "Kon buffermap %s niet openen" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:267 +-#: ../camel/providers/imap/camel-imap-message-cache.c:324 +-#: ../camel/providers/imap/camel-imap-message-cache.c:355 +-#: ../camel/providers/imap/camel-imap-message-cache.c:387 ++#: ../camel/providers/imap/camel-imap-message-cache.c:307 ++#: ../camel/providers/imap/camel-imap-message-cache.c:364 ++#: ../camel/providers/imap/camel-imap-message-cache.c:395 ++#: ../camel/providers/imap/camel-imap-message-cache.c:427 + #, c-format + msgid "Failed to cache message %s: %s" + msgstr "Bufferen van bericht %s mislukt: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:438 ++#: ../camel/providers/imap/camel-imap-message-cache.c:478 + #, c-format + msgid "Failed to cache %s: %s" + msgstr "Bufferen van bericht %s mislukt: %s" + +-#: ../camel/providers/imap/camel-imap-provider.c:64 ++#: ../camel/providers/imap/camel-imap-provider.c:48 ++msgid "Ch_eck for new messages in subscribed folders" ++msgstr "_Controleer op nieuwe berichten in de geabonneerde mappen" ++ ++#: ../camel/providers/imap/camel-imap-provider.c:66 + #: ../camel/providers/imap4/camel-imap4-provider.c:50 + msgid "Namespace:" + msgstr "Naamruimte:" + +-#: ../camel/providers/imap/camel-imap-provider.c:68 ++#: ../camel/providers/imap/camel-imap-provider.c:70 + #: ../camel/providers/imap4/camel-imap4-provider.c:54 + msgid "_Apply filters to new messages in INBOX on this server" + msgstr "P_as filters toe op alle nieuwe berichten in de INBOX op deze server" + +-#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap/camel-imap-provider.c:72 + msgid "Check new messages for Jun_k contents" + msgstr "Nieuwe berichten op _spam controleren" + +-#: ../camel/providers/imap/camel-imap-provider.c:74 ++#: ../camel/providers/imap/camel-imap-provider.c:76 + #: ../camel/providers/imap4/camel-imap4-provider.c:60 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "Automatisch lokaal synchroni_seren met post op afstand" + +-#: ../camel/providers/imap/camel-imap-provider.c:81 ++#: ../camel/providers/imap/camel-imap-provider.c:83 + msgid "IMAP" + msgstr "IMAP" + +-#: ../camel/providers/imap/camel-imap-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:85 + msgid "For reading and storing mail on IMAP servers." + msgstr "Voor het lezen en opslaan van e-mail op IMAP servers." + +-#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap/camel-imap-provider.c:102 + #: ../camel/providers/imapp/camel-imapp-provider.c:69 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen " + "als platte tekst." + +-#: ../camel/providers/imap/camel-imap-store.c:457 ++#: ../camel/providers/imap/camel-imap-store.c:436 + #: ../camel/providers/imap4/camel-imap4-store.c:214 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP-server %s" + +-#: ../camel/providers/imap/camel-imap-store.c:459 ++#: ../camel/providers/imap/camel-imap-store.c:438 + #: ../camel/providers/imap4/camel-imap4-store.c:216 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "IMAP-service voor %s op %s" + +-#: ../camel/providers/imap/camel-imap-store.c:588 +-#: ../camel/providers/imap/camel-imap-store.c:603 ++#: ../camel/providers/imap/camel-imap-store.c:567 ++#: ../camel/providers/imap/camel-imap-store.c:582 + #: ../camel/providers/imap4/camel-imap4-store.c:251 + #: ../camel/providers/imap4/camel-imap4-store.c:266 + #: ../camel/providers/nntp/camel-nntp-store.c:183 + #: ../camel/providers/nntp/camel-nntp-store.c:198 + #: ../camel/providers/pop3/camel-pop3-store.c:171 + #: ../camel/providers/pop3/camel-pop3-store.c:185 +-#: ../camel/providers/smtp/camel-smtp-transport.c:258 +-#: ../camel/providers/smtp/camel-smtp-transport.c:273 ++#: ../camel/providers/smtp/camel-smtp-transport.c:260 ++#: ../camel/providers/smtp/camel-smtp-transport.c:275 + #, c-format + msgid "Could not connect to %s: %s" + msgstr "Kon niet verbinden met %s: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:589 ++#: ../camel/providers/imap/camel-imap-store.c:568 + #: ../camel/providers/imap4/camel-imap4-store.c:252 + #: ../camel/providers/nntp/camel-nntp-store.c:184 + #: ../camel/providers/pop3/camel-pop3-store.c:172 +-#: ../camel/providers/smtp/camel-smtp-transport.c:259 ++#: ../camel/providers/smtp/camel-smtp-transport.c:261 + msgid "SSL unavailable" + msgstr "SSL is niet beschikbaar" + +-#: ../camel/providers/imap/camel-imap-store.c:600 +-#: ../camel/providers/imap/camel-imap-store.c:882 ++#: ../camel/providers/imap/camel-imap-store.c:579 ++#: ../camel/providers/imap/camel-imap-store.c:861 + msgid "Connection cancelled" + msgstr "Verbinding geannuleerd" + +-#: ../camel/providers/imap/camel-imap-store.c:711 +-#: ../camel/providers/imap/camel-imap-store.c:730 +-#: ../camel/providers/imap/camel-imap-store.c:736 +-#: ../camel/providers/imap/camel-imap-store.c:762 ++#: ../camel/providers/imap/camel-imap-store.c:690 ++#: ../camel/providers/imap/camel-imap-store.c:709 ++#: ../camel/providers/imap/camel-imap-store.c:715 ++#: ../camel/providers/imap/camel-imap-store.c:741 + #: ../camel/providers/imap4/camel-imap4-store.c:314 + #: ../camel/providers/imap4/camel-imap4-store.c:329 + #: ../camel/providers/imap4/camel-imap4-store.c:338 +@@ -3202,44 +3300,44 @@ msgstr "Verbinding geannuleerd" + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Fout bij opzetten van beveiligde verbinding met IMAP-server %s: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:712 +-#: ../camel/providers/smtp/camel-smtp-transport.c:331 ++#: ../camel/providers/imap/camel-imap-store.c:691 ++#: ../camel/providers/smtp/camel-smtp-transport.c:333 + msgid "STARTTLS not supported" + msgstr "STARTTLS niet ondersteund" + +-#: ../camel/providers/imap/camel-imap-store.c:731 ++#: ../camel/providers/imap/camel-imap-store.c:710 + msgid "SSL negotiations failed" + msgstr "SSL-onderhandelingen mislukt" + +-#: ../camel/providers/imap/camel-imap-store.c:737 ++#: ../camel/providers/imap/camel-imap-store.c:716 + #: ../camel/providers/imap4/camel-imap4-store.c:339 +-#: ../camel/providers/smtp/camel-smtp-transport.c:370 ++#: ../camel/providers/smtp/camel-smtp-transport.c:372 + msgid "SSL is not available in this build" + msgstr "SSL is niet beschikbar in deze bouw" + +-#: ../camel/providers/imap/camel-imap-store.c:885 ++#: ../camel/providers/imap/camel-imap-store.c:864 + #, c-format + msgid "Could not connect with command \"%s\": %s" + msgstr "Kon niet verbinden met opdracht ‘%s’: %s" + + # postvak in/inbox + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imap/camel-imap-store.c:1070 +-#: ../camel/providers/imap/camel-imap-store.c:2460 +-#: ../camel/providers/imap4/camel-imap4-store-summary.c:367 ++#: ../camel/providers/imap/camel-imap-store.c:1052 ++#: ../camel/providers/imap/camel-imap-store.c:2397 ++#: ../camel/providers/imap4/camel-imap4-store-summary.c:368 + #: ../camel/providers/imap4/camel-imap4-store.c:1408 + #: ../camel/providers/local/camel-maildir-folder.c:77 +-#: ../camel/providers/local/camel-maildir-store.c:218 +-#: ../camel/providers/local/camel-maildir-store.c:290 +-#: ../camel/providers/local/camel-maildir-store.c:514 +-#: ../camel/providers/local/camel-maildir-store.c:527 ++#: ../camel/providers/local/camel-maildir-store.c:219 ++#: ../camel/providers/local/camel-maildir-store.c:291 ++#: ../camel/providers/local/camel-maildir-store.c:517 ++#: ../camel/providers/local/camel-maildir-store.c:530 + #: ../camel/providers/local/camel-spool-store.c:464 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264 + msgid "Inbox" + msgstr "Inbox" + + # kladjes/klad +-#: ../camel/providers/imap/camel-imap-store.c:1072 ++#: ../camel/providers/imap/camel-imap-store.c:1054 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263 + msgid "Drafts" + msgstr "Klad" +@@ -3248,26 +3346,26 @@ msgstr "Klad" + # To snow or hail with a mixture of rain. + # Hail or snow, mingled with rain, usually falling, or driven + # by the wind, in fine particles. +-#: ../camel/providers/imap/camel-imap-store.c:1074 ++#: ../camel/providers/imap/camel-imap-store.c:1056 + msgid "Sent" + msgstr "Verzonden" + +-#: ../camel/providers/imap/camel-imap-store.c:1076 ++#: ../camel/providers/imap/camel-imap-store.c:1058 + msgid "Templates" + msgstr "Sjablonen" + +-#: ../camel/providers/imap/camel-imap-store.c:1349 ++#: ../camel/providers/imap/camel-imap-store.c:1303 + #, c-format + msgid "IMAP server %s does not support requested authentication type %s" + msgstr "IMAP-server %s ondersteunt het gevraagde aanmeldingstype %s niet" + +-#: ../camel/providers/imap/camel-imap-store.c:1359 +-#: ../camel/providers/smtp/camel-smtp-transport.c:504 ++#: ../camel/providers/imap/camel-imap-store.c:1313 ++#: ../camel/providers/smtp/camel-smtp-transport.c:507 + #, c-format + msgid "No support for authentication type %s" + msgstr "Geen ondersteuning voor aanmeldingstype %s" + +-#: ../camel/providers/imap/camel-imap-store.c:1431 ++#: ../camel/providers/imap/camel-imap-store.c:1385 + #, c-format + msgid "" + "Unable to authenticate to IMAP server.\n" +@@ -3278,23 +3376,23 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/imap/camel-imap-store.c:1925 +-#: ../camel/providers/imap/camel-imap-store.c:2302 ++#: ../camel/providers/imap/camel-imap-store.c:1858 ++#: ../camel/providers/imap/camel-imap-store.c:2239 + #: ../camel/providers/imap4/camel-imap4-store.c:959 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "De mapnaam ‘%s’ is ongeldig omdat deze het teken ‘%c’ bevat" + +-#: ../camel/providers/imap/camel-imap-store.c:2042 +-#: ../camel/providers/local/camel-maildir-store.c:191 ++#: ../camel/providers/imap/camel-imap-store.c:1975 ++#: ../camel/providers/local/camel-maildir-store.c:192 + #: ../camel/providers/local/camel-mbox-store.c:204 + #: ../camel/providers/local/camel-mh-store.c:249 + #, c-format + msgid "Cannot create folder '%s': folder exists." + msgstr "Kan map ‘%s’ niet aanmaken: map bestaat al." + +-#: ../camel/providers/imap/camel-imap-store.c:2313 ++#: ../camel/providers/imap/camel-imap-store.c:2250 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "Onbekende oudermap: %s" +@@ -3346,7 +3444,9 @@ msgstr "De verbinding is onverwacht verb + msgid "" + "Enable extended Mailing-List detection required for some filter and vFolder " + "rules" +-msgstr "Uitgebreide mailinglijst-detectie aanzetten. Dit is nodig voor bepaalde filters en vFolder-regels." ++msgstr "" ++"Uitgebreide mailinglijst-detectie aanzetten. Dit is nodig voor bepaalde " ++"filters en vFolder-regels." + + #: ../camel/providers/imap4/camel-imap4-folder.c:90 + msgid "Expire cached messages that haven't been read in X seconds" +@@ -3364,8 +3464,8 @@ msgstr "Kan geen toegang krijgen tot map + + #: ../camel/providers/imap4/camel-imap4-folder.c:482 + #, c-format +-msgid "Cannot sync flags to folder '%s': Unknown" +-msgstr "Kan vlaggen niet synchroniseren naar map ‘%s’: Onbekend" ++msgid "Cannot sync flags to folder '%s': Unknown error" ++msgstr "Kan vlaggen niet synchroniseren naar map ‘%s’: Onbekende fout" + + #: ../camel/providers/imap4/camel-imap4-folder.c:488 + #, c-format +@@ -3374,8 +3474,8 @@ msgstr "Kan vlaggen niet synchroniseren + + #: ../camel/providers/imap4/camel-imap4-folder.c:628 + #, c-format +-msgid "Cannot expunge folder '%s': Unknown" +-msgstr "Kan de map ‘%s’ niet leegmaken: Onbekend" ++msgid "Cannot expunge folder '%s': Unknown error" ++msgstr "Kan de map ‘%s’ niet leegmaken: Onbekende fout" + + #: ../camel/providers/imap4/camel-imap4-folder.c:633 + #, c-format +@@ -3409,26 +3509,26 @@ msgstr "Kan het bericht niet toevoegen a + + #: ../camel/providers/imap4/camel-imap4-folder.c:1181 + #, c-format +-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown" +-msgstr "Kan de berichten van map ‘%s’ niet verplaatsen naar map ‘%s’: Onbekend" ++msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" ++msgstr "" ++"Kan berichten uit map ‘%s’ niet verplaatsen naar map ‘%s’: Onbekende fout" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1185 + #, c-format +-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown" +-msgstr "Kan de berichten van map ‘%s’ niet kopiëren naar map ‘%s’: Onbekend" ++msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" ++msgstr "Kan berichten uit map ‘%s’ niet kopiëren naar map ‘%s’: Onbekende fout" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1193 + #, c-format + msgid "Cannot move messages from folder '%s' to folder '%s': Bad command" + msgstr "" +-"Kan de berichten van map ‘%s’ niet verplaatsen naar map ‘%s’: Opdracht " +-"onjuist" ++"Kan berichten uit map ‘%s’ niet verplaatsen naar map ‘%s’: Opdracht onjuist" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1197 + #, c-format + msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command" + msgstr "" +-"Kan de berichten van map ‘%s’ niet kopiëren naar map ‘%s’: Opdracht onjuist" ++"Kan berichten uit map ‘%s’ niet kopiëren naar map ‘%s’: Opdracht onjuist" + + #: ../camel/providers/imap4/camel-imap4-provider.c:56 + msgid "Check new messages for _Junk contents" +@@ -3458,7 +3558,7 @@ msgstr "" + #: ../camel/providers/nntp/camel-nntp-store.c:195 + #: ../camel/providers/nntp/camel-nntp-store.c:214 + #: ../camel/providers/pop3/camel-pop3-store.c:182 +-#: ../camel/providers/smtp/camel-smtp-transport.c:270 ++#: ../camel/providers/smtp/camel-smtp-transport.c:272 + msgid "Connection canceled" + msgstr "Verbinding geannuleerd" + +@@ -3496,8 +3596,8 @@ msgstr "Kan geen IMAP-mappen aanmaken in + + #: ../camel/providers/imap4/camel-imap4-store.c:740 + #, c-format +-msgid "Cannot get folder '%s' on IMAP server %s: Unknown" +-msgstr "Kan de map ‘%s’ niet verkrijgen van IMAP-server ‘%s’: Onbekend" ++msgid "Cannot get folder '%s' on IMAP server %s: Unknown error" ++msgstr "Kan de map ‘%s’ van IMAP-server ‘%s’ niet verkrijgen: Onbekende fout" + + #: ../camel/providers/imap4/camel-imap4-store.c:821 + #, c-format +@@ -3505,7 +3605,7 @@ msgid "Cannot get LIST information for ' + msgstr "Kan de LIST-informatie niet verkrijgen voor ‘%s’ op IMAP-server %s: %s" + + #: ../camel/providers/imap4/camel-imap4-store.c:823 +-#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + msgid "Bad command" + msgstr "Opdracht onjuist" + +@@ -3557,36 +3657,39 @@ msgstr "Kan map ‘%s’ niet hernoemen + msgid "Cannot rename folder '%s' to '%s': Bad command" + msgstr "Kan map ‘%s’ niet hernoemen naar ‘%s’: Opdracht onjuist" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1575 ++#. Translators: the first %s is an IMAP4 command, either LSUB or LIST. ++#. * The fourth one is an error message. ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 + #, c-format + msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" +-msgstr "Kan geen %s-informatie verkrijgen voor patroon ‘%s’ van IMAP-server %s: %s" ++msgstr "" ++"Kan geen %s-informatie verkrijgen voor patroon ‘%s’ van IMAP-server %s: %s" + + # abonneren/inschrijven +-#: ../camel/providers/imap4/camel-imap4-store.c:1636 ++#: ../camel/providers/imap4/camel-imap4-store.c:1638 + msgid "Cannot subscribe to IMAP folders in offline mode." + msgstr "Kan niet inschrijven op IMAP-mappen in offline modus." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1681 ++#: ../camel/providers/imap4/camel-imap4-store.c:1683 + #, c-format + msgid "Cannot subscribe to folder '%s': Invalid mailbox name" + msgstr "Kan niet inschrijven voor map ‘%s’: Ongeldige mailbox-naam" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1686 ++#: ../camel/providers/imap4/camel-imap4-store.c:1688 + #, c-format + msgid "Cannot subscribe to folder '%s': Bad command" + msgstr "Kan niet inschrijven voor map ‘%s’: Opdracht onjuist" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1708 ++#: ../camel/providers/imap4/camel-imap4-store.c:1710 + msgid "Cannot unsubscribe from IMAP folders in offline mode." + msgstr "Kan niet uitschrijven bij map IMAP-mappen in offline modus." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1753 ++#: ../camel/providers/imap4/camel-imap4-store.c:1755 + #, c-format + msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" + msgstr "Kan niet uitschrijven bij map ‘%s’: Ongeldige mailbox-naam" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1758 ++#: ../camel/providers/imap4/camel-imap4-store.c:1760 + #, c-format + msgid "Cannot unsubscribe from folder '%s': Bad command" + msgstr "Kan niet uitschrijven bij map ‘%s’: Opdracht onjuist" +@@ -3656,20 +3759,20 @@ msgid "Index message body data" + msgstr "Indexeer bericht body data" + + #. $HOME relative path + protocol string +-#: ../camel/providers/local/camel-local-folder.c:382 ++#: ../camel/providers/local/camel-local-folder.c:390 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + + #. /var/spool/mail relative path + protocol +-#: ../camel/providers/local/camel-local-folder.c:386 +-#: ../camel/providers/local/camel-local-folder.c:389 ++#: ../camel/providers/local/camel-local-folder.c:394 ++#: ../camel/providers/local/camel-local-folder.c:397 + #, c-format + msgid "mailbox:%s (%s)" + msgstr "postbus: %s: (%s)" + + #. a full path + protocol +-#: ../camel/providers/local/camel-local-folder.c:393 ++#: ../camel/providers/local/camel-local-folder.c:401 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -3734,72 +3837,59 @@ msgstr "" + msgid "Standard Unix mbox spool directory" + msgstr "Standaard Unix mbox-spoolmap" + +-#: ../camel/providers/local/camel-local-store.c:159 +-#: ../camel/providers/local/camel-local-store.c:270 ++#: ../camel/providers/local/camel-local-store.c:171 ++#: ../camel/providers/local/camel-local-store.c:282 + #: ../camel/providers/local/camel-mbox-store.c:359 + #: ../camel/providers/local/camel-spool-store.c:129 + #, c-format + msgid "Store root %s is not an absolute path" + msgstr "Opslaglocatie %s is geen absoluut pad" + +-#: ../camel/providers/local/camel-local-store.c:166 ++#: ../camel/providers/local/camel-local-store.c:178 + #, c-format + msgid "Store root %s is not a regular directory" + msgstr "Opslaglocatie ‘%s’ is geen normale map" + +-#: ../camel/providers/local/camel-local-store.c:175 +-#: ../camel/providers/local/camel-local-store.c:183 +-#: ../camel/providers/local/camel-local-store.c:281 ++#: ../camel/providers/local/camel-local-store.c:187 ++#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:293 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "Kan map niet verkrijgen: %s: %s" + + # CHECK:postbus-in +-#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:207 + msgid "Local stores do not have an inbox" + msgstr "Lokale opslaglocaties hebben geen postbus-in" + +-#: ../camel/providers/local/camel-local-store.c:241 ++#: ../camel/providers/local/camel-local-store.c:253 + #, c-format + msgid "Local mail file %s" + msgstr "Lokaal postbusbestand %s" + +-#: ../camel/providers/local/camel-local-store.c:359 ++#: ../camel/providers/local/camel-local-store.c:348 + #, c-format + msgid "Could not rename folder %s to %s: %s" + msgstr "Kon de naam van map %s niet wijzigen naar %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:427 ++#: ../camel/providers/local/camel-local-store.c:416 + #, c-format + msgid "Could not rename '%s': %s" + msgstr "Kon ‘%s’ niet hernoemen: %s" + +-#: ../camel/providers/local/camel-local-store.c:452 +-#: ../camel/providers/local/camel-local-store.c:462 +-#: ../camel/providers/local/camel-mbox-store.c:276 +-#: ../camel/providers/local/camel-mbox-store.c:288 +-#, c-format +-msgid "Could not delete folder summary file '%s': %s" +-msgstr "Kon samenvattingsbestand ‘%s’ niet verwijderen: %s" +- +-#: ../camel/providers/local/camel-local-store.c:472 ++#: ../camel/providers/local/camel-local-store.c:441 + #: ../camel/providers/local/camel-mbox-store.c:300 + #, c-format + msgid "Could not delete folder index file '%s': %s" + msgstr "Kon indexbestand ‘%s’ niet verwijderen: %s" + +-#: ../camel/providers/local/camel-local-store.c:495 ++#: ../camel/providers/local/camel-local-store.c:464 + #: ../camel/providers/local/camel-mbox-store.c:324 + #, c-format + msgid "Could not delete folder meta file '%s': %s" + msgstr "Kon metabestand ‘%s’ niet verwijderen: %s" + +-#: ../camel/providers/local/camel-local-summary.c:409 +-#, c-format +-msgid "Could not save summary: %s: %s" +-msgstr "Kon samenvatting %s niet opslaan: %s" +- +-#: ../camel/providers/local/camel-local-summary.c:467 ++#: ../camel/providers/local/camel-local-summary.c:506 + msgid "Unable to add message to summary: unknown reason" + msgstr "Kan geen bericht toevoegen aan de korte inhoud: onbekende reden" + +@@ -3834,70 +3924,70 @@ msgstr "" + msgid "Invalid message contents" + msgstr "Ongeldige berichtinhoud" + +-#: ../camel/providers/local/camel-maildir-store.c:147 +-#: ../camel/providers/local/camel-maildir-store.c:172 ++#: ../camel/providers/local/camel-maildir-store.c:148 ++#: ../camel/providers/local/camel-maildir-store.c:173 + #: ../camel/providers/local/camel-mbox-store.c:176 + #: ../camel/providers/local/camel-mbox-store.c:188 + #, c-format + msgid "Cannot create folder '%s': %s" + msgstr "Kan map niet aanmaken: ‘%s’: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:160 ++#: ../camel/providers/local/camel-maildir-store.c:161 + #: ../camel/providers/local/camel-mbox-store.c:147 + #: ../camel/providers/local/camel-mh-store.c:217 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "Kan map niet verkrijgen ‘%s’: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:164 ++#: ../camel/providers/local/camel-maildir-store.c:165 + #: ../camel/providers/local/camel-mbox-store.c:155 + #: ../camel/providers/local/camel-mh-store.c:224 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "Kan map ‘%s’ niet verkrijgen: map bestaat niet." + +-#: ../camel/providers/local/camel-maildir-store.c:188 ++#: ../camel/providers/local/camel-maildir-store.c:189 + #, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "Kan map ‘%s’ niet verkrijgen: is geen maildir-map." + +-#: ../camel/providers/local/camel-maildir-store.c:233 +-#: ../camel/providers/local/camel-maildir-store.c:271 ++#: ../camel/providers/local/camel-maildir-store.c:234 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mh-store.c:273 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "Kon map ‘%s’ niet verwijderen: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:235 ++#: ../camel/providers/local/camel-maildir-store.c:236 + msgid "not a maildir directory" + msgstr "geen maildir-map" + +-#: ../camel/providers/local/camel-maildir-store.c:439 ++#: ../camel/providers/local/camel-maildir-store.c:440 + #: ../camel/providers/local/camel-spool-store.c:331 + #: ../camel/providers/local/camel-spool-store.c:345 + #, c-format + msgid "Could not scan folder '%s': %s" + msgstr "Kon map ‘%s’ niet scannen: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:433 +-#: ../camel/providers/local/camel-maildir-summary.c:567 ++#: ../camel/providers/local/camel-maildir-summary.c:434 ++#: ../camel/providers/local/camel-maildir-summary.c:553 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "Kon maildir-map %s niet openen: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:560 ++#: ../camel/providers/local/camel-maildir-summary.c:546 + msgid "Checking folder consistency" + msgstr "Consistentie van de map controleren" + +-#: ../camel/providers/local/camel-maildir-summary.c:664 ++#: ../camel/providers/local/camel-maildir-summary.c:650 + msgid "Checking for new messages" + msgstr "Controleren op nieuwe berichten" + +-#: ../camel/providers/local/camel-maildir-summary.c:755 +-#: ../camel/providers/local/camel-mbox-summary.c:436 +-#: ../camel/providers/local/camel-mbox-summary.c:609 +-#: ../camel/providers/local/camel-mbox-summary.c:706 +-#: ../camel/providers/local/camel-spool-summary.c:140 ++#: ../camel/providers/local/camel-maildir-summary.c:736 ++#: ../camel/providers/local/camel-mbox-summary.c:534 ++#: ../camel/providers/local/camel-mbox-summary.c:714 ++#: ../camel/providers/local/camel-mbox-summary.c:810 ++#: ../camel/providers/local/camel-spool-summary.c:158 + msgid "Storing folder" + msgstr "Map wordt opgeslagen" + +@@ -3961,6 +4051,12 @@ msgstr "‘%s’ is geen normaal bestand + msgid "Folder '%s' is not empty. Not deleted." + msgstr "Map ‘%s’ is niet leeg. Niet verwijderd." + ++#: ../camel/providers/local/camel-mbox-store.c:276 ++#: ../camel/providers/local/camel-mbox-store.c:288 ++#, c-format ++msgid "Could not delete folder summary file '%s': %s" ++msgstr "Kon samenvattingsbestand ‘%s’ niet verwijderen: %s" ++ + #: ../camel/providers/local/camel-mbox-store.c:378 + #, c-format + msgid "Cannot create directory '%s': %s." +@@ -3989,81 +4085,76 @@ msgstr "Kon ‘%s’ niet hernoemen: ‘ + msgid "Could not rename '%s' to %s: %s" + msgstr "Kon de map niet hernoemen van ‘%s’ naar %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:442 ++#: ../camel/providers/local/camel-mbox-summary.c:540 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "Kon map ‘%s’ niet openen: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:490 ++#: ../camel/providers/local/camel-mbox-summary.c:588 + #, c-format + msgid "Fatal mail parser error near position %ld in folder %s" + msgstr "Onherstelbare e-mailverwerkingsfout op positie %ld in de map %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:546 ++#: ../camel/providers/local/camel-mbox-summary.c:651 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Kan map ‘%s’ niet controleren: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:614 +-#: ../camel/providers/local/camel-mbox-summary.c:711 +-#: ../camel/providers/local/camel-spool-summary.c:145 ++#: ../camel/providers/local/camel-mbox-summary.c:719 ++#: ../camel/providers/local/camel-mbox-summary.c:815 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Kon bestand ‘%s’ niet openen: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:626 +-#: ../camel/providers/local/camel-spool-summary.c:158 ++#: ../camel/providers/local/camel-mbox-summary.c:731 ++#: ../camel/providers/local/camel-spool-summary.c:176 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Kon tijdelijke postbus niet openen: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:639 +-#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:744 ++#: ../camel/providers/local/camel-mbox-summary.c:920 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Kon de bronmap ‘%s’ niet sluiten: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:648 ++#: ../camel/providers/local/camel-mbox-summary.c:753 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Kon de tijdelijke map niet sluiten: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:663 ++#: ../camel/providers/local/camel-mbox-summary.c:768 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Kon de naam van de map niet wijzigen: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:722 +-#: ../camel/providers/local/camel-mbox-summary.c:1046 ++#: ../camel/providers/local/camel-mbox-summary.c:826 ++#: ../camel/providers/local/camel-mbox-summary.c:1050 + #, c-format + msgid "Could not store folder: %s" + msgstr "Kon de map niet opslaan: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:770 +-#: ../camel/providers/local/camel-mbox-summary.c:799 ++#: ../camel/providers/local/camel-mbox-summary.c:862 ++#: ../camel/providers/local/camel-mbox-summary.c:870 ++#: ../camel/providers/local/camel-mbox-summary.c:1080 + #: ../camel/providers/local/camel-mbox-summary.c:1088 +-#: ../camel/providers/local/camel-mbox-summary.c:1117 +-msgid "Detected a corrupt mbox file or an invalid 'From' header" +-msgstr "Beschadigd mbox-bestand gevonden of ongeldige ‘Van’-kopregels" ++msgid "Summary and folder mismatch, even after a sync" ++msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie" + +-#: ../camel/providers/local/camel-mbox-summary.c:935 +-#: ../camel/providers/local/camel-spool-summary.c:326 ++#: ../camel/providers/local/camel-mbox-summary.c:1013 ++#: ../camel/providers/local/camel-spool-summary.c:344 + #, c-format + msgid "Unknown error: %s" + msgstr "Onbekende fout: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:971 +-#, c-format +-msgid "Folder %s cannot be opened: %s" +-msgstr "Map ‘%s’ kan niet geopend worden: %s" +- ++#: ../camel/providers/local/camel-mbox-summary.c:1156 + #: ../camel/providers/local/camel-mbox-summary.c:1182 +-#: ../camel/providers/local/camel-mbox-summary.c:1208 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Fout bij het schrijven naar tijdelijk postbus: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1199 ++#: ../camel/providers/local/camel-mbox-summary.c:1173 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Fout bij het schrijven naar tijdelijk postbus %s: %s" +@@ -4087,7 +4178,7 @@ msgstr "Kon de map ‘%s’ niet aanmake + msgid "Cannot get folder '%s': not a directory." + msgstr "Kan de map ‘%s’ niet verkrijgen: is geen map." + +-#: ../camel/providers/local/camel-mh-summary.c:246 ++#: ../camel/providers/local/camel-mh-summary.c:248 + #, c-format + msgid "Cannot open MH directory path: %s: %s" + msgstr "Kan MH-postbusmap niet openen: %s: %s" +@@ -4157,21 +4248,21 @@ msgstr "Spoolmappen kunnen niet hernoemd + msgid "Spool folders cannot be deleted" + msgstr "Spoolmappen kunnen niet gewist worden" + +-#: ../camel/providers/local/camel-spool-summary.c:171 +-#: ../camel/providers/local/camel-spool-summary.c:181 +-#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:189 ++#: ../camel/providers/local/camel-spool-summary.c:199 ++#: ../camel/providers/local/camel-spool-summary.c:209 + #, c-format + msgid "Could not sync temporary folder %s: %s" + msgstr "Kon tijdelijke map %s niet synchroniseren: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:207 ++#: ../camel/providers/local/camel-spool-summary.c:225 + #, c-format + msgid "Could not sync spool folder %s: %s" + msgstr "Kon spoolmap: %s niet synchroniseren: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:238 +-#: ../camel/providers/local/camel-spool-summary.c:255 +-#: ../camel/providers/local/camel-spool-summary.c:266 ++#: ../camel/providers/local/camel-spool-summary.c:256 ++#: ../camel/providers/local/camel-spool-summary.c:273 ++#: ../camel/providers/local/camel-spool-summary.c:284 + #, c-format + msgid "" + "Could not sync spool folder %s: %s\n" +@@ -4186,19 +4277,19 @@ msgstr "" + msgid "Internal error: UID in invalid format: %s" + msgstr "Interne fout: UID in ongeldig formaat: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:328 +-#: ../camel/providers/nntp/camel-nntp-folder.c:331 +-#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/nntp/camel-nntp-folder.c:330 ++#: ../camel/providers/nntp/camel-nntp-folder.c:333 + #: ../camel/providers/nntp/camel-nntp-folder.c:375 ++#: ../camel/providers/nntp/camel-nntp-folder.c:377 + #, c-format + msgid "Posting failed: %s" + msgstr "Plaatsen mislukt: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:393 ++#: ../camel/providers/nntp/camel-nntp-folder.c:395 + msgid "You cannot post NNTP messages while working offline!" + msgstr "U kunt geen NNTP-berichten verzenden wanneer u offline werkt!" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:404 ++#: ../camel/providers/nntp/camel-nntp-folder.c:406 + msgid "You cannot copy messages from a NNTP folder!" + msgstr "Het kopiëren van berichten vanuit een NNTP-map is niet mogelijk!" + +@@ -4317,27 +4408,27 @@ msgstr "Niet verbonden." + msgid "No such folder: %s" + msgstr "Map: %s bestaat niet" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:222 +-#: ../camel/providers/nntp/camel-nntp-summary.c:318 ++#: ../camel/providers/nntp/camel-nntp-summary.c:273 ++#: ../camel/providers/nntp/camel-nntp-summary.c:369 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: nieuwe berichten doorzoeken" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:229 ++#: ../camel/providers/nntp/camel-nntp-summary.c:280 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "Onverwacht serverantwoord van xover: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:332 ++#: ../camel/providers/nntp/camel-nntp-summary.c:383 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "Onverwacht serverantwoord van head: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:372 ++#: ../camel/providers/nntp/camel-nntp-summary.c:423 + msgid "Use cancel" + msgstr "Gebruik annuleren" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:374 ++#: ../camel/providers/nntp/camel-nntp-summary.c:425 + #, c-format + msgid "Operation failed: %s" + msgstr "Opdracht mislukt: %s" +@@ -4359,19 +4450,19 @@ msgstr "Bezig met schrappen van oude ber + msgid "Expunging deleted messages" + msgstr "Bezig met schrappen van verwijderde berichten" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 ++#: ../camel/providers/pop3/camel-pop3-folder.c:533 + #, c-format + msgid "No message with UID %s" + msgstr "Geen bericht met UID %s" + + #. Sigh, most of the crap in this function is so that the cancel button + #. returns the proper exception code. Sigh. +-#: ../camel/providers/pop3/camel-pop3-folder.c:541 ++#: ../camel/providers/pop3/camel-pop3-folder.c:540 + #, c-format + msgid "Retrieving POP message %d" + msgstr "POP-bericht %d wordt opgehaald" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:631 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 + msgid "Unknown reason" + msgstr "Onbekende reden" + +@@ -4557,128 +4648,128 @@ msgstr "SMTP" + msgid "For delivering mail by connecting to a remote mailhub using SMTP." + msgstr "Voor het versturen van e-mail naar een externe mailhub met SMTP." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:168 + msgid "Syntax error, command unrecognized" + msgstr "Syntactische fout, opdracht niet herkend" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:170 + msgid "Syntax error in parameters or arguments" + msgstr "Syntactische fout in parameters of argumenten" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:170 ++#: ../camel/providers/smtp/camel-smtp-transport.c:172 + msgid "Command not implemented" + msgstr "Opdracht niet geïmplementeerd" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:174 + msgid "Command parameter not implemented" + msgstr "Opdrachtparameter niet geïmplementeerd" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:174 ++#: ../camel/providers/smtp/camel-smtp-transport.c:176 + msgid "System status, or system help reply" + msgstr "Systeem-status, of systeemhulp-antwoord" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:176 ++#: ../camel/providers/smtp/camel-smtp-transport.c:178 + msgid "Help message" + msgstr "Hulpbericht" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:180 + msgid "Service ready" + msgstr "Systeemdienst is gereed" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:180 ++#: ../camel/providers/smtp/camel-smtp-transport.c:182 + msgid "Service closing transmission channel" + msgstr "Systeemdienst heeft transmissiekanaal gesloten" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:184 + msgid "Service not available, closing transmission channel" + msgstr "Systeemdienst niet beschikbaar, overdrachtskanaal gesloten" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:184 ++#: ../camel/providers/smtp/camel-smtp-transport.c:186 + msgid "Requested mail action okay, completed" + msgstr "Postopdracht geslaagd, voltooid" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:186 ++#: ../camel/providers/smtp/camel-smtp-transport.c:188 + msgid "User not local; will forward to " + msgstr "Gebruiker niet lokaal; zal doorsturen naar " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:188 ++#: ../camel/providers/smtp/camel-smtp-transport.c:190 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "Postopdracht niet uitgevoerd: postbus niet beschikbaar" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:190 ++#: ../camel/providers/smtp/camel-smtp-transport.c:192 + msgid "Requested action not taken: mailbox unavailable" + msgstr "Opdracht niet uitgevoerd: postbus niet beschikbaar" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:192 ++#: ../camel/providers/smtp/camel-smtp-transport.c:194 + msgid "Requested action aborted: error in processing" + msgstr "Verzochte actie afgebroken: fout tijdens verwerken" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:194 ++#: ../camel/providers/smtp/camel-smtp-transport.c:196 + msgid "User not local; please try " + msgstr "Gebruiker niet lokaal; probeer " + +-#: ../camel/providers/smtp/camel-smtp-transport.c:196 ++#: ../camel/providers/smtp/camel-smtp-transport.c:198 + msgid "Requested action not taken: insufficient system storage" + msgstr "Opdracht niet uitgevoerd: onvoldoende ruimte op systeem" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:198 ++#: ../camel/providers/smtp/camel-smtp-transport.c:200 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "Postopdracht afgebroken: gebruikt teveel ruimte" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:200 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "Opdracht niet uitgevoerd: postbusnaam niet toegestaan" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:204 + msgid "Start mail input; end with ." + msgstr "Start postinvoer; eindig met ." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:204 ++#: ../camel/providers/smtp/camel-smtp-transport.c:206 + msgid "Transaction failed" + msgstr "Transactie mislukt" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/providers/smtp/camel-smtp-transport.c:210 + msgid "A password transition is needed" + msgstr "Veranderen van wachtwoord is vereist" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:210 ++#: ../camel/providers/smtp/camel-smtp-transport.c:212 + msgid "Authentication mechanism is too weak" + msgstr "Aanmeldingsmechanisme te zwak" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:212 ++#: ../camel/providers/smtp/camel-smtp-transport.c:214 + msgid "Encryption required for requested authentication mechanism" + msgstr "Versleuteling vereist voor gewenst aanmeldingsmechanisme" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:214 ++#: ../camel/providers/smtp/camel-smtp-transport.c:216 + msgid "Temporary authentication failure" + msgstr "Tijdelijke aanmeldingsfout" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:295 ++#: ../camel/providers/smtp/camel-smtp-transport.c:297 + msgid "Welcome response error" + msgstr "Fout in welkomstbericht" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:330 +-#: ../camel/providers/smtp/camel-smtp-transport.c:363 +-#: ../camel/providers/smtp/camel-smtp-transport.c:369 ++#: ../camel/providers/smtp/camel-smtp-transport.c:332 ++#: ../camel/providers/smtp/camel-smtp-transport.c:365 ++#: ../camel/providers/smtp/camel-smtp-transport.c:371 + #, c-format + msgid "Failed to connect to SMTP server %s in secure mode: %s" + msgstr "Fout bij opzetten van beveiligde verbinding met SMTP-server %s: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:341 + #, c-format + msgid "STARTTLS command failed: %s" + msgstr "STARTTLS-opdracht mislukt: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:354 ++#: ../camel/providers/smtp/camel-smtp-transport.c:356 + msgid "STARTTLS command failed" + msgstr "STARTTLS-opdracht mislukt: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:494 ++#: ../camel/providers/smtp/camel-smtp-transport.c:497 + #, c-format + msgid "SMTP server %s does not support requested authentication type %s." + msgstr "SMTP-server %s ondersteunt het gevraagde aanmeldingstype %s niet." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:559 ++#: ../camel/providers/smtp/camel-smtp-transport.c:564 + #, c-format + msgid "" + "Unable to authenticate to SMTP server.\n" +@@ -4689,93 +4780,93 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:683 ++#: ../camel/providers/smtp/camel-smtp-transport.c:697 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP-server %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:685 ++#: ../camel/providers/smtp/camel-smtp-transport.c:699 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "Postaflevering via %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:703 ++#: ../camel/providers/smtp/camel-smtp-transport.c:717 + msgid "Cannot send message: service not connected." + msgstr "Kan bericht niet versturen: service niet verbonden." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:709 ++#: ../camel/providers/smtp/camel-smtp-transport.c:723 + msgid "Cannot send message: sender address not valid." + msgstr "Kan berichten niet versturen: afzender niet geldig." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:713 ++#: ../camel/providers/smtp/camel-smtp-transport.c:727 + msgid "Sending message" + msgstr "Bericht wordt verstuurd" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:728 ++#: ../camel/providers/smtp/camel-smtp-transport.c:742 + msgid "Cannot send message: no recipients defined." + msgstr "Kan bericht niet versturen: geen geadresseerden opgegeven." + +-#: ../camel/providers/smtp/camel-smtp-transport.c:739 ++#: ../camel/providers/smtp/camel-smtp-transport.c:753 + msgid "Cannot send message: one or more invalid recipients" + msgstr "Kan bericht niet versturen: een of meerdere ongeldige ontvangers" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:968 ++#: ../camel/providers/smtp/camel-smtp-transport.c:982 + msgid "SMTP Greeting" + msgstr "SMTP Begroeting" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:993 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1007 + #, c-format + msgid "HELO command failed: %s" + msgstr "HELO-opdracht mislukt: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1010 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1024 + msgid "HELO command failed" + msgstr "HELO command mislukt" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1073 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1090 + msgid "SMTP Authentication" + msgstr "SMTP Aanmelding" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1079 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1096 + msgid "Error creating SASL authentication object." + msgstr "Fout bij aanmaken van SASL aanmeldingsobject" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1096 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1107 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1124 + #, c-format + msgid "AUTH command failed: %s" + msgstr "AUTH-opdracht mislukt: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1130 + msgid "AUTH command failed" + msgstr "AUTH-opdracht mislukt: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1177 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1200 + msgid "Bad authentication response from server.\n" + msgstr "Foutief antwoord van server bij aanmelding.\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1227 + #, c-format + msgid "MAIL FROM command failed: %s: mail not sent" + msgstr "MAIL FROM-opdracht mislukt: %s: bericht niet verzonden" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1219 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1244 + msgid "MAIL FROM command failed" + msgstr "MAIL FROM-opdracht mislukt" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1243 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1268 + #, c-format + msgid "RCPT TO command failed: %s: mail not sent" + msgstr "RCPT TO-opdracht mislukt: %s: bericht niet verzonden" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1262 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1287 + #, c-format + msgid "RCPT TO <%s> failed" + msgstr "RCPT TO <%s> mislukt" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1301 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1359 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1378 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1327 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1396 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1415 + #, c-format + msgid "DATA command failed: %s: mail not sent" + msgstr "DATA-opdracht mislukt: %s : bericht niet verstuurd" +@@ -4783,26 +4874,26 @@ msgstr "DATA-opdracht mislukt: %s : beri + #. we should have gotten instructions on how to use the DATA command: + #. * 354 Enter mail, end with "." on a line by itself + #. +-#: ../camel/providers/smtp/camel-smtp-transport.c:1318 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1394 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1344 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1431 + msgid "DATA command failed" + msgstr "DATA-opdracht mislukt" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1417 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1454 + #, c-format + msgid "RSET command failed: %s" + msgstr "RSET-opdracht mislukt: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1433 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1470 + msgid "RSET command failed" + msgstr "RSET-opdracht mislukt" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1456 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1493 + #, c-format + msgid "QUIT command failed: %s" + msgstr "QUIT-opdracht mislukt: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1470 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1507 + msgid "QUIT command failed" + msgstr "QUIT-opdracht mislukt: %s" + +@@ -4865,28 +4956,29 @@ msgstr "Persoonlijk" + msgid "Phone Calls" + msgstr "Telefoontjes" + +-#: ../libedataserver/e-categories.c:60 ++#. Translators: "Status" is a category name; it can mean anything user wants to ++#: ../libedataserver/e-categories.c:61 + msgid "Status" + msgstr "Status" + +-#: ../libedataserver/e-categories.c:61 ++#: ../libedataserver/e-categories.c:62 + msgid "Strategies" + msgstr "Strategiën" + +-#: ../libedataserver/e-categories.c:62 ++#: ../libedataserver/e-categories.c:63 + msgid "Suppliers" + msgstr "Leveranciers" + +-#: ../libedataserver/e-categories.c:63 ++#: ../libedataserver/e-categories.c:64 + msgid "Time & Expenses" + msgstr "Tijd en kosten" + + # very important person +-#: ../libedataserver/e-categories.c:64 ++#: ../libedataserver/e-categories.c:65 + msgid "VIP" + msgstr "VIP" + +-#: ../libedataserver/e-categories.c:65 ++#: ../libedataserver/e-categories.c:66 + msgid "Waiting" + msgstr "Wachtend" + +@@ -5018,15 +5110,15 @@ msgstr "%H%M" + msgid "%I %p" + msgstr "%I %p" + +-#: ../libedataserverui/e-book-auth-util.c:89 ++#: ../libedataserverui/e-book-auth-util.c:90 + msgid "Accessing LDAP Server anonymously" + msgstr "LDAP-server zal anoniem worden benaderd" + +-#: ../libedataserverui/e-book-auth-util.c:193 ++#: ../libedataserverui/e-book-auth-util.c:192 + msgid "Failed to authenticate.\n" + msgstr "Het aanmelden is mislukt.\n" + +-#: ../libedataserverui/e-categories-dialog.c:274 ++#: ../libedataserverui/e-categories-dialog.c:261 + #, c-format + msgid "" + "There is already a category '%s' in the configuration. Please use another " +@@ -5034,11 +5126,11 @@ msgid "" + msgstr "" + "Er is al een categorie ‘%s’ in de configuratie. Gebruik een andere naam" + +-#: ../libedataserverui/e-categories-dialog.c:475 ++#: ../libedataserverui/e-categories-dialog.c:466 + msgid "Icon" + msgstr "Pictogram" + +-#: ../libedataserverui/e-categories-dialog.c:480 ++#: ../libedataserverui/e-categories-dialog.c:471 + msgid "Category" + msgstr "Categorie" + +@@ -5074,19 +5166,19 @@ msgstr "Be_werken" + msgid "categories" + msgstr "categorieën" + +-#: ../libedataserverui/e-name-selector-dialog.c:275 ++#: ../libedataserverui/e-name-selector-dialog.c:272 + msgid "Select Contacts from Address Book" + msgstr "Selecteer contacten uit het adresboek" + +-#: ../libedataserverui/e-name-selector-dialog.c:555 ++#: ../libedataserverui/e-name-selector-dialog.c:559 + msgid "_Add" + msgstr "_Toevoegen" + +-#: ../libedataserverui/e-name-selector-dialog.c:580 ++#: ../libedataserverui/e-name-selector-dialog.c:584 + msgid "_Remove" + msgstr "_Verwijderen" + +-#: ../libedataserverui/e-name-selector-dialog.c:753 ++#: ../libedataserverui/e-name-selector-dialog.c:761 + #: ../libedataserverui/e-name-selector-dialog.glade.h:6 + msgid "Any Category" + msgstr "Willekeurige categorie" +@@ -5129,76 +5221,76 @@ msgid "_Search:" + msgstr "_Zoeken:" + + #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2249 ++#: ../libedataserverui/e-name-selector-entry.c:2369 + #, c-format + msgid "E_xpand %s Inline" + msgstr "%s hier _weergeven" + + #. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2264 ++#: ../libedataserverui/e-name-selector-entry.c:2384 + #, c-format + msgid "Cop_y %s" + msgstr "‘%s’ _kopiëren" + + #. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2274 ++#: ../libedataserverui/e-name-selector-entry.c:2394 + #, c-format + msgid "C_ut %s" + msgstr "‘%s’ k_nippen" + + #. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2291 ++#: ../libedataserverui/e-name-selector-entry.c:2411 + #, c-format + msgid "_Edit %s" + msgstr "%s be_werken" + +-#: ../libedataserverui/e-name-selector-list.c:479 ++#: ../libedataserverui/e-name-selector-list.c:466 + #, c-format + msgid "_Delete %s" + msgstr "%s _verwijderen" + +-#: ../libedataserverui/e-passwords.c:214 ++#: ../libedataserverui/e-passwords.c:218 + #, c-format + msgid "Keyring key is unusable: no user or host name" + msgstr "Sleutel van sleutelbos is onbruikbaar: geen gebruiker of hostnaam" + +-#: ../libedataserverui/e-passwords.c:1044 ++#: ../libedataserverui/e-passwords.c:1055 + msgid "You have the Caps Lock key on." + msgstr "De Caps Lock staat aan." + +-#: ../libedataserverui/e-passwords.c:1164 ++#: ../libedataserverui/e-passwords.c:1175 + msgid "_Remember this passphrase" + msgstr "Deze _wachtwoordzin onthouden" + +-#: ../libedataserverui/e-passwords.c:1165 ++#: ../libedataserverui/e-passwords.c:1176 + msgid "_Remember this passphrase for the remainder of this session" + msgstr "Dit _wachtwoord onthouden gedurende de rest van deze sessie" + +-#: ../libedataserverui/e-passwords.c:1170 ++#: ../libedataserverui/e-passwords.c:1181 + msgid "_Remember this password" + msgstr "Dit _wachtwoord onthouden" + +-#: ../libedataserverui/e-passwords.c:1171 ++#: ../libedataserverui/e-passwords.c:1182 + msgid "_Remember this password for the remainder of this session" + msgstr "Dit _wachtwoord onthouden gedurende de rest van deze sessie" + + #. prepare the dialog +-#: ../libedataserverui/e-source-selector-dialog.c:101 ++#: ../libedataserverui/e-source-selector-dialog.c:95 + msgid "Select destination" + msgstr "Selecteer doel" + +-#: ../libedataserverui/e-source-selector-dialog.c:154 ++#: ../libedataserverui/e-source-selector-dialog.c:148 + msgid "_Destination" + msgstr "_Doel" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1660 +-#: ../servers/exchange/storage/exchange-account.c:971 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1683 ++#: ../servers/exchange/storage/exchange-account.c:953 + #, c-format + msgid "Enter password for %s" + msgstr "Wachtwoord invoeren voor %s" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1661 +-#: ../servers/exchange/storage/exchange-account.c:976 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1684 ++#: ../servers/exchange/storage/exchange-account.c:958 + msgid "Enter password" + msgstr "Voer wachtwoord in" + +@@ -5302,26 +5394,26 @@ msgstr "Deze opdracht is niet beschikbaa + + #. i18n: This is the title of an "other user's folders" + #. hierarchy. Eg, "John Doe's Folders". +-#: ../servers/exchange/storage/exchange-account.c:662 ++#: ../servers/exchange/storage/exchange-account.c:644 + #, c-format + msgid "%s's Folders" + msgstr "Mappen van %s" + +-#: ../servers/exchange/storage/exchange-account.c:1277 ++#: ../servers/exchange/storage/exchange-account.c:1259 + msgid "Personal Folders" + msgstr "Persoonlijke mappen" + +-#: ../servers/exchange/storage/exchange-account.c:1292 ++#: ../servers/exchange/storage/exchange-account.c:1274 + msgid "Favorite Public Folders" + msgstr "Favoriete publieke mappen" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1309 ++#: ../servers/exchange/storage/exchange-account.c:1291 + msgid "All Public Folders" + msgstr "Alle publieke mappen" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1323 ++#: ../servers/exchange/storage/exchange-account.c:1305 + msgid "Global Address List" + msgstr "Globale adreslijst" + +@@ -5349,19 +5441,19 @@ msgstr "Verzonden items" + msgid "Tasks" + msgstr "Taken" + +-#: ../servers/groupwise/e-gw-connection.c:224 ++#: ../servers/groupwise/e-gw-connection.c:225 + msgid "Invalid connection" + msgstr "Ongeldige verbinding" + +-#: ../servers/groupwise/e-gw-connection.c:228 ++#: ../servers/groupwise/e-gw-connection.c:229 + msgid "Invalid response from server" + msgstr "Ongeldige reactie van server" + +-#: ../servers/groupwise/e-gw-connection.c:230 ++#: ../servers/groupwise/e-gw-connection.c:231 + msgid "No response from the server" + msgstr "Geen reactie van de server" + +-#: ../servers/groupwise/e-gw-connection.c:236 ++#: ../servers/groupwise/e-gw-connection.c:237 + msgid "Bad parameter" + msgstr "Onjuiste parameter" + +@@ -5395,6 +5487,22 @@ msgstr "Kleurinformatie" + msgid "The color to render" + msgstr "De te gebruiken kleur" + ++#~ msgid "Folder was destroyed and recreated on server." ++#~ msgstr "Map is vernietigd en opnieuw gemaakt op de server." ++ ++#~ msgid "" ++#~ "Unexpected server response: Identical UIDs provided for messages %d and %d" ++#~ msgstr "Onverwacht server antwoord: Identieke UIDs voor bericht %d en %d " ++ ++#~ msgid "Could not save summary: %s: %s" ++#~ msgstr "Kon samenvatting %s niet opslaan: %s" ++ ++#~ msgid "Detected a corrupt mbox file or an invalid 'From' header" ++#~ msgstr "Beschadigd mbox-bestand gevonden of ongeldige ‘Van’-kopregels" ++ ++#~ msgid "Folder %s cannot be opened: %s" ++#~ msgstr "Map ‘%s’ kan niet geopend worden: %s" ++ + #~ msgid "Cannot find certificate for `%s'" + #~ msgstr "Kan geen certificaat voor ‘%s’ vinden" + +@@ -5410,9 +5518,6 @@ msgstr "De te gebruiken kleur" + #~ msgid "%sPlease enter the IMAP password for %s on host %s" + #~ msgstr "%sVoer het IMAP wachtwoord in voor %s op host %s" + +-#~ msgid "Summary and folder mismatch, even after a sync" +-#~ msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie" +- + #~ msgid "Error writing to temp mailbox: %s" + #~ msgstr "Fout bij het schrijven naar tijdelijke postbus: %s" + +Index: evolution-data-server-2.23.92/po/pa.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/pa.po ++++ evolution-data-server-2.23.92/po/pa.po +@@ -12,75 +12,73 @@ msgid "" + msgstr "" + "Project-Id-Version: evolution-data-server.HEAD\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-08-28 16:28+0100\n" +-"PO-Revision-Date: 2007-09-09 19:21+0530\n" +-"Last-Translator: ASB \n" ++"POT-Creation-Date: 2008-08-18 05:26+0000\n" ++"PO-Revision-Date: 2008-09-11 07:47+0530\n" ++"Last-Translator: Amanpreet Singh Alam \n" + "Language-Team: Punjabi \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "X-Generator: KBabel 1.11.4\n" + "Plural-Forms: nplurals=2; plural=n != 1;\n" +-"\n" +-"\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:554 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2312 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:486 ++#: ../addressbook/backends/file/e-book-backend-file.c:555 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360 ++#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475 + msgid "Loading..." + msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:557 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2271 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2291 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2310 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4150 +-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:488 ++#: ../addressbook/backends/file/e-book-backend-file.c:558 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4282 ++#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477 + msgid "Searching..." + msgstr "ਖੋਜ ਜਾਰੀ ਹੈ..." + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2672 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4309 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4446 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "ਸੰਪਰਕ (%d) ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ... " + +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2827 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3018 +-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3062 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059 ++#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103 + #, c-format + msgid "Updating contacts cache (%d)... " + msgstr "ਸੰਪਰਕ ਕੈਂਚੇ (%d) ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ... " + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:742 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751 + msgid "Using Distinguished Name (DN)" + msgstr "ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ (DN)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754 + msgid "Using Email Address" + msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਵਰਤ ਕੇ" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:998 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017 + msgid "Reconnecting to LDAP server..." + msgstr "LDAP ਸਰਵਰ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1592 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1613 + msgid "Adding contact to LDAP server..." + msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰਕ ਸ਼ਾਮਿਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1720 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1747 + msgid "Removing contact from LDAP server..." + msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰਕ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2025 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2058 + msgid "Modifying contact from LDAP server..." + msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰਕ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4021 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4142 + msgid "Receiving LDAP search results..." + msgstr "LDAP ਤੋਂ ਖੋਜ ਨਤੀਜੇ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4170 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4304 + msgid "Error performing search" + msgstr "ਖੋਜ ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ" + +@@ -88,106 +86,140 @@ msgstr "ਖੋਜ ਚਲਾਉਣ ਵਿ + #. * function names, e.g. + #. * "e_book_add_contact" on book before + #. * "e_book_open +-#: ../addressbook/libebook/e-book.c:257 ../addressbook/libebook/e-book.c:261 +-#: ../addressbook/libebook/e-book.c:473 ../addressbook/libebook/e-book.c:477 +-#: ../addressbook/libebook/e-book.c:618 ../addressbook/libebook/e-book.c:622 +-#: ../addressbook/libebook/e-book.c:711 ../addressbook/libebook/e-book.c:715 +-#: ../addressbook/libebook/e-book.c:1029 ../addressbook/libebook/e-book.c:1034 +-#: ../addressbook/libebook/e-book.c:1221 ../addressbook/libebook/e-book.c:1225 +-#: ../addressbook/libebook/e-book.c:1382 ../addressbook/libebook/e-book.c:1386 +-#: ../addressbook/libebook/e-book.c:1595 ../addressbook/libebook/e-book.c:1599 +-#: ../addressbook/libebook/e-book.c:1836 ../addressbook/libebook/e-book.c:1840 +-#: ../addressbook/libebook/e-book.c:2077 ../addressbook/libebook/e-book.c:2081 +-#: ../addressbook/libebook/e-book.c:2293 ../addressbook/libebook/e-book.c:2297 +-#: ../addressbook/libebook/e-book.c:3431 ++#: ../addressbook/libebook/e-book.c:252 ++#: ../addressbook/libebook/e-book.c:256 ++#: ../addressbook/libebook/e-book.c:461 ++#: ../addressbook/libebook/e-book.c:465 ++#: ../addressbook/libebook/e-book.c:604 ++#: ../addressbook/libebook/e-book.c:608 ++#: ../addressbook/libebook/e-book.c:695 ++#: ../addressbook/libebook/e-book.c:699 ++#: ../addressbook/libebook/e-book.c:995 ++#: ../addressbook/libebook/e-book.c:1000 ++#: ../addressbook/libebook/e-book.c:1179 ++#: ../addressbook/libebook/e-book.c:1183 ++#: ../addressbook/libebook/e-book.c:1338 ++#: ../addressbook/libebook/e-book.c:1342 ++#: ../addressbook/libebook/e-book.c:1544 ++#: ../addressbook/libebook/e-book.c:1548 ++#: ../addressbook/libebook/e-book.c:1787 ++#: ../addressbook/libebook/e-book.c:1791 ++#: ../addressbook/libebook/e-book.c:2025 ++#: ../addressbook/libebook/e-book.c:2029 ++#: ../addressbook/libebook/e-book.c:2234 ++#: ../addressbook/libebook/e-book.c:2238 ++#: ../addressbook/libebook/e-book.c:3339 + #, c-format + msgid "\"%s\" on book before \"%s\"" + msgstr "\"%s\" ਬੁੱਕ ਤੇ ਪਹਿਲਾਂ \"%s\"" + +-#: ../addressbook/libebook/e-book.c:270 ../addressbook/libebook/e-book.c:486 +-#: ../addressbook/libebook/e-book.c:631 ../addressbook/libebook/e-book.c:724 +-#: ../addressbook/libebook/e-book.c:1044 ../addressbook/libebook/e-book.c:1235 +-#: ../addressbook/libebook/e-book.c:1396 ../addressbook/libebook/e-book.c:1608 +-#: ../addressbook/libebook/e-book.c:1849 ../addressbook/libebook/e-book.c:2091 +-#: ../addressbook/libebook/e-book.c:2306 ../addressbook/libebook/e-book.c:2672 +-#: ../addressbook/libebook/e-book.c:2878 ++#: ../addressbook/libebook/e-book.c:265 ++#: ../addressbook/libebook/e-book.c:474 ++#: ../addressbook/libebook/e-book.c:617 ++#: ../addressbook/libebook/e-book.c:708 ++#: ../addressbook/libebook/e-book.c:1010 ++#: ../addressbook/libebook/e-book.c:1193 ++#: ../addressbook/libebook/e-book.c:1352 ++#: ../addressbook/libebook/e-book.c:1557 ++#: ../addressbook/libebook/e-book.c:1800 ++#: ../addressbook/libebook/e-book.c:2039 ++#: ../addressbook/libebook/e-book.c:2247 ++#: ../addressbook/libebook/e-book.c:2593 ++#: ../addressbook/libebook/e-book.c:2792 ++#, c-format + msgid "book busy" + msgstr "ਬੁੱਕ ਰੁੱਝੀ" + +-#: ../addressbook/libebook/e-book.c:303 ../addressbook/libebook/e-book.c:307 +-#: ../addressbook/libebook/e-book.c:519 ../addressbook/libebook/e-book.c:523 +-#: ../addressbook/libebook/e-book.c:660 ../addressbook/libebook/e-book.c:664 +-#: ../addressbook/libebook/e-book.c:753 ../addressbook/libebook/e-book.c:757 +-#: ../addressbook/libebook/e-book.c:1073 ../addressbook/libebook/e-book.c:1076 +-#: ../addressbook/libebook/e-book.c:1267 ../addressbook/libebook/e-book.c:1270 +-#: ../addressbook/libebook/e-book.c:1425 ../addressbook/libebook/e-book.c:1429 +-#: ../addressbook/libebook/e-book.c:1644 ../addressbook/libebook/e-book.c:1648 +-#: ../addressbook/libebook/e-book.c:1896 ../addressbook/libebook/e-book.c:1900 +-#: ../addressbook/libebook/e-book.c:2123 ../addressbook/libebook/e-book.c:2127 +-#: ../addressbook/libebook/e-book.c:2334 ../addressbook/libebook/e-book.c:2338 +-#: ../addressbook/libebook/e-book.c:2613 ../addressbook/libebook/e-book.c:2700 +-#: ../addressbook/libebook/e-book.c:2704 ../addressbook/libebook/e-book.c:2906 +-#: ../addressbook/libebook/e-book.c:2910 ../addressbook/libebook/e-book.c:3440 ++#: ../addressbook/libebook/e-book.c:296 ++#: ../addressbook/libebook/e-book.c:300 ++#: ../addressbook/libebook/e-book.c:505 ++#: ../addressbook/libebook/e-book.c:509 ++#: ../addressbook/libebook/e-book.c:644 ++#: ../addressbook/libebook/e-book.c:648 ++#: ../addressbook/libebook/e-book.c:735 ++#: ../addressbook/libebook/e-book.c:739 ++#: ../addressbook/libebook/e-book.c:1037 ++#: ../addressbook/libebook/e-book.c:1040 ++#: ../addressbook/libebook/e-book.c:1223 ++#: ../addressbook/libebook/e-book.c:1226 ++#: ../addressbook/libebook/e-book.c:1379 ++#: ../addressbook/libebook/e-book.c:1383 ++#: ../addressbook/libebook/e-book.c:1593 ++#: ../addressbook/libebook/e-book.c:1597 ++#: ../addressbook/libebook/e-book.c:1847 ++#: ../addressbook/libebook/e-book.c:1851 ++#: ../addressbook/libebook/e-book.c:2069 ++#: ../addressbook/libebook/e-book.c:2073 ++#: ../addressbook/libebook/e-book.c:2273 ++#: ../addressbook/libebook/e-book.c:2277 ++#: ../addressbook/libebook/e-book.c:2538 ++#: ../addressbook/libebook/e-book.c:2619 ++#: ../addressbook/libebook/e-book.c:2623 ++#: ../addressbook/libebook/e-book.c:2818 ++#: ../addressbook/libebook/e-book.c:2822 ++#: ../addressbook/libebook/e-book.c:3348 + #, c-format + msgid "CORBA exception making \"%s\" call" + msgstr "CORBA ਅਪਵਾਦ \"%s\" ਕਾਲ" + +-#: ../addressbook/libebook/e-book.c:2594 ++#: ../addressbook/libebook/e-book.c:2523 + #, c-format + msgid "%s: there is no current operation" + msgstr "%s: ਮੌਜੂਦਾ ਕੋਈ ਕਾਰਵਾਈ ਨਹੀਂ ਹੈ" + +-#: ../addressbook/libebook/e-book.c:2629 ++#: ../addressbook/libebook/e-book.c:2552 + #, c-format + msgid "%s: could not cancel" + msgstr "%s: ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ" + +-#: ../addressbook/libebook/e-book.c:2658 ../addressbook/libebook/e-book.c:2662 ++#: ../addressbook/libebook/e-book.c:2579 ++#: ../addressbook/libebook/e-book.c:2583 + #, c-format + msgid "\"%s\" on book after \"%s\"" + msgstr "\"%s\" ਬੁੱਕ ਦੇ ਬਾਅਦ \"%s\"" + +-#: ../addressbook/libebook/e-book.c:2728 ++#: ../addressbook/libebook/e-book.c:2647 + #, c-format + msgid "%s: canceled" + msgstr "%s: ਰੱਦ ਕੀਤਾ" + +-#: ../addressbook/libebook/e-book.c:3295 ++#: ../addressbook/libebook/e-book.c:3203 + #, c-format + msgid "%s: Invalid source." + msgstr "%s: ਗਲਤ ਸਰੋਤ ਕੋਡ" + +-#: ../addressbook/libebook/e-book.c:3303 ../addressbook/libebook/e-book.c:3369 ++#: ../addressbook/libebook/e-book.c:3211 ++#: ../addressbook/libebook/e-book.c:3277 + #, c-format + msgid "%s: no factories available for URI `%s'" + msgstr "%s: URI `%s' ਲਈ ਕੋਈ ਫੈਕਟਰੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ" + +-#: ../addressbook/libebook/e-book.c:3315 ++#: ../addressbook/libebook/e-book.c:3223 + #, c-format + msgid "%s: Could not create EBookListener" + msgstr "%s: ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ" + +-#: ../addressbook/libebook/e-book.c:3580 ++#: ../addressbook/libebook/e-book.c:3490 + #, c-format + msgid "%s: there was no self contact UID stored in gconf" + msgstr "%s: gconf ਵਿੱਚ ਕੋਈ ਖੁਦ-ਸੰਪਰਕ UID ਸੰਭਾਲਿਆ ਨਹੀਂ ਹੈ।" + +-#: ../addressbook/libebook/e-book.c:3713 ++#: ../addressbook/libebook/e-book.c:3623 + #, c-format + msgid "%s: there was no source for uid `%s' stored in gconf." + msgstr "%s: ਜੀ-ਕਾਨਫ ਵਿੱਚ UID `%s' ਲਈ ਕੋਈ ਸਰੋਤ ਨਹੀਂ ਹੈ।" + + #. Dummy row as EContactField starts from 1 +-#: ../addressbook/libebook/e-contact.c:114 ++#: ../addressbook/libebook/e-contact.c:113 + msgid "Unique ID" + msgstr "ਵੱਖਰਾ ID" + +-#: ../addressbook/libebook/e-contact.c:115 ++#: ../addressbook/libebook/e-contact.c:114 + msgid "File Under" + msgstr "ਫਾਇਲ ਹੇਠਾਂ" + + #. URI of the book to which the contact belongs to +-#: ../addressbook/libebook/e-contact.c:117 ++#: ../addressbook/libebook/e-contact.c:116 + msgid "Book URI" + msgstr "ਕਿਤਾਬ URI" + +@@ -195,763 +227,773 @@ msgstr "ਕਿਤਾਬ URI" + #. 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:123 ++#: ../addressbook/libebook/e-contact.c:122 + msgid "Full Name" + msgstr "ਪੂਰਾ ਨਾਂ" + +-#: ../addressbook/libebook/e-contact.c:124 ++#: ../addressbook/libebook/e-contact.c:123 + msgid "Given Name" + msgstr "ਉਪਲੱਬਧ ਨਾਂ" + +-#: ../addressbook/libebook/e-contact.c:125 ++#: ../addressbook/libebook/e-contact.c:124 + msgid "Family Name" + msgstr "ਪਰਿਵਾਰਿਕ ਨਾਂ" + +-#: ../addressbook/libebook/e-contact.c:126 ++#: ../addressbook/libebook/e-contact.c:125 + msgid "Nickname" + msgstr "ਆਮ ਨਾਂ" + + #. Email fields +-#: ../addressbook/libebook/e-contact.c:129 ++#: ../addressbook/libebook/e-contact.c:128 + msgid "Email 1" + msgstr "ਈਮੇਲ 1" + +-#: ../addressbook/libebook/e-contact.c:130 ++#: ../addressbook/libebook/e-contact.c:129 + msgid "Email 2" + msgstr "ਈਮੇਲ 2" + +-#: ../addressbook/libebook/e-contact.c:131 ++#: ../addressbook/libebook/e-contact.c:130 + msgid "Email 3" + msgstr "ਈਮੇਲ 3" + +-#: ../addressbook/libebook/e-contact.c:132 ++#: ../addressbook/libebook/e-contact.c:131 + msgid "Email 4" + msgstr "ਈਮੇਲ 4" + +-#: ../addressbook/libebook/e-contact.c:134 ++#: ../addressbook/libebook/e-contact.c:133 + msgid "Mailer" + msgstr "ਮੇਲਰ" + + #. Address Labels +-#: ../addressbook/libebook/e-contact.c:137 ++#: ../addressbook/libebook/e-contact.c:136 + msgid "Home Address Label" + msgstr "ਘਰ ਐਡਰੈੱਸ ਲੇਬਲ" + +-#: ../addressbook/libebook/e-contact.c:138 ++#: ../addressbook/libebook/e-contact.c:137 + msgid "Work Address Label" + msgstr "ਕੰਮ ਐਡਰੈੱਸ ਲੇਬਲ" + +-#: ../addressbook/libebook/e-contact.c:139 ++#: ../addressbook/libebook/e-contact.c:138 + msgid "Other Address Label" + msgstr "ਹੋਰ ਐਡਰੈੱਸ ਲੇਬਲ" + + #. Phone fields +-#: ../addressbook/libebook/e-contact.c:142 ++#: ../addressbook/libebook/e-contact.c:141 + msgid "Assistant Phone" + msgstr "ਸਹਾਇਕ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:143 ++#: ../addressbook/libebook/e-contact.c:142 + msgid "Business Phone" + msgstr "ਵਪਾਰਿਕ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:144 ++#: ../addressbook/libebook/e-contact.c:143 + msgid "Business Phone 2" + msgstr "ਵਪਾਰਿਕ ਫੋਨ 2" + +-#: ../addressbook/libebook/e-contact.c:145 ++#: ../addressbook/libebook/e-contact.c:144 + msgid "Business Fax" + msgstr "ਵਪਾਰਿਕ ਫੈਕਸ" + +-#: ../addressbook/libebook/e-contact.c:146 ++#: ../addressbook/libebook/e-contact.c:145 + msgid "Callback Phone" + msgstr "ਕਾਲਬੈਕ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:147 ++#: ../addressbook/libebook/e-contact.c:146 + msgid "Car Phone" + msgstr "ਕਾਰ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:148 ++#: ../addressbook/libebook/e-contact.c:147 + msgid "Company Phone" + msgstr "ਕੰਪਨੀ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:149 ++#: ../addressbook/libebook/e-contact.c:148 + msgid "Home Phone" + msgstr "ਘਰ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:150 ++#: ../addressbook/libebook/e-contact.c:149 + msgid "Home Phone 2" + msgstr "ਘਰ ਫੋਨ 2" + +-#: ../addressbook/libebook/e-contact.c:151 ++#: ../addressbook/libebook/e-contact.c:150 + msgid "Home Fax" + msgstr "ਘਰ ਫੈਕਸ" + +-#: ../addressbook/libebook/e-contact.c:152 ++#: ../addressbook/libebook/e-contact.c:151 + msgid "ISDN" + msgstr "ISDN" + +-#: ../addressbook/libebook/e-contact.c:153 ++#: ../addressbook/libebook/e-contact.c:152 + msgid "Mobile Phone" + msgstr "ਮੋਬਾਇਨ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:154 ++#: ../addressbook/libebook/e-contact.c:153 + msgid "Other Phone" + msgstr "ਹੋਰ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:155 ++#: ../addressbook/libebook/e-contact.c:154 + msgid "Other Fax" + msgstr "ਹੋਰ ਫੈਕਸ" + +-#: ../addressbook/libebook/e-contact.c:156 ++#: ../addressbook/libebook/e-contact.c:155 + msgid "Pager" + msgstr "ਪੇਜਰ" + +-#: ../addressbook/libebook/e-contact.c:157 ++#: ../addressbook/libebook/e-contact.c:156 + msgid "Primary Phone" + msgstr "ਪ੍ਰਾਇਮਰੀ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:158 ++#: ../addressbook/libebook/e-contact.c:157 + msgid "Radio" + msgstr "ਰੇਡੀਓ" + +-#: ../addressbook/libebook/e-contact.c:159 ++#: ../addressbook/libebook/e-contact.c:158 + msgid "Telex" + msgstr "ਟੈਲੇਕਸ" + + #. To translators: TTY is Teletypewriter +-#: ../addressbook/libebook/e-contact.c:161 ++#: ../addressbook/libebook/e-contact.c:160 + msgid "TTY" + msgstr "TTY" + + #. Organizational fields +-#: ../addressbook/libebook/e-contact.c:164 ++#: ../addressbook/libebook/e-contact.c:163 + msgid "Organization" + msgstr "ਸੰਸਥਾ" + +-#: ../addressbook/libebook/e-contact.c:165 ++#: ../addressbook/libebook/e-contact.c:164 + msgid "Organizational Unit" + msgstr "ਸੰਸਥਾ ਯੂਨਿਟ" + +-#: ../addressbook/libebook/e-contact.c:166 ++#: ../addressbook/libebook/e-contact.c:165 + msgid "Office" + msgstr "ਦਫਤਰ" + +-#: ../addressbook/libebook/e-contact.c:167 ++#: ../addressbook/libebook/e-contact.c:166 + msgid "Title" + msgstr "ਟਾਇਟਲ" + +-#: ../addressbook/libebook/e-contact.c:168 ++#: ../addressbook/libebook/e-contact.c:167 + msgid "Role" + msgstr "ਕੰਮ" + +-#: ../addressbook/libebook/e-contact.c:169 ++#: ../addressbook/libebook/e-contact.c:168 + msgid "Manager" + msgstr "ਮੈਨੇਜਰ" + +-#: ../addressbook/libebook/e-contact.c:170 ++#: ../addressbook/libebook/e-contact.c:169 + msgid "Assistant" + msgstr "ਸਹਾਇਕ" + + #. Web fields +-#: ../addressbook/libebook/e-contact.c:173 ++#: ../addressbook/libebook/e-contact.c:172 + msgid "Homepage URL" + msgstr "ਮੁੱਖ ਸਫਾ URL" + +-#: ../addressbook/libebook/e-contact.c:174 ++#: ../addressbook/libebook/e-contact.c:173 + msgid "Weblog URL" + msgstr "ਵੈਬਲਾਗ URL" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:177 +-#: ../libedataserverui/e-categories-dialog.c:439 ++#: ../addressbook/libebook/e-contact.c:176 ++#: ../libedataserverui/e-categories-dialog.c:426 + msgid "Categories" + msgstr "ਕੈਟਾਗਰੀ" + + #. Collaboration fields +-#: ../addressbook/libebook/e-contact.c:180 ++#: ../addressbook/libebook/e-contact.c:179 + msgid "Calendar URI" + msgstr "ਕੈਲੰਡਰ URI" + +-#: ../addressbook/libebook/e-contact.c:181 ++#: ../addressbook/libebook/e-contact.c:180 + msgid "Free/Busy URL" + msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ URL" + +-#: ../addressbook/libebook/e-contact.c:182 ++#: ../addressbook/libebook/e-contact.c:181 + msgid "ICS Calendar" + msgstr "ICS ਕੈਲੰਡਰ" + +-#: ../addressbook/libebook/e-contact.c:183 ++#: ../addressbook/libebook/e-contact.c:182 + msgid "Video Conferencing URL" + msgstr "ਵੀਡਿਓ ਕਾਨਫਰਸਿੰਗ URL" + + #. Misc fields +-#: ../addressbook/libebook/e-contact.c:186 ++#: ../addressbook/libebook/e-contact.c:185 + msgid "Spouse's Name" + msgstr "ਸਾਥੀ ਦਾ ਨਾਂ" + +-#: ../addressbook/libebook/e-contact.c:187 ++#: ../addressbook/libebook/e-contact.c:186 + msgid "Note" + msgstr "ਟਿੱਪਣੀ" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:190 ++#: ../addressbook/libebook/e-contact.c:189 + msgid "AIM Home Screen Name 1" + msgstr "AIM ਘਰ ਸਕਰੀਨ ਨਾਂ 1" + +-#: ../addressbook/libebook/e-contact.c:191 ++#: ../addressbook/libebook/e-contact.c:190 + msgid "AIM Home Screen Name 2" + msgstr "AIM ਘਰ ਸਕਰੀਨ ਨਾਂ 2" + +-#: ../addressbook/libebook/e-contact.c:192 ++#: ../addressbook/libebook/e-contact.c:191 + msgid "AIM Home Screen Name 3" + msgstr "AIM ਘਰ ਸਕਰੀਨ ਨਾਂ 3" + +-#: ../addressbook/libebook/e-contact.c:193 ++#: ../addressbook/libebook/e-contact.c:192 + msgid "AIM Work Screen Name 1" + msgstr "AIM ਕੰਮ ਸਕਰੀਨ ਨਾਂ 1" + +-#: ../addressbook/libebook/e-contact.c:194 ++#: ../addressbook/libebook/e-contact.c:193 + msgid "AIM Work Screen Name 2" + msgstr "AIM ਕੰਮ ਸਕਰੀਨ ਨਾਂ 2" + +-#: ../addressbook/libebook/e-contact.c:195 ++#: ../addressbook/libebook/e-contact.c:194 + msgid "AIM Work Screen Name 3" + msgstr "AIM ਕੰਮ ਸਕਰੀਨ ਨਾਂ 3" + +-#: ../addressbook/libebook/e-contact.c:196 ++#: ../addressbook/libebook/e-contact.c:195 + msgid "GroupWise Home Screen Name 1" + msgstr "ਗਰੁਪਵਾਈਜ ਘਰ ਸਕਰੀਨ ਨਾਂ 1" + +-#: ../addressbook/libebook/e-contact.c:197 ++#: ../addressbook/libebook/e-contact.c:196 + msgid "GroupWise Home Screen Name 2" + msgstr "ਗਰੁਪਵਾਈਜ ਘਰ ਸਕਰੀਨ ਨਾਂ 2" + +-#: ../addressbook/libebook/e-contact.c:198 ++#: ../addressbook/libebook/e-contact.c:197 + msgid "GroupWise Home Screen Name 3" + msgstr "ਗਰੁਪਵਾਈਜ ਘਰ ਸਕਰੀਨ ਨਾਂ 3" + +-#: ../addressbook/libebook/e-contact.c:199 ++#: ../addressbook/libebook/e-contact.c:198 + msgid "GroupWise Work Screen Name 1" + msgstr "ਗਰੁਪਵਾਈਜ ਕੰਮ ਸਕਰੀਨ ਨਾਂ 1" + +-#: ../addressbook/libebook/e-contact.c:200 ++#: ../addressbook/libebook/e-contact.c:199 + msgid "GroupWise Work Screen Name 2" + msgstr "ਗਰੁਪਵਾਈਜ ਕੰਮ ਸਕਰੀਨ ਨਾਂ 2" + +-#: ../addressbook/libebook/e-contact.c:201 ++#: ../addressbook/libebook/e-contact.c:200 + msgid "GroupWise Work Screen Name 3" + msgstr "ਗਰੁਪਵਾਈਜ ਕੰਮ ਸਕਰੀਨ ਨਾਂ 3" + +-#: ../addressbook/libebook/e-contact.c:202 ++#: ../addressbook/libebook/e-contact.c:201 + msgid "Jabber Home Id 1" + msgstr "Jabber Home Id 1" + +-#: ../addressbook/libebook/e-contact.c:203 ++#: ../addressbook/libebook/e-contact.c:202 + msgid "Jabber Home Id 2" + msgstr "Jabber Home Id 2" + +-#: ../addressbook/libebook/e-contact.c:204 ++#: ../addressbook/libebook/e-contact.c:203 + msgid "Jabber Home Id 3" + msgstr "Jabber Home Id 3" + +-#: ../addressbook/libebook/e-contact.c:205 ++#: ../addressbook/libebook/e-contact.c:204 + msgid "Jabber Work Id 1" + msgstr "Jabber Work Id 1" + +-#: ../addressbook/libebook/e-contact.c:206 ++#: ../addressbook/libebook/e-contact.c:205 + msgid "Jabber Work Id 2" + msgstr "Jabber Work Id 2" + +-#: ../addressbook/libebook/e-contact.c:207 ++#: ../addressbook/libebook/e-contact.c:206 + msgid "Jabber Work Id 3" + msgstr "Jabber Work Id 3" + +-#: ../addressbook/libebook/e-contact.c:208 ++#: ../addressbook/libebook/e-contact.c:207 + msgid "Yahoo! Home Screen Name 1" + msgstr "Yahoo! Home Screen Name 1" + +-#: ../addressbook/libebook/e-contact.c:209 ++#: ../addressbook/libebook/e-contact.c:208 + msgid "Yahoo! Home Screen Name 2" + msgstr "Yahoo! Home Screen Name 2" + +-#: ../addressbook/libebook/e-contact.c:210 ++#: ../addressbook/libebook/e-contact.c:209 + msgid "Yahoo! Home Screen Name 3" + msgstr "Yahoo! Home Screen Name 3" + +-#: ../addressbook/libebook/e-contact.c:211 ++#: ../addressbook/libebook/e-contact.c:210 + msgid "Yahoo! Work Screen Name 1" + msgstr "Yahoo! Work Screen Name 1" + +-#: ../addressbook/libebook/e-contact.c:212 ++#: ../addressbook/libebook/e-contact.c:211 + msgid "Yahoo! Work Screen Name 2" + msgstr "Yahoo! Work Screen Name 2" + +-#: ../addressbook/libebook/e-contact.c:213 ++#: ../addressbook/libebook/e-contact.c:212 + msgid "Yahoo! Work Screen Name 3" + msgstr "Yahoo! Work Screen Name 3" + +-#: ../addressbook/libebook/e-contact.c:214 ++#: ../addressbook/libebook/e-contact.c:213 + msgid "MSN Home Screen Name 1" + msgstr "MSN Home Screen Name 1" + +-#: ../addressbook/libebook/e-contact.c:215 ++#: ../addressbook/libebook/e-contact.c:214 + msgid "MSN Home Screen Name 2" + msgstr "MSN Home Screen Name 2" + +-#: ../addressbook/libebook/e-contact.c:216 ++#: ../addressbook/libebook/e-contact.c:215 + msgid "MSN Home Screen Name 3" + msgstr "MSN Home Screen Name 3" + +-#: ../addressbook/libebook/e-contact.c:217 ++#: ../addressbook/libebook/e-contact.c:216 + msgid "MSN Work Screen Name 1" + msgstr "MSN Work Screen Name 1" + +-#: ../addressbook/libebook/e-contact.c:218 ++#: ../addressbook/libebook/e-contact.c:217 + msgid "MSN Work Screen Name 2" + msgstr "MSN Work Screen Name 2" + +-#: ../addressbook/libebook/e-contact.c:219 ++#: ../addressbook/libebook/e-contact.c:218 + msgid "MSN Work Screen Name 3" + msgstr "MSN Work Screen Name 3" + +-#: ../addressbook/libebook/e-contact.c:220 ++#: ../addressbook/libebook/e-contact.c:219 + msgid "ICQ Home Id 1" + msgstr "ICQ Home Id 1" + +-#: ../addressbook/libebook/e-contact.c:221 ++#: ../addressbook/libebook/e-contact.c:220 + msgid "ICQ Home Id 2" + msgstr "ICQ Home Id 2" + +-#: ../addressbook/libebook/e-contact.c:222 ++#: ../addressbook/libebook/e-contact.c:221 + msgid "ICQ Home Id 3" + msgstr "ICQ Home Id 3" + +-#: ../addressbook/libebook/e-contact.c:223 ++#: ../addressbook/libebook/e-contact.c:222 + msgid "ICQ Work Id 1" + msgstr "ICQ Work Id 1" + +-#: ../addressbook/libebook/e-contact.c:224 ++#: ../addressbook/libebook/e-contact.c:223 + msgid "ICQ Work Id 2" + msgstr "ICQ Work Id 2" + +-#: ../addressbook/libebook/e-contact.c:225 ++#: ../addressbook/libebook/e-contact.c:224 + msgid "ICQ Work Id 3" + msgstr "ICQ Work Id 3" + + #. Last modified time +-#: ../addressbook/libebook/e-contact.c:228 ++#: ../addressbook/libebook/e-contact.c:227 + msgid "Last Revision" + msgstr "ਆਖਰੀ ਰੀਵਿਜ਼ਨ" + +-#: ../addressbook/libebook/e-contact.c:229 ++#: ../addressbook/libebook/e-contact.c:228 + msgid "Name or Org" + msgstr "ਨਾਂ ਜਾਂ ਸੰਸਥਾ" + + #. Address fields +-#: ../addressbook/libebook/e-contact.c:232 ++#: ../addressbook/libebook/e-contact.c:231 + msgid "Address List" + msgstr "ਐਡਰੈੱਸ ਲਿਸਟ" + +-#: ../addressbook/libebook/e-contact.c:233 ++#: ../addressbook/libebook/e-contact.c:232 + msgid "Home Address" + msgstr "ਘਰ ਐਡਰੈੱਸ" + +-#: ../addressbook/libebook/e-contact.c:234 ++#: ../addressbook/libebook/e-contact.c:233 + msgid "Work Address" + msgstr "ਕੰਮ ਫੋਨ" + +-#: ../addressbook/libebook/e-contact.c:235 ++#: ../addressbook/libebook/e-contact.c:234 + msgid "Other Address" + msgstr "ਹੋਰ ਐਡਰੈੱਸ" + + #. Contact categories +-#: ../addressbook/libebook/e-contact.c:238 ++#: ../addressbook/libebook/e-contact.c:237 + msgid "Category List" + msgstr "ਕੈਟਾਗਰੀ ਲਿਸਟ" + + #. Photo/Logo +-#: ../addressbook/libebook/e-contact.c:241 ++#: ../addressbook/libebook/e-contact.c:240 + msgid "Photo" + msgstr "ਤਸਵੀਰ" + +-#: ../addressbook/libebook/e-contact.c:242 ++#: ../addressbook/libebook/e-contact.c:241 + msgid "Logo" + msgstr "ਲੋਗੋ" + +-#: ../addressbook/libebook/e-contact.c:244 ++#: ../addressbook/libebook/e-contact.c:243 + msgid "Name" + msgstr "ਨਾਂ" + +-#: ../addressbook/libebook/e-contact.c:245 ++#: ../addressbook/libebook/e-contact.c:244 + msgid "Email List" + msgstr "ਈਮੇਲ ਲਿਸਟ" + + #. Instant messaging fields +-#: ../addressbook/libebook/e-contact.c:248 ++#: ../addressbook/libebook/e-contact.c:247 + msgid "AIM Screen Name List" + msgstr "AIM ਸਕਰੀਨ ਨਾਂ ਲਿਸਟ" + +-#: ../addressbook/libebook/e-contact.c:249 ++#: ../addressbook/libebook/e-contact.c:248 + msgid "GroupWise Id List" + msgstr "ਗਰੁੱਵਾਈਜ Id ਲਿਸਟ" + +-#: ../addressbook/libebook/e-contact.c:250 ++#: ../addressbook/libebook/e-contact.c:249 + msgid "Jabber Id List" + msgstr "Jabber Id ਲਿਸਟ" + +-#: ../addressbook/libebook/e-contact.c:251 ++#: ../addressbook/libebook/e-contact.c:250 + msgid "Yahoo! Screen Name List" + msgstr "Yahoo! Screen ਨਾਂ ਲਿਸਟ" + +-#: ../addressbook/libebook/e-contact.c:252 ++#: ../addressbook/libebook/e-contact.c:251 + msgid "MSN Screen Name List" + msgstr "MSN Screen ਨਾਂ ਲਿਸਟ" + +-#: ../addressbook/libebook/e-contact.c:253 ++#: ../addressbook/libebook/e-contact.c:252 + msgid "ICQ Id List" + msgstr "ICQ Id ਲਿਸਟ" + +-#: ../addressbook/libebook/e-contact.c:255 ++#: ../addressbook/libebook/e-contact.c:254 + msgid "Wants HTML Mail" + msgstr "HTML ਮੇਲ ਚਾਹੀਦੀ ਹੈ" + +-#: ../addressbook/libebook/e-contact.c:257 ++#: ../addressbook/libebook/e-contact.c:256 + msgid "List" + msgstr "ਲਿਸਟ" + +-#: ../addressbook/libebook/e-contact.c:258 ++#: ../addressbook/libebook/e-contact.c:257 + msgid "List Show Addresses" + msgstr "ਵੇਖਾਏ ਐਡਰੈੱਸ ਲਿਸਟ ਕਰੋ" + +-#: ../addressbook/libebook/e-contact.c:260 ++#: ../addressbook/libebook/e-contact.c:259 + msgid "Birth Date" + msgstr "ਜਨਮ ਦਿਨ" + +-#: ../addressbook/libebook/e-contact.c:261 +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463 +-#: ../libedataserver/e-categories.c:41 ++#: ../addressbook/libebook/e-contact.c:260 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461 ++#: ../libedataserver/e-categories.c:43 + msgid "Anniversary" + msgstr "ਵਰੇ-ਗੰਢ" + + #. Security fields +-#: ../addressbook/libebook/e-contact.c:264 ++#: ../addressbook/libebook/e-contact.c:263 + msgid "X.509 Certificate" + msgstr "X.509 ਸਰਟੀਫਿਕੇਟ" + +-#: ../addressbook/libebook/e-contact.c:266 ++#: ../addressbook/libebook/e-contact.c:265 + msgid "Gadu-Gadu Home Id 1" + msgstr "Gadu-Gadu ਘਰ Id 1" + +-#: ../addressbook/libebook/e-contact.c:267 ++#: ../addressbook/libebook/e-contact.c:266 + msgid "Gadu-Gadu Home Id 2" + msgstr "Gadu-Gadu ਘਰ Id 2" + +-#: ../addressbook/libebook/e-contact.c:268 ++#: ../addressbook/libebook/e-contact.c:267 + msgid "Gadu-Gadu Home Id 3" + msgstr "Gadu-Gadu ਘਰ Id 3" + +-#: ../addressbook/libebook/e-contact.c:269 ++#: ../addressbook/libebook/e-contact.c:268 + msgid "Gadu-Gadu Work Id 1" + msgstr "Gadu-Gadu ਕੰਮ Id 1" + +-#: ../addressbook/libebook/e-contact.c:270 ++#: ../addressbook/libebook/e-contact.c:269 + msgid "Gadu-Gadu Work Id 2" + msgstr "Gadu-Gadu ਕੰਮ Id 2" + +-#: ../addressbook/libebook/e-contact.c:271 ++#: ../addressbook/libebook/e-contact.c:270 + msgid "Gadu-Gadu Work Id 3" + msgstr "Gadu-Gadu ਕੰਮ Id 3" + +-#: ../addressbook/libebook/e-contact.c:272 ++#: ../addressbook/libebook/e-contact.c:271 + msgid "Gadu-Gadu Id List" + msgstr "Gadu-Gadu Id ਲਿਸਟ" + + #. Geo information +-#: ../addressbook/libebook/e-contact.c:275 ++#: ../addressbook/libebook/e-contact.c:274 + msgid "Geographic Information" + msgstr "ਭੂਗੋਲਿਕ ਜਾਣਕਾਰੀ" + +-#: ../addressbook/libebook/e-contact.c:1492 +-#: ../addressbook/libebook/e-destination.c:770 ++#: ../addressbook/libebook/e-contact.c:276 ++msgid "Telephone" ++msgstr "ਟੈਲੀਫੋਨ" ++ ++#: ../addressbook/libebook/e-contact.c:1493 ++#: ../addressbook/libebook/e-destination.c:761 + msgid "Unnamed List" + msgstr "ਬਿਨਾਂ ਨਾਂ ਸੂਚੀ" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:465 +-#: ../libedataserver/e-categories.c:42 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463 ++#: ../libedataserver/e-categories.c:44 + msgid "Birthday" + msgstr "ਜਨਮਦਿਨ" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:491 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489 + #, c-format + msgid "Birthday: %s" + msgstr "ਜਨਮਦਿਨ: %s" + +-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:515 ++#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513 + #, c-format + msgid "Anniversary: %s" + msgstr "ਵਰੇਗੰਢ: %s" + +-#: ../calendar/backends/file/e-cal-backend-file.c:202 ++#: ../calendar/backends/file/e-cal-backend-file.c:214 + msgid "Cannot save calendar data: Malformed URI." + msgstr "ਕੈਲੰਡਰ ਡਾਟੇ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਨਿਕਾਰਾ URI" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:981 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1760 ++#: ../calendar/backends/file/e-cal-backend-file.c:221 ++#: ../calendar/backends/file/e-cal-backend-file.c:227 ++msgid "Cannot save calendar data" ++msgstr "ਕੈਲੰਡਰ ਡਾਟੇ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" ++ ++#: ../calendar/backends/google/e-cal-backend-google-utils.c:335 ++msgid "Could not create thread for getting deltas" ++msgstr "ਕੈਂਚੇ ਥਰਿੱਡ ਨੂੰ ਵਿਕਸਤ ਨਹੀਂ ਜਾ ਸਕਿਆ" ++ ++#: ../calendar/backends/google/e-cal-backend-google-utils.c:367 ++#: ../calendar/backends/google/e-cal-backend-google.c:1194 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352 ++#: ../calendar/backends/http/e-cal-backend-http.c:569 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:466 ++msgid "Could not create cache file" ++msgstr "ਕੈਂਚੇ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" ++ ++#: ../calendar/backends/google/e-cal-backend-google-utils.c:380 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065 ++msgid "Could not create thread for populating cache" ++msgstr "ਕੈਂਚੇ ਥਰਿੱਡ ਨੂੰ ਵਿਕਸਤ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" ++ ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795 + msgid "Reply Requested: by " + msgstr "ਜਵਾਬ ਦੀ ਬੇਨਤੀ: ਵਲੋਂ" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:986 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1765 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800 + msgid "Reply Requested: When convenient" + msgstr "ਜਵਾਬ ਲਈ ਬੇਨਤੀ: ਜਦੋਂ ਠੀਕ ਲੱਗੇ" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:266 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277 + #, c-format + msgid "Loading %s items" + msgstr "ਇਕਾਈਆਂ %s ਲੋਡ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:786 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260 + msgid "Calendar" + msgstr "ਕੈਲੰਡਰ" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:843 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947 + msgid "Invalid server URI" + msgstr "ਗਲਤ ਸਰਵਰ URI" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:862 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:871 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:971 +-#: ../calendar/libecal/e-cal.c:5001 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1046 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1078 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1116 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:586 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:601 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:712 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:754 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1248 +-#: ../camel/providers/groupwise/camel-groupwise-transport.c:159 +-#: ../camel/providers/groupwise/camel-groupwise-transport.c:186 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071 ++#: ../calendar/libecal/e-cal.c:5082 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:109 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:594 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:746 ++#: ../camel/providers/groupwise/camel-groupwise-transport.c:157 ++#: ../camel/providers/groupwise/camel-groupwise-transport.c:184 + msgid "Authentication failed" + msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫਲ" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:913 +-msgid "Could not create thread for getting deltas" +-msgstr "ਕੈਂਚੇ ਥਰਿੱਡ ਨੂੰ ਵਿਕਸਤ ਨਹੀਂ ਜਾ ਸਕਿਆ" +- +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:953 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1227 +-#: ../calendar/backends/http/e-cal-backend-http.c:597 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:452 +-msgid "Could not create cache file" +-msgstr "ਕੈਂਚੇ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" +- +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:965 +-msgid "Could not create thread for populating cache" +-msgstr "ਕੈਂਚੇ ਥਰਿੱਡ ਨੂੰ ਵਿਕਸਤ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" +- +-#: ../calendar/backends/http/e-cal-backend-http.c:271 ++#: ../calendar/backends/http/e-cal-backend-http.c:269 + msgid "Redirected to Invalid URI" + msgstr "ਗਲਤ URI ਲਈ ਭੇਜਿਆ " + +-#: ../calendar/backends/http/e-cal-backend-http.c:295 ++#: ../calendar/backends/http/e-cal-backend-http.c:290 + msgid "Bad file format." + msgstr "ਗਲਤ ਫਾਇਲ ਫਾਰਮਿਟ" + +-#: ../calendar/backends/http/e-cal-backend-http.c:301 ++#: ../calendar/backends/http/e-cal-backend-http.c:296 + msgid "Not a calendar." + msgstr "ਕੋਈ ਕੈਲੰਡਰ ਨਹੀਂ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:142 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:144 + msgid "Could not retrieve weather data" + msgstr "ਕੈਂਚੇ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:202 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:216 + msgid "Fair" + msgstr "ਸਾਫ਼" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:203 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:217 + msgid "Snow showers" + msgstr "ਬਰਫ਼ ਫੁਹਾਰ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:204 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:218 + msgid "Snow" + msgstr "ਬਰਫ਼" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:205 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:219 + msgid "Partly cloudy" + msgstr "ਹਲਕਾ ਬੱਦਲਵਾਈ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:206 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:220 + msgid "Smoke" + msgstr "ਧੁੰਦ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:207 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:221 + msgid "Thunderstorms" + msgstr "ਗਰਜ਼" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:208 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:222 + msgid "Cloudy" + msgstr "ਬੱਦਲਵਾਈ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:209 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:223 + msgid "Drizzle" + msgstr "ਬੂੰਦਾਬਾਂਦੀ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:210 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:224 + msgid "Sunny" + msgstr "ਸੋਹਣਾ ਦਿਨ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:211 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:225 + msgid "Dust" + msgstr "ਘੱਟਾ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:212 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:226 + msgid "Clear" + msgstr "ਸਾਫ਼" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:213 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:227 + msgid "Mostly cloudy" + msgstr "ਸੰਘਣੀ ਬੱਦਲਵਾਈ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:214 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:228 + msgid "Windy" + msgstr "ਤੇਜ਼ ਹਵਾ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:215 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:229 + msgid "Rain showers" + msgstr "ਮੀਂਹ ਫੁਹਾਰ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:216 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:230 + msgid "Foggy" + msgstr "ਧੁੰਦ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:217 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:231 + msgid "Rain/snow mixed" + msgstr "ਮੀਂਹ/ਬਰਫ਼ " + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:218 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:232 + msgid "Sleet" + msgstr "ਬਰਫ਼ ਵਾਲਾ ਮੀਂਹ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:219 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:233 + msgid "Very hot/humid" + msgstr "ਬਹੁਤ ਗਰਮ/ਨਮੀਂ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:220 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:234 + msgid "Blizzard" + msgstr "ਬਰਫੀਲਾ ਤੂਫਾਨ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:221 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:235 + msgid "Freezing rain" + msgstr "ਜਮਾਊਂ ਮੀਂਹ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:222 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:236 + msgid "Haze" + msgstr "ਕੋਹਰਾ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:223 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:237 + msgid "Blowing snow" + msgstr "ਬਰਫ਼ ਦੀ ਹਵਾ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:224 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:238 + msgid "Freezing drizzle" + msgstr "ਜਮਾਉਣ ਵਾਲੀ ਬੂੰਦਾਬਾਂਦੀ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:225 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:239 + msgid "Very cold/wind chill" + msgstr "ਬਹੁਤ ਠੰਡ/ਠੰਡੀ ਹਵਾ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:226 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:240 + msgid "Rain" + msgstr "ਮੀਂਹ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:236 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:244 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:246 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:253 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:250 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:258 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:260 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:267 + msgid "Weather: Sunny" + msgstr "ਮੌਸਮ: ਖਿੜਿਆ ਦਿਨ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:237 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:238 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:254 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:257 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:251 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:252 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:268 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:271 + msgid "Weather: Snow" + msgstr "ਮੌਸਮ: ਬਰਫ਼" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:239 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:253 + msgid "Weather: Partly Cloudy" + msgstr "ਮੌਸਮ: ਹਲਕੀ ਬੱਦਲਵਾਈ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:240 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:245 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:250 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:256 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:254 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:259 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:264 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:270 + msgid "Weather: Fog" + msgstr "ਮੌਸਮ: ਧੁੰਦ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:241 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:255 + msgid "Weather: Thunderstorms" + msgstr "ਮੌਸਮ: ਬਰਫ਼ੀਲਾ ਤੂਫਾਨ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:242 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:247 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:256 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:261 + msgid "Weather: Cloudy" + msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:243 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:249 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:251 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:252 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:255 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:258 +-#: ../calendar/backends/weather/e-cal-backend-weather.c:260 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:257 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:263 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:265 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:266 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:269 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:272 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:274 + msgid "Weather: Rain" + msgstr "ਮੌਸਮ: ਮੀਂਹ" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:335 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:349 + #, c-format + msgid "%.1f°C - %s" + msgstr "%.1f°C - %s" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:337 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:351 + #, c-format + msgid "%.1f°F - %s" + msgstr "%.1f°F - %s" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:340 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:354 + #, c-format + msgid "%.1f/%.1f°C - %s" + msgstr "%.1f/%.1f°C - %s" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:342 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:356 + #, c-format + msgid "%.1f/%.1f°F - %s" + msgstr "%.1f/%.1f°F - %s" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:348 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:362 + #, c-format + msgid "%d%% chance of precipitation\n" + msgstr "%d%% ਗੜਿਆਂ ਦੀ ਸੰਭਵਾਨਾ\n" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:355 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:369 + #, c-format + msgid "%.1fcm snow\n" + msgstr "%.1fਸੈਂਮੀ ਬਰਫ਼\n" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:357 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:371 + #, c-format + msgid "%.1fin snow\n" + msgstr "%.1fਇੰਚ ਬਰਫ਼\n" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:360 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:374 + #, c-format + msgid "%.1f-%.1fcm snow\n" + msgstr "%.1f-%.1fਸੈਂਮੀ ਬਰਫ਼\n" + +-#: ../calendar/backends/weather/e-cal-backend-weather.c:362 ++#: ../calendar/backends/weather/e-cal-backend-weather.c:376 + #, c-format + msgid "%.1f-%.1fin snow\n" + msgstr "%.1f-%.1fਇੰਚ ਬਰਫ਼\n" +@@ -960,148 +1002,152 @@ msgstr "%.1f-%.1fਇੰਚ ਬਰਫ਼\n" + msgid "Untitled appointment" + msgstr "ਬਿਨਾਂ ਨਾਂ ਰੁਝੇਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4038 ++#: ../calendar/libecal/e-cal-recur.c:4041 + msgid "1st" + msgstr "1ਹਿਲਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4039 ++#: ../calendar/libecal/e-cal-recur.c:4042 + msgid "2nd" + msgstr "2ਜਾ" + +-#: ../calendar/libecal/e-cal-recur.c:4040 ++#: ../calendar/libecal/e-cal-recur.c:4043 + msgid "3rd" + msgstr "3ਜਾ" + +-#: ../calendar/libecal/e-cal-recur.c:4041 ++#: ../calendar/libecal/e-cal-recur.c:4044 + msgid "4th" + msgstr "4ਥਾ" + +-#: ../calendar/libecal/e-cal-recur.c:4042 ++#: ../calendar/libecal/e-cal-recur.c:4045 + msgid "5th" + msgstr "5ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4043 ++#: ../calendar/libecal/e-cal-recur.c:4046 + msgid "6th" + msgstr "6ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4044 ++#: ../calendar/libecal/e-cal-recur.c:4047 + msgid "7th" + msgstr "7ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4045 ++#: ../calendar/libecal/e-cal-recur.c:4048 + msgid "8th" + msgstr "8ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4046 ++#: ../calendar/libecal/e-cal-recur.c:4049 + msgid "9th" + msgstr "9ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4047 ++#: ../calendar/libecal/e-cal-recur.c:4050 + msgid "10th" + msgstr "10ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4048 ++#: ../calendar/libecal/e-cal-recur.c:4051 + msgid "11th" + msgstr "11ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4049 ++#: ../calendar/libecal/e-cal-recur.c:4052 + msgid "12th" + msgstr "12ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4050 ++#: ../calendar/libecal/e-cal-recur.c:4053 + msgid "13th" + msgstr "13ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4051 ++#: ../calendar/libecal/e-cal-recur.c:4054 + msgid "14th" + msgstr "14ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4052 ++#: ../calendar/libecal/e-cal-recur.c:4055 + msgid "15th" + msgstr "15ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4053 ++#: ../calendar/libecal/e-cal-recur.c:4056 + msgid "16th" + msgstr "16ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4054 ++#: ../calendar/libecal/e-cal-recur.c:4057 + msgid "17th" + msgstr "17ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4055 ++#: ../calendar/libecal/e-cal-recur.c:4058 + msgid "18th" + msgstr "18ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4056 ++#: ../calendar/libecal/e-cal-recur.c:4059 + msgid "19th" + msgstr "19ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4057 ++#: ../calendar/libecal/e-cal-recur.c:4060 + msgid "20th" + msgstr "20ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4058 ++#: ../calendar/libecal/e-cal-recur.c:4061 + msgid "21st" + msgstr "21ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4059 ++#: ../calendar/libecal/e-cal-recur.c:4062 + msgid "22nd" + msgstr "22ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4060 ++#: ../calendar/libecal/e-cal-recur.c:4063 + msgid "23rd" + msgstr "23ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4061 ++#: ../calendar/libecal/e-cal-recur.c:4064 + msgid "24th" + msgstr "24ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4062 ++#: ../calendar/libecal/e-cal-recur.c:4065 + msgid "25th" + msgstr "25ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4063 ++#: ../calendar/libecal/e-cal-recur.c:4066 + msgid "26th" + msgstr "26ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4064 ++#: ../calendar/libecal/e-cal-recur.c:4067 + msgid "27th" + msgstr "27ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4065 ++#: ../calendar/libecal/e-cal-recur.c:4068 + msgid "28th" + msgstr "28ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4066 ++#: ../calendar/libecal/e-cal-recur.c:4069 + msgid "29th" + msgstr "29ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4067 ++#: ../calendar/libecal/e-cal-recur.c:4070 + msgid "30th" + msgstr "30ਵਾਂ" + +-#: ../calendar/libecal/e-cal-recur.c:4068 ++#: ../calendar/libecal/e-cal-recur.c:4071 + msgid "31st" + msgstr "31ਵਾਂ" + +-#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:710 ++#: ../calendar/libecal/e-cal-util.c:685 ++#: ../calendar/libecal/e-cal-util.c:713 + msgid "High" + msgstr "ਅਧਿਕਤਮ" + +-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712 ++#: ../calendar/libecal/e-cal-util.c:687 ++#: ../calendar/libecal/e-cal-util.c:715 + msgid "Normal" + msgstr "ਸਧਾਰਨ" + +-#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714 ++#: ../calendar/libecal/e-cal-util.c:689 ++#: ../calendar/libecal/e-cal-util.c:717 + msgid "Low" + msgstr "ਨਿਊਨਤਮ" + + #. An empty string is the same as 'None'. +-#: ../calendar/libecal/e-cal-util.c:708 ++#: ../calendar/libecal/e-cal-util.c:711 + msgid "Undefined" + msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ" + +-#: ../calendar/libecal/e-cal.c:1658 ../libedataserverui/e-book-auth-util.c:198 ++#: ../calendar/libecal/e-cal.c:1665 ++#: ../libedataserverui/e-book-auth-util.c:199 + #, c-format + msgid "Enter password for %s (user %s)" + msgstr "%s ਲਈ ਪਾਸਵਰਡ ਦਿਓ (ਯੂਜ਼ਰ %s)" +@@ -1110,92 +1156,111 @@ msgstr "%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:1672 ++#: ../calendar/libecal/e-cal.c:1679 + #, c-format + msgid "Enter password for %s to enable proxy for user %s" + msgstr "%s ਲਈ ਪਾਸਵਰਡ ਯੂਜ਼ਰ %s ਲਈ ਪਰਾਕਸੀ ਯੋਗ ਕਰਨ ਲਈ ਦਿਓ" + +-#: ../calendar/libecal/e-cal.c:4973 ++#: ../calendar/libecal/e-cal.c:5054 + msgid "Invalid argument" + msgstr "ਗਲਤ ਆਰਗੂਮਿੰਟ" + +-#: ../calendar/libecal/e-cal.c:4975 ++#: ../calendar/libecal/e-cal.c:5056 + msgid "Backend is busy" + msgstr "ਪਿੱਛਲਾ ਤਾਂ ਰੁਝਿਆ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4977 ++#: ../calendar/libecal/e-cal.c:5058 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:97 + msgid "Repository is offline" + msgstr "Repository ਆਫਲਾਇਨ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4979 ++#: ../calendar/libecal/e-cal.c:5060 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:121 + msgid "No such calendar" + msgstr "ਇੱਦਾਂ ਦਾ ਕੋਈ ਕੈਲੰਡਰ ਨਹੀਂ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4981 ../servers/groupwise/e-gw-connection.c:176 ++#: ../calendar/libecal/e-cal.c:5062 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:103 ++#: ../servers/groupwise/e-gw-connection.c:233 + msgid "Object not found" + msgstr "ਇਕਾਈ ਨਹੀਂ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4983 ../servers/groupwise/e-gw-connection.c:170 ++#: ../calendar/libecal/e-cal.c:5064 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:105 ++#: ../servers/groupwise/e-gw-connection.c:227 + msgid "Invalid object" + msgstr "ਗਲਤ ਇਕਾਈ" + +-#: ../calendar/libecal/e-cal.c:4985 ++#: ../calendar/libecal/e-cal.c:5066 + msgid "URI not loaded" + msgstr "URI ਲੋਡ ਨਹੀਂ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4987 ++#: ../calendar/libecal/e-cal.c:5068 + msgid "URI already loaded" + msgstr "URI ਪਹਿਲਾਂ ਹੀ ਲੋਡ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4989 ++#: ../calendar/libecal/e-cal.c:5070 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:99 + #: ../servers/exchange/storage/e-storage.c:571 + msgid "Permission denied" + msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4991 ../servers/groupwise/e-gw-connection.c:178 ++#: ../calendar/libecal/e-cal.c:5072 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:123 ++#: ../servers/groupwise/e-gw-connection.c:235 + msgid "Unknown User" + msgstr "ਅਣਜਾਣ ਯੂਜ਼ਰ" + +-#: ../calendar/libecal/e-cal.c:4993 ++#: ../calendar/libecal/e-cal.c:5074 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:107 + msgid "Object ID already exists" + msgstr "ਇਕਾਈ ID ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4995 ++#: ../calendar/libecal/e-cal.c:5076 + msgid "Protocol not supported" + msgstr "ਪਰੋਟੋਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4997 ++#: ../calendar/libecal/e-cal.c:5078 + msgid "Operation has been canceled" + msgstr "ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ ਗਈ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:4999 ++#: ../calendar/libecal/e-cal.c:5080 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:135 + msgid "Could not cancel operation" + msgstr "ਕਾਰਵਾਈ ਨੂੰ ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:5003 +-#: ../camel/providers/smtp/camel-smtp-transport.c:216 ++#: ../calendar/libecal/e-cal.c:5084 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:111 ++#: ../camel/providers/smtp/camel-smtp-transport.c:218 + msgid "Authentication required" + msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ" + +-#: ../calendar/libecal/e-cal.c:5005 ++#: ../calendar/libecal/e-cal.c:5086 + msgid "A CORBA exception has occurred" + msgstr "ਇੱਕ CORBA ਅਪਵਾਦ ਆਇਆ ਹੈ|" + +-#: ../calendar/libecal/e-cal.c:5007 +-#: ../camel/providers/groupwise/camel-groupwise-transport.c:225 +-#: ../camel/providers/imap/camel-imap-command.c:312 +-#: ../camel/providers/imap/camel-imap-command.c:412 +-#: ../camel/providers/imap/camel-imap-store.c:760 +-#: ../camel/providers/imap4/camel-imap4-store.c:313 +-#: ../camel/providers/pop3/camel-pop3-store.c:549 +-#: ../camel/providers/pop3/camel-pop3-store.c:556 +-#: ../camel/providers/pop3/camel-pop3-store.c:562 ++#: ../calendar/libecal/e-cal.c:5088 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:138 ++#: ../camel/providers/groupwise/camel-groupwise-transport.c:223 ++#: ../camel/providers/imap/camel-imap-command.c:434 ++#: ../camel/providers/imap/camel-imap-store.c:742 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1570 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1609 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1654 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1710 ++#: ../camel/providers/imap4/camel-imap4-store.c:315 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/providers/pop3/camel-pop3-store.c:560 ++#: ../camel/providers/pop3/camel-pop3-store.c:566 + #: ../servers/exchange/storage/e-storage.c:585 +-#: ../servers/groupwise/e-gw-connection.c:184 ++#: ../servers/groupwise/e-gw-connection.c:241 + msgid "Unknown error" + msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ" + +-#: ../calendar/libecal/e-cal.c:5009 ++#: ../calendar/libecal/e-cal.c:5090 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:95 + #: ../servers/exchange/storage/e-storage.c:553 + msgid "No error" + msgstr "ਕੋਈ ਗਲਤੀ ਨਹੀਂ" +@@ -1203,9 +1268,10 @@ msgstr "ਕੋਈ ਗਲਤੀ ਨਹੀ + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:67 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:674 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:693 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:801 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:994 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050 + #, c-format + msgid "\"%s\" expects no arguments" + msgstr "\"%s\" ਲਈ ਕੋਈ ਆਰਗੂਮਿੰਟ ਲਈ ਕੋਈ ਨਹੀਂ ਚਾਹੀਦਾ ਹੈ" +@@ -1214,7 +1280,7 @@ msgstr "\"%s\" ਲਈ ਕੋਈ ਆਰ + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:210 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:252 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:288 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1059 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088 + #, c-format + msgid "\"%s\" expects one argument" + msgstr "\"%s\" ਲਈ ਇੱਕ ਆਰਗੂਮਿੰਟ ਲੋੜੀਦਾ ਹੈ" +@@ -1236,7 +1302,7 @@ msgstr "\"%s\" ਲਈ ਪਹਿਲਾਂ + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:361 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:413 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:729 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862 + #, c-format + msgid "\"%s\" expects two arguments" + msgstr "\"%s\" ਲਈ ਦੋ ਆਰਗੂਮਿੰਟ ਲੋੜੀਦੇ ਹਨ" +@@ -1246,8 +1312,8 @@ msgstr "\"%s\" ਲਈ ਦੋ ਆਰਗ + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:258 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:367 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:419 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1065 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094 + #, c-format + msgid "\"%s\" expects the first argument to be a time_t" + msgstr "\"%s\" ਲਈ ਪਹਿਲਾਂ ਆਰਗੂਮਿੰਟ time_t ਚਾਹੀਦਾ ਹੈ" +@@ -1259,7 +1325,7 @@ msgstr "\"%s\" ਲਈ ਦੂਜਾ ਆ + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:375 + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:428 +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:847 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876 + #, c-format + msgid "\"%s\" expects the second argument to be a time_t" + msgstr "\"%s\"ਲਈ ਦੂਜਾ ਆਰਗੂਮਿੰਟ time_t ਲੋੜੀਦਾ ਹੈ" +@@ -1271,27 +1337,63 @@ msgstr "\"%s\" ਲਈ ਦੂਜਾ ਆ + + #: ../calendar/libedata-cal/e-cal-backend-sexp.c:773 + #, 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\", ਜਾਂ " +-"\"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\", ਜਾਂ \"description\", ਜਾਂ \"location\", ਜਾਂ \"attendee\", ਜਾਂ \"organizer\", ਜਾਂ \"classification\" ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:896 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925 + #, c-format + msgid "\"%s\" expects at least one argument" + msgstr "\"%s\" ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਆਰਗੂਮਿੰਟ ਲਾਜ਼ਮੀ ਹੈ" + +-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:910 ++#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939 + #, 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\" ਲਈ ਸਭ ਆਰਗੂਮਿੰਟ ਜਾਂ ਤਾਂ ਸਤਰ ਹੋਣ ਜਾਂ ਸਿਰਫ ਇੱਕ ਆਰਗੂਮਿੰਟ ਬੂਲੀਅਨ (ਗਲਤ) ਹੋਵੇ" + ++#: ../calendar/libedata-cal/e-cal-backend-util.c:101 ++msgid "Invalid range" ++msgstr "ਗਲਤ ਰੇਜ਼" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:113 ++msgid "Unsupported field" ++msgstr "ਗੈਰ-ਸਹਾਇਕ ਖੇਤਰ" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:115 ++msgid "Unsupported method" ++msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਢੰਗ" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:117 ++msgid "Unsupported authentication method" ++msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਪਰਮਾਣਕਿਤਾ ਢੰਗ" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:119 ++msgid "TLS not available" ++msgstr "TLS ਉਪਲੱਬਧ ਨਹੀਂ" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:125 ++msgid "Offline unavailable" ++msgstr "ਆਫਲਾਈਨ ਉਪਲੱਬਧ ਨਹੀਂ" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:127 ++msgid "Search size limit exceeded" ++msgstr "ਖੋਜ ਸਾਈਜ਼ ਲਿਮਟ ਵੱਧ ਗਈ" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:129 ++msgid "Search time limit exceeded" ++msgstr "ਖੋਜ ਟਾਈਮ ਲਿਮਟ ਵੱਧ ਗਈ" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:131 ++msgid "Invalid query" ++msgstr "ਗਲਤ ਕਿਊਰੀ" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:133 ++msgid "Query refused" ++msgstr "ਕਿਊਰੀ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ" ++ ++#: ../calendar/libedata-cal/e-cal-backend-util.c:140 ++msgid "Invalid server version" ++msgstr "ਗਲਤ ਸਰਵਰ ਵਰਜਨ" ++ + #: ../camel/camel-cipher-context.c:102 + msgid "Signing is not supported by this cipher" + msgstr "ਇਸ ਗੁਪਤ-ਲੇਖਣ ਦਸਤਖਤਾਂ ਲਈ ਸਹਾਈ ਨਹੀਂ ਹੈ" +@@ -1332,15 +1434,19 @@ msgstr "ਤੁਸੀਂ ਇਸ ਗੁਪ + msgid "You may not export keys with this cipher" + msgstr "ਤੁਸੀਂ ਗੁਪਤ-ਲੇਖਣ ਲਈ ਕੀ ਨਿਰਯਾਤ ਨਹੀਂ ਕਰ ਸਕਦੇ" + +-#: ../camel/camel-data-cache.c:137 ++#: ../camel/camel-data-cache.c:136 + msgid "Unable to create cache path" + msgstr "ਕੈਂਚੇ ਮਾਰਗ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ" + +-#: ../camel/camel-data-cache.c:384 ++#: ../camel/camel-data-cache.c:381 + #, c-format + msgid "Could not remove cache entry: %s: %s" + msgstr "ਕੈਂਚੇ ਇੰਦਰਾਜ ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: %s" + ++#: ../camel/camel-db.c:107 ++msgid "Insufficient memory" ++msgstr "ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ" ++ + #: ../camel/camel-disco-diary.c:198 + #, c-format + msgid "" +@@ -1353,13 +1459,14 @@ msgstr "" + "ਦੁਹਰਾਏ ਨਾ ਜਾ ਸਕਣਗੇ।" + + #: ../camel/camel-disco-diary.c:261 ++#: ../camel/providers/imap/camel-imap-journal.c:299 + #, c-format + msgid "" +-"Could not open `%s':\n" ++"Could not open '%s':\n" + "%s\n" + "Changes made to this folder will not be resynchronized." + msgstr "" +-"`%s' ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:\n" ++"'%s' ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:\n" + "%s\n" + "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਮੁੜ-ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕਣਗੀਆਂ।" + +@@ -1367,88 +1474,99 @@ msgstr "" + msgid "Resynchronizing with server" + msgstr "ਸਰਵਰ ਨਾਲ ਮੁੜ-ਸਮਕਾਲੀ" + +-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52 ++#: ../camel/camel-disco-folder.c:43 ++#: ../camel/camel-offline-folder.c:52 + msgid "Copy folder content locally for offline operation" + msgstr "ਬੰਦ ਕਾਰਵਾਈ ਦੌਰਾਨ ਫੋਲਡਰ ਭਾਗ ਨਕਲ ਕਰੋ" + +-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111 ++#: ../camel/camel-disco-folder.c:105 ++#: ../camel/camel-offline-folder.c:111 + msgid "Downloading new messages for offline mode" + msgstr "ਆਫਲਾਇਨ ਮੋਡ ਲਈ ਨਵੇਂ ਸੁਨੇਹੇ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" + +-#: ../camel/camel-disco-folder.c:468 ++#: ../camel/camel-disco-folder.c:469 + #, c-format + msgid "Preparing folder '%s' for offline" + msgstr "ਫੋਲਡਰ '%s' ਨੂੰ ਆਫਲਾਇਨ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" + + #: ../camel/camel-disco-store.c:403 +-#: ../camel/providers/imap/camel-imap-store.c:2997 ++#: ../camel/providers/imap/camel-imap-store.c:1002 ++#: ../camel/providers/imap/camel-imap-store.c:1810 ++#: ../camel/providers/imap/camel-imap-store.c:2226 ++#: ../camel/providers/imap/camel-imap-store.c:2989 + msgid "You must be working online to complete this operation" + msgstr "ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਸੰਪੂਰਨ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਆਨ-ਲਾਇਨ ਰਹਿਣਾ ਚਾਹੀਦਾ ਹੈ" + +-#: ../camel/camel-exception.c:304 ++#: ../camel/camel-exception.c:262 + msgid "No description available" + msgstr "ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ" + +-#: ../camel/camel-filter-driver.c:752 ++#: ../camel/camel-filter-driver.c:785 + #, c-format + msgid "Failed to create child process '%s': %s" + msgstr "ਅਗਲੀ ਕਿਰਿਆ `%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/camel-filter-driver.c:794 ++#: ../camel/camel-filter-driver.c:827 + #, c-format + msgid "Invalid message stream received from %s: %s" + msgstr "%s ਤੋਂ ਗਲਤ ਸੁਨੇਹਾ ਲੜੀ ਪ੍ਰਾਪਤ ਹੋਈ ਹੈ: %s" + +-#: ../camel/camel-filter-driver.c:983 ../camel/camel-filter-driver.c:992 ++#: ../camel/camel-filter-driver.c:1016 ++#: ../camel/camel-filter-driver.c:1025 + msgid "Syncing folders" + msgstr "ਫੋਲਡਰ ਸਮਕਾਲੀ" + +-#: ../camel/camel-filter-driver.c:1081 ../camel/camel-filter-driver.c:1460 ++#: ../camel/camel-filter-driver.c:1114 ++#: ../camel/camel-filter-driver.c:1494 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "ਫਿਲਟਰ ਨੂੰ ਪਾਰਸ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s: %s" + +-#: ../camel/camel-filter-driver.c:1090 ../camel/camel-filter-driver.c:1469 ++#: ../camel/camel-filter-driver.c:1123 ++#: ../camel/camel-filter-driver.c:1503 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "ਫਿਲਟਰ ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ: %s: %s" + +-#: ../camel/camel-filter-driver.c:1158 ++#: ../camel/camel-filter-driver.c:1191 + msgid "Unable to open spool folder" + msgstr "ਸਪੂਲ ਫੋਲਡਰ ਖੋਲਣ ਵਿੱਚ ਗਲਤੀ" + +-#: ../camel/camel-filter-driver.c:1167 ++#: ../camel/camel-filter-driver.c:1200 + msgid "Unable to process spool folder" + msgstr "ਕਾਰਜ ਸਪੂਲ ਫੋਲਡਰ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ" + +-#: ../camel/camel-filter-driver.c:1182 ++#: ../camel/camel-filter-driver.c:1215 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "%d ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ(%d%%)" + +-#: ../camel/camel-filter-driver.c:1186 ++#: ../camel/camel-filter-driver.c:1219 + msgid "Cannot open message" + msgstr "ਸੁਨੇਹਾ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" + +-#: ../camel/camel-filter-driver.c:1187 ../camel/camel-filter-driver.c:1199 ++#: ../camel/camel-filter-driver.c:1220 ++#: ../camel/camel-filter-driver.c:1233 + #, c-format + msgid "Failed on message %d" + msgstr "ਸੁਨੇਹਾ %d ਤੇ ਅਸਫਲ" + +-#: ../camel/camel-filter-driver.c:1213 ../camel/camel-filter-driver.c:1304 ++#: ../camel/camel-filter-driver.c:1247 ++#: ../camel/camel-filter-driver.c:1338 + msgid "Syncing folder" + msgstr "ਫੋਲਡਰ ਸਮਕਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" + +-#: ../camel/camel-filter-driver.c:1217 ../camel/camel-filter-driver.c:1309 ++#: ../camel/camel-filter-driver.c:1251 ++#: ../camel/camel-filter-driver.c:1343 + msgid "Complete" + msgstr "ਮੁਕੰਮਲ" + +-#: ../camel/camel-filter-driver.c:1274 ++#: ../camel/camel-filter-driver.c:1308 + #, c-format + msgid "Getting message %d of %d" + msgstr "%2d ਵਿੱਚੋਂ %1d ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" + +-#: ../camel/camel-filter-driver.c:1289 ++#: ../camel/camel-filter-driver.c:1323 + #, c-format + msgid "Failed at message %d of %d" + msgstr "%2d ਵਿੱਚੋਂ %1d ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ" +@@ -1457,26 +1575,28 @@ msgstr "%2d ਵਿੱਚੋਂ %1d ਸ + msgid "Failed to retrieve message" + msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ" + +-#: ../camel/camel-filter-search.c:399 ++#: ../camel/camel-filter-search.c:401 + msgid "Invalid arguments to (system-flag)" + msgstr "(system-flag) ਲਈ ਗਲਤ ਆਰਗੂਮਿੰਟ" + +-#: ../camel/camel-filter-search.c:414 ++#: ../camel/camel-filter-search.c:416 + msgid "Invalid arguments to (user-tag)" + msgstr "ਗਲਤ ਆਰਗੂਮਿੰਟ(user-tag)" + +-#: ../camel/camel-filter-search.c:579 ++#: ../camel/camel-filter-search.c:581 + #, c-format + msgid "Failed to create create child process '%s': %s" + msgstr "ਅਗਲੀ ਕਿਰਿਆ '%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s" + + #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru. +-#: ../camel/camel-filter-search.c:703 ../camel/camel-filter-search.c:711 ++#: ../camel/camel-filter-search.c:737 ++#: ../camel/camel-filter-search.c:745 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "ਫਿਲਟਰ ਖੋਜ ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s: %s" + +-#: ../camel/camel-folder-search.c:358 ../camel/camel-folder-search.c:480 ++#: ../camel/camel-folder-search.c:332 ++#: ../camel/camel-folder-search.c:444 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -1485,7 +1605,8 @@ msgstr "" + "ਖੋਜ ਸਮੀਕਰਨ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਦਾ ਸਕਦਾ ਹੈ: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:368 ../camel/camel-folder-search.c:490 ++#: ../camel/camel-folder-search.c:342 ++#: ../camel/camel-folder-search.c:454 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -1494,72 +1615,74 @@ msgstr "" + "ਖੋਜ ਸਮੀਕਰਨ ਨੂੰ ਚਲਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:677 ../camel/camel-folder-search.c:712 ++#: ../camel/camel-folder-search.c:643 ++#: ../camel/camel-folder-search.c:685 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) ਲਈ ਇੱਕ ਇੱਕਲਾ ਬੂਲ ਨਤੀਜਾ ਚਾਹੀਦਾ ਹੈ" + +-#: ../camel/camel-folder-search.c:765 ++#: ../camel/camel-folder-search.c:738 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) %s ਵਿੱਚ ਮਨਜ਼ੂਰ ਨਹੀਂ ਹੈ" + +-#: ../camel/camel-folder-search.c:771 ../camel/camel-folder-search.c:778 ++#: ../camel/camel-folder-search.c:744 ++#: ../camel/camel-folder-search.c:751 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) ਲਈ ਇੱਕ ਮੇਲ ਸਤਰ ਚਾਹੀਦੀ ਹੈ" + +-#: ../camel/camel-folder-search.c:805 ++#: ../camel/camel-folder-search.c:778 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) ਲਈ ਇੱਕ ਲੜੀ ਨਤੀਜੇ ਦੀ ਲੋੜ ਹੈ" + +-#: ../camel/camel-folder-search.c:814 ++#: ../camel/camel-folder-search.c:787 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) ਲਈ ਫੋਲਡਰ ਸੈੱਟ ਦੀ ਲੋੜ ਹੈ" + +-#: ../camel/camel-folder-search.c:909 ++#: ../camel/camel-folder-search.c:882 + #, c-format + msgid "Performing query on unknown header: %s" + msgstr "ਅਣਜਾਣੇ ਸਿਰਲੇਖ ਤੇ ਸਵਾਲ ਜਾਰੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s" + +-#: ../camel/camel-folder.c:619 ++#: ../camel/camel-folder.c:693 + #, c-format + msgid "Unsupported operation: append message: for %s" + msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ: ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ: %s ਲਈ" + +-#: ../camel/camel-folder.c:1241 ++#: ../camel/camel-folder.c:1349 + #, c-format + msgid "Unsupported operation: search by expression: for %s" + msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ: ਸਮੀਕਰਨ ਨਾਲ ਖੋਜ: %s ਲਈ" + +-#: ../camel/camel-folder.c:1282 ++#: ../camel/camel-folder.c:1390 + #, c-format + msgid "Unsupported operation: search by UIDs: for %s" + msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ: UID ਨਾਲ ਖੋਜ: %s ਲਈ" + +-#: ../camel/camel-folder.c:1398 ++#: ../camel/camel-folder.c:1506 + msgid "Moving messages" + msgstr "ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ" + +-#: ../camel/camel-folder.c:1398 ++#: ../camel/camel-folder.c:1506 + msgid "Copying messages" + msgstr "ਸੁਨੇਹਿਆਂ ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" + +-#: ../camel/camel-folder.c:1652 ++#: ../camel/camel-folder.c:1852 + msgid "Learning junk" + msgstr "ਜੰਕ ਸਿੱਖ ਰਿਹਾ ਹੈ" + +-#: ../camel/camel-folder.c:1669 ++#: ../camel/camel-folder.c:1869 + msgid "Learning non-junk" + msgstr "ਨਾ-ਰੱਦੀ ਸਿੱਖਿਆ ਜਾ ਰਿਹਾ ਹੈ" + +-#: ../camel/camel-folder.c:1688 ++#: ../camel/camel-folder.c:1888 + msgid "Filtering new message(s)" + msgstr "ਨਵੇਂ ਸੁਨੇਹੇ ਛਾਣੇ ਜਾ ਰਹੇ ਹਨ" + +-#: ../camel/camel-gpg-context.c:754 ++#: ../camel/camel-gpg-context.c:755 + #, c-format + msgid "" + "Unexpected GnuPG status message encountered:\n" +@@ -1570,15 +1693,16 @@ msgstr "" + "\n" + "%s" + +-#: ../camel/camel-gpg-context.c:769 ++#: ../camel/camel-gpg-context.c:770 + msgid "Failed to parse gpg userid hint." + msgstr "gpg userid ਸੰਕੇਤ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ।" + +-#: ../camel/camel-gpg-context.c:793 ../camel/camel-gpg-context.c:807 ++#: ../camel/camel-gpg-context.c:794 ++#: ../camel/camel-gpg-context.c:808 + msgid "Failed to parse gpg passphrase request." + msgstr "gpg passphrase ਸੰਕੇਤ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ।" + +-#: ../camel/camel-gpg-context.c:826 ++#: ../camel/camel-gpg-context.c:828 + #, c-format + msgid "" + "You need a PIN to unlock the key for your\n" +@@ -1587,7 +1711,7 @@ msgstr "" + "ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਸਮਾਰਟ-ਕਾਰਡ ਲਈ ਇੱਕ PIN ਅਣ-ਲਾਕ ਕਰਨ\n" + "ਲਈ ਲੋੜੀਦਾ ਹੈ: \"%s\"" + +-#: ../camel/camel-gpg-context.c:829 ++#: ../camel/camel-gpg-context.c:832 + #, c-format + msgid "" + "You need a passphrase to unlock the key for\n" +@@ -1596,101 +1720,109 @@ msgstr "" + "ਤੁਹਾਨੂੰ ਯੂਜ਼ਰ ਲਈ ਪਾਸ-ਪ੍ਰਸੰਗ ਲੋੜੀਦਾ ਹੈ, ਜੋ ਕਿ\n" + "ਖੋਲ ਸਕੇ: \"%s\"" + +-#: ../camel/camel-gpg-context.c:834 ++#: ../camel/camel-gpg-context.c:837 + #, c-format +-msgid "Unexpected request from GnuPG for `%s'" +-msgstr "GnuPG ਤੋਂ `%s' ਤੋਂ ਨਾ-ਲੋੜੀਦਾ ਜਵਾਬ ਪ੍ਰਾਪਤ ਹੋਇਆ" ++msgid "Unexpected request from GnuPG for '%s'" ++msgstr "GnuPG ਤੋਂ '%s' ਤੋਂ ਨਾ-ਲੋੜੀਦਾ ਜਵਾਬ ਪ੍ਰਾਪਤ ਹੋਇਆ" + +-#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:1064 +-#: ../camel/providers/nntp/camel-nntp-store.c:1269 ++#: ../camel/camel-gpg-context.c:862 ++#: ../camel/camel-gpg-context.c:1068 ++#: ../camel/providers/nntp/camel-nntp-store.c:1281 + msgid "Canceled." + msgstr "ਰੱਦ ਕੀਤਾ ਹੈ।" + +-#: ../camel/camel-gpg-context.c:873 ++#: ../camel/camel-gpg-context.c:876 + msgid "Failed to unlock secret key: 3 bad passphrases given." + msgstr "ਗੁਪਤ ਕੀ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ: ੩ ਗਲਤ ਪਾਸ-ਪੈਰੇ ਦਿੱਤੇ ਹਨ।" + +-#: ../camel/camel-gpg-context.c:881 ++#: ../camel/camel-gpg-context.c:884 + #, c-format + msgid "Unexpected response from GnuPG: %s" + msgstr "GnuPG ਤੋਂ ਨਾ-ਲੋੜੀਦਾ ਜਵਾਬ ਪ੍ਰਾਪਤ ਹੋਇਆ: %s" + +-#: ../camel/camel-gpg-context.c:934 ++#: ../camel/camel-gpg-context.c:937 + msgid "Failed to encrypt: No valid recipients specified." + msgstr "ਇਕ੍ਰਿਪਟ ਲਈ ਅਸਫਲ:ਕੋਈ ਜਾਇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਨਿਰਧਾਰਿਤ ਨਹੀਂ ਹੈ।" + + #. always called on an i/o error +-#: ../camel/camel-gpg-context.c:1202 ../camel/camel-gpg-context.c:1330 +-#: ../camel/camel-gpg-context.c:1824 ../camel/camel-gpg-context.c:1869 ++#: ../camel/camel-gpg-context.c:1206 ++#: ../camel/camel-gpg-context.c:1334 ++#: ../camel/camel-gpg-context.c:1829 ++#: ../camel/camel-gpg-context.c:1874 + #, c-format + msgid "Failed to execute gpg: %s" + msgstr "gpg ਨੂੰ ਚਲਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:392 ++#: ../camel/camel-gpg-context.c:1302 ++#: ../camel/camel-smime-context.c:392 + #, c-format + msgid "Could not generate signing data: %s" + msgstr "ਦਸਤਖਤੀ ਡਾਟਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1529 +-#: ../camel/camel-gpg-context.c:1614 ../camel/camel-gpg-context.c:1629 +-#: ../camel/camel-gpg-context.c:1746 ../camel/camel-gpg-context.c:1761 +-#: ../camel/camel-gpg-context.c:1840 ../camel/camel-gpg-context.c:1885 ++#: ../camel/camel-gpg-context.c:1349 ++#: ../camel/camel-gpg-context.c:1534 ++#: ../camel/camel-gpg-context.c:1619 ++#: ../camel/camel-gpg-context.c:1634 ++#: ../camel/camel-gpg-context.c:1750 ++#: ../camel/camel-gpg-context.c:1765 ++#: ../camel/camel-gpg-context.c:1845 ++#: ../camel/camel-gpg-context.c:1890 + msgid "Failed to execute gpg." + msgstr "gpg ਨੂੰ ਚਲਾਉਣ ਵਿੱਚ ਅਸਫਲ" + +-#: ../camel/camel-gpg-context.c:1364 ++#: ../camel/camel-gpg-context.c:1368 + msgid "This is a digitally signed message part" + msgstr "ਇਹ ਸੁਨੇਹੇ ਦਾ ਡਿਜ਼ੀਟਲ ਦਸਤਖਤੀ ਭਾਗ ਹੈ" + +-#: ../camel/camel-gpg-context.c:1449 ../camel/camel-gpg-context.c:1455 +-#: ../camel/camel-gpg-context.c:1461 ../camel/camel-gpg-context.c:1477 +-#: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706 ++#: ../camel/camel-gpg-context.c:1453 ++#: ../camel/camel-gpg-context.c:1459 ++#: ../camel/camel-gpg-context.c:1465 ++#: ../camel/camel-gpg-context.c:1480 ++#: ../camel/camel-smime-context.c:695 ++#: ../camel/camel-smime-context.c:706 + #: ../camel/camel-smime-context.c:713 + msgid "Cannot verify message signature: Incorrect message format" + msgstr "ਸੁਨੇਹਾ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਜਾ ਸਕੇ ਹਨ: ਗਲਤ ਸੁਨੇਹਾ ਫਾਰਮਿਟ" + +-#: ../camel/camel-gpg-context.c:1514 ++#: ../camel/camel-gpg-context.c:1519 + #, c-format + msgid "Cannot verify message signature: could not create temp file: %s" + msgstr "ਸੁਨੇਹਾ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਜਾ ਸਕੇ ਹਨ: ਆਰਜ਼ੀ ਫਾਇਲ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕੀ ਹੈ: %s" + +-#: ../camel/camel-gpg-context.c:1597 ++#: ../camel/camel-gpg-context.c:1602 + #, c-format + msgid "Could not generate encrypting data: %s" + msgstr "ਇੰਕ੍ਰਿਪਟਡ ਡਾਟਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s" + +-#: ../camel/camel-gpg-context.c:1647 ++#: ../camel/camel-gpg-context.c:1652 + msgid "This is a digitally encrypted message part" + msgstr "ਇਹ ਸੁਨੇਹੇ ਦਾ ਡਿਜ਼ੀਟਲ ਇਕ੍ਰਿਪਟਡ ਭਾਗ ਹੈ" + +-#: ../camel/camel-gpg-context.c:1700 ../camel/camel-gpg-context.c:1708 +-#: ../camel/camel-gpg-context.c:1728 ++#: ../camel/camel-gpg-context.c:1705 ++#: ../camel/camel-gpg-context.c:1713 ++#: ../camel/camel-gpg-context.c:1732 + msgid "Cannot decrypt message: Incorrect message format" + msgstr "ਸੁਨੇਹਾ ਡੀ-ਕਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: ਗਲਤ ਸੁਨੇਹਾ ਫਾਰਮਿਟ" + +-#: ../camel/camel-gpg-context.c:1717 ++#: ../camel/camel-gpg-context.c:1722 + msgid "Failed to decrypt MIME part: protocol error" + msgstr "MIME ਭਾਗ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਅਸਫਲ: ਪ੍ਰੋਟੋਕਾਲ ਗਲਤੀ" + +-#: ../camel/camel-gpg-context.c:1782 ../camel/camel-smime-context.c:969 ++#: ../camel/camel-gpg-context.c:1787 ++#: ../camel/camel-smime-context.c:969 + msgid "Encrypted content" + msgstr "ਇਕ੍ਰਿਪਟਡ ਭਾਗ" + +-#: ../camel/camel-gpg-context.c:1801 ++#: ../camel/camel-gpg-context.c:1806 + msgid "Unable to parse message content" + msgstr "ਸੁਨੇਹਾ ਭਾਗ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ" + +-#: ../camel/camel-gpg-context.c:1825 ../camel/camel-gpg-context.c:1870 +-#: ../camel/camel-tcp-stream-openssl.c:633 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1548 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1587 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1632 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1688 +-#: ../camel/providers/imap4/camel-imap4-store.c:813 +-#: ../camel/providers/imap4/camel-imap4-store.c:1488 +-#: ../camel/providers/imap4/camel-imap4-utils.c:557 +-#: ../camel/providers/smtp/camel-smtp-transport.c:164 +-#: ../camel/providers/smtp/camel-smtp-transport.c:219 ++#: ../camel/camel-gpg-context.c:1830 ++#: ../camel/camel-gpg-context.c:1875 ++#: ../camel/camel-tcp-stream-openssl.c:635 ++#: ../camel/providers/imap4/camel-imap4-utils.c:624 ++#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:221 + msgid "Unknown" + msgstr "ਅਣਜਾਣ" + +@@ -1704,7 +1836,8 @@ msgstr "ਲਾਕਿੰਗ ਸਹਾਇ + msgid "Cannot fork locking helper: %s" + msgstr "ਲਾਕਿੰਗ ਸਹਾਇਕ ਨੂੰ ਭਾਗ ਵਿੱਚ ਵੰਡਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s" + +-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227 ++#: ../camel/camel-lock-client.c:204 ++#: ../camel/camel-lock-client.c:227 + #, c-format + msgid "Could not lock '%s': protocol error with lock-helper" + msgstr "ਲਾੱਕ '%s' ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਲਾੱਕ-ਸਹਾਇਕ ਨਾਲ ਪ੍ਰੋਟੋਕਾਲ ਗਲਤੀ" +@@ -1717,7 +1850,7 @@ msgstr "ਲਾੱਕ '%s' ਬਣਾਇ + #: ../camel/camel-lock.c:103 + #, c-format + msgid "Could not create lock file for %s: %s" +-msgstr "%s ਲ਼ਈ ਫਾਇਲ ਤੇ ਲਾੱਕ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s" ++msgstr "%s ਲਈ ਫਾਇਲ ਤੇ ਲਾੱਕ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s" + + #: ../camel/camel-lock.c:144 + #, c-format +@@ -1747,7 +1880,7 @@ msgstr "ਪੱਤਰ ਫਾਇਲ %s ਨ + #: ../camel/camel-movemail.c:127 + #, c-format + msgid "Could not open temporary mail file %s: %s" +-msgstr "ਆਰਜੀ ਪੱਤਰ ਫਾਇਲ਼ %s ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" ++msgstr "ਆਰਜੀ ਪੱਤਰ ਫਾਇਲ %s ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + + #: ../camel/camel-movemail.c:156 + #, c-format +@@ -1783,49 +1916,51 @@ msgstr "ਗਲਤੀ ਪੱਤਰ ਫਾ + msgid "Error writing mail temp file: %s" + msgstr "ਆਰਜੀ ਪੱਤਰ ਫਾਇਲ ਤੇ ਲਿਖਣ ਵਿੱਚ ਗਲਤੀ: %s" + +-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531 ++#: ../camel/camel-movemail.c:464 ++#: ../camel/camel-movemail.c:531 + #, c-format + msgid "Error copying mail temp file: %s" + msgstr "ਆਰਜੀ ਪੱਤਰ ਫਾਇਲ ਨੂੰ ਨਕਲ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s" + +-#: ../camel/camel-multipart-signed.c:595 ++#: ../camel/camel-multipart-signed.c:593 + msgid "parse error" + msgstr "ਪਾਰਸ ਗਲਤੀ" + +-#: ../camel/camel-net-utils.c:498 ../camel/camel-net-utils.c:660 +-#: ../camel/camel-net-utils.c:791 ++#: ../camel/camel-net-utils.c:505 ++#: ../camel/camel-net-utils.c:667 ++#: ../camel/camel-net-utils.c:799 + #: ../camel/providers/pop3/camel-pop3-store.c:447 +-#: ../camel/providers/pop3/camel-pop3-store.c:543 ++#: ../camel/providers/pop3/camel-pop3-store.c:547 + msgid "Canceled" + msgstr "ਰੱਦ ਕੀਤਾ" + +-#: ../camel/camel-net-utils.c:517 ++#: ../camel/camel-net-utils.c:524 + msgid "cannot create thread" + msgstr "ਥਰਿੱਡ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" + +-#: ../camel/camel-net-utils.c:664 ++#: ../camel/camel-net-utils.c:671 + #, c-format + msgid "Resolving: %s" + msgstr "ਹੱਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s" + +-#: ../camel/camel-net-utils.c:686 ++#: ../camel/camel-net-utils.c:693 + msgid "Host lookup failed" + msgstr "ਹੋਸਟ ਖੋਜ ਅਸਫਲ" + +-#: ../camel/camel-net-utils.c:688 ++#: ../camel/camel-net-utils.c:695 + #, c-format + msgid "Host lookup failed: %s: %s" + msgstr "ਹੋਸਟ ਖੋਜ ਅਸਫਲ: %s: %s" + +-#: ../camel/camel-net-utils.c:795 ++#: ../camel/camel-net-utils.c:803 + msgid "Resolving address" + msgstr "ਐਡਰੈੱਸ ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ" + +-#: ../camel/camel-net-utils.c:815 ++#: ../camel/camel-net-utils.c:823 + msgid "Name lookup failed" + msgstr "ਨਾਂ ਖੋਜ ਅਸਫਲ" + +-#: ../camel/camel-net-utils.c:818 ++#: ../camel/camel-net-utils.c:826 + #, c-format + msgid "Name lookup failed: %s" + msgstr "ਨਾਂ ਖੋਜ ਅਸਫਲ: %s" +@@ -1835,38 +1970,40 @@ msgstr "ਨਾਂ ਖੋਜ ਅਸਫਲ + msgid "Syncing messages in folder '%s' to disk" + msgstr "ਫੋਲਡਰ `%s' ਵਿੱਚ ਸੁਨੇਹਿਆਂ ਨੂੰ ਡਿਸਕ ਤੇ ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ" + +-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187 ++#: ../camel/camel-offline-journal.c:164 ++#: ../camel/camel-offline-journal.c:187 + #, c-format +-msgid "Cannot write offline journal for folder `%s': %s" +-msgstr "ਫੋਲਡਰ `%s' ਲਈ ਆਫਲਾਇਨ ਜਰਨਲ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s" ++msgid "Cannot write offline journal for folder '%s': %s" ++msgstr "ਫੋਲਡਰ '%s' ਲਈ ਆਫਲਾਈਨ ਜਰਨਲ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s" + +-#: ../camel/camel-provider.c:62 ++#: ../camel/camel-provider.c:60 + msgid "Virtual folder email provider" + msgstr "ਫਰਜੀ ਫੋਲਡਰ ਈਮੇਲ ਉਪਲੱਬਧ ਕਰਤਾ" + +-#: ../camel/camel-provider.c:64 ++#: ../camel/camel-provider.c:62 + msgid "For reading mail as a query of another set of folders" + msgstr "ਹੋਰ ਫੋਲਡਰ ਸਮੂਹ ਦੇ ਮੇਲ ਸਵਾਲ ਦੇ ਤੌਰ ਤੇ ਪੜਨ ਲਈ" + +-#: ../camel/camel-provider.c:187 ++#: ../camel/camel-provider.c:184 + #, c-format + msgid "Could not load %s: Module loading not supported on this system." + msgstr "%s ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: ਇਸ ਸਿਸਟਮ ਤੇ ਮੋਡੀਊਲ ਲੋਡਿੰਗ ਸਹਾਈ ਨਹੀਂ ਹੈ।" + +-#: ../camel/camel-provider.c:196 ++#: ../camel/camel-provider.c:193 + #, c-format + msgid "Could not load %s: %s" + msgstr "%s ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/camel-provider.c:204 ++#: ../camel/camel-provider.c:201 + #, c-format + msgid "Could not load %s: No initialization code in module." + msgstr "%s ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਮੋਡੀਊਲ ਵਿੱਚ ਕੋਈ ਸ਼ੁਰੂਆਤੀ ਕੋਡ ਨਹੀਂ ਹੈ।" + +-#: ../camel/camel-provider.c:376 ../camel/camel-session.c:173 ++#: ../camel/camel-provider.c:373 ++#: ../camel/camel-session.c:177 + #, c-format +-msgid "No provider available for protocol `%s'" +-msgstr "ਪਰੋਟੋਕਾਲ `%s' ਲਈ ਕੋਈ ਉਪਲੱਬਧ ਕਰਤਾ ਨਹੀਂ ਹੈ" ++msgid "No provider available for protocol '%s'" ++msgstr "ਪਰੋਟੋਕਾਲ '%s' ਲਈ ਕੋਈ ਉਪਲੱਬਧ ਕਰਤਾ ਨਹੀਂ ਹੈ" + + #: ../camel/camel-sasl-anonymous.c:37 + msgid "Anonymous" +@@ -1876,7 +2013,8 @@ msgstr "ਗੁੰਮਨਾਮ" + msgid "This option will connect to the server using an anonymous login." + msgstr "ਇਸ ਚੋਣ ਨਾਲ ਸਰਵਰ ਨਾਲ ਅਣਜਾਣ ਦੇ ਤੌਰ ਤੇ ਲਾੱਗਆਨ ਕੀਤਾ ਜਾਵੇਗਾ।" + +-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91 ++#: ../camel/camel-sasl-anonymous.c:124 ++#: ../camel/camel-sasl-plain.c:91 + msgid "Authentication failed." + msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ।" + +@@ -1907,120 +2045,104 @@ msgstr "" + "ਗਲਤ ਜਾਂਚ ਜਾਣਕਾਰੀ:\n" + "%s" + +-#: ../camel/camel-sasl-cram-md5.c:40 ++#: ../camel/camel-sasl-cram-md5.c:38 + msgid "CRAM-MD5" + msgstr "CRAM-MD5" + +-#: ../camel/camel-sasl-cram-md5.c:42 +-msgid "" +-"This option will connect to the server using a secure CRAM-MD5 password, if " +-"the server supports it." ++#: ../camel/camel-sasl-cram-md5.c:40 ++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:50 ++#: ../camel/camel-sasl-digest-md5.c:48 + msgid "DIGEST-MD5" + msgstr "DIGEST-MD5" + +-#: ../camel/camel-sasl-digest-md5.c:52 +-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:50 ++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:820 ++#: ../camel/camel-sasl-digest-md5.c:845 + msgid "Server challenge too long (>2048 octets)" + msgstr "ਸਰਵਰ ਚੁਣੌਤੀ ਬਹੁਤ ਲੰਮੀ ਹੈ (>2048 octets)" + +-#: ../camel/camel-sasl-digest-md5.c:829 ++#: ../camel/camel-sasl-digest-md5.c:854 + msgid "Server challenge invalid\n" + msgstr "ਸਰਵਰ ਜਾਂਚ ਗਲਤ ਹੈ\n" + +-#: ../camel/camel-sasl-digest-md5.c:835 ++#: ../camel/camel-sasl-digest-md5.c:860 + msgid "Server challenge contained invalid \"Quality of Protection\" token" + msgstr "ਸਰਵਰ ਚੁਣੌਤੀ ਵਿੱਚ \"ਸੁਰੱਖਿਆ ਦਾ ਗੁਣ\" ਟੋਕਨ ਗਲਤ ਹੈ" + +-#: ../camel/camel-sasl-digest-md5.c:865 ++#: ../camel/camel-sasl-digest-md5.c:890 + msgid "Server response did not contain authorization data" + msgstr "ਸਰਵਰ ਜਵਾਬ ਵਿੱਚ ਪਰਮਾਣਿਤ ਡਾਟਾ ਨਹੀਂ ਹੈ" + +-#: ../camel/camel-sasl-digest-md5.c:883 ++#: ../camel/camel-sasl-digest-md5.c:908 + msgid "Server response contained incomplete authorization data" + msgstr "ਸਰਵਰ ਜਵਾਬ ਵਿੱਚ ਨਾ-ਸੰਪੂਰਨ ਪ੍ਰਮਾਣਿਤ ਡਾਟਾ ਹੈ" + +-#: ../camel/camel-sasl-digest-md5.c:893 ++#: ../camel/camel-sasl-digest-md5.c:918 + msgid "Server response does not match" + msgstr "ਸਰਵਰ ਜਵਾਬ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ ਹੈ" + +-#: ../camel/camel-sasl-gssapi.c:65 ++#: ../camel/camel-sasl-gssapi.c:64 + msgid "GSSAPI" + msgstr "GSSAPI" + +-#: ../camel/camel-sasl-gssapi.c:67 ++#: ../camel/camel-sasl-gssapi.c:66 + msgid "This option will connect to the server using Kerberos 5 authentication." + msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਕੀਬੋਰਸ ੫ ਪ੍ਰਮਾਣਕਿਤਾ ਵਰਤ ਕੇ ਸਰਵਰ ਨਾਲ ਜੋੜੇਗਾ।" + +-#: ../camel/camel-sasl-gssapi.c:165 +-msgid "" +-"The specified mechanism is not supported by the provided credential, or is " +-"unrecognized by the implementation." ++#: ../camel/camel-sasl-gssapi.c:164 ++msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation." + msgstr "ਨਿਰਧਾਰਿਤ ਢੰਗ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੁਆਰਾ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਜਾਂ ਇਹ ਸਥਾਪਨ ਦੁਆਰਾ ਪਛਾਣਿਆ ਨਹੀਂ ਗਿਆ।" + +-#: ../camel/camel-sasl-gssapi.c:170 ++#: ../camel/camel-sasl-gssapi.c:169 + msgid "The provided target_name parameter was ill-formed." + msgstr "ਉਪਲੱਬਧ ਨਿਯਤ ਨਾਂ ਪੈਰਾਮੀਟਰ ਗਲਤ ਢਾਂਚੇ ਵਿੱਚ ਹੈ।" + +-#: ../camel/camel-sasl-gssapi.c:173 +-msgid "" +-"The provided target_name parameter contained an invalid or unsupported type " +-"of name." ++#: ../camel/camel-sasl-gssapi.c:172 ++msgid "The provided target_name parameter contained an invalid or unsupported type of name." + msgstr "ਉਪਲੱਬਧ ਨਿਯਤ ਨਾਂ ਪੈਰਾਮੀਟਰ ਗਲਤ ਹੈ ਜਾਂ ਨਾ ਸਹਾਇਕ ਕਿਸਮ ਦਾ ਨਾਂ ਹੈ।" + +-#: ../camel/camel-sasl-gssapi.c:177 +-msgid "" +-"The input_token contains different channel bindings to those specified via " +-"the input_chan_bindings parameter." ++#: ../camel/camel-sasl-gssapi.c:176 ++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:182 +-msgid "" +-"The input_token contains an invalid signature, or a signature that could not " +-"be verified." ++#: ../camel/camel-sasl-gssapi.c:181 ++msgid "The input_token contains an invalid signature, or a signature that could not be verified." + msgstr "input_token ਵਿੱਚ ਗਲਤ ਦਸਤਖਤ ਹਨ ਜਾਂ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ।" + +-#: ../camel/camel-sasl-gssapi.c:186 +-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:185 ++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:191 ++#: ../camel/camel-sasl-gssapi.c:190 + msgid "The supplied context handle did not refer to a valid context." + msgstr "ਉਪਲੱਬਧ ਕਰਵਾਇਆ ਪ੍ਰਸੰਗ ਸਹੀਂ ਪ੍ਰਸੰਗ ਦਾ ਹਵਾਲਾ ਨਹੀਂ ਦੇ ਰਿਹਾ ਹੈ।" + +-#: ../camel/camel-sasl-gssapi.c:194 ++#: ../camel/camel-sasl-gssapi.c:193 + msgid "The consistency checks performed on the input_token failed." + msgstr "input_token ਤੇ ਇਕਸਾਰਤਾ ਜਾਂਚ ਅਸਫਲ ਰਹੀ ਹੈ।" + +-#: ../camel/camel-sasl-gssapi.c:197 ++#: ../camel/camel-sasl-gssapi.c:196 + msgid "The consistency checks performed on the credential failed." + msgstr "ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਪ੍ਰਮਾਣਕਿਤਾ ਜਾਂਚ ਅਸਫਲ ਰਹੀ ਹੈ।" + +-#: ../camel/camel-sasl-gssapi.c:200 ++#: ../camel/camel-sasl-gssapi.c:199 + msgid "The referenced credentials have expired." + msgstr "ਹਵਾਲਾ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਮਿਆਦ ਸਮਾਪਤ ਹੋ ਚੁੱਕੀ ਹੈ।" + +-#: ../camel/camel-sasl-gssapi.c:206 ../camel/camel-sasl-gssapi.c:254 +-#: ../camel/camel-sasl-gssapi.c:290 ../camel/camel-sasl-gssapi.c:305 ++#: ../camel/camel-sasl-gssapi.c:205 ++#: ../camel/camel-sasl-gssapi.c:253 ++#: ../camel/camel-sasl-gssapi.c:289 ++#: ../camel/camel-sasl-gssapi.c:304 + #: ../camel/camel-sasl-kerberos4.c:231 +-#: ../camel/providers/imap/camel-imap-store.c:1306 ++#: ../camel/providers/imap/camel-imap-store.c:1272 + msgid "Bad authentication response from server." + msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਜਵਾਬ ਮਿਲਿਆ ਹੈ।" + +-#: ../camel/camel-sasl-gssapi.c:315 ++#: ../camel/camel-sasl-gssapi.c:314 + msgid "Unsupported security layer." + msgstr "ਨਾ ਸਹਾਇਕ ਸੁਰੱਖਿਆ ਪਰਤ।" + +@@ -2045,7 +2167,8 @@ msgstr "" + msgid "Login" + msgstr "ਲਾਗਇਨ" + +-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38 ++#: ../camel/camel-sasl-login.c:38 ++#: ../camel/camel-sasl-plain.c:38 + msgid "This option will connect to the server using a simple password." + msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਨਾਲ ਜੋੜੇਗੀ।" + +@@ -2058,12 +2181,8 @@ msgid "NTLM / SPA" + msgstr "NTLM / SPA" + + #: ../camel/camel-sasl-ntlm.c:36 +-msgid "" +-"This option will connect to a Windows-based server using NTLM / Secure " +-"Password Authentication." +-msgstr "" +-"ਇਹ ਚੋਣ Windows ਆਧਰਿਤ ਸਰਵਰ ਨਾਲ NTLM / Secure Password Authentication ਵਰਤ ਕੇ " +-"ਜੋੜੇਗੀ।" ++msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication." ++msgstr "ਇਹ ਚੋਣ Windows ਆਧਰਿਤ ਸਰਵਰ ਨਾਲ NTLM / Secure Password Authentication ਵਰਤ ਕੇ ਜੋੜੇਗੀ।" + + #: ../camel/camel-sasl-plain.c:36 + msgid "PLAIN" +@@ -2089,27 +2208,27 @@ msgstr "ਇੱਕ ਨਾ-ਜਾਣੇ + msgid "POP Before SMTP auth using a non-pop source" + msgstr "ਇੱਕ ਨਾ-ਪੋਪ ਟਰਾਂਸਪੋਰਟ ਰਾਹੀ POP SMTP ਤੋਂ ਪਹਿਲਾਂ" + +-#: ../camel/camel-search-private.c:150 ++#: ../camel/camel-search-private.c:149 + #, c-format + msgid "Regular expression compilation failed: %s: %s" + msgstr "ਨਿਯਮਿਤ ਸਮੀਕਰਨ ਕੰਪਾਇਲੇਸ਼ਨ ਅਸਫਲ: %s: %s" + +-#: ../camel/camel-service.c:272 ++#: ../camel/camel-service.c:270 + #, c-format + msgid "URL '%s' needs a username component" + msgstr "URL '%s' ਨੂੰ ਯੂਜ਼ਰ ਭਾਗ ਲੋੜੀਦਾ ਹੈ" + +-#: ../camel/camel-service.c:276 ++#: ../camel/camel-service.c:274 + #, c-format + msgid "URL '%s' needs a host component" + msgstr "URL '%s' ਨੂੰ ਹੋਸਟ ਭਾਗ ਲੋੜੀਦਾ ਹੈ" + +-#: ../camel/camel-service.c:280 ++#: ../camel/camel-service.c:278 + #, c-format + msgid "URL '%s' needs a path component" + msgstr "URL '%s' ਨੂੰ ਰਸਤਾ ਭਾਗ ਲੋੜੀਦਾ ਹੈ" + +-#: ../camel/camel-session.c:299 ++#: ../camel/camel-session.c:303 + #, c-format + msgid "" + "Could not create directory %s:\n" +@@ -2118,7 +2237,13 @@ msgstr "" + "ਡਾਇਰੈਕਟਰੀ %s ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ:\n" + "%s" + ++#: ../camel/camel-session.c:478 ++#, c-format ++msgid "Please enter the %s password for %s on host %s." ++msgstr "ਹੋਸਟ %3$s ਲਈ %2$s ਵਾਸਤੇ %1$s ਪਾਸਵਰਡ ਦਿਓ ਜੀ।" ++ + #: ../camel/camel-smime-context.c:234 ++#: ../camel/camel-smime-context.c:778 + #, c-format + msgid "Cannot find certificate for '%s'" + msgstr "'%s' ਲਈ ਸਰਟੀਫਿਕੇਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ" +@@ -2151,7 +2276,8 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲ + msgid "Cannot add CMS Signing time" + msgstr "CMS ਦਸਤਖਤੀ ਸਮਾਂ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ" + +-#: ../camel/camel-smime-context.c:298 ../camel/camel-smime-context.c:310 ++#: ../camel/camel-smime-context.c:298 ++#: ../camel/camel-smime-context.c:310 + #, c-format + msgid "Encryption certificate for '%s' does not exist" + msgstr "'%s' ਲਈ ਇਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਮੌਜੂਦ ਨਹੀਂ" +@@ -2172,7 +2298,8 @@ msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਸ + msgid "Cannot add CMS Signer information" + msgstr "CMS ਦਸਤਖਤੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦੀ" + +-#: ../camel/camel-smime-context.c:403 ../camel/camel-smime-context.c:851 ++#: ../camel/camel-smime-context.c:403 ++#: ../camel/camel-smime-context.c:851 + msgid "Cannot create encoder context" + msgstr "ਇਕੋਡਰ ਪ੍ਰਸੰਗ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ" + +@@ -2180,7 +2307,8 @@ msgstr "ਇਕੋਡਰ ਪ੍ਰਸੰ + msgid "Failed to add data to CMS encoder" + msgstr "CMS ਇਕੋਡਰ ਵਿੱਚ ਡਾਟਾ ਸ਼ਾਮਿਲ ਕਰਨ ਤੋਂ ਅਸਮਰੱਥ" + +-#: ../camel/camel-smime-context.c:414 ../camel/camel-smime-context.c:868 ++#: ../camel/camel-smime-context.c:414 ++#: ../camel/camel-smime-context.c:868 + msgid "Failed to encode data" + msgstr "ਡਾਟਾ ਇਕੋਡਿਗ ਕਰਨ ਵਿੱਚ ਅਸਫਲ" + +@@ -2232,7 +2360,8 @@ msgstr "ਦਸਤਖਤ ਵਿੱਚ ਡ + msgid "Digests missing from enveloped data" + msgstr "ਸੰਖੇਪ ਲਪੇਟੇ ਡਾਟੇ ਤੋਂ ਬਿਨਾਂ ਹੈ" + +-#: ../camel/camel-smime-context.c:562 ../camel/camel-smime-context.c:572 ++#: ../camel/camel-smime-context.c:562 ++#: ../camel/camel-smime-context.c:572 + msgid "Cannot calculate digests" + msgstr "ਸੰਖੇਪ ਨੂੰ ਮਿਣਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" + +@@ -2240,15 +2369,18 @@ msgstr "ਸੰਖੇਪ ਨੂੰ ਮਿ + msgid "Cannot set message digests" + msgstr "ਸੁਨੇਹਾ ਸੰਖੇਪ ਨੂੰ ਨਿਰਧਾਰਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ" + +-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:592 ++#: ../camel/camel-smime-context.c:587 ++#: ../camel/camel-smime-context.c:592 + msgid "Certificate import failed" + msgstr "ਸਰਟੀਫਿਕੇਟ ਆਯਾਤ ਅਸਫਲ" + + #: ../camel/camel-smime-context.c:602 ++#, c-format + msgid "Certificate is the only message, cannot verify certificates" + msgstr "ਸੁਨੇਹਾ ਹੀ ਸਰਟੀਫਿਕੇਟ ਹੈ, ਸਰਟੀਫਿਕੇਟ ਜਾਂਚੇ ਨਹੀਂ ਹਨ" + + #: ../camel/camel-smime-context.c:605 ++#, c-format + msgid "Certificate is the only message, certificates imported and verified" + msgstr "ਸਰਟੀਫਿਕੇਟ ਸਿਰਫ਼ ਸੁਨੇਹਾ, ਸਰਟੀਫਿਕੇਟ ਆਯਾਤ ਅਤੇ ਜਾਂਚ ਹੋ ਸਕਦਾ ਹੈ" + +@@ -2265,11 +2397,6 @@ msgstr "ਦਸਤਖਤੀ: %s <%s>: %s\ + msgid "Decoder failed" + msgstr "ਡੀਕੋਡਰ ਅਸਫਲ" + +-#: ../camel/camel-smime-context.c:778 +-#, c-format +-msgid "Cannot find certificate for `%s'" +-msgstr "`%s' ਲਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਲੱਭਾ ਹੈ" +- + #: ../camel/camel-smime-context.c:785 + msgid "Cannot find common bulk encryption algorithm" + msgstr "ਆਮ ਬਲਕ ਇਕ੍ਰਿਪਸ਼ਨ ਐਲੋਗਰਿਥਮ ਨੂੰ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" +@@ -2324,164 +2451,170 @@ msgstr "ਆਯਾਤ ਕੀ: ਨਾ-ਸ + msgid "export keys: unimplemented" + msgstr "ਨਿਰਯਾਤ ਕੀ: ਨਾ-ਸਥਾਪਿਤ" + +-#: ../camel/camel-store.c:216 +-#: ../camel/providers/groupwise/camel-groupwise-transport.c:176 ++#: ../camel/camel-store.c:272 ++#: ../camel/providers/groupwise/camel-groupwise-transport.c:174 + msgid "Cannot get folder: Invalid operation on this store" + msgstr "ਫੋਲਡਰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਸੰਭਾਲ ਤੇ ਗਲਤ ਕਾਰਵਾਈ" + +-#: ../camel/camel-store.c:248 ++#: ../camel/camel-store.c:305 + #, c-format +-msgid "Cannot create folder `%s': folder exists" +-msgstr "ਫੋਲਡਰ `%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਫੋਲਡਰ ਮੌਜੂਦ ਹੈ" ++msgid "Cannot create folder '%s': folder exists" ++msgstr "ਫੋਲਡਰ '%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਫੋਲਡਰ ਮੌਜੂਦ ਹੈ" + +-#: ../camel/camel-store.c:312 ++#: ../camel/camel-store.c:369 + msgid "Cannot create folder: Invalid operation on this store" + msgstr "ਫੋਲਡਰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਸੰਭਾਲ ਤੇ ਗਲਤ ਕਾਰਵਾਈ" + +-#: ../camel/camel-store.c:340 ++#: ../camel/camel-store.c:397 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "ਫੋਲਡਰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ %s: ਮੌਜੂਦ ਹੈ" + +-#: ../camel/camel-store.c:404 ../camel/camel-vee-store.c:369 +-#: ../camel/providers/local/camel-maildir-store.c:218 ++#: ../camel/camel-store.c:461 ++#: ../camel/camel-vee-store.c:384 ++#: ../camel/providers/local/camel-maildir-store.c:219 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "ਫੋਲਡਰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: ਗਲਤ ਕਾਰਵਾਈ" + +-#: ../camel/camel-store.c:454 ../camel/camel-vee-store.c:406 +-#: ../camel/providers/local/camel-maildir-store.c:290 ++#: ../camel/camel-store.c:513 ++#: ../camel/camel-vee-store.c:421 ++#: ../camel/providers/local/camel-maildir-store.c:291 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "ਫੋਲਡਰ ਦਾ ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s: ਗਲਤ ਕਾਰਵਾਈ" + + #. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:795 ../camel/camel-vtrash-folder.c:52 ++#: ../camel/camel-store.c:854 ++#: ../camel/camel-vtrash-folder.c:53 ++#: ../camel/providers/imap/camel-imap-store.c:1060 + msgid "Trash" + msgstr "ਰੱਦੀ" + + #. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:798 ../camel/camel-vtrash-folder.c:54 ++#: ../camel/camel-store.c:857 ++#: ../camel/camel-vtrash-folder.c:55 + msgid "Junk" + msgstr "ਜੰਕ" + +-#: ../camel/camel-tcp-stream-openssl.c:570 ++#: ../camel/camel-tcp-stream-openssl.c:572 + msgid "Unable to get issuer's certificate" + msgstr "ਜਾਰੀਕਰਤਾ ਦਾ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ" + +-#: ../camel/camel-tcp-stream-openssl.c:572 ++#: ../camel/camel-tcp-stream-openssl.c:574 + msgid "Unable to get Certificate Revocation List" + msgstr "ਸਰਟੀਫਿਕੇਟ ਥਾਂ ਸੂਚੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:574 ++#: ../camel/camel-tcp-stream-openssl.c:576 + msgid "Unable to decrypt certificate signature" + msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ" + +-#: ../camel/camel-tcp-stream-openssl.c:576 ++#: ../camel/camel-tcp-stream-openssl.c:578 + msgid "Unable to decrypt Certificate Revocation List signature" + msgstr "ਸਰਟੀਫਿਕੇਟ ਥਾਂ ਸੂਚੀ ਦਸਤਖਤ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ" + +-#: ../camel/camel-tcp-stream-openssl.c:578 ++#: ../camel/camel-tcp-stream-openssl.c:580 + msgid "Unable to decode issuer's public key" + msgstr "ਜਾਰੀਕਰਤਾ ਦੀ ਪਬਲਿਕ ਕੁੰਜੀ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ" + +-#: ../camel/camel-tcp-stream-openssl.c:580 ++#: ../camel/camel-tcp-stream-openssl.c:582 + msgid "Certificate signature failure" + msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਅਸਫਲ" + +-#: ../camel/camel-tcp-stream-openssl.c:582 ++#: ../camel/camel-tcp-stream-openssl.c:584 + msgid "Certificate Revocation List signature failure" + msgstr "ਸਰਟੀਫਿਕੇਟ ਥਾਂ ਸੂਚੀ ਦਸਤਖਤ ਅਸਫਲ" + +-#: ../camel/camel-tcp-stream-openssl.c:584 ++#: ../camel/camel-tcp-stream-openssl.c:586 + msgid "Certificate not yet valid" + msgstr "ਸਰਟੀਫਿਕੇਟ ਜਾਇਜ ਨਹੀਂ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:586 ++#: ../camel/camel-tcp-stream-openssl.c:588 + msgid "Certificate has expired" + msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗ ਚੁੱਕੀ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:588 ++#: ../camel/camel-tcp-stream-openssl.c:590 + msgid "CRL not yet valid" + msgstr "CRL ਜਾਇਜ ਨਹੀਂ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:590 ++#: ../camel/camel-tcp-stream-openssl.c:592 + msgid "CRL has expired" + msgstr "CRL ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:595 ++#: ../camel/camel-tcp-stream-openssl.c:597 + msgid "Error in CRL" + msgstr "CRL ਵਿੱਚ ਗਲਤੀ" + +-#: ../camel/camel-tcp-stream-openssl.c:597 ++#: ../camel/camel-tcp-stream-openssl.c:599 + msgid "Out of memory" + msgstr "ਮੈਮੋਰੀ ਤੋਂ ਬਾਹਰ" + +-#: ../camel/camel-tcp-stream-openssl.c:599 ++#: ../camel/camel-tcp-stream-openssl.c:601 + msgid "Zero-depth self-signed certificate" + msgstr "Zero-depth ਸਵੈ-ਦਸਤਖਤੀ ਸਰਟੀਫਿਕੇਟ" + +-#: ../camel/camel-tcp-stream-openssl.c:601 ++#: ../camel/camel-tcp-stream-openssl.c:603 + msgid "Self-signed certificate in chain" + msgstr "ਲੜੀ ਵਿੱਚ ਸਵੈ-ਦਸਤਖਤੀ ਸਰਟੀਫਿਕੇਟ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:603 ++#: ../camel/camel-tcp-stream-openssl.c:605 + msgid "Unable to get issuer's certificate locally" + msgstr "ਜਾਰੀਕਰਤਾ ਦਾ ਸਰਟੀਫਿਕੇਟ ਲੋਕਲ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫ਼ਲ" + +-#: ../camel/camel-tcp-stream-openssl.c:605 ++#: ../camel/camel-tcp-stream-openssl.c:607 + msgid "Unable to verify leaf signature" + msgstr "ਸਿਰਾ ਦਸਤਖਤ ਜਾਂਚ ਕਰਨ ਤੋਂ ਅਸਫਲ" + +-#: ../camel/camel-tcp-stream-openssl.c:607 ++#: ../camel/camel-tcp-stream-openssl.c:609 + msgid "Certificate chain too long" + msgstr "ਸਰਟੀਫਿਕੇਟ ਲੜੀ ਬੜੀ ਲੰਮੀ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:609 ++#: ../camel/camel-tcp-stream-openssl.c:611 + msgid "Certificate Revoked" + msgstr "ਸਰਟੀਫਿਕੇਟ ਮੁੜ ਸ਼ਾਮਿਲ" + +-#: ../camel/camel-tcp-stream-openssl.c:611 ++#: ../camel/camel-tcp-stream-openssl.c:613 + msgid "Invalid Certificate Authority (CA)" + msgstr "ਗਲਤ Certificate Authority (CA)" + +-#: ../camel/camel-tcp-stream-openssl.c:613 ++#: ../camel/camel-tcp-stream-openssl.c:615 + msgid "Path length exceeded" + msgstr "ਰਸਤਾ ਲੰਬਾਈ ਵੱਧ ਗਈ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:615 ++#: ../camel/camel-tcp-stream-openssl.c:617 + msgid "Invalid purpose" + msgstr "ਗਲਤ ਉਦੇਸ਼" + +-#: ../camel/camel-tcp-stream-openssl.c:617 ++#: ../camel/camel-tcp-stream-openssl.c:619 + msgid "Certificate untrusted" + msgstr "ਸਰਟੀਫਿਕੇਟ ਨਾ-ਭਰੋਸੇਯੋਗ" + +-#: ../camel/camel-tcp-stream-openssl.c:619 ++#: ../camel/camel-tcp-stream-openssl.c:621 + msgid "Certificate rejected" + msgstr "ਸਰਟੀਫਿਕੇਟ ਅਸਵੀਕਾਰ" + +-#: ../camel/camel-tcp-stream-openssl.c:622 ++#: ../camel/camel-tcp-stream-openssl.c:624 + msgid "Subject/Issuer mismatch" + msgstr "ਵਿਸ਼ਾ/ਜਾਰੀ ਕਰਤਾ ਮੇਲ ਨਹੀਂ ਖਾ ਰਹੇ ਹਨ" + +-#: ../camel/camel-tcp-stream-openssl.c:624 ++#: ../camel/camel-tcp-stream-openssl.c:626 + msgid "AKID/SKID mismatch" + msgstr "AKID/SKID ਮੇਲ ਨਹੀਂ ਖਾ ਰਹੇ ਹਨ" + +-#: ../camel/camel-tcp-stream-openssl.c:626 ++#: ../camel/camel-tcp-stream-openssl.c:628 + msgid "AKID/Issuer serial mismatch" + msgstr "AKID/ਜਾਰੀ ਕਰਤਾ ਸੀਰੀਅਲ ਮੇਲ ਨਹੀਂ ਖਾਦੇ" + +-#: ../camel/camel-tcp-stream-openssl.c:628 ++#: ../camel/camel-tcp-stream-openssl.c:630 + msgid "Key usage does not support certificate signing" +-msgstr "ਵਰਤੀ ਕੁੰਜੀ ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤਾਂ ਲ਼ਈ ਸਹਾਈ ਨਹੀਂ ਹੈ" ++msgstr "ਵਰਤੀ ਕੁੰਜੀ ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤਾਂ ਲਈ ਸਹਾਈ ਨਹੀਂ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:631 ++#: ../camel/camel-tcp-stream-openssl.c:633 + msgid "Error in application verification" + msgstr "ਕਾਰਜ ਜਾਂਚ ਵਿੱਚ ਗਲਤੀ ਹੈ" + +-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:868 ++#: ../camel/camel-tcp-stream-openssl.c:700 ++#: ../camel/camel-tcp-stream-ssl.c:880 + #, c-format + msgid "" + "Issuer: %s\n" +@@ -2494,15 +2627,17 @@ msgstr "" + "ਫਿੰਗਰ ਪ੍ਰਿੰਟ: %s\n" + "ਦਸਤਖਤ: %s" + +-#: ../camel/camel-tcp-stream-openssl.c:704 ../camel/camel-tcp-stream-ssl.c:874 ++#: ../camel/camel-tcp-stream-openssl.c:706 ++#: ../camel/camel-tcp-stream-ssl.c:886 + msgid "GOOD" + msgstr "ਵਧੀਆ" + +-#: ../camel/camel-tcp-stream-openssl.c:704 ../camel/camel-tcp-stream-ssl.c:874 ++#: ../camel/camel-tcp-stream-openssl.c:706 ++#: ../camel/camel-tcp-stream-ssl.c:886 + msgid "BAD" + msgstr "ਘਟੀਆ" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ++#: ../camel/camel-tcp-stream-openssl.c:708 + #, c-format + msgid "" + "Bad certificate from %s:\n" +@@ -2522,7 +2657,7 @@ msgstr "" + "ਕੀ ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਤਰਾਂ ਸਵੀਕਾਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" + + #. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:878 ++#: ../camel/camel-tcp-stream-ssl.c:890 + #, c-format + msgid "" + "SSL Certificate check for %s:\n" +@@ -2537,7 +2672,7 @@ msgstr "" + "\n" + "ਕੀ ਤੁਸੀਂ ਸਵੀਕਾਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" + +-#: ../camel/camel-tcp-stream-ssl.c:922 ++#: ../camel/camel-tcp-stream-ssl.c:934 + #, c-format + msgid "" + "Certificate problem: %s\n" +@@ -2546,7 +2681,7 @@ msgstr "" + "ਸਰਟੀਫਿਕੇਟ ਸਮੱਸਿਆ: %s\n" + "ਜਾਰੀ ਕਰਤਾ: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:974 ++#: ../camel/camel-tcp-stream-ssl.c:986 + #, c-format + msgid "" + "Bad certificate domain: %s\n" +@@ -2555,7 +2690,7 @@ msgstr "" + "ਗਲਤ ਸਰਟੀਫਿਕੇਟ ਡੋਮੇਨ: %s\n" + "ਜਾਰੀ ਕਰਤਾ: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:992 ++#: ../camel/camel-tcp-stream-ssl.c:1004 + #, c-format + msgid "" + "Certificate expired: %s\n" +@@ -2564,7 +2699,7 @@ msgstr "" + "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗੀ: %s\n" + "ਜਾਰੀ ਕਰਤਾ: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1009 ++#: ../camel/camel-tcp-stream-ssl.c:1021 + #, c-format + msgid "" + "Certificate revocation list expired: %s\n" +@@ -2573,49 +2708,51 @@ msgstr "" + "ਸਰਟੀਫਿਕੇਟ: %s\n" + "Issuer: %s" + +-#: ../camel/camel-url.c:310 ++#: ../camel/camel-url.c:313 + #, c-format +-msgid "Could not parse URL `%s'" +-msgstr "URL `%s' ਨੂੰ ਪਾਰਸ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਦਾ" ++msgid "Could not parse URL '%s'" ++msgstr "URL '%s' ਨੂੰ ਪਾਰਸ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਦਾ" + +-#: ../camel/camel-vee-folder.c:480 ++#: ../camel/camel-vee-folder.c:585 + #, c-format +-msgid "Error storing `%s': %s" +-msgstr "`%s' ਨੂੰ ਕ੍ਰਮਬੱਧ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s" ++msgid "Error storing '%s': %s" ++msgstr "'%s' ਨੂੰ ਕ੍ਰਮਬੱਧ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s" + +-#: ../camel/camel-vee-folder.c:522 ++#: ../camel/camel-vee-folder.c:631 + #, c-format + msgid "No such message %s in %s" + msgstr "%2s ਵਿੱਚ %1s ਤਰਾਂ ਦਾ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ" + +-#: ../camel/camel-vee-folder.c:647 ../camel/camel-vee-folder.c:653 ++#: ../camel/camel-vee-folder.c:754 ++#: ../camel/camel-vee-folder.c:760 + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "ਫਰਜ਼ੀ ਫੋਲਡਰ ਵਿੱਚ ਸੁਨਹਿਆਂ ਨੂੰ ਨਕਲ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" + +-#: ../camel/camel-vee-store.c:102 ../camel/camel-vee-store.c:345 ++#: ../camel/camel-vee-store.c:114 ++#: ../camel/camel-vee-store.c:115 ++#: ../camel/camel-vee-store.c:360 + msgid "Unmatched" + msgstr "ਨਾ-ਮਿਲਦਾ" + +-#: ../camel/camel-vee-store.c:392 ++#: ../camel/camel-vee-store.c:407 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "ਫੋਲਡਰ ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: ਇਸਤਰਾਂ ਦਾ ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ ਹੈ" + +-#: ../camel/camel-vee-store.c:414 ++#: ../camel/camel-vee-store.c:429 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "ਫੋਲਡਰ ਦਾ ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s: ਇਸ ਤਰਾਂ ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ ਹੈ" + +-#: ../camel/camel-vtrash-folder.c:53 ++#: ../camel/camel-vtrash-folder.c:54 + msgid "Cannot copy messages to the Trash folder" + msgstr "ਸੁਨੇਹੇ ਨੂੰ ਰੱਦੀ ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ" + +-#: ../camel/camel-vtrash-folder.c:55 ++#: ../camel/camel-vtrash-folder.c:56 + msgid "Cannot copy messages to the Junk folder" + msgstr "ਸੁਨੇਹੇ ਨੂੰ ਕਬਾੜ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:120 +-#: ../camel/providers/imap/camel-imap-folder.c:2063 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #, c-format + msgid "" + "Cannot get message: %s\n" +@@ -2624,115 +2761,115 @@ msgstr "" + "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s\n" + " %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:120 +-#: ../camel/providers/imap/camel-imap-folder.c:2063 +-#: ../camel/providers/local/camel-maildir-folder.c:247 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:116 ++#: ../camel/providers/local/camel-maildir-folder.c:251 + #: ../camel/providers/local/camel-mbox-folder.c:348 + #: ../camel/providers/local/camel-mh-folder.c:204 + msgid "No such message" + msgstr "ਇਸਤਰਾਂ ਦਾ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:132 +-#: ../camel/providers/imap4/camel-imap4-folder.c:791 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:128 ++#: ../camel/providers/imap4/camel-imap4-folder.c:812 + #: ../camel/providers/nntp/camel-nntp-folder.c:156 + #: ../camel/providers/nntp/camel-nntp-folder.c:232 +-#: ../camel/providers/nntp/camel-nntp-folder.c:371 +-#: ../camel/providers/pop3/camel-pop3-folder.c:263 +-#: ../camel/providers/pop3/camel-pop3-folder.c:521 +-#: ../camel/providers/pop3/camel-pop3-folder.c:582 +-#: ../camel/providers/pop3/camel-pop3-folder.c:600 ++#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/pop3/camel-pop3-folder.c:266 ++#: ../camel/providers/pop3/camel-pop3-folder.c:560 ++#: ../camel/providers/pop3/camel-pop3-folder.c:621 ++#: ../camel/providers/pop3/camel-pop3-folder.c:639 + msgid "User canceled" + msgstr "ਯੂਜ਼ਰ ਨੇ ਰੱਦ ਕੀਤਾ" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139 +-#: ../camel/providers/imap4/camel-imap4-folder.c:796 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:135 ++#: ../camel/providers/imap4/camel-imap4-folder.c:817 + #: ../camel/providers/nntp/camel-nntp-folder.c:147 + #: ../camel/providers/nntp/camel-nntp-folder.c:149 + #: ../camel/providers/nntp/camel-nntp-folder.c:158 + #: ../camel/providers/nntp/camel-nntp-folder.c:234 +-#: ../camel/providers/pop3/camel-pop3-folder.c:524 +-#: ../camel/providers/pop3/camel-pop3-folder.c:585 +-#: ../camel/providers/pop3/camel-pop3-folder.c:592 +-#: ../camel/providers/pop3/camel-pop3-folder.c:603 ++#: ../camel/providers/pop3/camel-pop3-folder.c:388 ++#: ../camel/providers/pop3/camel-pop3-folder.c:563 ++#: ../camel/providers/pop3/camel-pop3-folder.c:624 ++#: ../camel/providers/pop3/camel-pop3-folder.c:631 ++#: ../camel/providers/pop3/camel-pop3-folder.c:642 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "ਸੁਨੇਹਾ %s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:164 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2117 +-#: ../camel/providers/imap4/camel-imap4-folder.c:814 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:152 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:160 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164 ++#: ../camel/providers/imap4/camel-imap4-folder.c:835 + msgid "This message is not available in offline mode." + msgstr "ਇਹ ਸੁਨੇਹਾ ਆਫਲਾਇਨ ਵਿੱਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:175 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:182 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1667 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1713 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:172 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:179 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747 + msgid "Could not get message" + msgstr "ਕੈਂਚੇ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:813 +-#: ../camel/providers/imap/camel-imap-folder.c:253 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:818 ++#: ../camel/providers/imap/camel-imap-folder.c:248 + #, c-format + msgid "Could not load summary for %s" + msgstr "%s ਲਈ ਸੰਖੇਪ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1042 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071 + msgid "Trash Folder Full. Please Empty." + msgstr "ਰੱਦੀ ਫੋਲਡਰ ਭਰ ਗਿਆ ਹੈ। ਖਾਲੀ ਕਰੋ ਜੀ।" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1219 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:630 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:744 +-#: ../camel/providers/imap/camel-imap-folder.c:2394 +-#: ../camel/providers/imap/camel-imap-folder.c:2464 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:623 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:736 ++#: ../camel/providers/imap/camel-imap-folder.c:3161 ++#: ../camel/providers/imap/camel-imap-folder.c:3238 + #, c-format + msgid "Fetching summary information for new messages in %s" + msgstr "%s ਵਿੱਚ ਨਵੇਂ ਸੁਨਹਿਆਂ ਲਈ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1984 +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2026 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073 + #, c-format +-msgid "Cannot append message to folder `%s': %s" +-msgstr "ਫੋਲਡਰ `%s' ਲਈ ਸੁਨੇਹਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ: %s" ++msgid "Cannot append message to folder '%s': %s" ++msgstr "ਫੋਲਡਰ '%s' ਲਈ ਸੁਨੇਹਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2014 ++#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061 + #, c-format + msgid "Cannot create message: %s" + msgstr "ਸੁਨੇਹਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:284 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:285 + #, c-format + msgid "Cannot get folder container %s" + msgstr "ਫੋਲਡਰ ਬਕਸਾ %s ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਸਕਿਆ" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:348 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:349 + #: ../camel/providers/imap4/camel-imap4-journal.c:319 + msgid "Cannot append message in offline mode: cache unavailable" + msgstr "ਆਫਲਾਇਨ ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: ਕੈਂਚੇ ਉਪਲੱਬਧ ਨਹੀਂ" + +-#: ../camel/providers/groupwise/camel-groupwise-journal.c:364 ++#: ../camel/providers/groupwise/camel-groupwise-journal.c:365 + #: ../camel/providers/imap4/camel-imap4-journal.c:335 + #, c-format + msgid "Cannot append message in offline mode: %s" + msgstr "ਆਫਲਾਇਨ ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:55 +-#: ../camel/providers/imap4/camel-imap4-provider.c:38 ++#: ../camel/providers/imap4/camel-imap4-provider.c:39 + msgid "Checking for new mail" + msgstr "ਨਵੀਂ ਮੇਲ ਲਈ ਚੈੱਕ ਕੀਤੀ ਜਾ ਰਿਹਾ ਹੈ" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:57 + #: ../camel/providers/hula/camel-hula-provider.c:51 + #: ../camel/providers/imap/camel-imap-provider.c:46 +-#: ../camel/providers/imap4/camel-imap4-provider.c:40 ++#: ../camel/providers/imap4/camel-imap4-provider.c:41 + msgid "C_heck for new messages in all folders" + msgstr "ਸਭ ਫੋਲਡਰਾਂ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਜਾਂਚ(_h)" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:60 +-#: ../camel/providers/imap/camel-imap-provider.c:66 +-#: ../camel/providers/imap4/camel-imap4-provider.c:51 ++#: ../camel/providers/imap/camel-imap-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:52 + #: ../camel/providers/local/camel-local-provider.c:46 + #: ../camel/providers/local/camel-local-provider.c:86 + #: ../camel/providers/local/camel-local-provider.c:106 +@@ -2748,7 +2885,7 @@ msgid "Check new messages for J_unk cont + msgstr "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਜੰਕ ਸਮੱਗਰੀ ਲਈ ਜਾਂਚੋ(_u)" + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:66 +-#: ../camel/providers/imap/camel-imap-provider.c:72 ++#: ../camel/providers/imap/camel-imap-provider.c:74 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "ਆਉਣ-ਬਕਸਾ ਫੋਲਡਰ ਵਿੱਚ ਜੰਕ ਸੁਨੇਹਿਆਂ ਲਈ ਚੈੱਕ ਕਰੋ(_B)" + +@@ -2774,8 +2911,8 @@ msgstr "Novell GroupWise ਸਰਵਰ + + #: ../camel/providers/groupwise/camel-groupwise-provider.c:106 + #: ../camel/providers/hula/camel-hula-provider.c:95 +-#: ../camel/providers/imap/camel-imap-provider.c:98 +-#: ../camel/providers/imap4/camel-imap4-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap4/camel-imap4-provider.c:84 + #: ../camel/providers/imapp/camel-imapp-provider.c:67 + #: ../camel/providers/nntp/camel-nntp-provider.c:74 + #: ../camel/providers/pop3/camel-pop3-provider.c:72 +@@ -2790,77 +2927,63 @@ msgstr "ਇਸ ਚੋਣ ਨਾਲ Group + msgid "Host or user not available in url" + msgstr "url ਵਿੱਚ ਹੋਸਟ ਜਾਂ ਯੂਜ਼ਰ ਉਪਲੱਬਧ ਨਹੀਂ" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:204 +-#, c-format +-msgid "%sPlease enter the GroupWise password for %s@%s" +-msgstr "%sਕਿਰਪਾ ਕਰਕੇ %s@%s ਲਈ Groupwise ਪਾਸਵਰਡ ਦਿਓ" +- +-#: ../camel/providers/groupwise/camel-groupwise-store.c:218 +-#: ../camel/providers/imap/camel-imap-store.c:1384 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:206 ++#: ../camel/providers/imap/camel-imap-store.c:1356 + msgid "You did not enter a password." + msgstr "ਤੁਸੀਂ ਪਾਸਵਰਡ ਨਹੀਂ ਭਰਿਆ ਹੈ।" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:230 +-msgid "Unable to authenticate to GroupWise server. " +-msgstr "GroupWise ਸਰਵਰ ਤੇ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।" +- +-#: ../camel/providers/groupwise/camel-groupwise-store.c:308 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:302 + msgid "Some features may not work correctly with your current server version" + msgstr "ਤੁਹਾਡੇ ਸਰਵਰ ਦੇ ਮੌਜੂਦਾ ਵਰਜਨ ਨਾਲ ਕੁਝ ਗੁਣ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਨ" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:538 +-#: ../camel/providers/imap/camel-imap-store.c:1893 +-#: ../camel/providers/imap/camel-imap-store.c:2084 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:532 ++#: ../camel/providers/imap/camel-imap-store.c:1846 ++#: ../camel/providers/imap/camel-imap-store.c:2044 + #, c-format + msgid "No such folder %s" + msgstr "ਫੋਲਡਰ %s ਮੌਜੂਦ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1225 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1219 + msgid "Cannot create GroupWise folders in offline mode." + msgstr "ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ GroupWise ਫੋਲਡਰ ਬਣਾਉਣੇ ਸੰਭਵ ਨਹੀਂ ਹਨ।" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1239 +-#: ../camel/providers/imap/camel-imap-store.c:1968 +-#: ../camel/providers/imap/camel-imap-store.c:2337 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1233 ++#: ../camel/providers/imap/camel-imap-store.c:1921 ++#: ../camel/providers/imap/camel-imap-store.c:2301 + msgid "The parent folder is not allowed to contain subfolders" + msgstr "ਮੁੱਢਲੇ ਫੋਲਡਰ ਵਿੱਚ ਸਬ-ਫੋਲਡਰ ਸਵੀਕਾਰ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1316 +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1337 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1309 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1330 + #, c-format +-msgid "Cannot rename Groupwise folder `%s' to `%s'" +-msgstr "GroupWise ਫੋਲਡਰ `%s' ਦਾ ਨਾਂ-ਤਬਦੀਲ `%s' ਲਈ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ" ++msgid "Cannot rename Groupwise folder '%s' to '%s'" ++msgstr "GroupWise ਫੋਲਡਰ '%s' ਦਾ ਨਾਂ-ਤਬਦੀਲ '%s' ਲਈ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1369 +-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1362 ++#: ../camel/providers/groupwise/camel-groupwise-transport.c:121 + #, c-format + msgid "GroupWise server %s" + msgstr "GroupWise ਸਰਵਰ %s" + +-#: ../camel/providers/groupwise/camel-groupwise-store.c:1371 ++#: ../camel/providers/groupwise/camel-groupwise-store.c:1364 + #, c-format + msgid "GroupWise service for %s on %s" + msgstr "ਗਰੁੱਪਵਾਇਜ਼ ਸੇਵਾ %s ਲਈ %s ਉੱਤੇ" + +-#: ../camel/providers/groupwise/camel-groupwise-transport.c:125 ++#: ../camel/providers/groupwise/camel-groupwise-transport.c:123 + #, c-format + msgid "GroupWise mail delivery via %s" + msgstr "%s ਨਾਲ ਗਰੁੱਪਵਾਈਜ ਪੱਤਰ" + +-#: ../camel/providers/groupwise/camel-groupwise-transport.c:169 ++#: ../camel/providers/groupwise/camel-groupwise-transport.c:167 + msgid "Sending Message" + msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ" + +-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223 +-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" ++#: ../camel/providers/groupwise/camel-groupwise-transport.c:221 ++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" + +-#: ../camel/providers/groupwise/camel-groupwise-transport.c:225 ++#: ../camel/providers/groupwise/camel-groupwise-transport.c:223 + #: ../camel/providers/sendmail/camel-sendmail-transport.c:209 + #, c-format + msgid "Could not send message: %s" +@@ -2872,36 +2995,36 @@ msgid "Checking for New Mail" + msgstr "ਨਵੇਂ ਮੇਲ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" + + #: ../camel/providers/hula/camel-hula-provider.c:54 +-#: ../camel/providers/imap/camel-imap-provider.c:50 ++#: ../camel/providers/imap/camel-imap-provider.c:52 + msgid "Connection to Server" + msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ" + + #: ../camel/providers/hula/camel-hula-provider.c:56 +-#: ../camel/providers/imap/camel-imap-provider.c:52 ++#: ../camel/providers/imap/camel-imap-provider.c:54 + msgid "_Use custom command to connect to server" + msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਪਸੰਦੀਦਾ ਕਮਾਂਡ ਵਰਤੋਂ(_U)" + + #: ../camel/providers/hula/camel-hula-provider.c:58 +-#: ../camel/providers/imap/camel-imap-provider.c:54 ++#: ../camel/providers/imap/camel-imap-provider.c:56 + msgid "Command:" + msgstr "ਕਮਾਂਡ:" + + #: ../camel/providers/hula/camel-hula-provider.c:61 +-#: ../camel/providers/imap/camel-imap-provider.c:58 +-#: ../camel/providers/imap4/camel-imap4-provider.c:43 ++#: ../camel/providers/imap/camel-imap-provider.c:60 ++#: ../camel/providers/imap4/camel-imap4-provider.c:44 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "ਫੋਲਡਰ" + + #: ../camel/providers/hula/camel-hula-provider.c:63 +-#: ../camel/providers/imap/camel-imap-provider.c:60 +-#: ../camel/providers/imap4/camel-imap4-provider.c:45 ++#: ../camel/providers/imap/camel-imap-provider.c:62 ++#: ../camel/providers/imap4/camel-imap4-provider.c:46 + msgid "_Show only subscribed folders" + msgstr "ਮੈਂਬਰੀ ਫੋਲਡਰ ਹੀ ਵੇਖਾਓ(_S)" + + #: ../camel/providers/hula/camel-hula-provider.c:65 +-#: ../camel/providers/imap/camel-imap-provider.c:62 +-#: ../camel/providers/imap4/camel-imap4-provider.c:47 ++#: ../camel/providers/imap/camel-imap-provider.c:64 ++#: ../camel/providers/imap4/camel-imap4-provider.c:48 + msgid "O_verride server-supplied folder namespace" + msgstr "ਸਰਵਰ-ਰਾਹੀਂ ਉਪਲੱਬਧ ਫੋਲਡਰ ਨਾਂ-ਥਾਂ ਉੱਪਰ(_v)" + +@@ -2921,22 +3044,32 @@ msgstr "Hula ਸਰਵਰ ਵਰਤਣ + msgid "This option will connect to the Hula server using a plaintext password." + msgstr "ਇਹ ਚੋਣ Hula ਸਰਵਰ ਨਾਲ ਪਲੇਨ-ਟੈਕਸਟ ਪਾਸਵਰਡ ਨਾਲ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।" + +-#: ../camel/providers/imap/camel-imap-command.c:224 +-#: ../camel/providers/imap/camel-imap-command.c:266 +-#: ../camel/providers/imap/camel-imap-command.c:472 +-#: ../camel/providers/imap/camel-imap-store.c:3037 ++#: ../camel/providers/imap/camel-imap-command.c:183 ++#: ../camel/providers/imap/camel-imap-command.c:267 ++msgid "No output stream" ++msgstr "ਕੋਈ ਆਉਟਪੁੱਟ ਸਟਰੀਮ" ++ ++#: ../camel/providers/imap/camel-imap-command.c:188 ++#: ../camel/providers/imap/camel-imap-command.c:272 ++msgid "No input stream" ++msgstr "ਇੰਪੁੱਟ ਸਟਰੀਮ ਨਹੀਂ" ++ ++#: ../camel/providers/imap/camel-imap-command.c:231 ++#: ../camel/providers/imap/camel-imap-command.c:280 ++#: ../camel/providers/imap/camel-imap-command.c:494 ++#: ../camel/providers/imap/camel-imap-store.c:3029 + msgid "Operation cancelled" + msgstr "ਕਾਰਵਾਈ ਅਸਫਲ" + +-#: ../camel/providers/imap/camel-imap-command.c:311 +-#: ../camel/providers/imap/camel-imap-store.c:3040 ++#: ../camel/providers/imap/camel-imap-command.c:333 ++#: ../camel/providers/imap/camel-imap-store.c:3032 + #, c-format + msgid "Server unexpectedly disconnected: %s" + msgstr "ਸਰਵਰ ਅਸਧਾਰਨ ਤੌਰ ਤੇ ਵੱਖ ਹੋ ਗਿਆ: %s" + + #. for imap ALERT codes, account user@host + #. we might get a ']' from a BAD response since we +12, but who cares? +-#: ../camel/providers/imap/camel-imap-command.c:332 ++#: ../camel/providers/imap/camel-imap-command.c:354 + #, c-format + msgid "" + "Alert from IMAP server %s@%s:\n" +@@ -2945,228 +3078,257 @@ msgstr "" + "IMAP ਸਰਵਰ %s@%s ਵਲੋਂ ਚੇਤਾਵਨੀ:\n" + "%s" + +-#: ../camel/providers/imap/camel-imap-command.c:401 ++#: ../camel/providers/imap/camel-imap-command.c:423 + #, c-format + msgid "Unexpected response from IMAP server: %s" + msgstr "IMAP ਸਰਵਰ ਵਲੋਂ ਅਸਧਾਰਨ ਜਵਾਬ: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:411 ++#: ../camel/providers/imap/camel-imap-command.c:433 + #, c-format + msgid "IMAP command failed: %s" + msgstr "IMAP ਕਮਾਂਡ ਅਸਫਲ: %s" + +-#: ../camel/providers/imap/camel-imap-command.c:486 ++#: ../camel/providers/imap/camel-imap-command.c:508 + msgid "Server response ended too soon." + msgstr "ਸਰਵਰ ਦਾ ਜਵਾਬ ਬੜੀ ਛੇਤੀ ਸਮਾਪਤ ਹੋ ਗਿਆ ਹੈ।" + +-#: ../camel/providers/imap/camel-imap-command.c:693 ++#: ../camel/providers/imap/camel-imap-command.c:715 + #, c-format + msgid "IMAP server response did not contain %s information" + msgstr "IMAP ਸਰਵਰ ਦੇ ਜਵਾਬ ਵਿੱਚ %s ਜਾਣਕਾਰੀ ਨਹੀਂ ਸੀ" + +-#: ../camel/providers/imap/camel-imap-command.c:729 ++#: ../camel/providers/imap/camel-imap-command.c:751 + #, c-format + msgid "Unexpected OK response from IMAP server: %s" + msgstr "IMAP ਸਰਵਰ ਤੋਂ ਅਸਧਾਰਨ ਸਭ ਠੀਕ ਹੈਂ ਜਵਾਬ: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:234 ++#: ../camel/providers/imap/camel-imap-folder.c:88 ++msgid "Always check for new mail in this folder" ++msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਹਮੇਸ਼ਾ ਨਵੀਂ ਚਿੱਠੀ ਵੇਖੋ" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:229 + #, c-format + msgid "Could not create directory %s: %s" + msgstr "ਡਾਇਰੈਕਟਰੀ %s ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:336 +-msgid "Folder was destroyed and recreated on server." +-msgstr "ਫੋਲਡਰ ਸਰਵਰ ਉੱਤੇ ਹਟਾਇਆ ਗਿਆ ਅਤੇ ਮੁੜ ਬਣਾਇਆ ਗਿਆ" +- + #. Check UIDs and flags of all messages we already know of. +-#: ../camel/providers/imap/camel-imap-folder.c:632 ++#: ../camel/providers/imap/camel-imap-folder.c:843 + #, c-format + msgid "Scanning for changed messages in %s" + msgstr "%s ਵਿੱਚ ਤਬਦੀਲ ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ" + +-#: ../camel/providers/imap/camel-imap-folder.c:2023 ++#: ../camel/providers/imap/camel-imap-folder.c:1838 ++#, c-format ++msgid "Unexpected response status '%s' after APPEND command" ++msgstr "APPEND ਕਮਾਂਡ ਦੇ ਬਾਅਦ ਅਚਾਨਕ ਜਵਾਬ ਹਾਲਤ '%s'" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1853 ++msgid "No response on continuation after APPEND command" ++msgstr "APPEND ਕਮਾਂਡ ਦੇ ਬਾਅਦ ਕੋਈ ਜਵਾਬ ਨਹੀਂ" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:1895 ++msgid "Unknown error occurred during APPEND command!" ++msgstr "APPEND ਕਮਾਂਡ ਦੇ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ ਆਈ ਹੈ!" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2707 + #, c-format + msgid "Unable to retrieve message: %s" + msgstr "ਸੁਨੇਹਾ ਲੈਣ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2102 +-#: ../camel/providers/imap/camel-imap-folder.c:2735 ++#: ../camel/providers/imap/camel-imap-folder.c:2748 ++#, c-format ++msgid "Cannot get message with message ID %s: %s" ++msgstr "ਸੁਨੇਹਾ ID %s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2749 ++msgid "No such message available." ++msgstr "ਇੰਝ ਦਾ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।" ++ ++#: ../camel/providers/imap/camel-imap-folder.c:2788 ++#: ../camel/providers/imap/camel-imap-folder.c:3540 + #: ../camel/providers/nntp/camel-nntp-folder.c:220 + msgid "This message is not currently available" + msgstr "ਇਹ ਸੁਨੇਹਾ ਮੌਕੇ ਤੇ ਉਪਲੱਬਧ ਹੈ" + +-#: ../camel/providers/imap/camel-imap-folder.c:2573 ++#: ../camel/providers/imap/camel-imap-folder.c:3367 + #, c-format + msgid "Incomplete server response: no information provided for message %d" + msgstr "ਸਰਵਰ ਤੋਂ ਅਧੂਰਾ ਜਵਾਬ: ਸੁਨੇਹਾ %d ਲਈ ਕੋਈ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/imap/camel-imap-folder.c:2581 ++#: ../camel/providers/imap/camel-imap-folder.c:3375 + #, c-format + msgid "Incomplete server response: no UID provided for message %d" + msgstr "ਅਧੂਰਾ ਸਰਵਰ ਜਵਾਬ: ਸੁਨੇਹੇ %d ਲਈ ਕੋਈ UID ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/imap/camel-imap-folder.c:2594 +-#, c-format +-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d" +-msgstr "ਅਧੂਰਾ ਸਰਵਰ ਜਵਾਬ: ਸੁਨੇਹੇ %d ਅਤੇ %d ਲਈ ਇੱਕੋ UIDs ਉਪਲੱਬਧ ਕਰਵਾਏ ਗਏ" +- +-#: ../camel/providers/imap/camel-imap-folder.c:2773 ++#: ../camel/providers/imap/camel-imap-folder.c:3578 + msgid "Could not find message body in FETCH response." + msgstr "FETCH ਜਵਾਬ ਵਿੱਚ ਸੁਨੇਹਾ ਭਾਗ ਨਹੀਂ ਮਿਲਿਆ।" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:161 ++#: ../camel/providers/imap/camel-imap-message-cache.c:160 ++#: ../camel/providers/imap/camel-imap-message-cache.c:220 + #, c-format + msgid "Could not open cache directory: %s" + msgstr "ਕੈਚੇ ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:267 +-#: ../camel/providers/imap/camel-imap-message-cache.c:324 +-#: ../camel/providers/imap/camel-imap-message-cache.c:355 +-#: ../camel/providers/imap/camel-imap-message-cache.c:387 ++#: ../camel/providers/imap/camel-imap-message-cache.c:307 ++#: ../camel/providers/imap/camel-imap-message-cache.c:364 ++#: ../camel/providers/imap/camel-imap-message-cache.c:395 ++#: ../camel/providers/imap/camel-imap-message-cache.c:427 + #, c-format + msgid "Failed to cache message %s: %s" + msgstr "ਸੁਨੇਹਾ %s ਕੈਚੇ ਲੈਣ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/providers/imap/camel-imap-message-cache.c:437 ++#: ../camel/providers/imap/camel-imap-message-cache.c:478 + #, c-format + msgid "Failed to cache %s: %s" + msgstr "ਕੈਚੇ %s ਲਈ ਅਸਫਲ: %s" + +-#: ../camel/providers/imap/camel-imap-provider.c:64 +-#: ../camel/providers/imap4/camel-imap4-provider.c:49 ++#: ../camel/providers/imap/camel-imap-provider.c:48 ++msgid "Ch_eck for new messages in subscribed folders" ++msgstr "ਮੈਂਬਰ ਬਣਾਏ ਫੋਲਡਰਾਂ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹੇ ਚੈੱਕ ਕਰੋ(_e)" ++ ++#: ../camel/providers/imap/camel-imap-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:50 + msgid "Namespace:" + msgstr "ਨੇਮ-ਸਪੇਸ:" + +-#: ../camel/providers/imap/camel-imap-provider.c:68 +-#: ../camel/providers/imap4/camel-imap4-provider.c:53 ++#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap4/camel-imap4-provider.c:54 + msgid "_Apply filters to new messages in INBOX on this server" + msgstr "ਇਸ ਸਰਵਰ ਉੱਤੇ ਇਨ-ਬਾਕਸ(INBOX) ਵਿੱਚ ਨਵੇਂ ਸੁਨਹਿਆਂ ਉੱਤੇ ਫਿਲਟਰ ਲਗਾਓ(_A)" + +-#: ../camel/providers/imap/camel-imap-provider.c:70 ++#: ../camel/providers/imap/camel-imap-provider.c:72 + msgid "Check new messages for Jun_k contents" + msgstr "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਜੰਕ ਸਮੱਗਰੀ ਲਈ ਚੈੱਕ ਕਰੋ(_K)" + +-#: ../camel/providers/imap/camel-imap-provider.c:74 +-#: ../camel/providers/imap4/camel-imap4-provider.c:59 ++#: ../camel/providers/imap/camel-imap-provider.c:76 ++#: ../camel/providers/imap4/camel-imap4-provider.c:60 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "ਰਿਮੋਟ ਮੇਲ ਲੋਕਲੀ ਆਟੋਮੈਟਿਕ ਹੀ ਸਿਕਰਾਨਾਇਜ਼ ਕਰੋ(_z)" + +-#: ../camel/providers/imap/camel-imap-provider.c:81 ++#: ../camel/providers/imap/camel-imap-provider.c:83 + msgid "IMAP" + msgstr "IMAP" + +-#: ../camel/providers/imap/camel-imap-provider.c:83 ++#: ../camel/providers/imap/camel-imap-provider.c:85 + msgid "For reading and storing mail on IMAP servers." + msgstr "IMAP ਸਰਵਰਾਂ ਉੱਤੇ ਮੇਲ ਪੜਨ ਅਤੇ ਸੰਭਾਲਣ ਲਈ" + +-#: ../camel/providers/imap/camel-imap-provider.c:100 ++#: ../camel/providers/imap/camel-imap-provider.c:102 + #: ../camel/providers/imapp/camel-imapp-provider.c:69 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "ਇਹ ਚੋਣ IMAP ਸਰਵਰ ਨਾਲ ਪਲੇਨ-ਟੈਕਸਟ ਪਾਸਵਰਡ ਨਾਲ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।" + +-#: ../camel/providers/imap/camel-imap-store.c:455 +-#: ../camel/providers/imap4/camel-imap4-store.c:212 ++#: ../camel/providers/imap/camel-imap-store.c:436 ++#: ../camel/providers/imap4/camel-imap4-store.c:214 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP ਸਰਵਰ %s" + +-#: ../camel/providers/imap/camel-imap-store.c:457 +-#: ../camel/providers/imap4/camel-imap4-store.c:214 ++#: ../camel/providers/imap/camel-imap-store.c:438 ++#: ../camel/providers/imap4/camel-imap4-store.c:216 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "IMAP ਸੇਵਾ %2s ਤੇ %1s ਲਈ" + +-#: ../camel/providers/imap/camel-imap-store.c:586 +-#: ../camel/providers/imap/camel-imap-store.c:601 +-#: ../camel/providers/imap4/camel-imap4-store.c:249 +-#: ../camel/providers/imap4/camel-imap4-store.c:264 ++#: ../camel/providers/imap/camel-imap-store.c:567 ++#: ../camel/providers/imap/camel-imap-store.c:582 ++#: ../camel/providers/imap4/camel-imap4-store.c:251 ++#: ../camel/providers/imap4/camel-imap4-store.c:266 + #: ../camel/providers/nntp/camel-nntp-store.c:183 + #: ../camel/providers/nntp/camel-nntp-store.c:198 +-#: ../camel/providers/pop3/camel-pop3-store.c:170 ++#: ../camel/providers/pop3/camel-pop3-store.c:171 + #: ../camel/providers/pop3/camel-pop3-store.c:185 +-#: ../camel/providers/smtp/camel-smtp-transport.c:258 +-#: ../camel/providers/smtp/camel-smtp-transport.c:273 ++#: ../camel/providers/smtp/camel-smtp-transport.c:260 ++#: ../camel/providers/smtp/camel-smtp-transport.c:275 + #, c-format + msgid "Could not connect to %s: %s" + msgstr "%s ਨਾਲ ਜੁੜ ਨਹੀਂ ਸਕਦਾ: %s" + +-#: ../camel/providers/imap/camel-imap-store.c:587 +-#: ../camel/providers/imap4/camel-imap4-store.c:250 ++#: ../camel/providers/imap/camel-imap-store.c:568 ++#: ../camel/providers/imap4/camel-imap4-store.c:252 + #: ../camel/providers/nntp/camel-nntp-store.c:184 +-#: ../camel/providers/pop3/camel-pop3-store.c:171 +-#: ../camel/providers/smtp/camel-smtp-transport.c:259 ++#: ../camel/providers/pop3/camel-pop3-store.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:261 + msgid "SSL unavailable" + msgstr "SSL ਉਪਲੱਬਧ ਨਹੀ ਹੈ" + +-#: ../camel/providers/imap/camel-imap-store.c:598 +-#: ../camel/providers/imap/camel-imap-store.c:879 ++#: ../camel/providers/imap/camel-imap-store.c:579 ++#: ../camel/providers/imap/camel-imap-store.c:861 + msgid "Connection cancelled" + msgstr "ਕੁਨੈਕਸ਼ਨ ਰੱਦ ਕੀਤਾ" + +-#: ../camel/providers/imap/camel-imap-store.c:706 +-#: ../camel/providers/imap/camel-imap-store.c:728 +-#: ../camel/providers/imap/camel-imap-store.c:734 +-#: ../camel/providers/imap/camel-imap-store.c:760 +-#: ../camel/providers/imap4/camel-imap4-store.c:312 +-#: ../camel/providers/imap4/camel-imap4-store.c:327 +-#: ../camel/providers/imap4/camel-imap4-store.c:335 ++#: ../camel/providers/imap/camel-imap-store.c:690 ++#: ../camel/providers/imap/camel-imap-store.c:709 ++#: ../camel/providers/imap/camel-imap-store.c:715 ++#: ../camel/providers/imap/camel-imap-store.c:741 ++#: ../camel/providers/imap4/camel-imap4-store.c:314 ++#: ../camel/providers/imap4/camel-imap4-store.c:329 ++#: ../camel/providers/imap4/camel-imap4-store.c:338 + #, 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:707 +-#: ../camel/providers/smtp/camel-smtp-transport.c:327 ++#: ../camel/providers/imap/camel-imap-store.c:691 ++#: ../camel/providers/smtp/camel-smtp-transport.c:333 + msgid "STARTTLS not supported" + msgstr "ਪ੍ਰੋਟੋਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/imap/camel-imap-store.c:729 ++#: ../camel/providers/imap/camel-imap-store.c:710 + msgid "SSL negotiations failed" + msgstr "SSL ਗੱਲਬਾਤ ਅਸਫਲ" + +-#: ../camel/providers/imap/camel-imap-store.c:735 +-#: ../camel/providers/imap4/camel-imap4-store.c:336 +-#: ../camel/providers/smtp/camel-smtp-transport.c:366 ++#: ../camel/providers/imap/camel-imap-store.c:716 ++#: ../camel/providers/imap4/camel-imap4-store.c:339 ++#: ../camel/providers/smtp/camel-smtp-transport.c:372 + msgid "SSL is not available in this build" + msgstr "ਇਸ ਨਿਰਮਾਣ ਵਿੱਚ SSL ਉਪਲੱਬਧ ਨਹੀਂ" + +-#: ../camel/providers/imap/camel-imap-store.c:882 ++#: ../camel/providers/imap/camel-imap-store.c:864 + #, c-format + msgid "Could not connect with command \"%s\": %s" + msgstr "ਕਮਾਂਡ \"%s\" ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imap/camel-imap-store.c:1066 +-#: ../camel/providers/imap/camel-imap-store.c:2433 +-#: ../camel/providers/imap4/camel-imap4-store-summary.c:367 +-#: ../camel/providers/imap4/camel-imap4-store.c:1319 ++#: ../camel/providers/imap/camel-imap-store.c:1052 ++#: ../camel/providers/imap/camel-imap-store.c:2397 ++#: ../camel/providers/imap4/camel-imap4-store-summary.c:368 ++#: ../camel/providers/imap4/camel-imap4-store.c:1408 + #: ../camel/providers/local/camel-maildir-folder.c:77 +-#: ../camel/providers/local/camel-maildir-store.c:218 +-#: ../camel/providers/local/camel-maildir-store.c:290 +-#: ../camel/providers/local/camel-maildir-store.c:512 +-#: ../camel/providers/local/camel-maildir-store.c:525 ++#: ../camel/providers/local/camel-maildir-store.c:219 ++#: ../camel/providers/local/camel-maildir-store.c:291 ++#: ../camel/providers/local/camel-maildir-store.c:517 ++#: ../camel/providers/local/camel-maildir-store.c:530 + #: ../camel/providers/local/camel-spool-store.c:464 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264 + msgid "Inbox" + msgstr "ਆਉਣ-ਬਕਸਾ" + +-#: ../camel/providers/imap/camel-imap-store.c:1337 ++#: ../camel/providers/imap/camel-imap-store.c:1054 ++#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263 ++msgid "Drafts" ++msgstr "ਡਰਾਫਟ" ++ ++#: ../camel/providers/imap/camel-imap-store.c:1056 ++msgid "Sent" ++msgstr "ਭੇਜੇ" ++ ++#: ../camel/providers/imap/camel-imap-store.c:1058 ++msgid "Templates" ++msgstr "ਟੈਪਲੇਟ" ++ ++#: ../camel/providers/imap/camel-imap-store.c:1303 + #, c-format + msgid "IMAP server %s does not support requested authentication type %s" + msgstr "IMAP ਸਰਵਰ %s ਲੋੜੀਦੀ ਪ੍ਰਮਾਣਿਤ ਕਿਸਮ %s ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/imap/camel-imap-store.c:1347 +-#: ../camel/providers/smtp/camel-smtp-transport.c:497 ++#: ../camel/providers/imap/camel-imap-store.c:1313 ++#: ../camel/providers/smtp/camel-smtp-transport.c:507 + #, c-format + msgid "No support for authentication type %s" + msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ %s ਲਈ ਸਹਾਈ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/imap/camel-imap-store.c:1370 +-#: ../camel/providers/imapp/camel-imapp-store.c:365 +-#, c-format +-msgid "%sPlease enter the IMAP password for %s@%s" +-msgstr "%s ਕਿਰਪਾ ਕਰਕੇ %s@%s ਲਈ IMAP ਪਾਸਵਰਡ ਦਿਓ" +- +-#: ../camel/providers/imap/camel-imap-store.c:1413 ++#: ../camel/providers/imap/camel-imap-store.c:1385 + #, c-format + msgid "" + "Unable to authenticate to IMAP server.\n" +@@ -3177,33 +3339,33 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/imap/camel-imap-store.c:1905 +-#: ../camel/providers/imap/camel-imap-store.c:2275 +-#: ../camel/providers/imap4/camel-imap4-store.c:949 ++#: ../camel/providers/imap/camel-imap-store.c:1858 ++#: ../camel/providers/imap/camel-imap-store.c:2239 ++#: ../camel/providers/imap4/camel-imap4-store.c:959 + #, 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:2022 +-#: ../camel/providers/local/camel-maildir-store.c:191 ++#: ../camel/providers/imap/camel-imap-store.c:1975 ++#: ../camel/providers/local/camel-maildir-store.c:192 + #: ../camel/providers/local/camel-mbox-store.c:204 + #: ../camel/providers/local/camel-mh-store.c:249 + #, c-format +-msgid "Cannot create folder `%s': folder exists." +-msgstr "ਫੋਲਡਰ `%s' ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ: ਫੋਲਡਰ ਮੌਜੂਦ ਹੈ।" ++msgid "Cannot create folder '%s': folder exists." ++msgstr "ਫੋਲਡਰ '%s' ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ: ਫੋਲਡਰ ਮੌਜੂਦ ਹੈ।" + +-#: ../camel/providers/imap/camel-imap-store.c:2286 ++#: ../camel/providers/imap/camel-imap-store.c:2250 + #, c-format + msgid "Unknown parent folder: %s" + msgstr "ਅਣਜਾਣਾ ਮੁੱਢਲਾ ਫੋਲਡਰ: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:550 +-#: ../camel/providers/imap4/camel-imap4-command.c:557 ++#: ../camel/providers/imap4/camel-imap4-command.c:576 ++#: ../camel/providers/imap4/camel-imap4-command.c:583 + #, c-format + msgid "Failed sending command to IMAP server %s: %s" + msgstr "IMAP ਸਰਵਰ %s ਨੂੰ ਕਮਾਂਡ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/providers/imap4/camel-imap4-command.c:660 ++#: ../camel/providers/imap4/camel-imap4-command.c:686 + #, c-format + msgid "Unexpected response from IMAP4 server %s: %s" + msgstr "IMAP4 ਸਰਵਰ %s ਤੋਂ ਅਣਚਾਹਿਆ ਜਵਾਬ: %s" +@@ -3213,280 +3375,288 @@ msgstr "IMAP4 ਸਰਵਰ %s ਤੋਂ + msgid "Unexpected greeting from IMAP server %s." + msgstr "IMAP ਸਰਵਰ %s ਤੋਂ ਅਣਜਾਣਾ ਸਵਾਗਤੀ ਸੁਨੇਹਾ" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:431 ++#: ../camel/providers/imap4/camel-imap4-engine.c:450 ++#, c-format ++msgid "Cannot select folder '%s': Invalid mailbox name" ++msgstr "ਫੋਲਡਰ '%s' ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:456 + #, c-format +-msgid "Cannot select folder `%s': Invalid mailbox name" +-msgstr "ਫੋਲਡਰ `%s' ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ" ++msgid "Cannot select folder '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%s' ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:437 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1433 + #, c-format +-msgid "Cannot select folder `%s': Bad command" +-msgstr "ਫੋਲਡਰ `%s' ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:ਗਲਤ ਕਮਾਂਡ" ++msgid "Failed to send command to IMAP server %s: %s" ++msgstr "IMAP ਸਰਵਰ %s ਨੂੰ ਕਮਾਂਡ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/providers/imap4/camel-imap4-engine.c:1547 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1586 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1631 +-#: ../camel/providers/imap4/camel-imap4-engine.c:1687 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1435 ++msgid "service unavailable" ++msgstr "ਸਰਵਿਸ ਉਪਲੱਬਧ ਨਹੀ ਹੈ" ++ ++#: ../camel/providers/imap4/camel-imap4-engine.c:1569 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1608 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1653 ++#: ../camel/providers/imap4/camel-imap4-engine.c:1709 + #, c-format + msgid "IMAP4 server %s unexpectedly disconnected: %s" + msgstr "IMAP4 ਸਰਵਰ %s ਅਸਧਾਰਨ ਬੰਦ ਹੋ ਗਿਆ ਹੈ: %s" + + #: ../camel/providers/imap4/camel-imap4-folder.c:89 +-msgid "Enable Mailing-List detection required for some filter and vFolder rules" +-msgstr "ਕੁਝ ਫਿਲਟਰਾਂ ਅਤੇ vFolder ਨਿਯਮਾਂ ਲ਼ਈ ਮੇਲਿੰਗ-ਲਿਸਟ ਖੋਜ ਯੋਗ" ++msgid "Enable extended Mailing-List detection required for some filter and vFolder rules" ++msgstr "ਕੁਝ ਫਿਲਟਰਾਂ ਅਤੇ vFolder ਨਿਯਮਾਂ ਹੋਰ ਮੇਲਿੰਗ-ਲਿਸਟ ਖੋਜ ਲਈ ਚਾਹੀਦੇ ਹਨ" ++ ++#: ../camel/providers/imap4/camel-imap4-folder.c:90 ++msgid "Expire cached messages that haven't been read in X seconds" ++msgstr "ਮਿਆਦ ਪੁੱਗੀ ਕੈਸ਼ ਵਾਲੇ ਸੁਨੇਹੇ, ਜੋ ਕਿ X ਸਕਿੰਟਾਂ 'ਚ ਨਹੀਂ ਪੜ੍ਹੇ ਗਏ ਹਨ" ++ ++#: ../camel/providers/imap4/camel-imap4-folder.c:91 ++msgid "Expire cached messages older than X seconds" ++msgstr "X ਸਕਿੰਟਾਂ ਤੋਂ ਪੁਰਾਣੇ ਮਿਆਦ ਪੁੱਗੀ ਕੈਸ਼ ਸੁਨੇਹੇ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:402 ++#: ../camel/providers/imap4/camel-imap4-folder.c:423 + #, c-format +-msgid "Cannot access folder `%s': %s" +-msgstr "`%s' ਫੋਲਡਰ ਤੇ ਪਹੁੰਚ ਨਹੀਂ ਹੈ: %s" ++msgid "Cannot access folder '%s': %s" ++msgstr "'%s' ਫੋਲਡਰ ਤੇ ਪਹੁੰਚ ਨਹੀਂ ਹੈ: %s" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:461 ++#: ../camel/providers/imap4/camel-imap4-folder.c:482 + #, c-format +-msgid "Cannot sync flags to folder `%s': Unknown" +-msgstr "ਫੋਲਡਰ `%s' ਨਾਲ ਨਿਸ਼ਾਨ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ: ਅਣਜਾਣ" ++msgid "Cannot sync flags to folder '%s': Unknown error" ++msgstr "ਫੋਲਡਰ '%s' ਨਾਲ ਨਿਸ਼ਾਨ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ: ਅਣਜਾਣ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:467 ++#: ../camel/providers/imap4/camel-imap4-folder.c:488 + #, c-format +-msgid "Cannot sync flags to folder `%s': Bad command" +-msgstr "ਫੋਲਡਰ `%s' ਨਾਲ ਸਮਕਾਲੀ ਨਿਸ਼ਾਨ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot sync flags to folder '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%s' ਨਾਲ ਸਮਕਾਲੀ ਨਿਸ਼ਾਨ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:607 ++#: ../camel/providers/imap4/camel-imap4-folder.c:628 + #, c-format +-msgid "Cannot expunge folder `%s': Unknown" +-msgstr "ਫੋਲਡਰ `%s' ਨੂੰ ਸਾਫ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਅਣਜਾਣ" ++msgid "Cannot expunge folder '%s': Unknown error" ++msgstr "ਫੋਲਡਰ '%s' ਨੂੰ ਸਾਫ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਅਣਜਾਣ ਗਲਤੀ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:612 ++#: ../camel/providers/imap4/camel-imap4-folder.c:633 + #, c-format +-msgid "Cannot expunge folder `%s': Bad command" +-msgstr "ਫੋਲਡਰ `%s' ਨੂੰ ਸਾਫ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot expunge folder '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%s' ਨੂੰ ਸਾਫ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:868 ++#: ../camel/providers/imap4/camel-imap4-folder.c:889 + #, c-format +-msgid "Cannot get message %s from folder `%s': No such message" +-msgstr "ਫੋਲਡਰ '%2s' ਸੁਨੇਹਾ %1s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇਸਤਰਾਂ ਦਾ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ" ++msgid "Cannot get message %s from folder '%s': No such message" ++msgstr "ਫੋਲਡਰ '%2$s' ਸੁਨੇਹਾ %1$s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇਸਤਰਾਂ ਦਾ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:873 ++#: ../camel/providers/imap4/camel-imap4-folder.c:894 + #, c-format +-msgid "Cannot get message %s from folder `%s': Bad command" +-msgstr "ਫੋਲਡਰ '%2s' ਸੁਨੇਹਾ %1s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot get message %s from folder '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%2$s' ਸੁਨੇਹਾ %1$s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:917 ++#: ../camel/providers/imap4/camel-imap4-folder.c:938 + #, c-format +-msgid "Cannot append message to folder `%s': Folder is read-only" +-msgstr "ਫੋਲਡਰ `%s' ਲਈ ਸੁਨੇਹਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ: ਫੋਲਡਰ ਸਿਰਫ਼ ਪੜਨ ਲਈ ਹੈ" ++msgid "Cannot append message to folder '%s': Folder is read-only" ++msgstr "ਫੋਲਡਰ '%s' ਲਈ ਸੁਨੇਹਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ: ਫੋਲਡਰ ਸਿਰਫ਼ ਪੜਨ ਲਈ ਹੈ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1010 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1031 + #, c-format +-msgid "Cannot append message to folder `%s': Unknown error" +-msgstr "ਫੋਲਡਰ`%s' ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਅਣਜਾਣੀ ਗਲਤੀ" ++msgid "Cannot append message to folder '%s': Unknown error" ++msgstr "ਫੋਲਡਰ '%s' ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਅਣਜਾਣੀ ਗਲਤੀ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1040 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1061 + #, c-format +-msgid "Cannot append message to folder `%s': Bad command" +-msgstr "ਫੋਲਡਰ`%s' ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot append message to folder '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%s' ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1160 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1181 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown" +-msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ`%s' ਤੋਂ `%s' ਵਿੱਚ ਭੇਜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਅਣਜਾਣ" ++msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" ++msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ '%s' ਤੋਂ '%s' ਵਿੱਚ ਭੇਜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਅਣਜਾਣ ਗਲਤੀ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1164 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1185 + #, c-format +-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown" +-msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ`%s' ਤੋਂ `%s' ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਅਣਜਾਣ" ++msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" ++msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ '%s' ਤੋਂ '%s' ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਅਣਜਾਣ ਗਲਤੀ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1172 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1193 + #, c-format +-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command" +-msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ`%s' ਤੋਂ `%s' ਵਿੱਚ ਭੇਜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot move messages from folder '%s' to folder '%s': Bad command" ++msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ '%s' ਤੋਂ '%s' ਵਿੱਚ ਭੇਜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-folder.c:1176 ++#: ../camel/providers/imap4/camel-imap4-folder.c:1197 + #, c-format +-msgid "Cannot copy 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' ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:55 ++#: ../camel/providers/imap4/camel-imap4-provider.c:56 + msgid "Check new messages for _Junk contents" + msgstr "ਜੰਕ ਸਮੱਗਰੀ ਲਈ ਨਵੇਂ ਸੁਨੇਹੇ ਚੈੱਕ ਕਰੋ(_J)" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:57 ++#: ../camel/providers/imap4/camel-imap4-provider.c:58 + msgid "Only check for Junk messa_ges in the INBOX folder" +-msgstr "ਆਉਣਬਕਸੇ ਫੋਲਡਰ ਵਿੱਚ ਜੰਕ ਸੁਨੇਹਿਆਂ ਲ਼ਈ ਪੜਤਾਲ ਕਰੋ(_g)" ++msgstr "ਆਉਣਬਕਸੇ ਫੋਲਡਰ ਵਿੱਚ ਜੰਕ ਸੁਨੇਹਿਆਂ ਲਈ ਪੜਤਾਲ ਕਰੋ(_g)" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:66 ++#: ../camel/providers/imap4/camel-imap4-provider.c:67 + msgid "IMAP4rev1" + msgstr "IMAP4rev1" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:68 ++#: ../camel/providers/imap4/camel-imap4-provider.c:69 + msgid "For reading and storing mail on IMAPv4rev1 servers." + msgstr "MAPv4rev1 ਸਰਵਰਾਂ ਤੇ ਪੱਤਰ ਪੜਨ ਅਤੇ ਸੰਭਾਲਣ ਲਈ ਹੈ।" + +-#: ../camel/providers/imap4/camel-imap4-provider.c:85 ++#: ../camel/providers/imap4/camel-imap4-provider.c:86 + msgid "This option will connect to the IMAPv4rev1 server using a plaintext password." + msgstr "ਇਸ ਚੋਣ ਨਾਲ ਤੁਸੀਂ IMAPv4rev1 ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਨਾਲ ਜੁੜ ਸਕਦੇ ਹੋ।" + +-#: ../camel/providers/imap4/camel-imap4-store.c:261 ++#: ../camel/providers/imap4/camel-imap4-store.c:263 + #: ../camel/providers/imapp/camel-imapp-store.c:249 + #: ../camel/providers/nntp/camel-nntp-store.c:195 + #: ../camel/providers/nntp/camel-nntp-store.c:214 + #: ../camel/providers/pop3/camel-pop3-store.c:182 +-#: ../camel/providers/smtp/camel-smtp-transport.c:270 ++#: ../camel/providers/smtp/camel-smtp-transport.c:272 + msgid "Connection canceled" + msgstr "ਕੁਨੈਕਸ਼ਨ ਰੱਦ ਕੀਤਾ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:298 ++#: ../camel/providers/imap4/camel-imap4-store.c:300 + #, c-format +-msgid "" +-"Failed to connect to IMAP server %s in secure mode: Server does not support " +-"STARTTLS" +-msgstr "" +-"IMAP ਸਰਵਰ %s ਨਾਲ ਸੁਰੱਖਿਅਤ ਮੋਡ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ: ਸਰਵਰ STARTTLS ਲਈ " +-"ਸਹਾਇਕ ਨਹੀਂ ਹੈ।" ++msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS" ++msgstr "IMAP ਸਰਵਰ %s ਨਾਲ ਸੁਰੱਖਿਅਤ ਮੋਡ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ: ਸਰਵਰ STARTTLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/imap4/camel-imap4-store.c:328 ++#: ../camel/providers/imap4/camel-imap4-store.c:330 + #: ../camel/providers/pop3/camel-pop3-store.c:250 + msgid "TLS negotiations failed" + msgstr "TLS ਗੱਲਬਾਤ ਫੇਲ੍ਹ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:412 ++#: ../camel/providers/imap4/camel-imap4-store.c:415 + #, c-format + msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism" + msgstr "IMAP ਸਰਵਰ %s ਤੇ ਪ੍ਰਮਾਣਕਿਤ ਢੰਗ %s ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਨਹੀਂ ਹੋ ਜਾ ਸਕਦਾ ਹੈ।" + +-#: ../camel/providers/imap4/camel-imap4-store.c:461 +-#, c-format +-msgid "%sPlease enter the IMAP password for %s on host %s" +-msgstr "%s ਕਿਰਪਾ ਕਰਕੇ %s ਲਈ IMAP ਪਾਸਵਰਡ ਭਰੋ ਲਈ, ਹੋਸਟ %s ਉੱਤੇ" +- +-#: ../camel/providers/imap4/camel-imap4-store.c:528 ++#: ../camel/providers/imap4/camel-imap4-store.c:538 + #, c-format + msgid "Cannot authenticate to IMAP server %s using %s" + msgstr "IMAP ਸਰਵਰ %s ਤੇ %s ਵਰਤ ਕੇ ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:691 +-#: ../camel/providers/imap4/camel-imap4-store.c:959 ++#: ../camel/providers/imap4/camel-imap4-store.c:701 ++#: ../camel/providers/imap4/camel-imap4-store.c:969 + msgid "Cannot create IMAP folders in offline mode." + msgstr "ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ IMAP ਫੋਲਡਰ ਬਣਾਇਆ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।" + +-#: ../camel/providers/imap4/camel-imap4-store.c:730 ++#: ../camel/providers/imap4/camel-imap4-store.c:740 + #, c-format +-msgid "Cannot get folder `%s' on IMAP server %s: Unknown" +-msgstr "IMAP ਸਰਵਰ %2s ਤੇ ਫੋਲਡਰ '%1s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: ਅਣਜਾਣ" ++msgid "Cannot get folder '%s' on IMAP server %s: Unknown error" ++msgstr "IMAP ਸਰਵਰ %2$s ਤੇ ਫੋਲਡਰ '%1$s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: ਅਣਜਾਣ ਗਲਤੀ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:811 ++#: ../camel/providers/imap4/camel-imap4-store.c:821 + #, c-format +-msgid "Cannot get LIST information for `%s' on IMAP server %s: %s" +-msgstr "IMAP ਸਰਵਰ %2$s ਉੱਤੇ `%1$s' ਵਾਸਤੇ LIST ਜਾਣਕਾਰੀ ਲਈ ਨਹੀਂ ਜਾ ਸਕਦੀ: %3$s" ++msgid "Cannot get LIST information for '%s' on IMAP server %s: %s" ++msgstr "IMAP ਸਰਵਰ %2$s ਉੱਤੇ '%1$s' ਵਾਸਤੇ LIST ਜਾਣਕਾਰੀ ਲਈ ਨਹੀਂ ਜਾ ਸਕਦੀ: %3$s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:813 +-#: ../camel/providers/imap4/camel-imap4-store.c:1488 ++#: ../camel/providers/imap4/camel-imap4-store.c:823 ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 + msgid "Bad command" + msgstr "ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:892 ++#: ../camel/providers/imap4/camel-imap4-store.c:902 + #, c-format +-msgid "Cannot create folder `%s': Invalid mailbox name" +-msgstr "ਫੋਲਡਰ `%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ" ++msgid "Cannot create folder '%s': Invalid mailbox name" ++msgstr "ਫੋਲਡਰ '%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:897 ++#: ../camel/providers/imap4/camel-imap4-store.c:907 + #, c-format +-msgid "Cannot create folder `%s': Bad command" +-msgstr "ਫੋਲਡਰ `%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot create folder '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1003 ++#: ../camel/providers/imap4/camel-imap4-store.c:1013 + #, c-format +-msgid "Cannot delete folder `%s': Special folder" +-msgstr "ਫੋਲਡਰ `%s' ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਖਾਸ ਫੋਲਡਰ" ++msgid "Cannot delete folder '%s': Special folder" ++msgstr "ਫੋਲਡਰ '%s' ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਖਾਸ ਫੋਲਡਰ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1010 ++#: ../camel/providers/imap4/camel-imap4-store.c:1020 + msgid "Cannot delete IMAP folders in offline mode." + msgstr "ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ IMAP ਫੋਲਡਰਾਂ ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1069 ++#: ../camel/providers/imap4/camel-imap4-store.c:1079 + #, c-format +-msgid "Cannot delete folder `%s': Invalid mailbox name" +-msgstr "ਫੋਲਡਰ `%s' ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਗਲਤ mailbox ਨਾਂ" ++msgid "Cannot delete folder '%s': Invalid mailbox name" ++msgstr "ਫੋਲਡਰ '%s' ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਗਲਤ mailbox ਨਾਂ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1074 ++#: ../camel/providers/imap4/camel-imap4-store.c:1084 + #, c-format +-msgid "Cannot delete folder `%s': Bad command" +-msgstr "ਫੋਲਡਰ `%s' ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot delete folder '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%s' ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1094 ++#: ../camel/providers/imap4/camel-imap4-store.c:1104 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Special folder" +-msgstr "ਫੋਲਡਰ `%s' ਦਾਂ ਨਾਂ-ਤਬਦੀਲ `%s' ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਖਾਸ ਫੋਲਡਰ" ++msgid "Cannot rename folder '%s' to '%s': Special folder" ++msgstr "ਫੋਲਡਰ '%s' ਦਾਂ ਨਾਂ-ਤਬਦੀਲ '%s' ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਖਾਸ ਫੋਲਡਰ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1101 ++#: ../camel/providers/imap4/camel-imap4-store.c:1111 + msgid "Cannot rename IMAP folders in offline mode." + msgstr "ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ IMAP ਫੋਲਡਰ ਦਾ ਨਾਂ-ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1132 ++#: ../camel/providers/imap4/camel-imap4-store.c:1142 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name" +-msgstr "ਫੋਲਡਰ `%s' ਦਾਂ ਨਾਂ-ਤਬਦੀਲ `%s' ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ" ++msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name" ++msgstr "ਫੋਲਡਰ '%s' ਦਾ ਨਾਂ-ਤਬਦੀਲ '%s' ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1137 ++#: ../camel/providers/imap4/camel-imap4-store.c:1147 + #, c-format +-msgid "Cannot rename folder `%s' to `%s': Bad command" +-msgstr "ਫੋਲਡਰ `%s' ਦਾਂ ਨਾਂ-ਤਬਦੀਲ `%s' ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot rename folder '%s' to '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%s' ਦਾਂ ਨਾਂ-ਤਬਦੀਲ '%s' ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1486 ++#: ../camel/providers/imap4/camel-imap4-store.c:1575 + #, c-format +-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s" +-msgstr "IMAP ਸਰਵਰ %3s ਤੇ ਫਾਰਮੈਟ `%2s' ਲਈ %s ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ: %s" ++msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" ++msgstr "IMAP ਸਰਵਰ %3$s ਤੇ ਪੈਟਰਨ '%2$s' ਲਈ %1$s ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ: %4$s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1526 ++#: ../camel/providers/imap4/camel-imap4-store.c:1636 + msgid "Cannot subscribe to IMAP folders in offline mode." + msgstr "ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ IMAP ਫੋਲਡਰ ਨੂੰ ਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1571 ++#: ../camel/providers/imap4/camel-imap4-store.c:1681 + #, c-format +-msgid "Cannot subscribe to folder `%s': Invalid mailbox name" +-msgstr "ਫੋਲਡਰ `%s' ਨੂੰ ਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ" ++msgid "Cannot subscribe to folder '%s': Invalid mailbox name" ++msgstr "ਫੋਲਡਰ '%s' ਨੂੰ ਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1576 ++#: ../camel/providers/imap4/camel-imap4-store.c:1686 + #, c-format +-msgid "Cannot subscribe to folder `%s': Bad command" +-msgstr "ਫੋਲਡਰ `%s' ਨੂੰ ਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot subscribe to folder '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%s' ਲਈ ਮੈਂਬਰ ਨਹੀਂ ਬਣਿਆ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1598 ++#: ../camel/providers/imap4/camel-imap4-store.c:1708 + msgid "Cannot unsubscribe from IMAP folders in offline mode." + msgstr "ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ IMAP ਫੋਲਡਰ ਨੂੰ ਅਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1643 ++#: ../camel/providers/imap4/camel-imap4-store.c:1753 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name" +-msgstr "ਫੋਲਡਰ `%s' ਨੂੰ ਅਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਦਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ" ++msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" ++msgstr "ਫੋਲਡਰ '%s' ਦੀ ਮੈਂਬਰੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: ਗਲਤ mailbox ਨਾਂ" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1648 ++#: ../camel/providers/imap4/camel-imap4-store.c:1758 + #, c-format +-msgid "Cannot unsubscribe from folder `%s': Bad command" +-msgstr "ਫੋਲਡਰ `%s' ਨੂੰ ਅਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਦਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ" ++msgid "Cannot unsubscribe from folder '%s': Bad command" ++msgstr "ਫੋਲਡਰ '%s' ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: ਗਲਤ ਕਮਾਂਡ" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1452 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1596 + msgid "Scanning for changed messages" + msgstr "ਤਬਦੀਲ ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1473 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1617 + #, c-format + msgid "IMAP server %s is in an inconsistent state." + msgstr "IMAP ਸਰਵਰ %s ਖਰਾਬ ਹਾਲਤ 'ਚ ਹੈ।" + +-#: ../camel/providers/imap4/camel-imap4-summary.c:1500 ++#: ../camel/providers/imap4/camel-imap4-summary.c:1644 + msgid "Fetching envelopes of new messages" + msgstr "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਇੰਵੈਲਪ ਲਏ ਜਾ ਰਹੇ ਹਨ" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:370 ++#: ../camel/providers/imap4/camel-imap4-utils.c:437 + #, c-format + msgid "Unexpected token in response from IMAP server %s: " + msgstr "IMAP ਸਰਵਰ %s ਤੋਂ ਜਵਾਬ ਵਿੱਚ ਗਲਤ ਟੋਕਨ : " + +-#: ../camel/providers/imap4/camel-imap4-utils.c:393 ++#: ../camel/providers/imap4/camel-imap4-utils.c:460 + msgid "No data" + msgstr "ਕੋਈ ਡਾਟਾ ਨਹੀ" + +-#: ../camel/providers/imap4/camel-imap4-utils.c:556 ++#: ../camel/providers/imap4/camel-imap4-utils.c:623 + #, c-format + msgid "IMAP server %s unexpectedly disconnected: %s" + msgstr "IMAP ਸਰਵਰ %s ਅਸਧਾਰਨ ਵੱਖ ਹੋ ਗਿਆ ਹੈ: %s" +@@ -3522,32 +3692,32 @@ msgstr "%s ਨਾਲ (ਪੋਰਟ %s) + msgid "Could not connect to POP server on %s" + msgstr "POP ਸਰਵਰ ਨਾਲ %s ਤੇ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ" + +-#: ../camel/providers/local/camel-local-folder.c:175 ++#: ../camel/providers/local/camel-local-folder.c:174 + msgid "Index message body data" + msgstr "ਤਤਕਰਾ ਸੁਨੇਹਾ ਭਾਗ ਡਾਟਾ" + + #. $HOME relative path + protocol string +-#: ../camel/providers/local/camel-local-folder.c:383 ++#: ../camel/providers/local/camel-local-folder.c:390 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + + #. /var/spool/mail relative path + protocol +-#: ../camel/providers/local/camel-local-folder.c:387 +-#: ../camel/providers/local/camel-local-folder.c:390 ++#: ../camel/providers/local/camel-local-folder.c:394 ++#: ../camel/providers/local/camel-local-folder.c:397 + #, c-format + msgid "mailbox:%s (%s)" + msgstr "mailbox:%s (%s)" + + #. a full path + protocol +-#: ../camel/providers/local/camel-local-folder.c:394 ++#: ../camel/providers/local/camel-local-folder.c:401 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + + #: ../camel/providers/local/camel-local-provider.c:48 +-msgid "Use the `.folders' folder summary file (exmh)" +-msgstr "`.folders' ਫੋਲਡਰ ਸੰਖੇਪ ਫਾਇਲ਼ (exmh) ਵਰਤੋਂ" ++msgid "_Use the '.folders' folder summary file (exmh)" ++msgstr "'.folders' ਫੋਲਡਰ ਸੰਖੇਪ ਫਾਇਲ (exmh) ਵਰਤੋਂ(_U)" + + #: ../camel/providers/local/camel-local-provider.c:55 + msgid "MH-format mail directories" +@@ -3562,15 +3732,13 @@ msgid "Local delivery" + msgstr "ਲੋਕਲ ਪ੍ਰਾਪਤੀ" + + #: ../camel/providers/local/camel-local-provider.c:74 +-msgid "" +-"For retrieving (moving) local mail from standard mbox-formatted spools into " +-"folders managed by Evolution." ++msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution." + msgstr "ਸਟੈਂਡਰਡ mbox ਫਾਰਮੈਟ ਸਪੂਲ ਤੋਂ ਈਵੇਲੂਸ਼ਨ ਰਾਹੀਂ ਸੰਭਾਲੇ ਫੋਲਡਰ ਵਿੱਚ ਲੋਕਲ ਪੱਤਰ ਪ੍ਰਾਪਤ (ਭੇਜਣ) ਕਰਨ ਲਈ।" + + #: ../camel/providers/local/camel-local-provider.c:88 + #: ../camel/providers/local/camel-local-provider.c:107 +-msgid "Apply filters to new messages in INBOX" +-msgstr "ਆਉਣ-ਬਕਸੇ ਵਿੱਚ ਨਵੇਂ ਸੁਨਹਿਆਂ ਤੇ ਫਿਲਟਰ ਲਗਾਓ" ++msgid "_Apply filters to new messages in INBOX" ++msgstr "ਆਉਣ-ਬਕਸੇ ਵਿੱਚ ਨਵੇਂ ਸੁਨਹਿਆਂ ਤੇ ਫਿਲਟਰ ਲਗਾਓ(_A)" + + #: ../camel/providers/local/camel-local-provider.c:95 + msgid "Maildir-format mail directories" +@@ -3581,8 +3749,8 @@ msgid "For storing local mail in maildir + msgstr "maildir ਡਾਇਰੈਕਟਰੀਆਂ ਵਿੱਚ ਸੰਭਾਲਣ ਲਈ ਲੋਕਲ ਪੱਤਰ" + + #: ../camel/providers/local/camel-local-provider.c:108 +-msgid "Store status headers in Elm/Pine/Mutt format" +-msgstr "ਹਾਲਤ ਸਿਰਲੇਖ Elm/Pine/Mutt ਫਾਰਮੈਟ ਵਿੱਚ ਸੰਭਾਲੋ" ++msgid "_Store status headers in Elm/Pine/Mutt format" ++msgstr "ਹਾਲਤ ਸਿਰਲੇਖ Elm/Pine/Mutt ਫਾਰਮੈਟ ਵਿੱਚ ਸੰਭਾਲੋ(_S)" + + #: ../camel/providers/local/camel-local-provider.c:115 + msgid "Standard Unix mbox spool file" +@@ -3594,97 +3762,84 @@ 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 "" +-"ਬਾਹਰੀ ਪ-ਬਕਸਾ ਸਪੂਲ ਫਾਇਲਾਂ ਪੜਨ ਅਤੇ ਲੋਕਲ ਪੱਤਰ ਸੰਭਾਲਣ ਲ਼ਈ\n" ++"ਬਾਹਰੀ ਪ-ਬਕਸਾ ਸਪੂਲ ਫਾਇਲਾਂ ਪੜਨ ਅਤੇ ਲੋਕਲ ਪੱਤਰ ਸੰਭਾਲਣ ਲਈ\n" + "ਤੁਸੀਂ Elm, Pine, ਅਤੇ Mutt ਸ਼ੈਲੀ ਫੋਲਡਰ ਲੜੀ ਵਰਤ ਸਕਦੇ ਹੋ।" + + #: ../camel/providers/local/camel-local-provider.c:126 + msgid "Standard Unix mbox spool directory" + msgstr "ਸਟੈਂਡਰਡ Unix mbox ਸਪੂਲ ਡਾਇਰੈਕਟਰੀ" + +-#: ../camel/providers/local/camel-local-store.c:157 +-#: ../camel/providers/local/camel-local-store.c:268 ++#: ../camel/providers/local/camel-local-store.c:171 ++#: ../camel/providers/local/camel-local-store.c:282 + #: ../camel/providers/local/camel-mbox-store.c:359 + #: ../camel/providers/local/camel-spool-store.c:129 + #, c-format + msgid "Store root %s is not an absolute path" + msgstr "ਪ੍ਰਬੰਧਕ(root) %s ਸੰਭਾਲ ਇੱਕ ਅਸਲੀ ਰਸਤਾ ਨਹੀ ਹੈ।" + +-#: ../camel/providers/local/camel-local-store.c:164 ++#: ../camel/providers/local/camel-local-store.c:178 + #, c-format + msgid "Store root %s is not a regular directory" + msgstr "ਪ੍ਰਬੰਧਕ(root) %s ਸੰਭਾਲ ਇੱਕ ਅਸਲੀ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/local/camel-local-store.c:173 +-#: ../camel/providers/local/camel-local-store.c:181 +-#: ../camel/providers/local/camel-local-store.c:279 ++#: ../camel/providers/local/camel-local-store.c:187 ++#: ../camel/providers/local/camel-local-store.c:195 ++#: ../camel/providers/local/camel-local-store.c:293 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "ਫੋਲਡਰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s: %s" + +-#: ../camel/providers/local/camel-local-store.c:193 ++#: ../camel/providers/local/camel-local-store.c:207 + msgid "Local stores do not have an inbox" + msgstr "ਆਉਣ-ਬਕਸੇ ਵਿੱਚ ਲੋਕਲ ਸੰਭਾਲ ਬਕਸਾ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/local/camel-local-store.c:239 ++#: ../camel/providers/local/camel-local-store.c:253 + #, c-format + msgid "Local mail file %s" + msgstr "ਲੋਕਲ ਪੱਤਰ ਫਾਇਲ %s" + +-#: ../camel/providers/local/camel-local-store.c:357 ++#: ../camel/providers/local/camel-local-store.c:348 + #, c-format + msgid "Could not rename folder %s to %s: %s" + msgstr "ਫੋਲਡਰ %s ਦਾ ਨਾਂ-ਤਬਦੀਲ %s ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s" + +-#: ../camel/providers/local/camel-local-store.c:425 ++#: ../camel/providers/local/camel-local-store.c:416 + #, c-format + msgid "Could not rename '%s': %s" + msgstr "'%s' ਦਾ ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-local-store.c:450 +-#: ../camel/providers/local/camel-local-store.c:460 +-#: ../camel/providers/local/camel-mbox-store.c:276 +-#: ../camel/providers/local/camel-mbox-store.c:288 +-#, c-format +-msgid "Could not delete folder summary file `%s': %s" +-msgstr "ਫੋਲਡਰ ਸੰਖੇਪ ਫਾਇਲ਼ `%s' ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s" +- +-#: ../camel/providers/local/camel-local-store.c:470 ++#: ../camel/providers/local/camel-local-store.c:441 + #: ../camel/providers/local/camel-mbox-store.c:300 + #, c-format +-msgid "Could not delete folder index file `%s': %s" +-msgstr "ਫੋਲਡਰ ਤਤਕਰਾ ਫਾਇਲ਼ `%s' ਨੂੰ ਹਟਾਇਆ ਨਹੀ ਜਾ ਸਕਦਾ: %s" ++msgid "Could not delete folder index file '%s': %s" ++msgstr "ਫੋਲਡਰ ਇੰਡੈਕਸ ਫਾਇਲ '%s' ਨੂੰ ਹਟਾਇਆ ਨਹੀ ਜਾ ਸਕਦਾ: %s" + +-#: ../camel/providers/local/camel-local-store.c:493 ++#: ../camel/providers/local/camel-local-store.c:464 + #: ../camel/providers/local/camel-mbox-store.c:324 + #, c-format +-msgid "Could not delete folder meta file `%s': %s" +-msgstr "ਫੋਲਡਰ ਮੈਟਾ ਫਾਇਲ `%s' ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" +- +-#: ../camel/providers/local/camel-local-summary.c:409 +-#, c-format +-msgid "Could not save summary: %s: %s" +-msgstr "ਸੰਖੇਪ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s: %s" ++msgid "Could not delete folder meta file '%s': %s" ++msgstr "ਫੋਲਡਰ ਮੈਟਾ ਫਾਇਲ '%s' ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-local-summary.c:467 ++#: ../camel/providers/local/camel-local-summary.c:506 + msgid "Unable to add message to summary: unknown reason" + msgstr "ਸੁਨੇਹੇ ਨੂੰ ਸੰਖੇਪ ਵਿੱਚ ਸੰਭਾਲਣ ਵਿੱਚ ਅਸਫਲ: ਅਣਜਾਣਾ ਕਾਰਨ" + +-#: ../camel/providers/local/camel-maildir-folder.c:217 ++#: ../camel/providers/local/camel-maildir-folder.c:220 + msgid "Maildir append message canceled" + msgstr "Maildir ਸ਼ਾਮਿਲ ਸੁਨੇਹਾ ਰੱਦ ਕੀਤਾ" + +-#: ../camel/providers/local/camel-maildir-folder.c:220 ++#: ../camel/providers/local/camel-maildir-folder.c:223 + #, c-format + msgid "Cannot append message to maildir folder: %s: %s" + msgstr "maildir ਫੋਲਡਰ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s: %s" + +-#: ../camel/providers/local/camel-maildir-folder.c:246 +-#: ../camel/providers/local/camel-maildir-folder.c:260 +-#: ../camel/providers/local/camel-maildir-folder.c:269 ++#: ../camel/providers/local/camel-maildir-folder.c:250 ++#: ../camel/providers/local/camel-maildir-folder.c:264 ++#: ../camel/providers/local/camel-maildir-folder.c:273 + #: ../camel/providers/local/camel-mbox-folder.c:347 +-#: ../camel/providers/local/camel-mbox-folder.c:366 +-#: ../camel/providers/local/camel-mbox-folder.c:397 +-#: ../camel/providers/local/camel-mbox-folder.c:405 ++#: ../camel/providers/local/camel-mbox-folder.c:368 ++#: ../camel/providers/local/camel-mbox-folder.c:399 ++#: ../camel/providers/local/camel-mbox-folder.c:407 + #: ../camel/providers/local/camel-mh-folder.c:203 + #: ../camel/providers/local/camel-mh-folder.c:214 + #: ../camel/providers/local/camel-mh-folder.c:223 +@@ -3696,74 +3851,74 @@ msgstr "" + "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s ਫੋਲਡਰ %s ਤੋਂ\n" + " %s" + +-#: ../camel/providers/local/camel-maildir-folder.c:270 ++#: ../camel/providers/local/camel-maildir-folder.c:274 + msgid "Invalid message contents" + msgstr "ਗਲਤ ਫੋਲਡਰ ਭਾਗ" + +-#: ../camel/providers/local/camel-maildir-store.c:147 +-#: ../camel/providers/local/camel-maildir-store.c:172 ++#: ../camel/providers/local/camel-maildir-store.c:148 ++#: ../camel/providers/local/camel-maildir-store.c:173 + #: ../camel/providers/local/camel-mbox-store.c:176 + #: ../camel/providers/local/camel-mbox-store.c:188 + #, c-format +-msgid "Cannot create folder `%s': %s" +-msgstr "ਫੋਲਡਰ `%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s" ++msgid "Cannot create folder '%s': %s" ++msgstr "ਫੋਲਡਰ '%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:160 ++#: ../camel/providers/local/camel-maildir-store.c:161 + #: ../camel/providers/local/camel-mbox-store.c:147 + #: ../camel/providers/local/camel-mh-store.c:217 + #, c-format +-msgid "Cannot get folder `%s': %s" +-msgstr "ਫੋਲਡਰ `%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦਾ ਹੈ: %s" ++msgid "Cannot get folder '%s': %s" ++msgstr "ਫੋਲਡਰ '%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:164 ++#: ../camel/providers/local/camel-maildir-store.c:165 + #: ../camel/providers/local/camel-mbox-store.c:155 + #: ../camel/providers/local/camel-mh-store.c:224 + #, c-format +-msgid "Cannot get folder `%s': folder does not exist." +-msgstr "ਫੋਲਡਰ `%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦਾ ਹੈ: ਫੋਲਡਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।" ++msgid "Cannot get folder '%s': folder does not exist." ++msgstr "ਫੋਲਡਰ '%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦਾ ਹੈ: ਫੋਲਡਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/local/camel-maildir-store.c:188 ++#: ../camel/providers/local/camel-maildir-store.c:189 + #, c-format +-msgid "Cannot get folder `%s': not a maildir directory." +-msgstr "ਫੋਲਡਰ `%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇੱਕ maildir ਡਾਇਰਕਟਰੀ ਨਹੀਂ ਹੈ" ++msgid "Cannot get folder '%s': not a maildir directory." ++msgstr "ਫੋਲਡਰ '%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇੱਕ maildir ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/local/camel-maildir-store.c:233 +-#: ../camel/providers/local/camel-maildir-store.c:271 ++#: ../camel/providers/local/camel-maildir-store.c:234 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mh-store.c:273 + #, c-format +-msgid "Could not delete folder `%s': %s" +-msgstr "ਫੋਲਡਰ `%s' ਹਟਾਇਆ ਨਹੀਂ ਦਾ ਸਕਦਾ ਹੈ: %s" ++msgid "Could not delete folder '%s': %s" ++msgstr "ਫੋਲਡਰ '%s' ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:235 ++#: ../camel/providers/local/camel-maildir-store.c:236 + msgid "not a maildir directory" + msgstr "ਇੱਕ maildir ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/local/camel-maildir-store.c:437 ++#: ../camel/providers/local/camel-maildir-store.c:440 + #: ../camel/providers/local/camel-spool-store.c:331 + #: ../camel/providers/local/camel-spool-store.c:345 + #, c-format +-msgid "Could not scan folder `%s': %s" +-msgstr "ਫੋਲਡਰ `%s' ਦੀ ਜਾਂਚ ਨਹੀਂ ਹੋ ਸਕੀ ਹੈ: %s" ++msgid "Could not scan folder '%s': %s" ++msgstr "ਫੋਲਡਰ '%s' ਦੀ ਜਾਂਚ ਨਹੀਂ ਹੋ ਸਕੀ ਹੈ: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:425 +-#: ../camel/providers/local/camel-maildir-summary.c:556 ++#: ../camel/providers/local/camel-maildir-summary.c:433 ++#: ../camel/providers/local/camel-maildir-summary.c:567 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "maildir ਡਾਇਰੈਕਟਰੀ ਰਸਤਾ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:549 ++#: ../camel/providers/local/camel-maildir-summary.c:560 + msgid "Checking folder consistency" + msgstr "ਫੋਲਡਰ ਇਕਸਾਰਤਾ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ" + +-#: ../camel/providers/local/camel-maildir-summary.c:652 ++#: ../camel/providers/local/camel-maildir-summary.c:664 + msgid "Checking for new messages" + msgstr "ਨਵੇਂ ਸੁਨਹਿਆਂ ਲਈ ਜਾਂਚ ਜਾਰੀ ਹੈ" + +-#: ../camel/providers/local/camel-maildir-summary.c:741 +-#: ../camel/providers/local/camel-mbox-summary.c:433 +-#: ../camel/providers/local/camel-mbox-summary.c:606 +-#: ../camel/providers/local/camel-mbox-summary.c:701 +-#: ../camel/providers/local/camel-spool-summary.c:140 ++#: ../camel/providers/local/camel-maildir-summary.c:756 ++#: ../camel/providers/local/camel-mbox-summary.c:517 ++#: ../camel/providers/local/camel-mbox-summary.c:690 ++#: ../camel/providers/local/camel-mbox-summary.c:786 ++#: ../camel/providers/local/camel-spool-summary.c:141 + msgid "Storing folder" + msgstr "ਫੋਲਡਰ ਕ੍ਰਮਬੱਧ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" + +@@ -3787,11 +3942,11 @@ msgstr "ਪੱਤਰ ਸ਼ਾਮਿਲ ਰ + msgid "Cannot append message to mbox file: %s: %s" + msgstr "ਪੱਤਰਬਕਸਾ ਫਾਇਲ ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s: %s" + +-#: ../camel/providers/local/camel-mbox-folder.c:398 ++#: ../camel/providers/local/camel-mbox-folder.c:400 + msgid "The folder appears to be irrecoverably corrupted." + msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਾ-ਪ੍ਰਾਪਤਯੋਗ ਨਿਕਾਰਾਪਨ ਹੈ।" + +-#: ../camel/providers/local/camel-mbox-folder.c:406 ++#: ../camel/providers/local/camel-mbox-folder.c:408 + #: ../camel/providers/local/camel-mh-folder.c:224 + msgid "Message construction failed." + msgstr "ਸੁਨੇਹਾ ਰਚਨਾ ਅਸਫਲ।" +@@ -3803,34 +3958,40 @@ msgstr "ਇਸ ਨਾਂ ਨਾਲ ਫ + + #: ../camel/providers/local/camel-mbox-store.c:198 + #, c-format +-msgid "Cannot get folder `%s': not a regular file." +-msgstr "ਫੋਲਡਰ `%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: ਇੱਕ ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ।" ++msgid "Cannot get folder '%s': not a regular file." ++msgstr "ਫੋਲਡਰ '%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: ਇੱਕ ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ।" + + #: ../camel/providers/local/camel-mbox-store.c:228 + #: ../camel/providers/local/camel-mbox-store.c:239 + #: ../camel/providers/local/camel-mbox-store.c:262 + #, c-format + msgid "" +-"Could not delete folder `%s':\n" ++"Could not delete folder '%s':\n" + "%s" + msgstr "" +-"ਫੋਲਡਰ `%s' ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:\n" ++"ਫੋਲਡਰ '%s' ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:\n" + "%s" + + #: ../camel/providers/local/camel-mbox-store.c:247 + #, c-format +-msgid "`%s' is not a regular file." ++msgid "'%s' is not a regular file." + msgstr "'%s' ਇਕ ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀ ਹੈ।" + + #: ../camel/providers/local/camel-mbox-store.c:254 + #, c-format +-msgid "Folder `%s' is not empty. Not deleted." +-msgstr "ਫੋਲਡਰ `%s' ਖਾਲੀ ਨਹੀਂ ਹੈ। ਹਟਾਇਆ ਨਹੀਂ ਗਿਆ।" ++msgid "Folder '%s' is not empty. Not deleted." ++msgstr "ਫੋਲਡਰ `'%s' ਖਾਲੀ ਨਹੀਂ ਹੈ। ਹਟਾਇਆ ਨਹੀਂ ਗਿਆ।" ++ ++#: ../camel/providers/local/camel-mbox-store.c:276 ++#: ../camel/providers/local/camel-mbox-store.c:288 ++#, c-format ++msgid "Could not delete folder summary file '%s': %s" ++msgstr "ਫੋਲਡਰ ਸੰਖੇਪ ਫਾਇਲ '%s' ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s" + + #: ../camel/providers/local/camel-mbox-store.c:378 + #, c-format +-msgid "Cannot create directory `%s': %s." +-msgstr "ਡਾਇਰੈਕਟਰੀ `%s' ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: %s।" ++msgid "Cannot create directory '%s': %s." ++msgstr "ਡਾਇਰੈਕਟਰੀ '%s' ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: %s।" + + #: ../camel/providers/local/camel-mbox-store.c:392 + #, c-format +@@ -3847,84 +4008,84 @@ msgstr "ਨਵਾਂ ਫੋਲਡਰ ਨ + + #: ../camel/providers/local/camel-mbox-store.c:498 + #, c-format +-msgid "Could not rename `%s': `%s': %s" +-msgstr "`%s' ਦਾ ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: `%s': %s" ++msgid "Could not rename '%s': '%s': %s" ++msgstr "'%s' ਦਾ ਨਾਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: '%s': %s" + + #: ../camel/providers/local/camel-mbox-store.c:579 + #, c-format + msgid "Could not rename '%s' to %s: %s" + msgstr "'%s' ਦਾ ਨਾਂ %s ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:439 ++#: ../camel/providers/local/camel-mbox-summary.c:523 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:487 ++#: ../camel/providers/local/camel-mbox-summary.c:571 + #, c-format + msgid "Fatal mail parser error near position %ld in folder %s" + msgstr "%ld ਦੇ ਨੇੜੇ %s ਫੋਲਡਰ ਵਿੱਚ ਪੱਤਰ ਪ੍ਰਾਪਤ ਪਾਰਸ ਗਲਤੀ ਹੈ" + +-#: ../camel/providers/local/camel-mbox-summary.c:543 ++#: ../camel/providers/local/camel-mbox-summary.c:627 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "ਫੋਲਡਰ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:611 +-#: ../camel/providers/local/camel-mbox-summary.c:706 +-#: ../camel/providers/local/camel-spool-summary.c:145 ++#: ../camel/providers/local/camel-mbox-summary.c:695 ++#: ../camel/providers/local/camel-mbox-summary.c:791 ++#: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "ਫਾਇਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:623 +-#: ../camel/providers/local/camel-spool-summary.c:158 ++#: ../camel/providers/local/camel-mbox-summary.c:707 ++#: ../camel/providers/local/camel-spool-summary.c:159 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "ਆਰਜ਼ੀ mailbox ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:636 +-#: ../camel/providers/local/camel-mbox-summary.c:812 ++#: ../camel/providers/local/camel-mbox-summary.c:720 ++#: ../camel/providers/local/camel-mbox-summary.c:896 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "ਸਰੋਤ ਫੋਲਡਰ %s ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:645 ++#: ../camel/providers/local/camel-mbox-summary.c:729 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "ਆਰਜ਼ੀ ਫੋਲਡਰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:660 ++#: ../camel/providers/local/camel-mbox-summary.c:744 + #, c-format + msgid "Could not rename folder: %s" + msgstr "ਫੋਲਡਰ ਦਾ ਨਾਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:717 +-#: ../camel/providers/local/camel-mbox-summary.c:923 ++#: ../camel/providers/local/camel-mbox-summary.c:802 ++#: ../camel/providers/local/camel-mbox-summary.c:1024 + #, c-format + msgid "Could not store folder: %s" + msgstr "ਫੋਲਡਰ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:754 +-#: ../camel/providers/local/camel-mbox-summary.c:762 +-#: ../camel/providers/local/camel-mbox-summary.c:954 +-#: ../camel/providers/local/camel-mbox-summary.c:962 ++#: ../camel/providers/local/camel-mbox-summary.c:838 ++#: ../camel/providers/local/camel-mbox-summary.c:846 ++#: ../camel/providers/local/camel-mbox-summary.c:1055 ++#: ../camel/providers/local/camel-mbox-summary.c:1063 + msgid "Summary and folder mismatch, even after a sync" + msgstr "ਸੰਖੇਪ ਤੇ ਫੋਲਡਰ ਮੇਲ ਨਹੀਂ ਖਾ ਰਹੇ ਹਨ, ਸਮਕਾਲੀ ਕਰਨ ਮਗਰੋਂ ਵੀ" + +-#: ../camel/providers/local/camel-mbox-summary.c:888 +-#: ../camel/providers/local/camel-spool-summary.c:326 ++#: ../camel/providers/local/camel-mbox-summary.c:989 ++#: ../camel/providers/local/camel-spool-summary.c:327 + #, c-format + msgid "Unknown error: %s" + msgstr "ਅਣਜਾਣੀ ਗਲਤੀ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1017 +-#: ../camel/providers/local/camel-mbox-summary.c:1043 ++#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:1153 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "ਆਰਜ਼ੀ mailbox ਉੱਤੇ ਲਿਖਣਾ ਅਸਫਲ: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1034 ++#: ../camel/providers/local/camel-mbox-summary.c:1144 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "ਆਰਜ਼ੀ mailbox ਉੱਤੇ ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ: %s: %s" +@@ -3940,13 +4101,13 @@ msgstr "mh ਫੋਲਡਰ ਵਿੱਚ + + #: ../camel/providers/local/camel-mh-store.c:232 + #, c-format +-msgid "Could not create folder `%s': %s" +-msgstr "`%s' ਫੋਲਡਰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" ++msgid "Could not create folder '%s': %s" ++msgstr "'%s' ਫੋਲਡਰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + + #: ../camel/providers/local/camel-mh-store.c:244 + #, c-format +-msgid "Cannot get folder `%s': not a directory." +-msgstr "ਫੋਲਡਰ `%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇੱਕ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ।" ++msgid "Cannot get folder '%s': not a directory." ++msgstr "ਫੋਲਡਰ '%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇੱਕ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ।" + + #: ../camel/providers/local/camel-mh-summary.c:246 + #, c-format +@@ -3955,46 +4116,46 @@ msgstr "MH ਡਾਇਰੈਕਟਰੀ + + #: ../camel/providers/local/camel-spool-store.c:135 + #, c-format +-msgid "Spool `%s' cannot be opened: %s" +-msgstr "ਸਪੂਲ `%s' ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" ++msgid "Spool '%s' cannot be opened: %s" ++msgstr "ਸਪੂਲ '%s' ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s" + + #: ../camel/providers/local/camel-spool-store.c:147 + #, c-format +-msgid "Spool `%s' is not a regular file or directory" +-msgstr "ਸਪੂਲ `%s' ਇੱਕ ਨਿਯਮਿਤ ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ" ++msgid "Spool '%s' is not a regular file or directory" ++msgstr "ਸਪੂਲ '%s' ਇੱਕ ਨਿਯਮਿਤ ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ" + + #: ../camel/providers/local/camel-spool-store.c:166 + #, c-format +-msgid "Folder `%s/%s' does not exist." +-msgstr "ਫੋਲਡਰ `%s/%s' ਮੌਜੂਦ ਨਹੀਂ ਹੈ" ++msgid "Folder '%s/%s' does not exist." ++msgstr "ਫੋਲਡਰ '%s/%s' ਮੌਜੂਦ ਨਹੀਂ ਹੈ" + + #: ../camel/providers/local/camel-spool-store.c:176 + #, c-format + msgid "" +-"Could not open folder `%s':\n" ++"Could not open folder '%s':\n" + "%s" + msgstr "" +-"ਫੋਲਡਰ `%s' ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:\n" ++"ਫੋਲਡਰ '%s' ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:180 + #, c-format +-msgid "Folder `%s' does not exist." +-msgstr "ਫੋਲਡਰ `%s' ਮੌਜੂਦ ਨਹੀਂ ਹੈ।" ++msgid "Folder '%s' does not exist." ++msgstr "ਫੋਲਡਰ '%s' ਮੌਜੂਦ ਨਹੀਂ ਹੈ।" + + #: ../camel/providers/local/camel-spool-store.c:185 + #, c-format + msgid "" +-"Could not create folder `%s':\n" ++"Could not create folder '%s':\n" + "%s" + msgstr "" +-"ਫੋਲਡਰ `%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:\n" ++"ਫੋਲਡਰ '%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:\n" + "%s" + + #: ../camel/providers/local/camel-spool-store.c:193 + #, c-format +-msgid "`%s' is not a mailbox file." +-msgstr "`%s' ਇੱਕ mailbox ਫਾਇਲ਼ ਨਹੀਂ ਹੈ" ++msgid "'%s' is not a mailbox file." ++msgstr "'%s' ਇੱਕ mailbox ਫਾਇਲ ਨਹੀਂ ਹੈ" + + #: ../camel/providers/local/camel-spool-store.c:210 + msgid "Store does not support an INBOX" +@@ -4003,7 +4164,7 @@ msgstr "ਸੰਭਾਲ ਇੱਕ ਆਉ + #: ../camel/providers/local/camel-spool-store.c:222 + #, c-format + msgid "Spool mail file %s" +-msgstr "ਸਪੂਲ ਪੱਤਰ ਫਾਇਲ਼ %s" ++msgstr "ਸਪੂਲ ਪੱਤਰ ਫਾਇਲ %s" + + #: ../camel/providers/local/camel-spool-store.c:222 + #, c-format +@@ -4018,28 +4179,28 @@ msgstr "ਸਪੂ ਫੋਲਡਰਾਂ + msgid "Spool folders cannot be deleted" + msgstr "ਸਪੂਲ ਫੋਲਡਰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" + +-#: ../camel/providers/local/camel-spool-summary.c:171 +-#: ../camel/providers/local/camel-spool-summary.c:181 +-#: ../camel/providers/local/camel-spool-summary.c:191 ++#: ../camel/providers/local/camel-spool-summary.c:172 ++#: ../camel/providers/local/camel-spool-summary.c:182 ++#: ../camel/providers/local/camel-spool-summary.c:192 + #, c-format + msgid "Could not sync temporary folder %s: %s" + msgstr "ਆਰਜ਼ੀ ਫੋਲਡਰ %s ਨੂੰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:207 ++#: ../camel/providers/local/camel-spool-summary.c:208 + #, c-format + msgid "Could not sync spool folder %s: %s" + msgstr "ਸਪੂਲ ਫੋਲਡਰ %s ਨੂੰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:238 +-#: ../camel/providers/local/camel-spool-summary.c:255 +-#: ../camel/providers/local/camel-spool-summary.c:266 ++#: ../camel/providers/local/camel-spool-summary.c:239 ++#: ../camel/providers/local/camel-spool-summary.c:256 ++#: ../camel/providers/local/camel-spool-summary.c:267 + #, c-format + msgid "" + "Could not sync spool folder %s: %s\n" +-"Folder may be corrupt, copy saved in `%s'" ++"Folder may be corrupt, copy saved in '%s'" + msgstr "" + "ਸਪੂਲ ਫੋਲਡਰ %s ਨੂੰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s\n" +-"ਫੋਲਡਰ ਨਿਕਾਰਾ ਹੋ ਸਕਦਾ ਹੈ, ਨਕਲ `%s' ਵਿੱਚ ਸੰਭਾਲੀ ਗਈ ਹੈ।" ++"ਫੋਲਡਰ ਨਿਕਾਰਾ ਹੋ ਸਕਦਾ ਹੈ, ਨਕਲ '%s' ਵਿੱਚ ਸੰਭਾਲੀ ਗਈ ਹੈ।" + + #: ../camel/providers/nntp/camel-nntp-folder.c:176 + #: ../camel/providers/nntp/camel-nntp-folder.c:208 +@@ -4047,29 +4208,29 @@ msgstr "" + 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:331 +-#: ../camel/providers/nntp/camel-nntp-folder.c:373 ++#: ../camel/providers/nntp/camel-nntp-folder.c:330 ++#: ../camel/providers/nntp/camel-nntp-folder.c:333 + #: ../camel/providers/nntp/camel-nntp-folder.c:375 ++#: ../camel/providers/nntp/camel-nntp-folder.c:377 + #, c-format + msgid "Posting failed: %s" + msgstr "ਭੇਜਣ ਕਾਰਵਾਈ ਅਸਫਲ: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:393 ++#: ../camel/providers/nntp/camel-nntp-folder.c:395 + msgid "You cannot post NNTP messages while working offline!" + msgstr "ਤੁਸੀਂ ਆਫਲਾਈਨ ਕੰਮ ਕਰਦੇ ਸਮੇਂ NNTP ਸੁਨੇਹੇ ਭੇਜ ਨਹੀਂ ਸਕਦੇ !" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:404 ++#: ../camel/providers/nntp/camel-nntp-folder.c:406 + msgid "You cannot copy messages from a NNTP folder!" + msgstr "ਤੁਸੀਂ NNTP ਫੋਲਡਰ ਤੋਂ ਸੁਨੇਹੇ ਨਕਲ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ!" + + #: ../camel/providers/nntp/camel-nntp-provider.c:46 +-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)(_S)" + + #: ../camel/providers/nntp/camel-nntp-provider.c:48 +-msgid "In the subscription dialog, show relative folder names" +-msgstr "ਸਵੀਕਾਰ ਤਖਤੀ ਵਿੱਚ, ਅਨੁਸਾਰੀ ਫੋਲਡਰ ਹੀ ਵਰਤੋਂ" ++msgid "In the subscription _dialog, show relative folder names" ++msgstr "ਮੈਂਬਰ ਬਣਨ ਡਾਈਲਗ ਵਿੱਚ, ਅਨੁਸਾਰੀ ਫੋਲਡਰ ਹੀ ਵਰਤੋਂ(_d)" + + #: ../camel/providers/nntp/camel-nntp-provider.c:55 + msgid "USENET news" +@@ -4080,9 +4241,7 @@ msgid "This is a provider for reading fr + msgstr "ਇਹ ਖ਼ਬਰ-ਸਮੂਹ USENET ਤੋਂ ਪੜਨ ਅਤੇ ਭੇਜਣ ਲਈ ਸਹਾਈ ਹੈ।" + + #: ../camel/providers/nntp/camel-nntp-provider.c:76 +-msgid "" +-"This option will authenticate with the NNTP server using a plaintext " +-"password." ++msgid "This option will authenticate with the NNTP server using a plaintext password." + msgstr "ਇਸ ਚੋਣ ਨਾਲ NNTP ਸਰਵਰ ਤੇ ਸਮਤਲ-ਪਾਠ ਪਾਸਵਰਡ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ।" + + #: ../camel/providers/nntp/camel-nntp-store.c:217 +@@ -4100,7 +4259,7 @@ msgstr "NNTP ਸਰਵਰ %s ਨੇ ਗ + msgid "USENET News via %s" + msgstr "USENET ਖਬਰਾਂ %s ਰਾਹੀ" + +-#: ../camel/providers/nntp/camel-nntp-store.c:796 ++#: ../camel/providers/nntp/camel-nntp-store.c:798 + #, c-format + msgid "" + "Error retrieving newsgroups:\n" +@@ -4111,7 +4270,7 @@ msgstr "" + "\n" + "%s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:890 ++#: ../camel/providers/nntp/camel-nntp-store.c:892 + msgid "" + "You cannot subscribe to this newsgroup:\n" + "\n" +@@ -4121,7 +4280,7 @@ msgstr "" + "\n" + "ਇਸ ਤਰਾਂ ਦਾ ਕੋਈ ਖਬਰ-ਸਮੂਹ ਨਹੀਂ ਹੈ। ਸਾਇਦ ਚੁਣੀ ਇਕਾਈ ਮੁੱਢਲਾ ਫੋਲਡਰ ਹੈ।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:922 ++#: ../camel/providers/nntp/camel-nntp-store.c:924 + msgid "" + "You cannot unsubscribe to this newsgroup:\n" + "\n" +@@ -4131,116 +4290,111 @@ msgstr "" + "\n" + "ਇਸ ਤਰਾਂ ਦਾ ਕੋਈ ਖਬਰ-ਸਮੂਹ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:947 ++#: ../camel/providers/nntp/camel-nntp-store.c:949 + msgid "You cannot create a folder in a News store: subscribe instead." + msgstr "ਤੁਸੀਂ ਖਬਰ ਸੰਭਾਲ ਵਿੱਚ ਫੋਲਡਰ ਨਹੀਂ ਬਣਾ ਸਕਦੇ ਹੋ: ਸਵੀਕਾਰ ਹੀ ਕਰੋ।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:955 ++#: ../camel/providers/nntp/camel-nntp-store.c:957 + msgid "You cannot rename a folder in a News store." + msgstr "ਖਬਰ ਸੰਭਾਲ ਵਿੱਚ ਫੋਲਡਰ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:963 ++#: ../camel/providers/nntp/camel-nntp-store.c:965 + msgid "You cannot remove a folder in a News store: unsubscribe instead." + msgstr "ਤੁਸੀਂ ਖਬਰ ਸੰਭਾਲ ਵਿੱਚ ਫੋਲਡਰ ਨਹੀਂ ਹਟਾ ਸਕਦੇ ਹੋ: ਅਸਵੀਕਾਰ ਹੀ ਕਰੋ।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1144 ++#: ../camel/providers/nntp/camel-nntp-store.c:1154 + msgid "Authentication requested but no username provided" + msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ, ਪਰ ਕੋਈ ਯੂਜ਼ਰ ਦਿੱਤਾ ਨਹੀਂ ਗਿਆ" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1152 +-#, c-format +-msgid "Please enter the NNTP password for %s@%s" +-msgstr "ਕਿਰਪਾ ਕਰਕੇ %s@%s ਲਈ NNTP ਪਾਸਵਰਡ ਦਿਓ" +- +-#: ../camel/providers/nntp/camel-nntp-store.c:1156 ++#: ../camel/providers/nntp/camel-nntp-store.c:1166 + #, c-format + msgid "Cannot authenticate to server: %s" + msgstr "ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1271 ++#: ../camel/providers/nntp/camel-nntp-store.c:1283 + #, c-format + msgid "NNTP Command failed: %s" + msgstr "NNTP ਕਮਾਂਡ ਅਸਫਲ: %s" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1325 ++#: ../camel/providers/nntp/camel-nntp-store.c:1337 + msgid "Not connected." + msgstr "ਜੁੜਿਆ ਨਹੀ ਹੈ।" + +-#: ../camel/providers/nntp/camel-nntp-store.c:1378 ++#: ../camel/providers/nntp/camel-nntp-store.c:1390 + #, c-format + msgid "No such folder: %s" + msgstr "ਇਸਤਰਾਂ ਦਾ ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ ਹੈ: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:222 +-#: ../camel/providers/nntp/camel-nntp-summary.c:318 ++#: ../camel/providers/nntp/camel-nntp-summary.c:273 ++#: ../camel/providers/nntp/camel-nntp-summary.c:369 + #, c-format + msgid "%s: Scanning new messages" + msgstr "%s: ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:229 ++#: ../camel/providers/nntp/camel-nntp-summary.c:280 + #, c-format + msgid "Unexpected server response from xover: %s" + msgstr "xover ਤੋ ਅਸਧਾਰਨ ਸਰਵਰ ਜਵਾਬ ਹੈ: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:332 ++#: ../camel/providers/nntp/camel-nntp-summary.c:383 + #, c-format + msgid "Unexpected server response from head: %s" + msgstr "head ਤੋ ਅਸਧਾਰਨ ਸਰਵਰ ਜਵਾਬ ਹੈ: %s" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:372 ++#: ../camel/providers/nntp/camel-nntp-summary.c:423 + msgid "Use cancel" + msgstr "ਰੱਦ ਵਰਤੋਂ" + +-#: ../camel/providers/nntp/camel-nntp-summary.c:374 ++#: ../camel/providers/nntp/camel-nntp-summary.c:425 + #, c-format + msgid "Operation failed: %s" + msgstr "ਕਾਰਵਾਈ ਅਸਫਲ: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:247 ++#: ../camel/providers/pop3/camel-pop3-folder.c:251 + msgid "Retrieving POP summary" + msgstr "POP ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:266 ++#: ../camel/providers/pop3/camel-pop3-folder.c:269 + #, c-format + msgid "Cannot get POP summary: %s" + msgstr "POP ਸੰਖੇਪ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦੀ ਹੈ: %s" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:310 ++#: ../camel/providers/pop3/camel-pop3-folder.c:312 + msgid "Expunging old messages" + msgstr "ਹਟਾਏ ਸੁਨੇਹੇ ਸੁੰਘੜੇ ਜਾ ਰਹੇ ਹਨ" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:318 ++#: ../camel/providers/pop3/camel-pop3-folder.c:320 + msgid "Expunging deleted messages" + msgstr "ਹਟਾਏ ਸੁਨੇਹੇ ਫੋਲੇ ਜਾ ਰਹੇ ਹਨ" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:495 ++#: ../camel/providers/pop3/camel-pop3-folder.c:534 + #, c-format + msgid "No message with UID %s" + msgstr "UID %s ਨਾਲ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ" + + #. Sigh, most of the crap in this function is so that the cancel button + #. returns the proper exception code. Sigh. +-#: ../camel/providers/pop3/camel-pop3-folder.c:502 ++#: ../camel/providers/pop3/camel-pop3-folder.c:541 + #, c-format + msgid "Retrieving POP message %d" + msgstr "POP ਸੁਨੇਹੇ %d ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:592 ++#: ../camel/providers/pop3/camel-pop3-folder.c:631 + msgid "Unknown reason" + msgstr "ਅਣਪਛਾਤਾ ਕਾਰਨ" + + #: ../camel/providers/pop3/camel-pop3-provider.c:43 +-msgid "Leave messages on server" +-msgstr "ਸਰਵਰ ਤੇ ਸੁਨੇਹੇ ਛੱਡੋ" ++msgid "_Leave messages on server" ++msgstr "ਸਰਵਰ ਤੇ ਸੁਨੇਹੇ ਛੱਡੋ(_L)" + + #: ../camel/providers/pop3/camel-pop3-provider.c:45 + #, c-format +-msgid "Delete after %s day(s)" +-msgstr "%s ਦਿਨਾਂ ਬਾਅਦ ਹਟਾਓ" ++msgid "_Delete after %s day(s)" ++msgstr "%s ਦਿਨਾਂ ਬਾਅਦ ਹਟਾਓ(_D)" + + #: ../camel/providers/pop3/camel-pop3-provider.c:47 +-msgid "Disable support for all POP3 extensions" +-msgstr "ਸਭ POP3 ਐਕਸ਼ਟੇਸ਼ਨ ਲਈ ਸਹਿਯੋਗ ਅਯੋਗ" ++msgid "Disable _support for all POP3 extensions" ++msgstr "ਸਭ POP3 ਐਕਸ਼ਟੇਸ਼ਨ ਲਈ ਸਹਿਯੋਗ ਅਯੋਗ(_s)" + + #: ../camel/providers/pop3/camel-pop3-provider.c:55 + msgid "POP" +@@ -4251,28 +4405,19 @@ msgid "For connecting to and downloading + msgstr "ਜੁੜਨ ਲਈ POP ਸਰਵਰ ਤੋਂ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ।" + + #: ../camel/providers/pop3/camel-pop3-provider.c:74 +-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:84 +-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 "" +-"ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ 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 "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ POP ਸਰਵਰ ਨਾਲ APOP ਪਰੋਟੋਕਾਲ ਰਾਹੀ ਇਕ੍ਰਿਪਟਡ ਪਾਸਵਰਡ ਨਾਲ ਜੋੜੇਗਾ, ਇਹ ਹੀ ਚੋਣ ਹੈ, ਜੋ ਕਿ ਅਕਸਰ ਸਰਵਰ ਸਭ ਯੂਜ਼ਰਵਾਂ ਨੂੰ ਦੇਣ ਦਾ ਵਾਅਦਾ ਤਾਂ ਕਰਦੇ ਹਨ, ਪਰ ਸੱਚ ਘੱਟ ਹੀ ਹੁੰਦਾ ਹੈ।" + + #: ../camel/providers/pop3/camel-pop3-store.c:208 + #, c-format + msgid "Failed to read a valid greeting from POP server %s" + msgstr "POP ਸਰਵਰ %s ਤੋਂ ਸੁਨੇਹਾ ਪੜਨ ਵਿੱਚ ਅਸਫਲ" + +-#: ../camel/providers/pop3/camel-pop3-store.c:222 ++#: ../camel/providers/pop3/camel-pop3-store.c:225 + #: ../camel/providers/pop3/camel-pop3-store.c:239 + #: ../camel/providers/pop3/camel-pop3-store.c:249 + #: ../camel/providers/pop3/camel-pop3-store.c:255 +@@ -4280,7 +4425,7 @@ msgstr "POP ਸਰਵਰ %s ਤੋਂ + msgid "Failed to connect to POP server %s in secure mode: %s" + msgstr "POP ਸਰਵਰ %s ਨਾਲ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:223 ++#: ../camel/providers/pop3/camel-pop3-store.c:226 + msgid "STLS not supported by server" + msgstr "ਸਰਵਰ ਵਲੋਂ STLS ਸਹਾਇਕ ਨਹੀਂ" + +@@ -4294,17 +4439,15 @@ msgid "Could not connect to POP server % + msgstr "POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ" + + #: ../camel/providers/pop3/camel-pop3-store.c:403 +-#: ../camel/providers/pop3/camel-pop3-store.c:532 ++#: ../camel/providers/pop3/camel-pop3-store.c:536 + #, c-format +-msgid "" +-"Unable to connect to POP server %s: No support for requested authentication " +-"mechanism." ++msgid "Unable to connect to POP server %s: No support for requested authentication mechanism." + msgstr "POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ: ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਲਈ ਸਹਾਇਕ ਨਹੀਂ।" + + #: ../camel/providers/pop3/camel-pop3-store.c:419 + #, c-format +-msgid "SASL `%s' Login failed for POP server %s: %s" +-msgstr "POP ਸਰਵਰ %2$s ਉੱਤੇ SASL `%1$s' ਲਾਗਇਨ ਅਸਫਲ: %3$s" ++msgid "SASL '%s' Login failed for POP server %s: %s" ++msgstr "POP ਸਰਵਰ %2$s ਉੱਤੇ SASL '%1$s' ਲਾਗਇਨ ਅਸਫਲ: %3$s" + + #: ../camel/providers/pop3/camel-pop3-store.c:431 + #, c-format +@@ -4316,22 +4459,13 @@ msgstr "POP ਸਰਵਰ %s ਤੇ ਲ + msgid "Failed to authenticate on POP server %s: %s" + msgstr "POP ਸਰਵਰ %s ਤੇ ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫਲ: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:476 ++#: ../camel/providers/pop3/camel-pop3-store.c:509 + #, c-format +-msgid "%sPlease enter the POP password for %s on host %s" +-msgstr "%1sਕਿਰਪਾ ਕਰਕੇ ਹੋਸਟ %3s ਤੇ %2s ਲਈ POP ਪਾਸਵਰਡ ਦਿਓ।" ++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 ਮਿਲਿਆ ਹੈ। Impersonation ਹਮਲੇ ਦਾ ਸ਼ੱਕ ਹੈ। ਆਪਣੇ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।" + +-#: ../camel/providers/pop3/camel-pop3-store.c:502 +-#, 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 ਮਿਲਿਆ ਹੈ। Impersonation " +-"ਹਮਲੇ ਦਾ ਸ਼ੱਕ ਹੈ। ਆਪਣੇ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।" +- +-#: ../camel/providers/pop3/camel-pop3-store.c:546 +-#: ../camel/providers/pop3/camel-pop3-store.c:559 ++#: ../camel/providers/pop3/camel-pop3-store.c:550 ++#: ../camel/providers/pop3/camel-pop3-store.c:563 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" +@@ -4340,7 +4474,7 @@ msgstr "" + "POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ\n" + "ਪਾਸਵਰਡ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:553 ++#: ../camel/providers/pop3/camel-pop3-store.c:557 + #, c-format + msgid "" + "Unable to connect to POP server %s.\n" +@@ -4349,19 +4483,17 @@ msgstr "" + "POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ।\n" + "ਯੂਜ਼ਰ ਨਾਂ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ: %s" + +-#: ../camel/providers/pop3/camel-pop3-store.c:659 ++#: ../camel/providers/pop3/camel-pop3-store.c:663 + #, c-format +-msgid "No such folder `%s'." +-msgstr "`%s' ਫੋਲਡਰ ਨਹੀਂ ਹੈ" ++msgid "No such folder '%s'." ++msgstr "'%s' ਫੋਲਡਰ ਨਹੀਂ ਹੈ।" + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:38 + msgid "Sendmail" + msgstr "Sendmail" + + #: ../camel/providers/sendmail/camel-sendmail-provider.c:40 +-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:115 +@@ -4407,135 +4539,130 @@ msgstr "SMTP" + + #: ../camel/providers/smtp/camel-smtp-provider.c:41 + msgid "For delivering mail by connecting to a remote mailhub using SMTP." +-msgstr "ਰਿਮੋਟ mailhub ਨੂੰ SMTP ਵਰਤ ਕੇ ਪੱਤਰ ਭੇਜਣ ਲ਼ਈ।" ++msgstr "ਰਿਮੋਟ mailhub ਨੂੰ SMTP ਵਰਤ ਕੇ ਪੱਤਰ ਭੇਜਣ ਲਈ।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:166 ++#: ../camel/providers/smtp/camel-smtp-transport.c:168 + msgid "Syntax error, command unrecognized" + msgstr "ਸੰਟੈਕਸ ਗਲਤੀ, ਕਮਾਂਡ ਪਛਾਣੀ ਨਹੀਂ ਜਾ ਸਕੀ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:168 ++#: ../camel/providers/smtp/camel-smtp-transport.c:170 + msgid "Syntax error in parameters or arguments" + msgstr "ਪੈਰਾਮੀਟਰ ਜਾਂ ਆਰਗੂਮਿੰਟ ਵਿੱਚ ਸੰਟੈਕਸ ਗਲਤੀ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:170 ++#: ../camel/providers/smtp/camel-smtp-transport.c:172 + msgid "Command not implemented" + msgstr "ਕਮਾਂਡ ਲਾਗੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ ਹੈ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:174 + msgid "Command parameter not implemented" + msgstr "ਕਮਾਂਡ ਪੈਰਾਮੀਟਰ ਲਾਗੂ ਨਹੀਂ ਹੈ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:174 ++#: ../camel/providers/smtp/camel-smtp-transport.c:176 + msgid "System status, or system help reply" + msgstr "ਸਿਸਟਮ ਸਥਿਤੀ ਜਾਂ ਸਿਸਟਮ ਸਹਾਇਤਾ ਜਵਾਬ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:176 ++#: ../camel/providers/smtp/camel-smtp-transport.c:178 + msgid "Help message" + msgstr "ਸਹਾਇਤਾ ਸੁਨੇਹਾ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:178 ++#: ../camel/providers/smtp/camel-smtp-transport.c:180 + msgid "Service ready" + msgstr "ਸੇਵਾ ਤਿਆਰ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:180 ++#: ../camel/providers/smtp/camel-smtp-transport.c:182 + msgid "Service closing transmission channel" + msgstr "ਸੇਵਾ ਬੰਦ ਕਰਨ ਲਈ ਸੰਚਾਰ ਚੈਨਲ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:182 ++#: ../camel/providers/smtp/camel-smtp-transport.c:184 + msgid "Service not available, closing transmission channel" + msgstr "ਸੇਵਾ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਸੰਚਾਰ ਚੈਨਲ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:184 ++#: ../camel/providers/smtp/camel-smtp-transport.c:186 + msgid "Requested mail action okay, completed" + msgstr "ਲੋੜੀਦਾ ਪੱਤਰ ਕਾਰਵਾਈ ਠੀਕ ਹੈ, ਸਮਾਪਤ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:186 ++#: ../camel/providers/smtp/camel-smtp-transport.c:188 + msgid "User not local; will forward to " + msgstr "ਯੂਜ਼ਰ ਲੋਕਲ ਨਹੀਂ ਹੈ; ਅੱਗੇ ਭੇਜਿਆ ਜਾਵੇਗਾ।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:188 ++#: ../camel/providers/smtp/camel-smtp-transport.c:190 + msgid "Requested mail action not taken: mailbox unavailable" + msgstr "ਲੋੜੀਦੀ ਪੱਤਰ ਕਾਰਵਾਈ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ: mailbox ਉਪਲੱਬਧ ਨਹੀ।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:190 ++#: ../camel/providers/smtp/camel-smtp-transport.c:192 + msgid "Requested action not taken: mailbox unavailable" + msgstr "ਲੋੜੀਦੀ ਕਾਰਵਾਈ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ: mailbox ਉਪਲੱਬਧ ਨਹੀਂ।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:192 ++#: ../camel/providers/smtp/camel-smtp-transport.c:194 + msgid "Requested action aborted: error in processing" + msgstr "ਲੋੜੀਦੀ ਕਾਰਵਾਈ ਛੱਡੀ ਗਈ ਗਈ, ਕਾਰਵਾਈ ਵਿੱਚ ਗਲਤੀ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:194 ++#: ../camel/providers/smtp/camel-smtp-transport.c:196 + msgid "User not local; please try " + msgstr "ਯੂਜ਼ਰ ਲੋਕਲ ਨਹੀਂ ਹੈ; ਕਿਰਪਾ ਕਰਕੇ ਵਰਤੋਂ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:196 ++#: ../camel/providers/smtp/camel-smtp-transport.c:198 + msgid "Requested action not taken: insufficient system storage" + msgstr "ਲੋੜੀਦੀ ਕਾਰਵਾਈ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: ਲੋੜੀਦੀ ਸਿਸਟਮ ਥਾਂ ਉਪਲੱਬਧ ਨਹੀਂ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:198 ++#: ../camel/providers/smtp/camel-smtp-transport.c:200 + msgid "Requested mail action aborted: exceeded storage allocation" + msgstr "ਲੋੜੀਦੀ ਪੱਤਰ ਕਾਰਵਾਈ ਅਧੂਰੀ: ਉਪਲੱਬਧ ਲੋੜ ਸੀਮਾ ਤੋਂ ਵਧੇਰੇ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:200 ++#: ../camel/providers/smtp/camel-smtp-transport.c:202 + msgid "Requested action not taken: mailbox name not allowed" + msgstr "ਲੋੜੀਦੀ ਕਾਰਵਾਈ ਸੰਭਵ ਨਹੀਂ: mailbox ਨਾਂ ਸੰਭਵ ਹੈ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:202 ++#: ../camel/providers/smtp/camel-smtp-transport.c:204 + msgid "Start mail input; end with ." + msgstr "ਮੇਲ ਇੰਪੁੱਟ ਸ਼ੁਰੂ; . ਨਾਲ ਸਮਾਪਤ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:204 ++#: ../camel/providers/smtp/camel-smtp-transport.c:206 + msgid "Transaction failed" + msgstr "ਟਰਾਂਸ਼ੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:208 ++#: ../camel/providers/smtp/camel-smtp-transport.c:210 + msgid "A password transition is needed" + msgstr "ਇੱਕ ਪਾਸਵਰਡ ਤਬਦੀਲੀ ਲੋੜੀਦੀ ਹੈ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:210 ++#: ../camel/providers/smtp/camel-smtp-transport.c:212 + msgid "Authentication mechanism is too weak" + msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਢੰਗ ਬਹੁਤ ਕਮਜ਼ੋਰ ਹੈ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:212 ++#: ../camel/providers/smtp/camel-smtp-transport.c:214 + msgid "Encryption required for requested authentication mechanism" + msgstr "ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਲਈ ਇਕ੍ਰਿਪਸ਼ਨ ਲੋੜੀਦੀ ਹੈ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:214 ++#: ../camel/providers/smtp/camel-smtp-transport.c:216 + msgid "Temporary authentication failure" + msgstr "ਆਰਜ਼ੀ ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫਲ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:295 ++#: ../camel/providers/smtp/camel-smtp-transport.c:297 + msgid "Welcome response error" + msgstr "ਜੀ ਆਇਆਂ ਨੂੰ ਜਵਾਬ ਗਲਤੀ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:326 +-#: ../camel/providers/smtp/camel-smtp-transport.c:359 ++#: ../camel/providers/smtp/camel-smtp-transport.c:332 + #: ../camel/providers/smtp/camel-smtp-transport.c:365 ++#: ../camel/providers/smtp/camel-smtp-transport.c:371 + #, 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:335 ++#: ../camel/providers/smtp/camel-smtp-transport.c:341 + #, c-format + msgid "STARTTLS command failed: %s" + msgstr "STARTTLS ਕਮਾਂਡ ਅਸਫਲ: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:350 ++#: ../camel/providers/smtp/camel-smtp-transport.c:356 + msgid "STARTTLS command failed" + msgstr "STARTTLS ਕਮਾਂਡ ਅਸਫਲ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:487 ++#: ../camel/providers/smtp/camel-smtp-transport.c:497 + #, c-format + msgid "SMTP server %s does not support requested authentication type %s." + msgstr "SMTP ਸਰਵਰ %s ਲੋੜੀਦੀ ਪ੍ਰਮਾਣਕਿਤਾ ਕਿਸਮ %s ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:525 +-#, c-format +-msgid "%sPlease enter the SMTP password for %s on host %s" +-msgstr "%1s ਕਿਰਪਾ ਕਰਕੇ %3s ਹੋਸਟ ਤੇ %2s ਲਈ SMTP ਪਾਸਵਰਡ ਦਿਓ" +- +-#: ../camel/providers/smtp/camel-smtp-transport.c:544 ++#: ../camel/providers/smtp/camel-smtp-transport.c:564 + #, c-format + msgid "" + "Unable to authenticate to SMTP server.\n" +@@ -4546,93 +4673,93 @@ msgstr "" + "%s\n" + "\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:668 ++#: ../camel/providers/smtp/camel-smtp-transport.c:697 + #, c-format + msgid "SMTP server %s" + msgstr "SMTP ਸਰਵਰ %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:670 ++#: ../camel/providers/smtp/camel-smtp-transport.c:699 + #, c-format + msgid "SMTP mail delivery via %s" + msgstr "SMTP ਪੱਤਰ ਪਹੁੰਚ %s ਰਾਹੀ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:688 ++#: ../camel/providers/smtp/camel-smtp-transport.c:717 + msgid "Cannot send message: service not connected." + msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਸੇਵਾ ਜੁੜੀ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:694 ++#: ../camel/providers/smtp/camel-smtp-transport.c:723 + msgid "Cannot send message: sender address not valid." + msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਭੇਜਣ ਵਾਲੇ ਦਾ ਐਡਰੈੱਸ ਜਾਇਜ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:698 ++#: ../camel/providers/smtp/camel-smtp-transport.c:727 + msgid "Sending message" + msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:713 ++#: ../camel/providers/smtp/camel-smtp-transport.c:742 + msgid "Cannot send message: no recipients defined." + msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਕੋਈ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨਹੀਂ ਹੈ।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:724 ++#: ../camel/providers/smtp/camel-smtp-transport.c:753 + msgid "Cannot send message: one or more invalid recipients" + msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਪ੍ਰਾਪਤ-ਕਰਤਾ ਗਲਤ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:894 ++#: ../camel/providers/smtp/camel-smtp-transport.c:982 + msgid "SMTP Greeting" + msgstr "SMTP ਸ਼ੁੱਭ-ਸੁਨੇਹਾ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:919 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1007 + #, c-format + msgid "HELO command failed: %s" + msgstr "HELO ਕਮਾਂਡ ਅਸਫਲ: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:936 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1024 + msgid "HELO command failed" + msgstr "HELO ਕਮਾਂਡ ਅਸਫਲ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1002 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1090 + msgid "SMTP Authentication" + msgstr "SMTP ਪ੍ਰਮਾਣਕਿਤਾ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1008 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1096 + msgid "Error creating SASL authentication object." + msgstr "ਗਲਤੀ, SASL ਪ੍ਰਮਾਣਕਿਤਾ ਇਕਾਈ ਬਣਾਉਣ ਵਿੱਚ।" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1025 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1036 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1113 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1124 + #, c-format + msgid "AUTH command failed: %s" + msgstr "AUTH ਕਮਾਂਡ ਅਸਫਲ: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1042 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1130 + msgid "AUTH command failed" + msgstr "AUTH ਕਮਾਂਡ ਅਸਫਲ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1106 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1200 + msgid "Bad authentication response from server.\n" + msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਪ੍ਰਮਾਣਿਕਤਾ ਜਵਾਬ।\n" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1131 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1227 + #, c-format + msgid "MAIL FROM command failed: %s: mail not sent" + msgstr "MAIL FROM ਕਮਾਂਡ ਅਸਫਲ: %s: ਪੱਤਰ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1148 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1244 + msgid "MAIL FROM command failed" + msgstr "MAIL FROM ਕਮਾਂਡ ਅਸਫਲ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1172 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1268 + #, c-format + msgid "RCPT TO command failed: %s: mail not sent" + msgstr "RCPT TO ਕਮਾਂਡ ਅਸਫਲ: %s:ਪੱਤਰ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1191 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1287 + #, c-format + msgid "RCPT TO <%s> failed" + msgstr "RCPT TO <%s> ਅਸਫਲ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1230 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1288 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1307 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1327 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1396 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1415 + #, c-format + msgid "DATA command failed: %s: mail not sent" + msgstr "DATA ਕਮਾਂਡ ਅਸਫਲ: %s: ਪੱਤਰ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ" +@@ -4640,107 +4767,108 @@ msgstr "DATA ਕਮਾਂਡ ਅਸਫ + #. we should have gotten instructions on how to use the DATA command: + #. * 354 Enter mail, end with "." on a line by itself + #. +-#: ../camel/providers/smtp/camel-smtp-transport.c:1247 +-#: ../camel/providers/smtp/camel-smtp-transport.c:1323 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1344 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1431 + msgid "DATA command failed" + msgstr "DATA ਕਮਾਂਡ ਅਸਫਲ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1346 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1454 + #, c-format + msgid "RSET command failed: %s" + msgstr "RSET ਕਮਾਂਡ ਅਸਫਲ: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1362 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1470 + msgid "RSET command failed" + msgstr "RSET ਕਮਾਂਡ ਅਸਫਲ" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1385 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1493 + #, c-format + msgid "QUIT command failed: %s" + msgstr "QUIT ਕਮਾਂਡ ਅਸਫਲ: %s" + +-#: ../camel/providers/smtp/camel-smtp-transport.c:1399 ++#: ../camel/providers/smtp/camel-smtp-transport.c:1507 + msgid "QUIT command failed" + msgstr "QUIT ਕਮਾਂਡ ਅਸਫਲ" + +-#: ../libedataserver/e-categories.c:43 ++#: ../libedataserver/e-categories.c:45 + msgid "Business" + msgstr "ਵਪਾਰ" + +-#: ../libedataserver/e-categories.c:44 ++#: ../libedataserver/e-categories.c:46 + msgid "Competition" + msgstr "ਮੁਕਾਬਲਾ" + +-#: ../libedataserver/e-categories.c:45 ++#: ../libedataserver/e-categories.c:47 + msgid "Favorites" + msgstr "ਪਸੰਦੀਦਾ" + +-#: ../libedataserver/e-categories.c:46 ++#: ../libedataserver/e-categories.c:48 + msgid "Gifts" + msgstr "ਤੋਹਫੇ" + +-#: ../libedataserver/e-categories.c:47 ++#: ../libedataserver/e-categories.c:49 + msgid "Goals/Objectives" + msgstr "ਨਿਸ਼ਾਨੇ/ਟੀਚੇ" + +-#: ../libedataserver/e-categories.c:48 ++#: ../libedataserver/e-categories.c:50 + msgid "Holiday" + msgstr "ਛੁੱਟੀ" + +-#: ../libedataserver/e-categories.c:49 ++#: ../libedataserver/e-categories.c:51 + msgid "Holiday Cards" + msgstr "ਛੁੱਟੀਆਂ ਕਾਰਡ" + + #. important people (e.g. new business partners) +-#: ../libedataserver/e-categories.c:51 ++#: ../libedataserver/e-categories.c:53 + msgid "Hot Contacts" + msgstr "ਤੇਜ਼ ਸੰਪਰਕ" + +-#: ../libedataserver/e-categories.c:52 ++#: ../libedataserver/e-categories.c:54 + msgid "Ideas" + msgstr "ਢੰਗ" + +-#: ../libedataserver/e-categories.c:53 ++#: ../libedataserver/e-categories.c:55 + msgid "International" + msgstr "ਅੰਤਰਰਾਸ਼ਟਰੀ" + +-#: ../libedataserver/e-categories.c:54 ++#: ../libedataserver/e-categories.c:56 + msgid "Key Customer" + msgstr "ਖਾਸ ਗਾਹਕ" + +-#: ../libedataserver/e-categories.c:55 ++#: ../libedataserver/e-categories.c:57 + msgid "Miscellaneous" + msgstr "ਫੁਟਕਲ" + +-#: ../libedataserver/e-categories.c:56 ++#: ../libedataserver/e-categories.c:58 + msgid "Personal" + msgstr "ਨਿੱਜੀ" + +-#: ../libedataserver/e-categories.c:57 ++#: ../libedataserver/e-categories.c:59 + msgid "Phone Calls" + msgstr "ਫੋਨ ਕਾਲ" + +-#: ../libedataserver/e-categories.c:58 ++#. Translators: "Status" is a category name; it can mean anything user wants to ++#: ../libedataserver/e-categories.c:61 + msgid "Status" + msgstr "ਹਾਲਤ" + +-#: ../libedataserver/e-categories.c:59 ++#: ../libedataserver/e-categories.c:62 + msgid "Strategies" + msgstr "ਨੀਤੀ" + +-#: ../libedataserver/e-categories.c:60 ++#: ../libedataserver/e-categories.c:63 + msgid "Suppliers" + msgstr "ਸਪਲਾਇਰ" + +-#: ../libedataserver/e-categories.c:61 ++#: ../libedataserver/e-categories.c:64 + msgid "Time & Expenses" + msgstr "ਸਮਾਂ ਅਤੇ ਖਰਚੇ" + +-#: ../libedataserver/e-categories.c:62 ++#: ../libedataserver/e-categories.c:65 + msgid "VIP" + msgstr "VIP" + +-#: ../libedataserver/e-categories.c:63 ++#: ../libedataserver/e-categories.c:66 + msgid "Waiting" + msgstr "ਉਡੀਕ ਜਾਰੀ" + +@@ -4748,7 +4876,8 @@ msgstr "ਉਡੀਕ ਜਾਰੀ" + #. in 12-hour format. + #. strftime format of a weekday, a date and a + #. time, in 12-hour format. +-#: ../libedataserver/e-time-utils.c:1605 ../libedataserver/e-time-utils.c:1852 ++#: ../libedataserver/e-time-utils.c:1644 ++#: ../libedataserver/e-time-utils.c:1911 + msgid "%a %m/%d/%Y %I:%M:%S %p" + msgstr "%I:%M:%S %p %a %d/%m/%Y" + +@@ -4756,7 +4885,8 @@ msgstr "%I:%M:%S %p %a %d/%m/%Y" + #. in 24-hour format. + #. strftime format of a weekday, a date and a + #. time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1610 ../libedataserver/e-time-utils.c:1843 ++#: ../libedataserver/e-time-utils.c:1649 ++#: ../libedataserver/e-time-utils.c:1902 + msgid "%a %m/%d/%Y %H:%M:%S" + msgstr "%H:%M:%S %a %d/%m/%Y" + +@@ -4764,7 +4894,8 @@ msgstr "%H:%M:%S %a %d/%m/%Y" + #. 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:1615 ../libedataserver/e-time-utils.c:1848 ++#: ../libedataserver/e-time-utils.c:1654 ++#: ../libedataserver/e-time-utils.c:1907 + msgid "%a %m/%d/%Y %I:%M %p" + msgstr "%I:%M %p %a %d/%m/%Y" + +@@ -4772,78 +4903,83 @@ msgstr "%I:%M %p %a %d/%m/%Y" + #. 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:1620 ../libedataserver/e-time-utils.c:1839 ++#: ../libedataserver/e-time-utils.c:1659 ++#: ../libedataserver/e-time-utils.c:1898 + msgid "%a %m/%d/%Y %H:%M" + msgstr "%H:%M %a %d/%m/%Y" + + #. strptime format of a weekday, a date and a time, + #. in 12-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1625 ++#: ../libedataserver/e-time-utils.c:1664 + msgid "%a %m/%d/%Y %I %p" + msgstr "%I %p %a %d/%m/%Y" + + #. strptime format of a weekday, a date and a time, + #. in 24-hour format, without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1630 ++#: ../libedataserver/e-time-utils.c:1669 + msgid "%a %m/%d/%Y %H" + 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:1633 ../libedataserver/e-time-utils.c:1729 +-#: ../libedataserver/e-time-utils.c:1834 ++#: ../libedataserver/e-time-utils.c:1672 ++#: ../libedataserver/e-time-utils.c:1773 ++#: ../libedataserver/e-time-utils.c:1893 + 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:1641 ++#: ../libedataserver/e-time-utils.c:1680 + msgid "%m/%d/%Y %I:%M:%S %p" + msgstr "%I:%M:%S %p %d/%m/%Y" + + #. strptime format of a date and a time, in 24-hour format. +-#: ../libedataserver/e-time-utils.c:1645 ++#: ../libedataserver/e-time-utils.c:1684 + msgid "%m/%d/%Y %H:%M:%S" + msgstr "%H:%M:%S %d/%m/%Y" + + #. strptime format of a date and a time, in 12-hour format, + #. without seconds. +-#: ../libedataserver/e-time-utils.c:1650 ++#: ../libedataserver/e-time-utils.c:1689 + msgid "%m/%d/%Y %I:%M %p" + msgstr "%I:%M %p %d/%m/%Y" + + #. strptime format of a date and a time, in 24-hour format, + #. without seconds. +-#: ../libedataserver/e-time-utils.c:1655 ++#: ../libedataserver/e-time-utils.c:1694 + msgid "%m/%d/%Y %H:%M" + msgstr "%H:%M %d/%m/%Y" + + #. strptime format of a date and a time, in 12-hour format, + #. without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1660 ++#: ../libedataserver/e-time-utils.c:1699 + msgid "%m/%d/%Y %I %p" + msgstr "%I %p %d/%m/%Y" + + #. strptime format of a date and a time, in 24-hour format, + #. without minutes or seconds. +-#: ../libedataserver/e-time-utils.c:1665 ++#: ../libedataserver/e-time-utils.c:1704 + msgid "%m/%d/%Y %H" + msgstr "%H %d/%m/%Y" + + #. strptime format of a weekday and a date. + #. This is the preferred date format for the locale. +-#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1732 ++#: ../libedataserver/e-time-utils.c:1707 ++#: ../libedataserver/e-time-utils.c:1776 + 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:1778 ../libedataserver/e-time-utils.c:1897 ++#: ../libedataserver/e-time-utils.c:1834 ++#: ../libedataserver/e-time-utils.c:1956 + 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:1782 ../libedataserver/e-time-utils.c:1889 ++#: ../libedataserver/e-time-utils.c:1838 ++#: ../libedataserver/e-time-utils.c:1948 + msgid "%H:%M:%S" + msgstr "%H:%M:%S" + +@@ -4851,42 +4987,47 @@ msgstr "%H:%M:%S" + #. in 12-hour format. + #. strftime format of a time in 12-hour format, + #. without seconds. +-#: ../libedataserver/e-time-utils.c:1787 ../libedataserver/e-time-utils.c:1894 ++#: ../libedataserver/e-time-utils.c:1843 ++#: ../libedataserver/e-time-utils.c:1953 + 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:1791 ../libedataserver/e-time-utils.c:1886 ++#: ../libedataserver/e-time-utils.c:1847 ++#: ../libedataserver/e-time-utils.c:1945 + 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:1850 ++msgid "%H%M" ++msgstr "%H:%M" ++ + #. strptime format for hour and AM/PM, 12-hour format. +-#: ../libedataserver/e-time-utils.c:1795 ++#: ../libedataserver/e-time-utils.c:1854 + msgid "%I %p" + msgstr "%I %p" + +-#: ../libedataserverui/e-book-auth-util.c:89 ++#: ../libedataserverui/e-book-auth-util.c:90 + msgid "Accessing LDAP Server anonymously" + msgstr "LDAP ਸਰਵਰ ਨੂੰ ਅਗਿਆਤ ਦੇ ਤੌਰ 'ਤੇ ਵਰਤੋਂ" + +-#: ../libedataserverui/e-book-auth-util.c:191 ++#: ../libedataserverui/e-book-auth-util.c:192 + msgid "Failed to authenticate.\n" + msgstr "ਡਾਟਾ ਇਕੋਡਿਗ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।\n" + +-#: ../libedataserverui/e-categories-dialog.c:276 ++#: ../libedataserverui/e-categories-dialog.c:261 + #, c-format +-msgid "" +-"There is already a category '%s' in the configuration. Please use another " +-"name" ++msgid "There is already a category '%s' in the configuration. Please use another name" + msgstr "ਸੰਰਚਨਾ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ '%s' ਕੈਟਾਗਰੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ।" + +-#: ../libedataserverui/e-categories-dialog.c:475 ++#: ../libedataserverui/e-categories-dialog.c:462 + msgid "Icon" + msgstr "ਆਈਕਾਨ" + +-#: ../libedataserverui/e-categories-dialog.c:480 ++#: ../libedataserverui/e-categories-dialog.c:467 + msgid "Category" + msgstr "ਕੈਟਾਗਰੀ" + +@@ -4899,149 +5040,154 @@ msgid "Category Properties" + msgstr "ਕੈਟਾਗਰੀ ਗੁਣ" + + #: ../libedataserverui/e-categories-dialog.glade.h:3 +-msgid "Category _Color" +-msgstr "ਕੈਟਾਗਰੀ ਰੰਗ(_C)" +- +-#: ../libedataserverui/e-categories-dialog.glade.h:4 + msgid "Category _Icon" + msgstr "ਕੈਟਾਗਰੀ ਆਈਕਾਨ(_I)" + +-#: ../libedataserverui/e-categories-dialog.glade.h:5 ++#: ../libedataserverui/e-categories-dialog.glade.h:4 + msgid "Category _Name" + msgstr "ਕੈਟਾਗਰੀ ਨਾਂ(_N)" + +-#: ../libedataserverui/e-categories-dialog.glade.h:6 ++#: ../libedataserverui/e-categories-dialog.glade.h:5 + msgid "Item(s) belong to these _categories:" + msgstr "ਇਹਨਾਂ ਕੈਟਾਗਰੀਾਂ ਨਾਲ ਸਬੰਧਤ ਇਕਾਈਆਂ(_c):" + +-#: ../libedataserverui/e-categories-dialog.glade.h:7 ++#: ../libedataserverui/e-categories-dialog.glade.h:6 + msgid "_Available Categories:" + msgstr "ਉਪਲੱਬਧ ਕੈਟਾਗਰੀ(_A):" + +-#: ../libedataserverui/e-categories-dialog.glade.h:8 ++#: ../libedataserverui/e-categories-dialog.glade.h:7 + msgid "_Edit" + msgstr "ਸੋਧ(_E)" + +-#: ../libedataserverui/e-categories-dialog.glade.h:9 ++#: ../libedataserverui/e-categories-dialog.glade.h:8 + msgid "categories" + msgstr "ਕੈਟਾਗਰੀ" + +-#: ../libedataserverui/e-name-selector-dialog.c:122 +-#: ../libedataserverui/e-name-selector-dialog.c:782 +-msgid "Any Category" +-msgstr "ਕੋਈ ਵੀ ਕੈਟਾਗਰੀ" +- +-#: ../libedataserverui/e-name-selector-dialog.c:287 ++#: ../libedataserverui/e-name-selector-dialog.c:266 + msgid "Select Contacts from Address Book" + msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚੋਂ ਸੰਪਰਕ ਚੁਣੋ" + +-#: ../libedataserverui/e-name-selector-dialog.c:589 ++#: ../libedataserverui/e-name-selector-dialog.c:546 + msgid "_Add" + msgstr "ਸ਼ਾਮਲ(_A)" + +-#: ../libedataserverui/e-name-selector-dialog.c:614 ++#: ../libedataserverui/e-name-selector-dialog.c:571 + msgid "_Remove" + msgstr "ਹਟਾਓ(_R)" + ++#: ../libedataserverui/e-name-selector-dialog.c:744 ++#: ../libedataserverui/e-name-selector-dialog.glade.h:6 ++msgid "Any Category" ++msgstr "ਕੋਈ ਵੀ ਕੈਟਾਗਰੀ" ++ + #: ../libedataserverui/e-name-selector-dialog.glade.h:1 + msgid "*" + msgstr "*" + + #: ../libedataserverui/e-name-selector-dialog.glade.h:2 +-msgid "Show Contacts" +-msgstr "ਸੰਬੰਧ ਵੇਖੋ" ++msgid "Co_ntacts" ++msgstr "ਸੰਪਰਕ(_n)" + + #: ../libedataserverui/e-name-selector-dialog.glade.h:3 +-msgid "_Contacts" +-msgstr "ਸੰਪਰਕ(_C)" ++msgid "Show Contacts" ++msgstr "ਸੰਬੰਧ ਵੇਖੋ" + + #: ../libedataserverui/e-name-selector-dialog.glade.h:4 +-msgid "Address Book" +-msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ" ++msgid "Address B_ook:" ++msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ(_o):" + + #: ../libedataserverui/e-name-selector-dialog.glade.h:5 +-msgid "Address _Book:" +-msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ(_B):" +- +-#: ../libedataserverui/e-name-selector-dialog.glade.h:6 +-msgid "C_ategory:" +-msgstr "ਕੈਟਾਗਰੀ(_a):" ++msgid "Address Book" ++msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ" + + #: ../libedataserverui/e-name-selector-dialog.glade.h:7 ++msgid "Cate_gory:" ++msgstr "ਕੈਟਾਗਰੀ(_g):" ++ ++#: ../libedataserverui/e-name-selector-dialog.glade.h:8 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261 + msgid "Contacts" + msgstr "ਸੰਪਰਕ" + +-#: ../libedataserverui/e-name-selector-dialog.glade.h:8 ++#: ../libedataserverui/e-name-selector-dialog.glade.h:9 + msgid "Search" + msgstr "ਖੋਜ" + +-#: ../libedataserverui/e-name-selector-dialog.glade.h:9 ++#: ../libedataserverui/e-name-selector-dialog.glade.h:10 + msgid "_Search:" + msgstr "ਖੋਜ(_S):" + + #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2241 ++#: ../libedataserverui/e-name-selector-entry.c:2240 + #, c-format + msgid "E_xpand %s Inline" + msgstr "%s ਲਾਇਨ 'ਚ ਫੈਲਾਓ(_x)" + + #. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2256 ++#: ../libedataserverui/e-name-selector-entry.c:2255 + #, c-format + msgid "Cop_y %s" + msgstr "%s ਕਾਪੀ ਕਰੋ(_y)" + + #. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2266 ++#: ../libedataserverui/e-name-selector-entry.c:2265 + #, c-format + msgid "C_ut %s" + msgstr "%s ਕੱਟੋ(_U)" + + #. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2283 ++#: ../libedataserverui/e-name-selector-entry.c:2282 + #, c-format + msgid "_Edit %s" + msgstr "%s ਸੋਧ(_E)" + +-#: ../libedataserverui/e-name-selector-list.c:479 ++#: ../libedataserverui/e-name-selector-list.c:466 + #, c-format + msgid "_Delete %s" + msgstr "%s ਹਟਾਓ(_D)" + +-#: ../libedataserverui/e-passwords.c:819 ++#: ../libedataserverui/e-passwords.c:218 ++#, c-format ++msgid "Keyring key is unusable: no user or host name" ++msgstr "ਕੀਰਿੰਗ ਕੀ ਅਣ-ਵਰਤੋਂਯੋਗ ਹੈ: ਕੋਈ ਹੋਸਟ ਜਾਂ ਯੂਜ਼ਰ ਨਹੀਂ" ++ ++#: ../libedataserverui/e-passwords.c:1055 ++msgid "You have the Caps Lock key on." ++msgstr "ਤੁਸੀਂ ਕੈਪਸ ਲਾਕ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੈ।" ++ ++#: ../libedataserverui/e-passwords.c:1175 + msgid "_Remember this passphrase" + msgstr "ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)" + +-#: ../libedataserverui/e-passwords.c:820 ++#: ../libedataserverui/e-passwords.c:1176 + msgid "_Remember this passphrase for the remainder of this session" + msgstr "ਇਸ ਸ਼ੈਸ਼ਨ ਲਈ ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)" + +-#: ../libedataserverui/e-passwords.c:823 ++#: ../libedataserverui/e-passwords.c:1181 + msgid "_Remember this password" + msgstr "ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)" + +-#: ../libedataserverui/e-passwords.c:824 ++#: ../libedataserverui/e-passwords.c:1182 + msgid "_Remember this password for the remainder of this session" + msgstr "ਇਸ ਸ਼ੈਸਨ ਲਈ ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)" + + #. prepare the dialog +-#: ../libedataserverui/e-source-selector-dialog.c:101 ++#: ../libedataserverui/e-source-selector-dialog.c:95 + msgid "Select destination" + msgstr "ਟਿਕਾਣਾ ਚੁਣੋ" + +-#: ../libedataserverui/e-source-selector-dialog.c:154 ++#: ../libedataserverui/e-source-selector-dialog.c:148 + msgid "_Destination" + msgstr "ਟਿਕਾਣਾ(_D)" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1655 +-#: ../servers/exchange/storage/exchange-account.c:940 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1683 ++#: ../servers/exchange/storage/exchange-account.c:953 + #, c-format + msgid "Enter password for %s" + msgstr "%s ਲਈ ਪਾਸਵਰਡ ਦਿਓ" + +-#: ../servers/exchange/lib/e2k-autoconfig.c:1656 +-#: ../servers/exchange/storage/exchange-account.c:945 ++#: ../servers/exchange/lib/e2k-autoconfig.c:1684 ++#: ../servers/exchange/storage/exchange-account.c:958 + msgid "Enter password" + msgstr "ਪਾਸਵਰਡ ਦਿਓ" + +@@ -5087,14 +5233,6 @@ msgstr "ਕੋਈ ਨਹੀਂ" + msgid "Custom" + msgstr "ਪਸੰਦੀਦਾ" + +-#: ../servers/exchange/lib/e2k-user-dialog.c:139 +-msgid "Select User" +-msgstr "ਯੂਜ਼ਰ ਚੁਣੋ" +- +-#: ../servers/exchange/lib/e2k-user-dialog.c:177 +-msgid "Addressbook..." +-msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ..." +- + #: ../servers/exchange/storage/e-storage.c:555 + msgid "Generic error" + msgstr "ਆਮ ਗਲਤੀ" +@@ -5153,26 +5291,26 @@ msgstr "ਇਹ ਕਾਰਵਾਈ ਆਫ + + #. i18n: This is the title of an "other user's folders" + #. hierarchy. Eg, "John Doe's Folders". +-#: ../servers/exchange/storage/exchange-account.c:636 ++#: ../servers/exchange/storage/exchange-account.c:644 + #, c-format + msgid "%s's Folders" + msgstr "%s ਦੇ ਫੋਲਡਰ" + +-#: ../servers/exchange/storage/exchange-account.c:1246 ++#: ../servers/exchange/storage/exchange-account.c:1259 + msgid "Personal Folders" + msgstr "ਨਿੱਜੀ ਫੋਲਡਰ" + +-#: ../servers/exchange/storage/exchange-account.c:1261 ++#: ../servers/exchange/storage/exchange-account.c:1274 + msgid "Favorite Public Folders" + msgstr "ਪਸੰਦੀਦਾ ਪਬਲਿਕ ਫੋਲਡਰ" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1278 ++#: ../servers/exchange/storage/exchange-account.c:1291 + msgid "All Public Folders" + msgstr "ਸਭ ਪਬਲਿਕ ਫੋਲਡਰ" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1292 ++#: ../servers/exchange/storage/exchange-account.c:1305 + msgid "Global Address List" + msgstr "ਗਲੋਬਲ ਐਡਰੈੱਸ ਸੂਚੀ" + +@@ -5180,10 +5318,6 @@ msgstr "ਗਲੋਬਲ ਐਡਰੈੱ + msgid "Deleted Items" + msgstr "ਹਟਾਈਆਂ ਇਕਾਈਆਂ" + +-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263 +-msgid "Drafts" +-msgstr "ਡਰਾਫਟ" +- + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265 + msgid "Journal" + msgstr "ਰੋਜ਼ਾਨਾਮਚਾ" +@@ -5204,19 +5338,19 @@ msgstr "ਭੇਜੀਆਂ ਇਕਾਈ + msgid "Tasks" + msgstr "ਕੰਮ" + +-#: ../servers/groupwise/e-gw-connection.c:168 ++#: ../servers/groupwise/e-gw-connection.c:225 + msgid "Invalid connection" + msgstr "ਗਲਤ ਕੁਨੈਕਸ਼ਨ" + +-#: ../servers/groupwise/e-gw-connection.c:172 ++#: ../servers/groupwise/e-gw-connection.c:229 + msgid "Invalid response from server" + msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਜਵਾਬ" + +-#: ../servers/groupwise/e-gw-connection.c:174 ++#: ../servers/groupwise/e-gw-connection.c:231 + msgid "No response from the server" + msgstr "ਸਰਵਰ ਤੋਂ ਕੋਈ ਜਵਾਬ ਨਹੀਂ" + +-#: ../servers/groupwise/e-gw-connection.c:180 ++#: ../servers/groupwise/e-gw-connection.c:237 + msgid "Bad parameter" + msgstr "ਗਲਤ ਪੈਰਾਮੀਟਰ" + +@@ -5226,7 +5360,7 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰ + + #: ../src/GNOME_Evolution_DataServer.server.in.in.h:2 + msgid "Evolution Calendar file and webcal backend" +-msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਫਾਇਲ਼ ਤੇ webcal" ++msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਫਾਇਲ ਤੇ webcal" + + #: ../src/GNOME_Evolution_DataServer.server.in.in.h:3 + msgid "Evolution Data Server interface check service" +@@ -5237,8 +5371,44 @@ msgid "Evolution Data Server logging ser + msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਸਰਵਰ ਲਾਗਇਨ ਸੇਵਾ" + + #. dialog display isn't working out +-#: ../src/server.c:110 ++#: ../src/server.c:109 + #, c-format + msgid "Multiple segmentation faults occurred; cannot display error dialog\n" + msgstr "ਬਹੁ ਭਾਗ ਗਲਤੀ ਆਈ ਹੈ, ਗਲਤੀ ਬਕਸਾ ਵੇਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ\n" + ++#: ../libedataserverui/e-cell-renderer-color.c:210 ++msgid "Color Info" ++msgstr "ਰੰਗ ਜਾਣਕਾਰੀ" ++ ++#: ../libedataserverui/e-cell-renderer-color.c:211 ++msgid "The color to render" ++msgstr "ਰੈਂਡਰ ਕਰਨ ਲਈ ਰੰਗ" ++ ++#~ msgid "Cannot find certificate for `%s'" ++#~ msgstr "`%s' ਲਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਲੱਭਾ ਹੈ" ++#~ msgid "%sPlease enter the GroupWise password for %s@%s" ++#~ msgstr "%sਕਿਰਪਾ ਕਰਕੇ %s@%s ਲਈ Groupwise ਪਾਸਵਰਡ ਦਿਓ" ++#~ msgid "Unable to authenticate to GroupWise server. " ++#~ msgstr "GroupWise ਸਰਵਰ ਤੇ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।" ++#~ msgid "Folder was destroyed and recreated on server." ++#~ msgstr "ਫੋਲਡਰ ਸਰਵਰ ਉੱਤੇ ਹਟਾਇਆ ਗਿਆ ਅਤੇ ਮੁੜ ਬਣਾਇਆ ਗਿਆ" ++#~ msgid "" ++#~ "Unexpected server response: Identical UIDs provided for messages %d and %d" ++#~ msgstr "ਅਧੂਰਾ ਸਰਵਰ ਜਵਾਬ: ਸੁਨੇਹੇ %d ਅਤੇ %d ਲਈ ਇੱਕੋ UIDs ਉਪਲੱਬਧ ਕਰਵਾਏ ਗਏ" ++#~ msgid "%sPlease enter the IMAP password for %s@%s" ++#~ msgstr "%s ਕਿਰਪਾ ਕਰਕੇ %s@%s ਲਈ IMAP ਪਾਸਵਰਡ ਦਿਓ" ++#~ msgid "%sPlease enter the IMAP password for %s on host %s" ++#~ msgstr "%s ਕਿਰਪਾ ਕਰਕੇ %s ਲਈ IMAP ਪਾਸਵਰਡ ਭਰੋ ਲਈ, ਹੋਸਟ %s ਉੱਤੇ" ++#~ msgid "Could not save summary: %s: %s" ++#~ msgstr "ਸੰਖੇਪ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s: %s" ++#~ msgid "Please enter the NNTP password for %s@%s" ++#~ msgstr "ਕਿਰਪਾ ਕਰਕੇ %s@%s ਲਈ NNTP ਪਾਸਵਰਡ ਦਿਓ" ++#~ msgid "%sPlease enter the SMTP password for %s on host %s" ++#~ msgstr "%1s ਕਿਰਪਾ ਕਰਕੇ %3s ਹੋਸਟ ਤੇ %2s ਲਈ SMTP ਪਾਸਵਰਡ ਦਿਓ" ++#~ msgid "Category _Color" ++#~ msgstr "ਕੈਟਾਗਰੀ ਰੰਗ(_C)" ++#~ msgid "Select User" ++#~ msgstr "ਯੂਜ਼ਰ ਚੁਣੋ" ++#~ msgid "Addressbook..." ++#~ msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ..." ++ +Index: evolution-data-server-2.23.92/po/pt.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/pt.po ++++ evolution-data-server-2.23.92/po/pt.po +@@ -8,8 +8,8 @@ msgid "" + msgstr "" + "Project-Id-Version: 2.24\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2008-08-11 16:09+0100\n" +-"PO-Revision-Date: 2008-08-11 16:20+0000\n" ++"POT-Creation-Date: 2008-09-14 17:57+0100\n" ++"PO-Revision-Date: 2008-09-14 18:00+0000\n" + "Last-Translator: Duarte Loreto \n" + "Language-Team: Portuguese \n" + "MIME-Version: 1.0\n" +@@ -26,13 +26,13 @@ msgstr "A Ler..." + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315 + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4282 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288 + #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477 + msgid "Searching..." + msgstr "A Procurar..." + + #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4446 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452 + #, c-format + msgid "Downloading contacts (%d)... " + msgstr "A obter os contactos (%d)... " +@@ -52,27 +52,27 @@ msgstr "A Utilizar Nome Distinto (DN)" + msgid "Using Email Address" + msgstr "A Utilizar Endereço de Email" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019 + msgid "Reconnecting to LDAP server..." + msgstr "A ligar-se novamente ao servidor LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1613 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617 + msgid "Adding contact to LDAP server..." + msgstr "A adicionar contacto ao servidor LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1747 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752 + msgid "Removing contact from LDAP server..." + msgstr "A remover contacto do servidor LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2058 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064 + msgid "Modifying contact from LDAP server..." + msgstr "A alterar contacto no servidor LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4142 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148 + msgid "Receiving LDAP search results..." + msgstr "A receber resultados da procura no LDAP..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4304 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310 + msgid "Error performing search" + msgstr "Erro ao efectuar a procura" + +@@ -91,7 +91,7 @@ msgstr "Erro ao efectuar a procura" + #: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791 + #: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029 + #: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238 +-#: ../addressbook/libebook/e-book.c:3339 ++#: ../addressbook/libebook/e-book.c:3364 + #, c-format + msgid "\"%s\" on book before \"%s\"" + msgstr "\"%s\" em livro antes de \"%s\"" +@@ -120,7 +120,7 @@ msgstr "livro ocupado" + #: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277 + #: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619 + #: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818 +-#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3348 ++#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3373 + #, c-format + msgid "CORBA exception making \"%s\" call" + msgstr "Excepção Corba ao efectuar invocação \"%s\"" +@@ -145,27 +145,27 @@ msgstr "\"%s\" no livro após \"%s\"" + msgid "%s: canceled" + msgstr "%s: cancelado" + +-#: ../addressbook/libebook/e-book.c:3203 ++#: ../addressbook/libebook/e-book.c:3228 + #, c-format + msgid "%s: Invalid source." + msgstr "%s: Origem inválida." + +-#: ../addressbook/libebook/e-book.c:3211 ../addressbook/libebook/e-book.c:3277 ++#: ../addressbook/libebook/e-book.c:3236 ../addressbook/libebook/e-book.c:3302 + #, c-format + msgid "%s: no factories available for URI `%s'" + msgstr "%s: nenhuma fábrica disponível para o URI `%s'" + +-#: ../addressbook/libebook/e-book.c:3223 ++#: ../addressbook/libebook/e-book.c:3248 + #, c-format + msgid "%s: Could not create EBookListener" + msgstr "%s: Incapaz de criar EBookListener" + +-#: ../addressbook/libebook/e-book.c:3490 ++#: ../addressbook/libebook/e-book.c:3515 + #, c-format + msgid "%s: there was no self contact UID stored in gconf" + msgstr "%s: não existe nenhum UID de contacto próprio armazenado no gconf" + +-#: ../addressbook/libebook/e-book.c:3623 ++#: ../addressbook/libebook/e-book.c:3648 + #, c-format + msgid "%s: there was no source for uid `%s' stored in gconf." + msgstr "%s: não existia origem para uid `%s' armazenado no gconf." +@@ -668,7 +668,7 @@ msgstr "Informação Geográfica" + msgid "Telephone" + msgstr "Telefone" + +-#: ../addressbook/libebook/e-contact.c:1493 ++#: ../addressbook/libebook/e-contact.c:1499 + #: ../addressbook/libebook/e-destination.c:761 + msgid "Unnamed List" + msgstr "Lista Sem Nome" +@@ -697,21 +697,21 @@ msgstr "Incapaz de gravar dados de calen + msgid "Cannot save calendar data" + msgstr "Incapaz de gravar dados de calendário" + +-#: ../calendar/backends/google/e-cal-backend-google-utils.c:335 ++#: ../calendar/backends/google/e-cal-backend-google-utils.c:338 + msgid "Could not create thread for getting deltas" + msgstr "Incapaz de criar thread para obter os deltas" + +-#: ../calendar/backends/google/e-cal-backend-google-utils.c:367 +-#: ../calendar/backends/google/e-cal-backend-google.c:1192 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1049 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1348 +-#: ../calendar/backends/http/e-cal-backend-http.c:569 ++#: ../calendar/backends/google/e-cal-backend-google-utils.c:370 ++#: ../calendar/backends/google/e-cal-backend-google.c:1194 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352 ++#: ../calendar/backends/http/e-cal-backend-http.c:584 + #: ../calendar/backends/weather/e-cal-backend-weather.c:466 + msgid "Could not create cache file" + msgstr "Incapaz de criar o ficheiro de cache" + +-#: ../calendar/backends/google/e-cal-backend-google-utils.c:380 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1061 ++#: ../calendar/backends/google/e-cal-backend-google-utils.c:383 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065 + msgid "Could not create thread for populating cache" + msgstr "Incapaz de criar thread para popular a cache" + +@@ -725,24 +725,24 @@ msgstr "Resposta Pedida: até " + msgid "Reply Requested: When convenient" + msgstr "Resposta Pedida: Quando possível " + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:275 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277 + #, c-format + msgid "Loading %s items" + msgstr "A ler %s itens" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:885 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889 + #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260 + msgid "Calendar" + msgstr "Calendário" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:943 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947 + msgid "Invalid server URI" + msgstr "URI de servidor inválido" + +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:962 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:971 +-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1067 +-#: ../calendar/libecal/e-cal.c:5076 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975 ++#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071 ++#: ../calendar/libecal/e-cal.c:5082 + #: ../calendar/libedata-cal/e-cal-backend-util.c:109 + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1075 + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1107 +@@ -1119,86 +1119,86 @@ msgid "Enter password for %s to enable p + msgstr "" + "Introduza a senha para %s para permitir o acesso à proxy ao utilizador %s" + +-#: ../calendar/libecal/e-cal.c:5048 ++#: ../calendar/libecal/e-cal.c:5054 + msgid "Invalid argument" + msgstr "Argumento inválido" + +-#: ../calendar/libecal/e-cal.c:5050 ++#: ../calendar/libecal/e-cal.c:5056 + msgid "Backend is busy" + msgstr "Motor de processamento ocupado" + +-#: ../calendar/libecal/e-cal.c:5052 ++#: ../calendar/libecal/e-cal.c:5058 + #: ../calendar/libedata-cal/e-cal-backend-util.c:97 + msgid "Repository is offline" + msgstr "Repositório está desligado" + +-#: ../calendar/libecal/e-cal.c:5054 ++#: ../calendar/libecal/e-cal.c:5060 + #: ../calendar/libedata-cal/e-cal-backend-util.c:121 + msgid "No such calendar" + msgstr "Calendário inexistente" + +-#: ../calendar/libecal/e-cal.c:5056 ++#: ../calendar/libecal/e-cal.c:5062 + #: ../calendar/libedata-cal/e-cal-backend-util.c:103 + #: ../servers/groupwise/e-gw-connection.c:233 + msgid "Object not found" + msgstr "Objecto não foi encontrado" + +-#: ../calendar/libecal/e-cal.c:5058 ++#: ../calendar/libecal/e-cal.c:5064 + #: ../calendar/libedata-cal/e-cal-backend-util.c:105 + #: ../servers/groupwise/e-gw-connection.c:227 + msgid "Invalid object" + msgstr "Objecto inválido" + +-#: ../calendar/libecal/e-cal.c:5060 ++#: ../calendar/libecal/e-cal.c:5066 + msgid "URI not loaded" + msgstr "URI não foi lido" + +-#: ../calendar/libecal/e-cal.c:5062 ++#: ../calendar/libecal/e-cal.c:5068 + msgid "URI already loaded" + msgstr "URI já foi lido" + +-#: ../calendar/libecal/e-cal.c:5064 ++#: ../calendar/libecal/e-cal.c:5070 + #: ../calendar/libedata-cal/e-cal-backend-util.c:99 + #: ../servers/exchange/storage/e-storage.c:571 + msgid "Permission denied" + msgstr "Permissão negada" + +-#: ../calendar/libecal/e-cal.c:5066 ++#: ../calendar/libecal/e-cal.c:5072 + #: ../calendar/libedata-cal/e-cal-backend-util.c:123 + #: ../servers/groupwise/e-gw-connection.c:235 + msgid "Unknown User" + msgstr "Utilizador Desconhecido" + +-#: ../calendar/libecal/e-cal.c:5068 ++#: ../calendar/libecal/e-cal.c:5074 + #: ../calendar/libedata-cal/e-cal-backend-util.c:107 + msgid "Object ID already exists" + msgstr "ID de objecto já existe" + +-#: ../calendar/libecal/e-cal.c:5070 ++#: ../calendar/libecal/e-cal.c:5076 + msgid "Protocol not supported" + msgstr "Protocolo não suportado" + +-#: ../calendar/libecal/e-cal.c:5072 ++#: ../calendar/libecal/e-cal.c:5078 + msgid "Operation has been canceled" + msgstr "A operação foi cancelada" + +-#: ../calendar/libecal/e-cal.c:5074 +-#: ../calendar/libedata-cal/e-cal-backend-util.c:135 ++#: ../calendar/libecal/e-cal.c:5080 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:136 + msgid "Could not cancel operation" + msgstr "Incapaz de cancelar a operação" + +-#: ../calendar/libecal/e-cal.c:5078 ++#: ../calendar/libecal/e-cal.c:5084 + #: ../calendar/libedata-cal/e-cal-backend-util.c:111 + #: ../camel/providers/smtp/camel-smtp-transport.c:218 + msgid "Authentication required" + msgstr "Autenticação requerida" + +-#: ../calendar/libecal/e-cal.c:5080 ++#: ../calendar/libecal/e-cal.c:5086 + msgid "A CORBA exception has occurred" + msgstr "Ocorreu uma excepção CORBA" + +-#: ../calendar/libecal/e-cal.c:5082 +-#: ../calendar/libedata-cal/e-cal-backend-util.c:138 ++#: ../calendar/libecal/e-cal.c:5088 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:139 + #: ../camel/providers/groupwise/camel-groupwise-transport.c:223 + #: ../camel/providers/imap/camel-imap-command.c:434 + #: ../camel/providers/imap/camel-imap-store.c:742 +@@ -1208,7 +1208,7 @@ msgstr "Ocorreu uma excepção CORBA" + #: ../camel/providers/imap4/camel-imap4-engine.c:1710 + #: ../camel/providers/imap4/camel-imap4-store.c:315 + #: ../camel/providers/imap4/camel-imap4-store.c:823 +-#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + #: ../camel/providers/pop3/camel-pop3-store.c:553 + #: ../camel/providers/pop3/camel-pop3-store.c:560 + #: ../camel/providers/pop3/camel-pop3-store.c:566 +@@ -1217,7 +1217,7 @@ msgstr "Ocorreu uma excepção CORBA" + msgid "Unknown error" + msgstr "Erro desconhecido" + +-#: ../calendar/libecal/e-cal.c:5084 ++#: ../calendar/libecal/e-cal.c:5090 + #: ../calendar/libedata-cal/e-cal-backend-util.c:95 + #: ../servers/exchange/storage/e-storage.c:553 + msgid "No error" +@@ -1340,27 +1340,28 @@ msgstr "Método de autenticação não s + msgid "TLS not available" + msgstr "TLS indisponível" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:125 ++#. Translators: This means "Offline mode unavailable" ++#: ../calendar/libedata-cal/e-cal-backend-util.c:126 + msgid "Offline unavailable" + msgstr "Desligado indisponível" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:127 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:128 + msgid "Search size limit exceeded" + msgstr "Limite do tamanho da procura excedido" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:129 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:130 + msgid "Search time limit exceeded" + msgstr "Limite do tempo de procura excedido" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:131 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:132 + msgid "Invalid query" + msgstr "Consulta inválida" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:133 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:134 + msgid "Query refused" + msgstr "Consulta recusada" + +-#: ../calendar/libedata-cal/e-cal-backend-util.c:140 ++#: ../calendar/libedata-cal/e-cal-backend-util.c:141 + msgid "Invalid server version" + msgstr "Versão de servidor inválida" + +@@ -1413,7 +1414,7 @@ msgstr "Incapaz de criar o caminho para + msgid "Could not remove cache entry: %s: %s" + msgstr "Incapaz de remover a entrada de cache: %s: %s" + +-#: ../camel/camel-db.c:108 ++#: ../camel/camel-db.c:102 + msgid "Insufficient memory" + msgstr "Memória insuficiente" + +@@ -1429,6 +1430,7 @@ msgstr "" + "se ligar à rede." + + #: ../camel/camel-disco-diary.c:261 ++#: ../camel/providers/imap/camel-imap-journal.c:299 + #, c-format + msgid "" + "Could not open '%s':\n" +@@ -1460,7 +1462,7 @@ msgstr "A preparar a pasta '%s' para tra + #: ../camel/providers/imap/camel-imap-store.c:1002 + #: ../camel/providers/imap/camel-imap-store.c:1810 + #: ../camel/providers/imap/camel-imap-store.c:2226 +-#: ../camel/providers/imap/camel-imap-store.c:2989 ++#: ../camel/providers/imap/camel-imap-store.c:2994 + msgid "You must be working online to complete this operation" + msgstr "Tem de estar a trabalhar ligado para terminar esta operação" + +@@ -1482,52 +1484,52 @@ msgstr "Fluxo de mensagem inválido rece + msgid "Syncing folders" + msgstr "A sincronizar as pastas" + +-#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1494 ++#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1520 + #, c-format + msgid "Error parsing filter: %s: %s" + msgstr "Erro ao processar o filtro: %s: %s" + +-#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1503 ++#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1529 + #, c-format + msgid "Error executing filter: %s: %s" + msgstr "Erro ao executar o filtro: %s: %s" + +-#: ../camel/camel-filter-driver.c:1191 ++#: ../camel/camel-filter-driver.c:1211 + msgid "Unable to open spool folder" + msgstr "Incapaz de abrir a pasta de spool" + +-#: ../camel/camel-filter-driver.c:1200 ++#: ../camel/camel-filter-driver.c:1220 + msgid "Unable to process spool folder" + msgstr "Incapaz de processar a pasta de spool" + +-#: ../camel/camel-filter-driver.c:1215 ++#: ../camel/camel-filter-driver.c:1236 + #, c-format + msgid "Getting message %d (%d%%)" + msgstr "A receber a mensagem %d (%d%%)" + +-#: ../camel/camel-filter-driver.c:1219 ++#: ../camel/camel-filter-driver.c:1240 + msgid "Cannot open message" + msgstr "Incapaz de abrir a mensagem" + +-#: ../camel/camel-filter-driver.c:1220 ../camel/camel-filter-driver.c:1233 ++#: ../camel/camel-filter-driver.c:1241 ../camel/camel-filter-driver.c:1259 + #, c-format + msgid "Failed on message %d" + msgstr "Falha na mensagem %d" + +-#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1338 ++#: ../camel/camel-filter-driver.c:1273 ../camel/camel-filter-driver.c:1364 + msgid "Syncing folder" + msgstr "A sincronizar a pasta" + +-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1343 ++#: ../camel/camel-filter-driver.c:1277 ../camel/camel-filter-driver.c:1369 + msgid "Complete" + msgstr "Terminada" + +-#: ../camel/camel-filter-driver.c:1308 ++#: ../camel/camel-filter-driver.c:1334 + #, c-format + msgid "Getting message %d of %d" + msgstr "A receber a mensagem %d de %d" + +-#: ../camel/camel-filter-driver.c:1323 ++#: ../camel/camel-filter-driver.c:1349 + #, c-format + msgid "Failed at message %d of %d" + msgstr "Falha na mensagem %d de %d" +@@ -1555,7 +1557,7 @@ msgstr "Falha ao criar o processo filho + msgid "Error executing filter search: %s: %s" + msgstr "Erro ao executar uma procura com filtro: %s: %s" + +-#: ../camel/camel-folder-search.c:332 ../camel/camel-folder-search.c:447 ++#: ../camel/camel-folder-search.c:335 ../camel/camel-folder-search.c:447 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -1564,7 +1566,7 @@ msgstr "" + "Incapaz de processar a expressão de procura: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:457 ++#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:457 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -1573,32 +1575,32 @@ msgstr "" + "Erro ao executar a expressão de procura: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:643 ../camel/camel-folder-search.c:685 ++#: ../camel/camel-folder-search.c:649 ../camel/camel-folder-search.c:692 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) requer um único resultado boleano" + +-#: ../camel/camel-folder-search.c:738 ++#: ../camel/camel-folder-search.c:745 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) não permitido dentro de %s" + +-#: ../camel/camel-folder-search.c:744 ../camel/camel-folder-search.c:751 ++#: ../camel/camel-folder-search.c:751 ../camel/camel-folder-search.c:758 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) requer uma expressão de coincidência" + +-#: ../camel/camel-folder-search.c:778 ++#: ../camel/camel-folder-search.c:785 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) espera um resultado em matriz" + +-#: ../camel/camel-folder-search.c:787 ++#: ../camel/camel-folder-search.c:794 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) requer um conjunto de pastas" + +-#: ../camel/camel-folder-search.c:882 ++#: ../camel/camel-folder-search.c:889 + #, c-format + msgid "Performing query on unknown header: %s" + msgstr "A efectuar a procura num cabeçalho desconhecido: %s" +@@ -1871,7 +1873,7 @@ msgstr "Erro ao copiar o ficheiro tempor + + #: ../camel/camel-multipart-signed.c:593 + msgid "parse error" +-msgstr "erro de parseamento" ++msgstr "erro de processamento" + + #: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667 + #: ../camel/camel-net-utils.c:799 +@@ -2457,13 +2459,13 @@ msgid "Cannot rename folder: %s: Invalid + msgstr "Incapaz de renomear a pasta: %s: Operação inválida" + + #. the name of the Trash folder, used for deleted messages +-#: ../camel/camel-store.c:854 ../camel/camel-vtrash-folder.c:53 ++#: ../camel/camel-store.c:856 ../camel/camel-vtrash-folder.c:53 + #: ../camel/providers/imap/camel-imap-store.c:1060 + msgid "Trash" + msgstr "Lixo" + + #. the name of the Junk folder, used for spam messages +-#: ../camel/camel-store.c:857 ../camel/camel-vtrash-folder.c:55 ++#: ../camel/camel-store.c:859 ../camel/camel-vtrash-folder.c:55 + msgid "Junk" + msgstr "Não Solicitado" + +@@ -2584,7 +2586,7 @@ msgstr "Utilização de chave não supor + msgid "Error in application verification" + msgstr "Erro na verificação de aplicação" + +-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:879 ++#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880 + #, c-format + msgid "" + "Issuer: %s\n" +@@ -2597,11 +2599,11 @@ msgstr "" + "Impressão-Digital: %s\n" + "Assinatura: %s" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "GOOD" + msgstr "VÁLIDO" + +-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885 ++#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886 + msgid "BAD" + msgstr "INVÁLIDO" + +@@ -2625,7 +2627,7 @@ msgstr "" + "Ainda assim deseja aceitar?" + + #. construct our user prompt +-#: ../camel/camel-tcp-stream-ssl.c:889 ++#: ../camel/camel-tcp-stream-ssl.c:890 + #, c-format + msgid "" + "SSL Certificate check for %s:\n" +@@ -2640,7 +2642,7 @@ msgstr "" + "\n" + "Deseja aceitá-lo?" + +-#: ../camel/camel-tcp-stream-ssl.c:933 ++#: ../camel/camel-tcp-stream-ssl.c:934 + #, c-format + msgid "" + "Certificate problem: %s\n" +@@ -2649,7 +2651,7 @@ msgstr "" + "Problema de certificado: %s\n" + "Emissor: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:985 ++#: ../camel/camel-tcp-stream-ssl.c:986 + #, c-format + msgid "" + "Bad certificate domain: %s\n" +@@ -2658,7 +2660,7 @@ msgstr "" + "Domínio de certificação inválido: %s\n" + "Emissor: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1003 ++#: ../camel/camel-tcp-stream-ssl.c:1004 + #, c-format + msgid "" + "Certificate expired: %s\n" +@@ -2667,7 +2669,7 @@ msgstr "" + "Certificado expirou: %s\n" + "Emissor: %s" + +-#: ../camel/camel-tcp-stream-ssl.c:1020 ++#: ../camel/camel-tcp-stream-ssl.c:1021 + #, c-format + msgid "" + "Certificate revocation list expired: %s\n" +@@ -2681,17 +2683,17 @@ msgstr "" + msgid "Could not parse URL '%s'" + msgstr "Incapaz de processar o URL '%s'" + +-#: ../camel/camel-vee-folder.c:580 ++#: ../camel/camel-vee-folder.c:585 + #, c-format + msgid "Error storing '%s': %s" + msgstr "Erro ao armazenar '%s': %s" + +-#: ../camel/camel-vee-folder.c:626 ++#: ../camel/camel-vee-folder.c:639 + #, c-format + msgid "No such message %s in %s" + msgstr "Nenhuma mensagem %s em %s" + +-#: ../camel/camel-vee-folder.c:749 ../camel/camel-vee-folder.c:755 ++#: ../camel/camel-vee-folder.c:762 ../camel/camel-vee-folder.c:768 + msgid "Cannot copy or move messages into a Virtual Folder" + msgstr "Incapaz de copiar ou mover as mensagens para uma Pasta Virtual" + +@@ -2729,7 +2731,7 @@ msgstr "" + + #: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #: ../camel/providers/local/camel-maildir-folder.c:251 +-#: ../camel/providers/local/camel-mbox-folder.c:349 ++#: ../camel/providers/local/camel-mbox-folder.c:348 + #: ../camel/providers/local/camel-mh-folder.c:204 + msgid "No such message" + msgstr "Mensagem inexistente" +@@ -2740,9 +2742,9 @@ msgstr "Mensagem inexistente" + #: ../camel/providers/nntp/camel-nntp-folder.c:232 + #: ../camel/providers/nntp/camel-nntp-folder.c:373 + #: ../camel/providers/pop3/camel-pop3-folder.c:266 +-#: ../camel/providers/pop3/camel-pop3-folder.c:560 +-#: ../camel/providers/pop3/camel-pop3-folder.c:621 +-#: ../camel/providers/pop3/camel-pop3-folder.c:639 ++#: ../camel/providers/pop3/camel-pop3-folder.c:559 ++#: ../camel/providers/pop3/camel-pop3-folder.c:620 ++#: ../camel/providers/pop3/camel-pop3-folder.c:638 + msgid "User canceled" + msgstr "Cancelado pelo utilizador" + +@@ -2752,11 +2754,11 @@ msgstr "Cancelado pelo utilizador" + #: ../camel/providers/nntp/camel-nntp-folder.c:149 + #: ../camel/providers/nntp/camel-nntp-folder.c:158 + #: ../camel/providers/nntp/camel-nntp-folder.c:234 +-#: ../camel/providers/pop3/camel-pop3-folder.c:388 +-#: ../camel/providers/pop3/camel-pop3-folder.c:563 +-#: ../camel/providers/pop3/camel-pop3-folder.c:624 +-#: ../camel/providers/pop3/camel-pop3-folder.c:631 +-#: ../camel/providers/pop3/camel-pop3-folder.c:642 ++#: ../camel/providers/pop3/camel-pop3-folder.c:386 ++#: ../camel/providers/pop3/camel-pop3-folder.c:562 ++#: ../camel/providers/pop3/camel-pop3-folder.c:623 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 ++#: ../camel/providers/pop3/camel-pop3-folder.c:641 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Incapaz de obter a mensagem %s: %s" +@@ -2788,8 +2790,8 @@ msgstr "Pasta de Lixo Cheia. Esvazie-a." + #: ../camel/providers/groupwise/camel-groupwise-folder.c:1248 + #: ../camel/providers/groupwise/camel-groupwise-store.c:623 + #: ../camel/providers/groupwise/camel-groupwise-store.c:736 +-#: ../camel/providers/imap/camel-imap-folder.c:3161 +-#: ../camel/providers/imap/camel-imap-folder.c:3238 ++#: ../camel/providers/imap/camel-imap-folder.c:3192 ++#: ../camel/providers/imap/camel-imap-folder.c:3269 + #, c-format + msgid "Fetching summary information for new messages in %s" + msgstr "A obter a informação de resumo para novas mensagens em %s" +@@ -3038,12 +3040,12 @@ msgstr "Nenhum fluxo de entrada" + #: ../camel/providers/imap/camel-imap-command.c:231 + #: ../camel/providers/imap/camel-imap-command.c:280 + #: ../camel/providers/imap/camel-imap-command.c:494 +-#: ../camel/providers/imap/camel-imap-store.c:3029 ++#: ../camel/providers/imap/camel-imap-store.c:3034 + msgid "Operation cancelled" + msgstr "Operação cancelada" + + #: ../camel/providers/imap/camel-imap-command.c:333 +-#: ../camel/providers/imap/camel-imap-store.c:3032 ++#: ../camel/providers/imap/camel-imap-store.c:3037 + #, c-format + msgid "Server unexpectedly disconnected: %s" + msgstr "Servidor desligou-se inesperadamente: %s" +@@ -3093,59 +3095,59 @@ msgid "Could not create directory %s: %s + msgstr "Incapaz de criar o directório %s: %s" + + #. Check UIDs and flags of all messages we already know of. +-#: ../camel/providers/imap/camel-imap-folder.c:843 ++#: ../camel/providers/imap/camel-imap-folder.c:844 + #, c-format + msgid "Scanning for changed messages in %s" + msgstr "A procurar mensagens alteradas em %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:1838 ++#: ../camel/providers/imap/camel-imap-folder.c:1869 + #, c-format + msgid "Unexpected response status '%s' after APPEND command" + msgstr "Estado de resposta '%s' inesperado após comando APPEND" + +-#: ../camel/providers/imap/camel-imap-folder.c:1853 ++#: ../camel/providers/imap/camel-imap-folder.c:1884 + msgid "No response on continuation after APPEND command" + msgstr "Nenhuma resposta ao prosseguir após comando APPEND" + +-#: ../camel/providers/imap/camel-imap-folder.c:1895 ++#: ../camel/providers/imap/camel-imap-folder.c:1926 + msgid "Unknown error occurred during APPEND command!" + msgstr "Ocorreu um erro desconhecido durante o comando APPEND!" + +-#: ../camel/providers/imap/camel-imap-folder.c:2707 ++#: ../camel/providers/imap/camel-imap-folder.c:2738 + #, c-format + msgid "Unable to retrieve message: %s" + msgstr "Incapaz de obter a mensagem: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2748 ++#: ../camel/providers/imap/camel-imap-folder.c:2779 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "Incapaz de obter a mensagem com o ID de mensagem %s: %s" + +-#: ../camel/providers/imap/camel-imap-folder.c:2749 ++#: ../camel/providers/imap/camel-imap-folder.c:2780 + msgid "No such message available." + msgstr "Mensagem indisponível." + +-#: ../camel/providers/imap/camel-imap-folder.c:2788 +-#: ../camel/providers/imap/camel-imap-folder.c:3540 ++#: ../camel/providers/imap/camel-imap-folder.c:2819 ++#: ../camel/providers/imap/camel-imap-folder.c:3571 + #: ../camel/providers/nntp/camel-nntp-folder.c:220 + msgid "This message is not currently available" + msgstr "Esta mensagem de momento não está disponível" + +-#: ../camel/providers/imap/camel-imap-folder.c:3367 ++#: ../camel/providers/imap/camel-imap-folder.c:3398 + #, c-format + msgid "Incomplete server response: no information provided for message %d" + msgstr "" + "Resposta de servidor incompleta: nenhuma informação disponibilizada para a " + "mensagem %d" + +-#: ../camel/providers/imap/camel-imap-folder.c:3375 ++#: ../camel/providers/imap/camel-imap-folder.c:3406 + #, c-format + msgid "Incomplete server response: no UID provided for message %d" + msgstr "" + "Resposta de servidor incompleta: nenhum UID disponibilizado para a mensagem %" + "d" + +-#: ../camel/providers/imap/camel-imap-folder.c:3578 ++#: ../camel/providers/imap/camel-imap-folder.c:3609 + msgid "Could not find message body in FETCH response." + msgstr "Incapaz de encontrar o corpo da mensagem na resposta FETCH." + +@@ -3414,7 +3416,8 @@ msgstr "Incapaz de aceder à pasta '%s': + #: ../camel/providers/imap4/camel-imap4-folder.c:482 + #, c-format + msgid "Cannot sync flags to folder '%s': Unknown error" +-msgstr "Incapaz de sincronizar os parâmetros para a pasta '%s': Erro desconhecido" ++msgstr "" ++"Incapaz de sincronizar os parâmetros para a pasta '%s': Erro desconhecido" + + #: ../camel/providers/imap4/camel-imap4-folder.c:488 + #, c-format +@@ -3461,13 +3464,15 @@ msgstr "Incapaz de adicionar a mensagem + #: ../camel/providers/imap4/camel-imap4-folder.c:1181 + #, c-format + msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error" +-msgstr "Incapaz de mover mensagens da pasta '%s' para a pasta '%s': Erro desconhecido" ++msgstr "" ++"Incapaz de mover mensagens da pasta '%s' para a pasta '%s': Erro desconhecido" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1185 + #, c-format + msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error" + msgstr "" +-"Incapaz de copiar mensagens da pasta '%s' para a pasta '%s': Erro desconhecido" ++"Incapaz de copiar mensagens da pasta '%s' para a pasta '%s': Erro " ++"desconhecido" + + #: ../camel/providers/imap4/camel-imap4-folder.c:1193 + #, c-format +@@ -3559,7 +3564,7 @@ msgid "Cannot get LIST information for ' + msgstr "Incapaz de obter a informação LIST para '%s' no servidor IMAP %s: %s" + + #: ../camel/providers/imap4/camel-imap4-store.c:823 +-#: ../camel/providers/imap4/camel-imap4-store.c:1577 ++#: ../camel/providers/imap4/camel-imap4-store.c:1579 + msgid "Bad command" + msgstr "Comando inválido" + +@@ -3612,38 +3617,40 @@ msgstr "" + msgid "Cannot rename folder '%s' to '%s': Bad command" + msgstr "Incapaz de renomear a pasta '%s' para '%s': Comando inválido" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1575 ++#. Translators: the first %s is an IMAP4 command, either LSUB or LIST. ++#. * The fourth one is an error message. ++#: ../camel/providers/imap4/camel-imap4-store.c:1577 + #, c-format + msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s" + msgstr "" + "Incapaz de obter a informação %s para o padrão '%s' no servidor IMAP %s: %s" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1636 ++#: ../camel/providers/imap4/camel-imap4-store.c:1638 + msgid "Cannot subscribe to IMAP folders in offline mode." + msgstr "Incapaz de subscrever pastas IMAP em modo desligado." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1681 ++#: ../camel/providers/imap4/camel-imap4-store.c:1683 + #, c-format + msgid "Cannot subscribe to folder '%s': Invalid mailbox name" + msgstr "Incapaz de subscrever a pasta '%s': Nome de caixa de correio inválido" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1686 ++#: ../camel/providers/imap4/camel-imap4-store.c:1688 + #, c-format + msgid "Cannot subscribe to folder '%s': Bad command" + msgstr "Incapaz de subscrever a pasta '%s': Comando inválido" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1708 ++#: ../camel/providers/imap4/camel-imap4-store.c:1710 + msgid "Cannot unsubscribe from IMAP folders in offline mode." + msgstr "Incapaz de remover a subscrição de pastas IMAP em modo desligado." + +-#: ../camel/providers/imap4/camel-imap4-store.c:1753 ++#: ../camel/providers/imap4/camel-imap4-store.c:1755 + #, c-format + msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name" + msgstr "" + "Incapaz de remover a subscrição da pasta '%s': Nome de caixa de correio " + "inválido" + +-#: ../camel/providers/imap4/camel-imap4-store.c:1758 ++#: ../camel/providers/imap4/camel-imap4-store.c:1760 + #, c-format + msgid "Cannot unsubscribe from folder '%s': Bad command" + msgstr "Incapaz de remover a subscrição da pasta '%s': Comando inválido" +@@ -3856,10 +3863,10 @@ msgstr "Incapaz de adicionar a mensagem + #: ../camel/providers/local/camel-maildir-folder.c:250 + #: ../camel/providers/local/camel-maildir-folder.c:264 + #: ../camel/providers/local/camel-maildir-folder.c:273 +-#: ../camel/providers/local/camel-mbox-folder.c:348 +-#: ../camel/providers/local/camel-mbox-folder.c:369 +-#: ../camel/providers/local/camel-mbox-folder.c:400 +-#: ../camel/providers/local/camel-mbox-folder.c:408 ++#: ../camel/providers/local/camel-mbox-folder.c:347 ++#: ../camel/providers/local/camel-mbox-folder.c:368 ++#: ../camel/providers/local/camel-mbox-folder.c:399 ++#: ../camel/providers/local/camel-mbox-folder.c:407 + #: ../camel/providers/local/camel-mh-folder.c:203 + #: ../camel/providers/local/camel-mh-folder.c:214 + #: ../camel/providers/local/camel-mh-folder.c:223 +@@ -3920,25 +3927,25 @@ msgstr "não é um directório maildir" + msgid "Could not scan folder '%s': %s" + msgstr "Incapaz de procurar na pasta '%s': %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:433 +-#: ../camel/providers/local/camel-maildir-summary.c:567 ++#: ../camel/providers/local/camel-maildir-summary.c:434 ++#: ../camel/providers/local/camel-maildir-summary.c:553 + #, c-format + msgid "Cannot open maildir directory path: %s: %s" + msgstr "Incapaz de abrir o caminho de directório maildir: %s: %s" + +-#: ../camel/providers/local/camel-maildir-summary.c:560 ++#: ../camel/providers/local/camel-maildir-summary.c:546 + msgid "Checking folder consistency" + msgstr "A verificar a consistência da pasta" + +-#: ../camel/providers/local/camel-maildir-summary.c:664 ++#: ../camel/providers/local/camel-maildir-summary.c:650 + msgid "Checking for new messages" + msgstr "A verificar a existência de novas mensagens" + +-#: ../camel/providers/local/camel-maildir-summary.c:756 +-#: ../camel/providers/local/camel-mbox-summary.c:520 +-#: ../camel/providers/local/camel-mbox-summary.c:693 +-#: ../camel/providers/local/camel-mbox-summary.c:790 +-#: ../camel/providers/local/camel-spool-summary.c:141 ++#: ../camel/providers/local/camel-maildir-summary.c:736 ++#: ../camel/providers/local/camel-mbox-summary.c:534 ++#: ../camel/providers/local/camel-mbox-summary.c:714 ++#: ../camel/providers/local/camel-mbox-summary.c:810 ++#: ../camel/providers/local/camel-spool-summary.c:158 + msgid "Storing folder" + msgstr "A armazenar a pasta" + +@@ -3953,20 +3960,20 @@ msgstr "Incapaz de obter a exclusividade + msgid "Cannot open mailbox: %s: %s\n" + msgstr "Incapaz de abrir a caixa de correio: %s: %s\n" + +-#: ../camel/providers/local/camel-mbox-folder.c:279 ++#: ../camel/providers/local/camel-mbox-folder.c:278 + msgid "Mail append canceled" + msgstr "Adição de correio cancelada" + +-#: ../camel/providers/local/camel-mbox-folder.c:282 ++#: ../camel/providers/local/camel-mbox-folder.c:281 + #, c-format + msgid "Cannot append message to mbox file: %s: %s" + msgstr "Incapaz de adicionar a mensagem ao ficheiro mbox: %s: %s" + +-#: ../camel/providers/local/camel-mbox-folder.c:401 ++#: ../camel/providers/local/camel-mbox-folder.c:400 + msgid "The folder appears to be irrecoverably corrupted." + msgstr "A pasta parece estar irreversivelmente corrompida." + +-#: ../camel/providers/local/camel-mbox-folder.c:409 ++#: ../camel/providers/local/camel-mbox-folder.c:408 + #: ../camel/providers/local/camel-mh-folder.c:224 + msgid "Message construction failed." + msgstr "Falha na construção da mensagem." +@@ -4036,81 +4043,76 @@ msgstr "Incapaz de renomear '%s': '%s': + msgid "Could not rename '%s' to %s: %s" + msgstr "Incapaz de renomear '%s' para %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:526 ++#: ../camel/providers/local/camel-mbox-summary.c:540 + #, c-format + msgid "Could not open folder: %s: %s" + msgstr "Incapaz de abrir a pasta: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:574 ++#: ../camel/providers/local/camel-mbox-summary.c:588 + #, c-format + msgid "Fatal mail parser error near position %ld in folder %s" +-msgstr "Erro fatal de parseamento de email perto da posição %ld na pasta %s" ++msgstr "Erro fatal de processamento de email perto da posição %ld na pasta %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:630 ++#: ../camel/providers/local/camel-mbox-summary.c:651 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Incapaz de verificar a pasta: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:698 +-#: ../camel/providers/local/camel-mbox-summary.c:795 +-#: ../camel/providers/local/camel-spool-summary.c:146 ++#: ../camel/providers/local/camel-mbox-summary.c:719 ++#: ../camel/providers/local/camel-mbox-summary.c:815 ++#: ../camel/providers/local/camel-spool-summary.c:163 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Incapaz de abrir o ficheiro: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:710 +-#: ../camel/providers/local/camel-spool-summary.c:159 ++#: ../camel/providers/local/camel-mbox-summary.c:731 ++#: ../camel/providers/local/camel-spool-summary.c:176 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Incapaz de abrir a caixa de email temporária: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:723 +-#: ../camel/providers/local/camel-mbox-summary.c:942 ++#: ../camel/providers/local/camel-mbox-summary.c:744 ++#: ../camel/providers/local/camel-mbox-summary.c:920 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Incapaz de fechar a pasta de origem %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:732 ++#: ../camel/providers/local/camel-mbox-summary.c:753 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Incapaz de fechar a pasta temporária: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:747 ++#: ../camel/providers/local/camel-mbox-summary.c:768 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Incapaz de renomear a pasta: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:806 +-#: ../camel/providers/local/camel-mbox-summary.c:1146 ++#: ../camel/providers/local/camel-mbox-summary.c:826 ++#: ../camel/providers/local/camel-mbox-summary.c:1050 + #, c-format + msgid "Could not store folder: %s" + msgstr "Incapaz de armazenar a pasta: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:853 +-#: ../camel/providers/local/camel-mbox-summary.c:882 +-#: ../camel/providers/local/camel-mbox-summary.c:1188 +-#: ../camel/providers/local/camel-mbox-summary.c:1217 +-msgid "Detected a corrupt mbox file or an invalid 'From' header" +-msgstr "Detectado um ficheiro mbox corrompido ou um cabeçalho 'De' inválido" ++#: ../camel/providers/local/camel-mbox-summary.c:862 ++#: ../camel/providers/local/camel-mbox-summary.c:870 ++#: ../camel/providers/local/camel-mbox-summary.c:1080 ++#: ../camel/providers/local/camel-mbox-summary.c:1088 ++msgid "Summary and folder mismatch, even after a sync" ++msgstr "Resumo e pasta não coincidem, mesmo depois de uma sincronização" + +-#: ../camel/providers/local/camel-mbox-summary.c:1035 +-#: ../camel/providers/local/camel-spool-summary.c:327 ++#: ../camel/providers/local/camel-mbox-summary.c:1013 ++#: ../camel/providers/local/camel-spool-summary.c:344 + #, c-format + msgid "Unknown error: %s" + msgstr "Erro desconhecido: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1071 +-#, c-format +-msgid "Folder %s cannot be opened: %s" +-msgstr "Incapaz de abrir a pasta %s: %s" +- +-#: ../camel/providers/local/camel-mbox-summary.c:1282 +-#: ../camel/providers/local/camel-mbox-summary.c:1308 ++#: ../camel/providers/local/camel-mbox-summary.c:1156 ++#: ../camel/providers/local/camel-mbox-summary.c:1182 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Falha ao gravar na caixa correio temporária: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1299 ++#: ../camel/providers/local/camel-mbox-summary.c:1173 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Falha ao gravar na caixa correio temporária: %s: %s" +@@ -4134,7 +4136,7 @@ msgstr "Incapaz de criar a pasta '%s': % + msgid "Cannot get folder '%s': not a directory." + msgstr "Incapaz de obter a pasta '%s': não é um directório." + +-#: ../camel/providers/local/camel-mh-summary.c:246 ++#: ../camel/providers/local/camel-mh-summary.c:248 + #, c-format + msgid "Cannot open MH directory path: %s: %s" + msgstr "Incapaz de abrir o caminho de directório MH: %s: %s" +@@ -4204,21 +4206,21 @@ msgstr "Pastas de spool não podem ser r + msgid "Spool folders cannot be deleted" + msgstr "Pastas de spool não podem ser apagadas" + +-#: ../camel/providers/local/camel-spool-summary.c:172 +-#: ../camel/providers/local/camel-spool-summary.c:182 +-#: ../camel/providers/local/camel-spool-summary.c:192 ++#: ../camel/providers/local/camel-spool-summary.c:189 ++#: ../camel/providers/local/camel-spool-summary.c:199 ++#: ../camel/providers/local/camel-spool-summary.c:209 + #, c-format + msgid "Could not sync temporary folder %s: %s" + msgstr "Incapaz de sincronizar a pasta temporária %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:208 ++#: ../camel/providers/local/camel-spool-summary.c:225 + #, c-format + msgid "Could not sync spool folder %s: %s" + msgstr "Incapaz de sincronizar a pasta de spool %s: %s" + +-#: ../camel/providers/local/camel-spool-summary.c:239 + #: ../camel/providers/local/camel-spool-summary.c:256 +-#: ../camel/providers/local/camel-spool-summary.c:267 ++#: ../camel/providers/local/camel-spool-summary.c:273 ++#: ../camel/providers/local/camel-spool-summary.c:284 + #, c-format + msgid "" + "Could not sync spool folder %s: %s\n" +@@ -4401,19 +4403,19 @@ msgstr "A expurgar as mensagens antigas" + msgid "Expunging deleted messages" + msgstr "A expurgar as mensagens apagadas" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:534 ++#: ../camel/providers/pop3/camel-pop3-folder.c:533 + #, c-format + msgid "No message with UID %s" + msgstr "Nenhuma mensagem com o UID %s" + + #. Sigh, most of the crap in this function is so that the cancel button + #. returns the proper exception code. Sigh. +-#: ../camel/providers/pop3/camel-pop3-folder.c:541 ++#: ../camel/providers/pop3/camel-pop3-folder.c:540 + #, c-format + msgid "Retrieving POP message %d" + msgstr "A obter a mensagem POP %d" + +-#: ../camel/providers/pop3/camel-pop3-folder.c:631 ++#: ../camel/providers/pop3/camel-pop3-folder.c:630 + msgid "Unknown reason" + msgstr "Razão desconhecida" + +@@ -5075,11 +5077,11 @@ msgid "" + "name" + msgstr "Já existe uma categoria '%s' na configuração. Utilize outro nome" + +-#: ../libedataserverui/e-categories-dialog.c:462 ++#: ../libedataserverui/e-categories-dialog.c:466 + msgid "Icon" + msgstr "Ícone" + +-#: ../libedataserverui/e-categories-dialog.c:467 ++#: ../libedataserverui/e-categories-dialog.c:471 + msgid "Category" + msgstr "Categoria" + +@@ -5115,19 +5117,19 @@ msgstr "_Editar" + msgid "categories" + msgstr "categorias" + +-#: ../libedataserverui/e-name-selector-dialog.c:266 ++#: ../libedataserverui/e-name-selector-dialog.c:272 + msgid "Select Contacts from Address Book" + msgstr "Seleccionar os Contactos do Livro de Endereços" + +-#: ../libedataserverui/e-name-selector-dialog.c:546 ++#: ../libedataserverui/e-name-selector-dialog.c:559 + msgid "_Add" + msgstr "_Adicionar" + +-#: ../libedataserverui/e-name-selector-dialog.c:571 ++#: ../libedataserverui/e-name-selector-dialog.c:584 + msgid "_Remove" + msgstr "_Remover" + +-#: ../libedataserverui/e-name-selector-dialog.c:744 ++#: ../libedataserverui/e-name-selector-dialog.c:761 + #: ../libedataserverui/e-name-selector-dialog.glade.h:6 + msgid "Any Category" + msgstr "Qualquer Categoria" +@@ -5170,25 +5172,25 @@ msgid "_Search:" + msgstr "_Procurar:" + + #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List +-#: ../libedataserverui/e-name-selector-entry.c:2240 ++#: ../libedataserverui/e-name-selector-entry.c:2369 + #, c-format + msgid "E_xpand %s Inline" + msgstr "E_xpandir %s Embutido" + + #. Copy Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2255 ++#: ../libedataserverui/e-name-selector-entry.c:2384 + #, c-format + msgid "Cop_y %s" + msgstr "Cop_iar %s" + + #. Cut Contact Item +-#: ../libedataserverui/e-name-selector-entry.c:2265 ++#: ../libedataserverui/e-name-selector-entry.c:2394 + #, c-format + msgid "C_ut %s" + msgstr "C_ortar %s" + + #. Edit Contact item +-#: ../libedataserverui/e-name-selector-entry.c:2282 ++#: ../libedataserverui/e-name-selector-entry.c:2411 + #, c-format + msgid "_Edit %s" + msgstr "_Editar %s" +@@ -5233,13 +5235,13 @@ msgid "_Destination" + msgstr "_Destino" + + #: ../servers/exchange/lib/e2k-autoconfig.c:1683 +-#: ../servers/exchange/storage/exchange-account.c:971 ++#: ../servers/exchange/storage/exchange-account.c:953 + #, c-format + msgid "Enter password for %s" + msgstr "Introduza a senha para %s" + + #: ../servers/exchange/lib/e2k-autoconfig.c:1684 +-#: ../servers/exchange/storage/exchange-account.c:976 ++#: ../servers/exchange/storage/exchange-account.c:958 + msgid "Enter password" + msgstr "Introduza a senha" + +@@ -5343,26 +5345,26 @@ msgstr "Esta operação não pode ser re + + #. i18n: This is the title of an "other user's folders" + #. hierarchy. Eg, "John Doe's Folders". +-#: ../servers/exchange/storage/exchange-account.c:662 ++#: ../servers/exchange/storage/exchange-account.c:644 + #, c-format + msgid "%s's Folders" + msgstr "Pastas do %s" + +-#: ../servers/exchange/storage/exchange-account.c:1277 ++#: ../servers/exchange/storage/exchange-account.c:1259 + msgid "Personal Folders" + msgstr "Pastas Pessoais" + +-#: ../servers/exchange/storage/exchange-account.c:1292 ++#: ../servers/exchange/storage/exchange-account.c:1274 + msgid "Favorite Public Folders" + msgstr "Pastas Públicas Favoritas" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1309 ++#: ../servers/exchange/storage/exchange-account.c:1291 + msgid "All Public Folders" + msgstr "Todas as Pastas Públicas" + + #. i18n: Outlookism +-#: ../servers/exchange/storage/exchange-account.c:1323 ++#: ../servers/exchange/storage/exchange-account.c:1305 + msgid "Global Address List" + msgstr "Lista Global de Endereços" + +@@ -5438,6 +5440,12 @@ msgstr "Informação de Cor" + msgid "The color to render" + msgstr "A cor a renderizar" + ++#~ msgid "Detected a corrupt mbox file or an invalid 'From' header" ++#~ msgstr "Detectado um ficheiro mbox corrompido ou um cabeçalho 'De' inválido" ++ ++#~ msgid "Folder %s cannot be opened: %s" ++#~ msgstr "Incapaz de abrir a pasta %s: %s" ++ + #~ msgid "Cannot find certificate for `%s'" + #~ msgstr "Incapaz de encontrar o certificado para `%s'" + +@@ -5465,9 +5473,6 @@ msgstr "A cor a renderizar" + #~ msgid "%sPlease enter the IMAP password for %s on host %s" + #~ msgstr "%sIntroduza a senha IMAP para %s no servidor %s" + +-#~ msgid "Summary and folder mismatch, even after a sync" +-#~ msgstr "Resumo e pasta não coincidem, mesmo depois de uma sincronização" +- + #~ msgid "Please enter the NNTP password for %s@%s" + #~ msgstr "Introduza a senha NNTP para %s@%s" + +Index: evolution-data-server-2.23.92/po/sv.po +=================================================================== +--- evolution-data-server-2.23.92.orig/po/sv.po ++++ evolution-data-server-2.23.92/po/sv.po +@@ -12,7 +12,7 @@ msgstr "" + "Project-Id-Version: evolution-data-server\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2008-08-28 22:46+0200\n" +-"PO-Revision-Date: 2008-08-28 23:11+0100\n" ++"PO-Revision-Date: 2008-09-13 19:14+0100\n" + "Last-Translator: Daniel Nylander \n" + "Language-Team: Swedish \n" + "MIME-Version: 1.0\n" +@@ -2540,7 +2540,7 @@ msgstr "Papperskorg" + #: ../camel/camel-store.c:859 + #: ../camel/camel-vtrash-folder.c:55 + msgid "Junk" +-msgstr "Skräp" ++msgstr "Skräppost" + + #: ../camel/camel-tcp-stream-openssl.c:572 + msgid "Unable to get issuer's certificate" +@@ -2797,7 +2797,7 @@ msgstr "Kan inte kopiera meddelanden til + + #: ../camel/camel-vtrash-folder.c:56 + msgid "Cannot copy messages to the Junk folder" +-msgstr "Kan inte kopiera meddelanden till skräpmappen" ++msgstr "Kan inte kopiera meddelanden till skräppostmappen" + + #: ../camel/providers/groupwise/camel-groupwise-folder.c:116 + #, c-format +@@ -2934,7 +2934,7 @@ msgstr "Kontrollera om nya meddelanden i + #: ../camel/providers/groupwise/camel-groupwise-provider.c:66 + #: ../camel/providers/imap/camel-imap-provider.c:74 + msgid "Only check for Junk messages in the IN_BOX folder" +-msgstr "Kontrollera endast om det finns skräpmeddelanden i IN_BOX-mappen" ++msgstr "Kontrollera endast om det finns skräppostmeddelanden i IN_BOX-mappen" + + # Låter konstigt + #: ../camel/providers/groupwise/camel-groupwise-provider.c:68 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 455fa57..5f95dd2 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 17 11:20:37 CDT 2008 - maw@suse.de + +- Add evolution-data-server-db-fixes.patch. + +------------------------------------------------------------------- +Tue Sep 16 09:26:28 CDT 2008 - maw@suse.de + +- Add evolution-data-server-updates.patch, which comprises the + diff between r9505 and r9557 in GNOME SVN +- Drop evolution-data-server-show-sexp.patch and + evolution-data-server-sql-percents.patch. + ------------------------------------------------------------------- Tue Sep 9 15:44:13 CDT 2008 - maw@suse.de diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 4448910..9c1f164 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -44,7 +44,7 @@ Group: Development/Libraries/GNOME AutoReqProv: on Summary: Evolution Data Server Version: 2.23.92 -Release: 3 +Release: 4 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.22/%{name}-%{version}.tar.bz2 Patch0: evolution-data-server-configure.patch # PATCH-NEEDS-REBASE bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 -- was PATCH-FIX-UPSTREAM, and may be droppable @@ -57,10 +57,10 @@ Patch4: bnc-304835-ex-crash-after-restart.patch Patch5: bnc-307861-calendar-auth.diff # PATCH-FIX-UPSTREAM bgo-530514-check-to-handle-specific-server-response.diff bgo530514 psankar@suse.de -- Fix is in upstream svn from 2.22.2 Patch9: bgo-530514-check-to-handle-specific-server-response.diff -# PATCH-FIX-UPSTREAM evolution-data-server-show-sexp.patch sragavan@novell.com bnc418080 -- hopefully will be obsolete in the next release; only useful for debugging -Patch10: evolution-data-server-show-sexp.patch -# PATCH-FIX-UPSTREAM evolution-data-server-sql-percents.patch sragavan@novell.com -- should go away in the next release -Patch11: evolution-data-server-sql-percents.patch +# PATCH-FIX-UPSTREAM evolution-data-server-updates.patch maw@novell.com -- will go away when we update to 2.24.0. +Patch12: evolution-data-server-updates.patch +# PATCH-FIX-UPSTREAM evolution-data-server-db-fixes.patch maw@novell.com -- courtesy of sragavan@novell.com; should go away in 2.24.0 +Patch13: evolution-data-server-db-fixes.patch # Change patch below if we move away from /opt/gnome # PATCH-FIX-OPENSUSE libgnomeui-dep.patch -- It avoids a build dependency on libgnomeui to speed up bootstrap Patch99: libgnomeui-dep.patch @@ -111,10 +111,7 @@ documentation. -%if 0%{opensuse_bs} -%endif %lang_package - %prep %setup -q %patch0 @@ -123,8 +120,8 @@ documentation. ###%patch4 ###%patch5 %patch9 -%patch10 -p1 -%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %patch99 %build @@ -186,6 +183,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Wed Sep 17 2008 maw@suse.de +- Add evolution-data-server-db-fixes.patch. +* Tue Sep 16 2008 maw@suse.de +- Add evolution-data-server-updates.patch, which comprises the + diff between r9505 and r9557 in GNOME SVN +- Drop evolution-data-server-show-sexp.patch and + evolution-data-server-sql-percents.patch. * Tue Sep 09 2008 maw@suse.de - Add evolution-data-server-sql-percents.patch (even more work on bnc#418080).