[evolution-data-server] Update British English translation
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Update British English translation
- Date: Sat, 28 Aug 2010 14:55:08 +0000 (UTC)
commit 84bd94091b99b8e4f49c719349e6e7a0fe9698a3
Author: Philip Withnall <philip tecnocode co uk>
Date: Sat Aug 28 12:25:58 2010 +0100
Update British English translation
po/en_GB.po | 2959 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 1648 insertions(+), 1311 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 88017ff..df38765 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,80 +8,93 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-13 18:10+0100\n"
+"POT-Creation-Date: 2010-08-28 09:16+0100\n"
"PO-Revision-Date: 2010-02-24 16:00+0100\n"
"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
"Language-Team: British English <en li org>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Virtaal 0.5.2\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
msgid "Loading..."
msgstr "Loadingâ?¦"
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
msgstr "Searchingâ?¦"
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "Downloading contacts (%d)â?¦ "
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr "Updating contacts cache (%d)â?¦ "
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "Not connected"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
msgid "Using Distinguished Name (DN)"
msgstr "Using Distinguished Name (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
msgid "Using Email Address"
msgstr "Using E-mail Address"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
msgid "Reconnecting to LDAP server..."
msgstr "Reconnecting to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+msgid "Invalid DN syntax"
+msgstr "Invalid DN syntax"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
msgid "Adding contact to LDAP server..."
msgstr "Adding contact to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
msgid "Removing contact from LDAP server..."
msgstr "Removing contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
msgid "Modifying contact from LDAP server..."
msgstr "Modifying contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
msgid "Receiving LDAP search results..."
msgstr "Receiving LDAP search resultsâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
msgid "Error performing search"
msgstr "Error performing search"
-#: ../addressbook/libebook/e-book.c:2152
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "Create resource '%s' failed with http status: %d"
+msgstr "Create resource '%s' failed with HTTP status: %d"
+
+#: ../addressbook/libebook/e-book.c:2979
+#, c-format
+msgid "%s: there was no source for UID '%s' stored in GConf."
msgstr "%s: there was no source for UID '%s' stored in GConf."
#. Dummy row as EContactField starts from 1
@@ -270,7 +283,7 @@ msgstr "Weblog URL"
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:667
msgid "Categories"
msgstr "Categories"
@@ -350,27 +363,27 @@ msgid "GroupWise Work Screen Name 3"
msgstr "GroupWise Work Screen Name 3"
#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
msgstr "Jabber Home ID 1"
#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
msgstr "Jabber Home ID 2"
#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
msgstr "Jabber Home ID 3"
#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
msgstr "Jabber Work ID 1"
#: ../addressbook/libebook/e-contact.c:207
-msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
msgstr "Jabber Work ID 2"
#: ../addressbook/libebook/e-contact.c:208
-msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
msgstr "Jabber Work ID 3"
#: ../addressbook/libebook/e-contact.c:209
@@ -422,27 +435,27 @@ msgid "MSN Work Screen Name 3"
msgstr "MSN Work Screen Name 3"
#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
msgstr "ICQ Home ID 1"
#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
msgstr "ICQ Home ID 2"
#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
msgstr "ICQ Home ID 3"
#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
msgstr "ICQ Work ID 1"
#: ../addressbook/libebook/e-contact.c:225
-msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
msgstr "ICQ Work ID 2"
#: ../addressbook/libebook/e-contact.c:226
-msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
msgstr "ICQ Work ID 3"
#. Last modified time
@@ -499,11 +512,11 @@ msgid "AIM Screen Name List"
msgstr "AIM Screen Name List"
#: ../addressbook/libebook/e-contact.c:250
-msgid "GroupWise Id List"
+msgid "GroupWise ID List"
msgstr "GroupWise ID List"
#: ../addressbook/libebook/e-contact.c:251
-msgid "Jabber Id List"
+msgid "Jabber ID List"
msgstr "Jabber ID List"
#: ../addressbook/libebook/e-contact.c:252
@@ -515,7 +528,7 @@ msgid "MSN Screen Name List"
msgstr "MSN Screen Name List"
#: ../addressbook/libebook/e-contact.c:254
-msgid "ICQ Id List"
+msgid "ICQ ID List"
msgstr "ICQ ID List"
#: ../addressbook/libebook/e-contact.c:256
@@ -535,8 +548,8 @@ msgid "Birth Date"
msgstr "Birth Date"
#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:44
msgid "Anniversary"
msgstr "Anniversary"
@@ -546,31 +559,31 @@ msgid "X.509 Certificate"
msgstr "X.509 Certificate"
#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
msgstr "Gadu-Gadu Home ID 1"
#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
msgstr "Gadu-Gadu Home ID 2"
#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
msgstr "Gadu-Gadu Home ID 3"
#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
msgstr "Gadu-Gadu Work ID 1"
#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
msgstr "Gadu-Gadu Work ID 2"
#: ../addressbook/libebook/e-contact.c:272
-msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
msgstr "Gadu-Gadu Work ID 3"
#: ../addressbook/libebook/e-contact.c:273
-msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
msgstr "Gadu-Gadu ID List"
#. Geo information
@@ -614,205 +627,350 @@ msgstr "Skype Name List"
msgid "SIP address"
msgstr "SIP address"
-#: ../addressbook/libebook/e-contact.c:1515
+#: ../addressbook/libebook/e-contact.c:1517
#: ../addressbook/libebook/e-destination.c:739
msgid "Unnamed List"
msgstr "Unnamed List"
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:287
#, c-format
msgid "Empty URI"
msgstr "Empty URI"
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#: ../addressbook/libedata-book/e-data-book-factory.c:306
+#: ../addressbook/libedata-book/e-data-book-factory.c:344
+#: ../calendar/libedata-cal/e-data-cal-factory.c:331
+#: ../calendar/libedata-cal/e-data-cal-factory.c:343
#, c-format
msgid "Invalid source"
msgstr "Invalid source"
-#: ../addressbook/libedata-book/e-data-book.c:301
-msgid "Cannot open book"
-msgstr "Cannot open book"
+#: ../addressbook/libedata-book/e-data-book.c:166
+#: ../calendar/libedata-cal/e-data-cal.c:104
+msgid "Success"
+msgstr "Success"
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "Cannot remove book"
+#: ../addressbook/libedata-book/e-data-book.c:167
+#: ../calendar/libedata-cal/e-data-cal.c:105
+msgid "Repository offline"
+msgstr "Repository offline"
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "Cannot get contact"
+#: ../addressbook/libedata-book/e-data-book.c:168
+#: ../calendar/libecal/e-cal.c:4017 ../calendar/libedata-cal/e-data-cal.c:106
+msgid "Permission denied"
+msgstr "Permission denied"
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "Empty query"
+#: ../addressbook/libedata-book/e-data-book.c:169
+msgid "Contact not found"
+msgstr "Contact not found"
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "Cannot authenticate user"
+#: ../addressbook/libedata-book/e-data-book.c:170
+msgid "Contact ID already exists"
+msgstr "Contact ID already exists"
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-msgid "Cannot add contact"
-msgstr "Cannot add contact"
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:111
+msgid "Authentication Failed"
+msgstr "Authentication Failed"
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-msgid "Cannot modify contact"
-msgstr "Cannot modify contact"
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:112
+msgid "Authentication Required"
+msgstr "Authentication Required"
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "Cannot remove contacts"
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:113
+msgid "Unsupported field"
+msgstr "Unsupported field"
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Unsupported authentication method"
+msgstr "Unsupported authentication method"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "TLS not available"
+msgstr "TLS not available"
+
+#: ../addressbook/libedata-book/e-data-book.c:176
+msgid "Address Book does not exist"
+msgstr "Address book does not exist"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Book removed"
+msgstr "Book removed"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Not available in offline mode"
+msgstr "Not available in offline mode"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Search size limit exceeded"
+msgstr "Search size limit exceeded"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Search time limit exceeded"
+msgstr "Search time limit exceeded"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:122
msgid "Invalid query"
msgstr "Invalid query"
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "Cannot get changes"
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Query refused"
+msgstr "Query refused"
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "Cannot complete operation"
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Could not cancel"
+msgstr "Could not cancel"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
+#. { OtherError, N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid server version"
+msgstr "Invalid server version"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+msgid "No space"
+msgstr "No space"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:4001 ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Invalid argument"
+msgstr "Invalid argument"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libecal/e-cal.c:4039 ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Not supported"
+msgstr "Not supported"
+
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libedata-cal/e-data-cal.c:136
+msgid "Other error"
+msgstr "Other error"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:307
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Cannot open book: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:329
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Cannot remove book: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:365
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Cannot get contact: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:380
+#, c-format
+msgid "Empty query: %s"
+msgstr "Empty query: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:396
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Cannot get contact list: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:433
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Cannot authenticate user: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:467
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Cannot add contact: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:485
+#: ../addressbook/libedata-book/e-data-book.c:504
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Cannot modify contact: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:543
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Cannot remove contacts: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:580
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Cannot get supported fields: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:595
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Cannot get required fields: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get supported auth methods: %s"
+msgstr "Cannot get supported authentication methods: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:636
+#: ../addressbook/libedata-book/e-data-book.c:647
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Invalid query: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:683
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Cannot get changes: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:722
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "Cancel operation failed: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#, c-format
+msgid "Unexpected HTTP status code %d returned"
+msgstr "Unexpected HTTP status code %d returned"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Calendar doesn't support Free/Busy"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:45
msgid "Birthday"
msgstr "Birthday"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
#, c-format
msgid "Birthday: %s"
msgstr "Birthday: %s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
#, c-format
msgid "Anniversary: %s"
msgstr "Anniversary: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:239
msgid "Cannot save calendar data: Malformed URI."
msgstr "Cannot save calendar data: Malformed URI."
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:246
+#: ../calendar/backends/file/e-cal-backend-file.c:252
msgid "Cannot save calendar data"
msgstr "Cannot save calendar data"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "Could not create thread for getting deltas"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1144
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1089
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1387
-#: ../calendar/backends/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
-msgid "Could not create cache file"
-msgstr "Could not create cache file"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1102
-msgid "Could not create thread for populating cache"
-msgstr "Could not create thread for populating cache"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
msgid "Reply Requested: by "
msgstr "Reply Requested: by "
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2141
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
msgid "Reply Requested: When convenient"
msgstr "Reply Requested: When convenient"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:294
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
#, c-format
msgid "Loading %s items"
msgstr "Loading %s items"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:928
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
msgid "Calendar"
msgstr "Calendar"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:986
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
msgid "Invalid server URI"
msgstr "Invalid server URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1005
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1107
-#: ../calendar/libecal/e-cal.c:4020
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1378
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1393
-#: ../camel/providers/groupwise/camel-groupwise-store.c:591
-#: ../camel/providers/groupwise/camel-groupwise-store.c:766
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:145
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:172
-msgid "Authentication failed"
-msgstr "Authentication failed"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:487
+msgid "Could not create cache file"
+msgstr "Could not create cache file"
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+msgid "Could not create thread for populating cache"
+msgstr "Could not create thread for populating cache"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:327
msgid "Redirected to Invalid URI"
msgstr "Redirected to Invalid URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:350
msgid "Bad file format."
msgstr "Bad file format."
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:357
msgid "Not a calendar."
msgstr "Not a calendar."
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:154
msgid "Could not retrieve weather data"
msgstr "Could not retrieve weather data"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
msgid "Weather: Fog"
msgstr "Weather: Fog"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
msgid "Weather: Cloudy Night"
msgstr "Weather: Cloudy Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
msgid "Weather: Cloudy"
msgstr "Weather: Cloudy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
msgid "Weather: Overcast"
msgstr "Weather: Overcast"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
msgid "Weather: Showers"
msgstr "Weather: Showers"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
msgid "Weather: Snow"
msgstr "Weather: Snow"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
msgid "Weather: Clear Night"
msgstr "Weather: Clear Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
msgid "Weather: Sunny"
msgstr "Weather: Sunny"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:261
msgid "Weather: Thunderstorms"
msgstr "Weather: Thunderstorms"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:407
msgid "Forecast"
msgstr "Forecast"
@@ -961,7 +1119,8 @@ msgstr "Low"
msgid "Undefined"
msgstr "Undefined"
-#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1200 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:435
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
@@ -970,101 +1129,91 @@ msgstr "Enter password for %s (user %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:1187
+#: ../calendar/libecal/e-cal.c:1214
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "Enter password for %s to enable proxy for user %s"
-#: ../calendar/libecal/e-cal.c:3992
-msgid "Invalid argument"
-msgstr "Invalid argument"
-
-#: ../calendar/libecal/e-cal.c:3994
+#: ../calendar/libecal/e-cal.c:4003
msgid "Backend is busy"
msgstr "Backend is busy"
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:4005
msgid "Repository is offline"
msgstr "Repository is offline"
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:4007
msgid "No such calendar"
msgstr "No such calendar"
-#: ../calendar/libecal/e-cal.c:4000
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:4009 ../calendar/libedata-cal/e-data-cal.c:108
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Object not found"
msgstr "Object not found"
-#: ../calendar/libecal/e-cal.c:4002
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4011 ../calendar/libedata-cal/e-data-cal.c:109
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "Invalid object"
-#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libecal/e-cal.c:4013
msgid "URI not loaded"
msgstr "URI not loaded"
-#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libecal/e-cal.c:4015
msgid "URI already loaded"
msgstr "URI already loaded"
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-msgid "Permission denied"
-msgstr "Permission denied"
-
-#: ../calendar/libecal/e-cal.c:4010
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4019 ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "Unknown User"
-#: ../calendar/libecal/e-cal.c:4012
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../calendar/libecal/e-cal.c:4021 ../calendar/libedata-cal/e-data-cal.c:110
msgid "Object ID already exists"
msgstr "Object ID already exists"
-#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libecal/e-cal.c:4023
msgid "Protocol not supported"
msgstr "Protocol not supported"
-#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libecal/e-cal.c:4025
msgid "Operation has been canceled"
msgstr "Operation has been cancelled"
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:145
+#: ../calendar/libecal/e-cal.c:4027
msgid "Could not cancel operation"
msgstr "Could not cancel operation"
-#: ../calendar/libecal/e-cal.c:4022
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../calendar/libecal/e-cal.c:4029
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "Authentication failed"
+
+#: ../calendar/libecal/e-cal.c:4031
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
msgid "Authentication required"
msgstr "Authentication required"
-#: ../calendar/libecal/e-cal.c:4024
-msgid "A CORBA exception has occurred"
-msgstr "A CORBA exception has occurred"
-
-#: ../calendar/libecal/e-cal.c:4026
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-#: ../camel/camel-net-utils.c:534
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:205
-#: ../camel/providers/imap/camel-imap-command.c:428
-#: ../camel/providers/imap/camel-imap-store.c:729
-#: ../camel/providers/pop3/camel-pop3-store.c:574
+#: ../calendar/libecal/e-cal.c:4033
+msgid "A DBUS exception has occurred"
+msgstr "A D-Bus exception has occurred"
+
+#: ../calendar/libecal/e-cal.c:4035
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:627
+#: ../camel/providers/pop3/camel-pop3-store.c:474
#: ../servers/groupwise/e-gw-connection.c:243
msgid "Unknown error"
msgstr "Unknown error"
-#: ../calendar/libecal/e-cal.c:4028
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4037
msgid "No error"
msgstr "No error"
@@ -1163,230 +1312,242 @@ msgstr ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
"be a boolean false (#f)"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libedata-cal/e-data-cal.c:107
msgid "Invalid range"
msgstr "Invalid range"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-msgid "Unsupported field"
-msgstr "Unsupported field"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-data-cal.c:114
msgid "Unsupported method"
msgstr "Unsupported method"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "Unsupported authentication method"
-msgstr "Unsupported authentication method"
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Calendar does not exist"
+msgstr "Calendar does not exist"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "TLS not available"
-msgstr "TLS not available"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Offline mode unavailable"
-msgstr "Offline mode unavailable"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search size limit exceeded"
-msgstr "Search size limit exceeded"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Search time limit exceeded"
-msgstr "Search time limit exceeded"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Query refused"
-msgstr "Query refused"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:150
-msgid "Invalid server version"
-msgstr "Invalid server version"
+#: ../calendar/libedata-cal/e-data-cal.c:118
+msgid "UnknownUser"
+msgstr "Unknown User"
-#: ../calendar/libedata-cal/e-data-cal.c:501
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:589
#, c-format
-msgid "Cannot retrieve calendar address"
-msgstr "Cannot retrieve calendar address"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Cannot retrieve calendar address: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:519
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:609
#, c-format
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "Cannot retrieve calendar alarm e-mail address"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Cannot retrieve calendar alarm e-mail address: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:537
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:629
#, c-format
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "Cannot retrieve calendar's ldap attribute"
+msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgstr "Cannot retrieve calendar's LDAP attribute: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:555
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:649
#, c-format
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "Cannot retrieve calendar scheduling information"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Cannot retrieve calendar scheduling information: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:572
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:668
#, c-format
-msgid "Cannot open calendar"
-msgstr "Cannot open calendar"
+msgid "Cannot open calendar: %s"
+msgstr "Cannot open calendar: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:591
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:689
#, c-format
-msgid "Cannot refresh calendar"
-msgstr "Cannot refresh calendar"
+msgid "Cannot refresh calendar: %s"
+msgstr "Cannot refresh calendar: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:608
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:708
#, c-format
-msgid "Cannot remove calendar"
-msgstr "Cannot remove calendar"
+msgid "Cannot remove calendar: %s"
+msgstr "Cannot remove calendar: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:627
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:729
#, c-format
-msgid "Cannot create calendar object"
-msgstr "Cannot create calendar object"
+msgid "Cannot create calendar object: %s"
+msgstr "Cannot create calendar object: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:649
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:753
#, c-format
-msgid "Cannot modify calendar object"
-msgstr "Cannot modify calendar object"
+msgid "Cannot modify calendar object: %s"
+msgstr "Cannot modify calendar object: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:673
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:779
#, c-format
-msgid "Cannot remove calendar object"
-msgstr "Cannot remove calendar object"
+msgid "Cannot remove calendar object: %s"
+msgstr "Cannot remove calendar object: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:692
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:800
#, c-format
-msgid "Cannot receive calendar objects"
-msgstr "Cannot receive calendar objects"
+msgid "Cannot receive calendar objects: %s"
+msgstr "Cannot receive calendar objects: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:709
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:819
#, c-format
-msgid "Cannot discard calendar alarm"
-msgstr "Cannot discard calendar alarm"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Cannot discard calendar alarm: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:728
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:840
#, c-format
-msgid "Cannot send calendar objects"
-msgstr "Cannot send calendar objects"
+msgid "Cannot send calendar objects: %s"
+msgstr "Cannot send calendar objects: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:763
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:865
#, c-format
-msgid "Cannot retrieve default calendar object path"
-msgstr "Cannot retrieve default calendar object path"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Cannot retrieve default calendar object path: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:781
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:885
#, c-format
-msgid "Cannot retrieve calendar object path"
-msgstr "Cannot retrieve calendar object path"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Cannot retrieve calendar object path: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:799
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:905
#, c-format
-msgid "Cannot retrieve calendar object list"
-msgstr "Cannot retrieve calendar object list"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Cannot retrieve calendar object list: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:837
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:933
#, c-format
-msgid "Could not retrieve attachment list"
-msgstr "Could not retrieve attachment list"
+msgid "Could not retrieve attachment list: %s"
+msgstr "Could not retrieve attachment list: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:859
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:959
#, c-format
-msgid "Could not complete calendar query"
-msgstr "Could not complete calendar query"
+msgid "Could not complete calendar query: %s"
+msgstr "Could not complete calendar query: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:877
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:979
#, c-format
-msgid "Could not retrieve calendar time zone"
-msgstr "Could not retrieve calendar time zone"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Could not retrieve calendar time zone: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:895
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:999
#, c-format
-msgid "Could not add calendar time zone"
-msgstr "Could not add calendar time zone"
+msgid "Could not add calendar time zone: %s"
+msgstr "Could not add calendar time zone: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:912
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1018
#, c-format
-msgid "Could not set default calendar time zone"
-msgstr "Could not set default calendar time zone"
+msgid "Could not set default calendar time zone: %s"
+msgstr "Could not set default calendar time zone: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:933
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1041
#, c-format
-msgid "Cannot retrieve calendar changes"
-msgstr "Cannot retrieve calendar changes"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Cannot retrieve calendar changes: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:983
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1072
#, c-format
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "Cannot retrieve calendar free/busy list"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Cannot retrieve calendar free/busy list: %s"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:353
#, c-format
msgid "Invalid URI"
msgstr "Invalid URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
#, c-format
msgid "No backend factory for '%s' of '%s'"
msgstr "No backend factory for '%s' of '%s'"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:421
#, c-format
msgid "Could not instantiate backend"
msgstr "Could not instantiate backend"
-#: ../camel/camel-cipher-context.c:65
+#: ../camel/camel-cipher-context.c:75
+#, c-format
msgid "Signing is not supported by this cipher"
msgstr "Signing is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:100
+#: ../camel/camel-cipher-context.c:110
msgid "Signing message"
msgstr "Signing message"
-#: ../camel/camel-cipher-context.c:120
+#: ../camel/camel-cipher-context.c:131
+#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "Verifying is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:153
+#: ../camel/camel-cipher-context.c:164
msgid "Verifying message"
msgstr "Verifying message"
-#: ../camel/camel-cipher-context.c:176
+#: ../camel/camel-cipher-context.c:188
+#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "Encryption is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:211
+#: ../camel/camel-cipher-context.c:223
msgid "Encrypting message"
msgstr "Encrypting message"
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:246
+#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "Decryption is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:263
+#: ../camel/camel-cipher-context.c:276
msgid "Decrypting message"
msgstr "Decrypting message"
-#: ../camel/camel-cipher-context.c:283
+#: ../camel/camel-cipher-context.c:297
+#, c-format
msgid "You may not import keys with this cipher"
msgstr "You may not import keys with this cypher"
-#: ../camel/camel-cipher-context.c:323
+#: ../camel/camel-cipher-context.c:341
+#, c-format
msgid "You may not export keys with this cipher"
msgstr "You may not export keys with this cypher"
-#: ../camel/camel-data-cache.c:137
+#: ../camel/camel-data-cache.c:181
+#, c-format
msgid "Unable to create cache path"
msgstr "Unable to create cache path"
-#: ../camel/camel-data-cache.c:427
+#: ../camel/camel-data-cache.c:494
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not remove cache entry: %s: %s"
-#: ../camel/camel-db.c:458
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "No stream available"
+
+#: ../camel/camel-db.c:464
+#, c-format
msgid "Insufficient memory"
msgstr "Insufficient memory"
-#: ../camel/camel-disco-diary.c:196
+#: ../camel/camel-disco-diary.c:195
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -1397,8 +1558,8 @@ msgstr ""
"Further operations on this server will not be replayed when you\n"
"reconnect to the network."
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:313
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1409,124 +1570,142 @@ msgstr ""
"%s\n"
"Changes made to this folder will not be resynchronised."
-#: ../camel/camel-disco-diary.c:300
+#: ../camel/camel-disco-diary.c:299
msgid "Resynchronizing with server"
msgstr "Resynchronising with server"
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "Copy folder content locally for offline operation"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
msgid "Downloading new messages for offline mode"
msgstr "Downloading new messages for offline mode"
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:379
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "Preparing folder '%s' for offline"
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:216
-#: ../camel/providers/imap/camel-imap-store.c:989
-#: ../camel/providers/imap/camel-imap-store.c:1831
-#: ../camel/providers/imap/camel-imap-store.c:2268
-#: ../camel/providers/imap/camel-imap-store.c:3077
-#: ../camel/providers/imapx/camel-imapx-store.c:152
-#: ../camel/providers/imapx/camel-imapx-store.c:605
-#: ../camel/providers/imapx/camel-imapx-store.c:665
-#: ../camel/providers/imapx/camel-imapx-store.c:714
+#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "Copy folder content locally for offline operation"
+
+#: ../camel/camel-disco-store.c:395
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:876
+#: ../camel/providers/imap/camel-imap-store.c:1720
+#: ../camel/providers/imap/camel-imap-store.c:2178
+#: ../camel/providers/imap/camel-imap-store.c:3022
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:709
+#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/imapx/camel-imapx-store.c:831
+#, c-format
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "No description available"
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/camel-tcp-stream-raw.c:250
+#: ../camel/providers/imapx/camel-imapx-server.c:4647
+#: ../camel/providers/imapx/camel-imapx-server.c:4664
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:466
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "Cancelled"
-#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "Failed to create child process '%s': %s"
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:853
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Invalid message stream received from %s: %s"
-#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
msgid "Syncing folders"
msgstr "Syncing folders"
-#: ../camel/camel-filter-driver.c:1122 ../camel/camel-filter-driver.c:1523
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Error parsing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1532
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Error executing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1217
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
msgid "Unable to open spool folder"
msgstr "Unable to open spool folder"
-#: ../camel/camel-filter-driver.c:1226
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
msgid "Unable to process spool folder"
msgstr "Unable to process spool folder"
-#: ../camel/camel-filter-driver.c:1242
+#: ../camel/camel-filter-driver.c:1269
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Getting message %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1246
-msgid "Cannot open message"
-msgstr "Cannot open message"
-
-#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1265
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
#, c-format
msgid "Failed on message %d"
msgstr "Failed on message %d"
-#: ../camel/camel-filter-driver.c:1279 ../camel/camel-filter-driver.c:1369
+#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
msgid "Syncing folder"
msgstr "Syncing folder"
-#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
msgid "Complete"
msgstr "Complete"
-#: ../camel/camel-filter-driver.c:1339
+#: ../camel/camel-filter-driver.c:1377
#, c-format
msgid "Getting message %d of %d"
msgstr "Getting message %d of %d"
-#: ../camel/camel-filter-driver.c:1354
+#: ../camel/camel-filter-driver.c:1395
#, c-format
msgid "Failed at message %d of %d"
msgstr "Failed at message %d of %d"
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
msgid "Failed to retrieve message"
msgstr "Failed to retrieve message"
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
msgid "Invalid arguments to (system-flag)"
msgstr "Invalid arguments to (system-flag)"
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
msgid "Invalid arguments to (user-tag)"
msgstr "Invalid arguments to (user-tag)"
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Error executing filter search: %s: %s"
-#: ../camel/camel-folder-search.c:350 ../camel/camel-folder-search.c:454
-#: ../camel/camel-folder-search.c:609
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -1535,8 +1714,8 @@ msgstr ""
"Cannot parse search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:464
-#: ../camel/camel-folder-search.c:619
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1545,85 +1724,74 @@ msgstr ""
"Error executing search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:811 ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) requires a single bool result"
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:938
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) not allowed inside %s"
-#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) requires a match type string"
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:978
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) expects an array result"
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:987
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) requires the folder set"
-#: ../camel/camel-folder.c:689
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Unsupported operation: append message: for %s"
-
-#: ../camel/camel-folder.c:1400
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Unsupported operation: search by expression: for %s"
-
-#: ../camel/camel-folder.c:1441
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Unsupported operation: count by expression: for %s"
-
-#: ../camel/camel-folder.c:1482
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Unsupported operation: search by UIDs: for %s"
-
-#: ../camel/camel-folder.c:1595
-#: ../camel/providers/local/camel-maildir-folder.c:378
-msgid "Moving messages"
-msgstr "Moving messages"
-
-#: ../camel/camel-folder.c:1595
-msgid "Copying messages"
-msgstr "Copying messages"
-
-#. Translators: The %s is replaced with a folder name where the operation is running.
-#: ../camel/camel-folder.c:1945
+#: ../camel/camel-folder.c:125
#, c-format
msgid "Learning new spam message in '%s'"
msgid_plural "Learning new spam messages in '%s'"
msgstr[0] "Learning new spam message in '%s'"
msgstr[1] "Learning new spam messages in '%s'"
-#. Translators: The %s is replaced with a folder name where the operation is running.
-#: ../camel/camel-folder.c:1964
+#: ../camel/camel-folder.c:147
#, c-format
msgid "Learning new ham message in '%s'"
msgid_plural "Learning new ham messages in '%s'"
msgstr[0] "Learning new ham message in '%s'"
msgstr[1] "Learning new ham messages in '%s'"
-#. Translators: The %s is replaced with a folder name where the operation is running.
-#: ../camel/camel-folder.c:1985
+#: ../camel/camel-folder.c:171
#, c-format
msgid "Filtering new message in '%s'"
msgid_plural "Filtering new messages in '%s'"
msgstr[0] "Filtering new message in '%s'"
msgstr[1] "Filtering new messages in '%s'"
-#: ../camel/camel-gpg-context.c:734
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
+msgid "Moving messages"
+msgstr "Moving messages"
+
+#: ../camel/camel-folder.c:690
+msgid "Copying messages"
+msgstr "Copying messages"
+
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Failed to execute gpg: %s"
+
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../camel/camel-gpg-context.c:770
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1634,15 +1802,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:787
+#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "Failed to parse gpg userid hint."
-#: ../camel/camel-gpg-context.c:776 ../camel/camel-gpg-context.c:791
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "Failed to parse gpg passphrase request."
-#: ../camel/camel-gpg-context.c:811
+#: ../camel/camel-gpg-context.c:848
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1651,7 +1821,7 @@ msgstr ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
-#: ../camel/camel-gpg-context.c:815
+#: ../camel/camel-gpg-context.c:852
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1660,122 +1830,102 @@ msgstr ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
-#: ../camel/camel-gpg-context.c:821
+#: ../camel/camel-gpg-context.c:858
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Unexpected request from GnuPG for '%s'"
-#: ../camel/camel-gpg-context.c:849 ../camel/camel-gpg-context.c:1101
-msgid "Canceled."
-msgstr "Cancelled."
-
-#: ../camel/camel-gpg-context.c:864
+#: ../camel/camel-gpg-context.c:905
+#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "Failed to unlock secret key: 3 bad passphrases given."
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:917
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Unexpected response from GnuPG: %s"
-#: ../camel/camel-gpg-context.c:976
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "Failed to encrypt: No valid recipients specified."
-#: ../camel/camel-gpg-context.c:1255 ../camel/camel-gpg-context.c:1394
-#: ../camel/camel-gpg-context.c:2017 ../camel/camel-gpg-context.c:2069
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Failed to execute gpg: %s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "Could not generate signing data: "
-#: ../camel/camel-gpg-context.c:1360 ../camel/camel-smime-context.c:758
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Could not generate signing data: %s"
-
-#: ../camel/camel-gpg-context.c:1413 ../camel/camel-gpg-context.c:1659
-#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1771
-#: ../camel/camel-gpg-context.c:1790 ../camel/camel-gpg-context.c:1915
-#: ../camel/camel-gpg-context.c:1933 ../camel/camel-gpg-context.c:2036
-#: ../camel/camel-gpg-context.c:2088
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
-#: ../camel/camel-gpg-context.c:1553 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-gpg-context.c:1569 ../camel/camel-gpg-context.c:1586
-#: ../camel/camel-smime-context.c:880 ../camel/camel-smime-context.c:893
-#: ../camel/camel-smime-context.c:901
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1627
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Cannot verify message signature: could not create temp file: %s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "Cannot verify message signature: "
-#: ../camel/camel-gpg-context.c:1752
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "Could not generate encrypting data: "
-#: ../camel/camel-gpg-context.c:1808
+#: ../camel/camel-gpg-context.c:1866
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: ../camel/camel-gpg-context.c:1865 ../camel/camel-gpg-context.c:1874
-#: ../camel/camel-gpg-context.c:1896
+#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Cannot decrypt message: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1885
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Failed to decrypt MIME part: protocol error"
-#: ../camel/camel-gpg-context.c:1969 ../camel/camel-smime-context.c:1174
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
msgid "Encrypted content"
msgstr "Encrypted content"
-#: ../camel/camel-gpg-context.c:1991
-msgid "Unable to parse message content"
-msgstr "Unable to parse message content"
-
-#: ../camel/camel-gpg-context.c:2018 ../camel/camel-gpg-context.c:2070
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
-#: ../camel/providers/smtp/camel-smtp-transport.c:207
-msgid "Unknown"
-msgstr "Unknown"
-
#: ../camel/camel-lock-client.c:106
#, c-format
msgid "Cannot build locking helper pipe: %s"
msgstr "Cannot build locking helper pipe: %s"
-#: ../camel/camel-lock-client.c:129
+#: ../camel/camel-lock-client.c:130
#, c-format
msgid "Cannot fork locking helper: %s"
msgstr "Cannot fork locking helper: %s"
-#: ../camel/camel-lock-client.c:209 ../camel/camel-lock-client.c:235
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
msgstr "Could not lock '%s': protocol error with lock-helper"
-#: ../camel/camel-lock-client.c:224
+#: ../camel/camel-lock-client.c:227
#, c-format
msgid "Could not lock '%s'"
msgstr "Could not lock '%s'"
-#: ../camel/camel-lock.c:104
+#: ../camel/camel-lock.c:102
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "Could not create lock file for %s: %s"
-#: ../camel/camel-lock.c:147
+#: ../camel/camel-lock.c:145
#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Timed out trying to get lock file on %s. Try again later."
-#: ../camel/camel-lock.c:206
+#: ../camel/camel-lock.c:205
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "Failed to get lock using fcntl(2): %s"
@@ -1785,17 +1935,17 @@ msgstr "Failed to get lock using fcntl(2): %s"
msgid "Failed to get lock using flock(2): %s"
msgstr "Failed to get lock using flock(2): %s"
-#: ../camel/camel-movemail.c:108
+#: ../camel/camel-movemail.c:105
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "Could not check mail file %s: %s"
-#: ../camel/camel-movemail.c:121
+#: ../camel/camel-movemail.c:119
#, c-format
msgid "Could not open mail file %s: %s"
msgstr "Could not open mail file %s: %s"
-#: ../camel/camel-movemail.c:130
+#: ../camel/camel-movemail.c:129
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "Could not open temporary mail file %s: %s"
@@ -1805,116 +1955,116 @@ msgstr "Could not open temporary mail file %s: %s"
msgid "Failed to store mail in temp file %s: %s"
msgstr "Failed to store mail in temp file %s: %s"
-#: ../camel/camel-movemail.c:192
+#: ../camel/camel-movemail.c:193
#, c-format
msgid "Could not create pipe: %s"
msgstr "Could not create pipe: %s"
-#: ../camel/camel-movemail.c:205
+#: ../camel/camel-movemail.c:207
#, c-format
msgid "Could not fork: %s"
msgstr "Could not fork: %s"
-#: ../camel/camel-movemail.c:243
+#: ../camel/camel-movemail.c:245
#, c-format
msgid "Movemail program failed: %s"
msgstr "Movemail program failed: %s"
-#: ../camel/camel-movemail.c:244
+#: ../camel/camel-movemail.c:246
msgid "(Unknown error)"
msgstr "(Unknown error)"
-#: ../camel/camel-movemail.c:270
+#: ../camel/camel-movemail.c:273
#, c-format
msgid "Error reading mail file: %s"
msgstr "Error reading mail file: %s"
-#: ../camel/camel-movemail.c:282
+#: ../camel/camel-movemail.c:286
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "Error writing mail temp file: %s"
-#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
#, c-format
msgid "Error copying mail temp file: %s"
msgstr "Error copying mail temp file: %s"
-#: ../camel/camel-multipart-signed.c:596
-msgid "parse error"
-msgstr "parse error"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "No content available"
-#: ../camel/camel-net-utils.c:511 ../camel/camel-net-utils.c:694
-#: ../camel/camel-net-utils.c:842
-#: ../camel/providers/pop3/camel-pop3-store.c:468
-#: ../camel/providers/pop3/camel-pop3-store.c:568
-msgid "Canceled"
-msgstr "Cancelled"
+#: ../camel/camel-multipart-signed.c:293
+#, c-format
+msgid "No signature available"
+msgstr "No signature available"
-#: ../camel/camel-net-utils.c:533
-msgid "cannot create thread"
-msgstr "cannot create thread"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "parse error"
-#: ../camel/camel-net-utils.c:698
+#: ../camel/camel-net-utils.c:693
#, c-format
msgid "Resolving: %s"
msgstr "Resolving: %s"
-#: ../camel/camel-net-utils.c:720
+#: ../camel/camel-net-utils.c:715
msgid "Host lookup failed"
msgstr "Host lookup failed"
-#: ../camel/camel-net-utils.c:724
+#: ../camel/camel-net-utils.c:719
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "Host lookup failed: %s: %s"
-#: ../camel/camel-net-utils.c:846
+#: ../camel/camel-net-utils.c:842
msgid "Resolving address"
msgstr "Resolving address"
-#: ../camel/camel-net-utils.c:866
+#: ../camel/camel-net-utils.c:862
msgid "Name lookup failed"
msgstr "Name lookup failed"
-#: ../camel/camel-net-utils.c:871
+#: ../camel/camel-net-utils.c:867
#, c-format
msgid "Name lookup failed: %s"
msgstr "Name lookup failed: %s"
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:169
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "Syncing messages in folder '%s' to disk"
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "Cannot write offline journal for folder '%s': %s"
-#: ../camel/camel-provider.c:59
+#: ../camel/camel-provider.c:58
msgid "Virtual folder email provider"
msgstr "Virtual folder e-mail provider"
-#: ../camel/camel-provider.c:61
+#: ../camel/camel-provider.c:60
msgid "For reading mail as a query of another set of folders"
msgstr "For reading mail as a query of another set of folders"
-#: ../camel/camel-provider.c:185
+#: ../camel/camel-provider.c:188
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "Could not load %s: Module loading not supported on this system."
-#: ../camel/camel-provider.c:194
+#: ../camel/camel-provider.c:197
#, c-format
msgid "Could not load %s: %s"
msgstr "Could not load %s: %s"
-#: ../camel/camel-provider.c:203
+#: ../camel/camel-provider.c:206
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "Could not load %s: No initialisation code in module."
-#: ../camel/camel-provider.c:383 ../camel/camel-session.c:116
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "No provider available for protocol '%s'"
@@ -1927,11 +2077,12 @@ msgstr "Anonymous"
msgid "This option will connect to the server using an anonymous login."
msgstr "This option will connect to the server using an anonymous login."
-#: ../camel/camel-sasl-anonymous.c:65
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
msgid "Authentication failed."
msgstr "Authentication failed."
-#: ../camel/camel-sasl-anonymous.c:75
+#: ../camel/camel-sasl-anonymous.c:80
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -1940,7 +2091,7 @@ msgstr ""
"Invalid e-mail address trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:88
+#: ../camel/camel-sasl-anonymous.c:94
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -1949,7 +2100,7 @@ msgstr ""
"Invalid opaque trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:101
+#: ../camel/camel-sasl-anonymous.c:108
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -1958,11 +2109,11 @@ msgstr ""
"Invalid trace information:\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:45
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:47
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
@@ -1970,11 +2121,11 @@ msgstr ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
-#: ../camel/camel-sasl-digest-md5.c:52
+#: ../camel/camel-sasl-digest-md5.c:56
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:58
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -1982,40 +2133,46 @@ msgstr ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
-#: ../camel/camel-sasl-digest-md5.c:812
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "Server challenge too long (>2048 octets)"
-#: ../camel/camel-sasl-digest-md5.c:822
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
msgid "Server challenge invalid\n"
msgstr "Server challenge invalid\n"
-#: ../camel/camel-sasl-digest-md5.c:829
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "Server challenge contained invalid \"Quality of Protection\" token"
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
msgid "Server response did not contain authorization data"
msgstr "Server response did not contain authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:880
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "Server response contained incomplete authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:892
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
msgid "Server response does not match"
msgstr "Server response does not match"
-#: ../camel/camel-sasl-gssapi.c:76
+#: ../camel/camel-sasl-gssapi.c:80
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:78
+#: ../camel/camel-sasl-gssapi.c:82
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr ""
"This option will connect to the server using Kerberos 5 authentication."
-#: ../camel/camel-sasl-gssapi.c:115
+#: ../camel/camel-sasl-gssapi.c:119
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
@@ -2023,11 +2180,11 @@ msgstr ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognised by the implementation."
-#: ../camel/camel-sasl-gssapi.c:120
+#: ../camel/camel-sasl-gssapi.c:124
msgid "The provided target_name parameter was ill-formed."
msgstr "The provided target_name parameter was ill-formed."
-#: ../camel/camel-sasl-gssapi.c:123
+#: ../camel/camel-sasl-gssapi.c:127
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
@@ -2035,7 +2192,7 @@ msgstr ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
-#: ../camel/camel-sasl-gssapi.c:127
+#: ../camel/camel-sasl-gssapi.c:131
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
@@ -2043,7 +2200,7 @@ msgstr ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
-#: ../camel/camel-sasl-gssapi.c:132
+#: ../camel/camel-sasl-gssapi.c:136
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
@@ -2051,7 +2208,7 @@ msgstr ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:140
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
@@ -2059,49 +2216,52 @@ msgstr ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:145
msgid "The supplied context handle did not refer to a valid context."
msgstr "The supplied context handle did not refer to a valid context."
-#: ../camel/camel-sasl-gssapi.c:144
+#: ../camel/camel-sasl-gssapi.c:148
msgid "The consistency checks performed on the input_token failed."
msgstr "The consistency checks performed on the input_token failed."
-#: ../camel/camel-sasl-gssapi.c:147
+#: ../camel/camel-sasl-gssapi.c:151
msgid "The consistency checks performed on the credential failed."
msgstr "The consistency checks performed on the credential failed."
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:154
msgid "The referenced credentials have expired."
msgstr "The referenced credentials have expired."
-#: ../camel/camel-sasl-gssapi.c:156 ../camel/camel-sasl-gssapi.c:287
-#: ../camel/camel-sasl-gssapi.c:330 ../camel/camel-sasl-gssapi.c:346
-#: ../camel/providers/imap/camel-imap-store.c:1260
+#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:1171
+#, c-format
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
-#: ../camel/camel-sasl-gssapi.c:357
+#: ../camel/camel-sasl-gssapi.c:369
+#, c-format
msgid "Unsupported security layer."
msgstr "Unsupported security layer."
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:39
msgid "Login"
msgstr "Login"
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
msgid "This option will connect to the server using a simple password."
msgstr "This option will connect to the server using a simple password."
-#: ../camel/camel-sasl-login.c:96
+#: ../camel/camel-sasl-login.c:94
+#, c-format
msgid "Unknown authentication state."
msgstr "Unknown authentication state."
-#: ../camel/camel-sasl-ntlm.c:37
+#: ../camel/camel-sasl-ntlm.c:41
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:39
+#: ../camel/camel-sasl-ntlm.c:43
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
@@ -2109,51 +2269,53 @@ msgstr ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:43
msgid "PLAIN"
msgstr "PLAIN"
-#: ../camel/camel-sasl-popb4smtp.c:43
+#: ../camel/camel-sasl-popb4smtp.c:46
msgid "POP before SMTP"
msgstr "POP before SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:45
+#: ../camel/camel-sasl-popb4smtp.c:48
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "This option will authorise a POP connection before attempting SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:79
+#: ../camel/camel-sasl-popb4smtp.c:82
msgid "POP Source URI"
msgstr "POP Source URI"
-#: ../camel/camel-sasl-popb4smtp.c:85
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
msgid "POP Before SMTP auth using an unknown transport"
msgstr "POP Before SMTP auth using an unknown transport"
-#: ../camel/camel-sasl-popb4smtp.c:92
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
msgid "POP Before SMTP auth using a non-pop source"
msgstr "POP Before SMTP auth using a non-pop source"
-#: ../camel/camel-search-private.c:113
+#: ../camel/camel-search-private.c:112
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "Regular expression compilation failed: %s: %s"
-#: ../camel/camel-service.c:207
+#: ../camel/camel-service.c:88
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' needs a username component"
-#: ../camel/camel-service.c:211
+#: ../camel/camel-service.c:92
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' needs a host component"
-#: ../camel/camel-service.c:215
+#: ../camel/camel-service.c:96
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' needs a path component"
-#: ../camel/camel-session.c:174
+#: ../camel/camel-session.c:261
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2162,242 +2324,301 @@ msgstr ""
"Could not create directory %s:\n"
"%s"
-#: ../camel/camel-session.c:641
+#: ../camel/camel-session.c:758
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "Please enter the %s password for %s on host %s."
-#: ../camel/camel-smime-context.c:340 ../camel/camel-smime-context.c:975
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Cannot find certificate for '%s'"
-#: ../camel/camel-smime-context.c:346
+#: ../camel/camel-smime-context.c:376
msgid "Cannot create CMS message"
msgstr "Cannot create CMS message"
-#: ../camel/camel-smime-context.c:351
+#: ../camel/camel-smime-context.c:381
msgid "Cannot create CMS signed data"
msgstr "Cannot create CMS signed data"
-#: ../camel/camel-smime-context.c:357
+#: ../camel/camel-smime-context.c:387
msgid "Cannot attach CMS signed data"
msgstr "Cannot attach CMS signed data"
-#: ../camel/camel-smime-context.c:364
+#: ../camel/camel-smime-context.c:394
msgid "Cannot attach CMS data"
msgstr "Cannot attach CMS data"
-#: ../camel/camel-smime-context.c:370
+#: ../camel/camel-smime-context.c:400
msgid "Cannot create CMS Signer information"
msgstr "Cannot create CMS Signer information"
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:406
msgid "Cannot find certificate chain"
msgstr "Cannot find certificate chain"
-#: ../camel/camel-smime-context.c:382
+#: ../camel/camel-smime-context.c:412
msgid "Cannot add CMS Signing time"
msgstr "Cannot add CMS Signing time"
-#: ../camel/camel-smime-context.c:406 ../camel/camel-smime-context.c:421
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "Encryption certificate for '%s' does not exist"
-#: ../camel/camel-smime-context.c:428
+#: ../camel/camel-smime-context.c:458
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "Cannot add SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:433
+#: ../camel/camel-smime-context.c:463
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:438
+#: ../camel/camel-smime-context.c:468
msgid "Cannot add encryption certificate"
msgstr "Cannot add encryption certificate"
-#: ../camel/camel-smime-context.c:444
+#: ../camel/camel-smime-context.c:474
msgid "Cannot add CMS Signer information"
msgstr "Cannot add CMS Signer information"
-#: ../camel/camel-smime-context.c:476
+#: ../camel/camel-smime-context.c:506
msgid "Unverified"
msgstr "Unverified"
-#: ../camel/camel-smime-context.c:478
+#: ../camel/camel-smime-context.c:508
msgid "Good signature"
msgstr "Good signature"
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:510
msgid "Bad signature"
msgstr "Bad signature"
-#: ../camel/camel-smime-context.c:482
+#: ../camel/camel-smime-context.c:512
msgid "Content tampered with or altered in transit"
msgstr "Content tampered with or altered in transit"
-#: ../camel/camel-smime-context.c:484
+#: ../camel/camel-smime-context.c:514
msgid "Signing certificate not found"
msgstr "Signing certificate not found"
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:516
msgid "Signing certificate not trusted"
msgstr "Signing certificate not trusted"
-#: ../camel/camel-smime-context.c:488
+#: ../camel/camel-smime-context.c:518
msgid "Signature algorithm unknown"
msgstr "Signature algorithm unknown"
-#: ../camel/camel-smime-context.c:490
+#: ../camel/camel-smime-context.c:520
msgid "Signature algorithm unsupported"
msgstr "Signature algorithm unsupported"
-#: ../camel/camel-smime-context.c:492
+#: ../camel/camel-smime-context.c:522
msgid "Malformed signature"
msgstr "Malformed signature"
-#: ../camel/camel-smime-context.c:494
+#: ../camel/camel-smime-context.c:524
msgid "Processing error"
msgstr "Processing error"
-#: ../camel/camel-smime-context.c:536
+#: ../camel/camel-smime-context.c:566
msgid "No signed data in signature"
msgstr "No signed data in signature"
-#: ../camel/camel-smime-context.c:541
+#: ../camel/camel-smime-context.c:571
msgid "Digests missing from enveloped data"
msgstr "Digests missing from enveloped data"
-#: ../camel/camel-smime-context.c:554 ../camel/camel-smime-context.c:565
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
msgid "Cannot calculate digests"
msgstr "Cannot calculate digests"
-#: ../camel/camel-smime-context.c:572 ../camel/camel-smime-context.c:576
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
msgid "Cannot set message digests"
msgstr "Cannot set message digests"
-#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:591
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
msgid "Certificate import failed"
msgstr "Certificate import failed"
-#: ../camel/camel-smime-context.c:601
+#: ../camel/camel-smime-context.c:631
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "Certificate is the only message, cannot verify certificates"
-#: ../camel/camel-smime-context.c:604
+#: ../camel/camel-smime-context.c:634
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "Certificate is the only message, certificates imported and verified"
-#: ../camel/camel-smime-context.c:608
+#: ../camel/camel-smime-context.c:638
msgid "Cannot find signature digests"
msgstr "Cannot find signature digests"
-#: ../camel/camel-smime-context.c:624
+#: ../camel/camel-smime-context.c:654
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "Signer: %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:769 ../camel/camel-smime-context.c:1047
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
msgid "Cannot create encoder context"
msgstr "Cannot create encoder context"
-#: ../camel/camel-smime-context.c:775
+#: ../camel/camel-smime-context.c:838
msgid "Failed to add data to CMS encoder"
msgstr "Failed to add data to CMS encoder"
-#: ../camel/camel-smime-context.c:780 ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
msgid "Failed to encode data"
msgstr "Failed to encode data"
-#: ../camel/camel-smime-context.c:915 ../camel/camel-smime-context.c:1153
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
msgid "Decoder failed"
msgstr "Decoder failed"
-#: ../camel/camel-smime-context.c:982
+#: ../camel/camel-smime-context.c:1049
msgid "Cannot find common bulk encryption algorithm"
msgstr "Cannot find common bulk encryption algorithm"
-#: ../camel/camel-smime-context.c:990
+#: ../camel/camel-smime-context.c:1057
msgid "Cannot allocate slot for encryption bulk key"
msgstr "Cannot allocate slot for encryption bulk key"
-#: ../camel/camel-smime-context.c:1001
+#: ../camel/camel-smime-context.c:1068
msgid "Cannot create CMS Message"
msgstr "Cannot create CMS Message"
-#: ../camel/camel-smime-context.c:1007
+#: ../camel/camel-smime-context.c:1074
msgid "Cannot create CMS Enveloped data"
msgstr "Cannot create CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1013
+#: ../camel/camel-smime-context.c:1080
msgid "Cannot attach CMS Enveloped data"
msgstr "Cannot attach CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1086
msgid "Cannot attach CMS data object"
msgstr "Cannot attach CMS data object"
-#: ../camel/camel-smime-context.c:1028
+#: ../camel/camel-smime-context.c:1095
msgid "Cannot create CMS Recipient information"
msgstr "Cannot create CMS Recipient information"
-#: ../camel/camel-smime-context.c:1033
+#: ../camel/camel-smime-context.c:1100
msgid "Cannot add CMS Recipient information"
msgstr "Cannot add CMS Recipient information"
-#: ../camel/camel-smime-context.c:1059
+#: ../camel/camel-smime-context.c:1125
msgid "Failed to add data to encoder"
msgstr "Failed to add data to encoder"
-#: ../camel/camel-smime-context.c:1160
+#: ../camel/camel-smime-context.c:1227
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: No encrypted content found"
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:162
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Cannot get folder: Invalid operation on this store"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "Cannot create folder '%s': folder exists"
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Cannot create folder: Invalid operation on this store"
-
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Cannot create folder: %s: folder exists"
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:389
-#: ../camel/providers/local/camel-maildir-store.c:214
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Cannot delete folder: %s: Invalid operation"
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:426
-#: ../camel/providers/local/camel-maildir-store.c:286
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Cannot rename folder: %s: Invalid operation"
#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:1128 ../camel/camel-vtrash-folder.c:48
msgid "Trash"
msgstr "Wastebasket"
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:1131 ../camel/camel-vtrash-folder.c:50
msgid "Junk"
msgstr "Junk"
-#: ../camel/camel-tcp-stream-ssl.c:712
+#: ../camel/camel-tcp-stream-raw.c:809
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "The proxy host does not support SOCKS5"
+
+#: ../camel/camel-tcp-stream-raw.c:815
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "Could not find a suitable authentication type: code 0x%x"
+
+#: ../camel/camel-tcp-stream-raw.c:827
+msgid "General SOCKS server failure"
+msgstr "General SOCKS server failure"
+
+#: ../camel/camel-tcp-stream-raw.c:828
+msgid "SOCKS server's rules do not allow connection"
+msgstr "SOCKS server's rules do not allow connection"
+
+#: ../camel/camel-tcp-stream-raw.c:829
+msgid "Network is unreachable from SOCKS server"
+msgstr "Network is unreachable from SOCKS server"
+
+#: ../camel/camel-tcp-stream-raw.c:830
+msgid "Host is unreachable from SOCKS server"
+msgstr "Host is unreachable from SOCKS server"
+
+#: ../camel/camel-tcp-stream-raw.c:831
+msgid "Connection refused"
+msgstr "Connection refused"
+
+#: ../camel/camel-tcp-stream-raw.c:832
+msgid "Time-to-live expired"
+msgstr "Time-to-live expired"
+
+#: ../camel/camel-tcp-stream-raw.c:833
+msgid "Command not supported by SOCKS server"
+msgstr "Command not supported by SOCKS server"
+
+#: ../camel/camel-tcp-stream-raw.c:834
+msgid "Address type not supported by SOCKS server"
+msgstr "Address type not supported by SOCKS server"
+
+#: ../camel/camel-tcp-stream-raw.c:835
+msgid "Unknown error from SOCKS server"
+msgstr "Unknown error from SOCKS server"
+
+#: ../camel/camel-tcp-stream-raw.c:865
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Got unknown address type from SOCKS server"
+
+#: ../camel/camel-tcp-stream-raw.c:882
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "Incomplete reply from SOCKS server"
+
+#: ../camel/camel-tcp-stream-raw.c:897
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Hostname is too long (maximum is 255 characters)"
+
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:929 ../camel/camel-tcp-stream-raw.c:939
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "Invalid reply from proxy server"
+
+#: ../camel/camel-tcp-stream-ssl.c:457
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2410,16 +2631,16 @@ msgstr ""
"Fingerprint: %s\n"
"Signature: %s"
-#: ../camel/camel-tcp-stream-ssl.c:718
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "GOOD"
msgstr "GOOD"
-#: ../camel/camel-tcp-stream-ssl.c:718
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "BAD"
msgstr "BAD"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:722
+#: ../camel/camel-tcp-stream-ssl.c:467
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2434,7 +2655,7 @@ msgstr ""
"\n"
"Do you wish to accept?"
-#: ../camel/camel-tcp-stream-ssl.c:766
+#: ../camel/camel-tcp-stream-ssl.c:511
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2443,7 +2664,7 @@ msgstr ""
"Certificate problem: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:818
+#: ../camel/camel-tcp-stream-ssl.c:563
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2452,7 +2673,7 @@ msgstr ""
"Bad certificate domain: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:836
+#: ../camel/camel-tcp-stream-ssl.c:581
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2461,7 +2682,7 @@ msgstr ""
"Certificate expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:853
+#: ../camel/camel-tcp-stream-ssl.c:598
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2470,49 +2691,50 @@ msgstr ""
"Certificate revocation list expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-url.c:315
+#: ../camel/camel-url.c:314
#, c-format
msgid "Could not parse URL '%s'"
msgstr "Could not parse URL '%s'"
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1044
#, c-format
-msgid "Error storing '%s': %s"
-msgstr "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "Error storing '%s': "
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1117
#, c-format
msgid "No such message %s in %s"
msgstr "No such message %s in %s"
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
+#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#, c-format
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "Cannot copy or move messages into a Virtual Folder"
-#: ../camel/camel-vee-store.c:118 ../camel/camel-vee-store.c:119
-#: ../camel/camel-vee-store.c:365
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
msgid "Unmatched"
msgstr "Unmatched"
-#: ../camel/camel-vee-store.c:412
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Cannot delete folder: %s: No such folder"
-
-#: ../camel/camel-vee-store.c:434
+#: ../camel/camel-vee-store.c:223
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Cannot rename folder: %s: No such folder"
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:289
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Cannot delete folder: %s: No such folder"
+
+#: ../camel/camel-vtrash-folder.c:49
msgid "Cannot copy messages to the Trash folder"
msgstr "Cannot copy messages to the Wastebasket folder"
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
msgid "Cannot copy messages to the Junk folder"
msgstr "Cannot copy messages to the Junk folder"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -2521,229 +2743,228 @@ msgstr ""
"Cannot get message: %s\n"
" %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:130
-#: ../camel/providers/local/camel-maildir-folder.c:258
-#: ../camel/providers/local/camel-maildir-folder.c:286
-#: ../camel/providers/local/camel-maildir-folder.c:391
-#: ../camel/providers/local/camel-mbox-folder.c:354
-#: ../camel/providers/local/camel-mbox-folder.c:404
-#: ../camel/providers/local/camel-mh-folder.c:221
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
msgid "No such message"
msgstr "No such message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:142
-#: ../camel/providers/pop3/camel-pop3-folder.c:262
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
-msgid "User canceled"
-msgstr "User cancelled"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/nntp/camel-nntp-folder.c:150
-#: ../camel/providers/nntp/camel-nntp-folder.c:152
-#: ../camel/providers/nntp/camel-nntp-folder.c:161
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
-#: ../camel/providers/pop3/camel-pop3-folder.c:382
-#: ../camel/providers/pop3/camel-pop3-folder.c:584
-#: ../camel/providers/pop3/camel-pop3-folder.c:645
-#: ../camel/providers/pop3/camel-pop3-folder.c:652
-#: ../camel/providers/pop3/camel-pop3-folder.c:663
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "Cannot get message %s: "
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:166
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:174
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2522
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2645
+#, c-format
msgid "This message is not available in offline mode."
msgstr "This message is not available in offline mode."
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2024
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2075
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#, c-format
msgid "Could not get message"
msgstr "Could not get message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:990
-#: ../camel/providers/imap/camel-imap-folder.c:274
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
+#: ../camel/providers/imap/camel-imap-folder.c:376
#, c-format
msgid "Could not load summary for %s"
msgstr "Could not load summary for %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1063
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
#, c-format
msgid "Checking for deleted messages %s"
msgstr "Checking for deleted messages %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1338
-msgid "Trash Folder Full. Please Empty."
-msgstr "Wastebasket Folder Full. Please Empty."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1572
-#: ../camel/providers/groupwise/camel-groupwise-store.c:626
-#: ../camel/providers/groupwise/camel-groupwise-store.c:756
-#: ../camel/providers/imap/camel-imap-folder.c:3409
-#: ../camel/providers/imap/camel-imap-folder.c:3485
-#: ../camel/providers/imapx/camel-imapx-server.c:2971
-#: ../camel/providers/imapx/camel-imapx-server.c:3057
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3814
+#: ../camel/providers/imap/camel-imap-folder.c:3892
+#: ../camel/providers/imapx/camel-imapx-server.c:3712
+#: ../camel/providers/imapx/camel-imapx-server.c:3836
#, c-format
msgid "Fetching summary information for new messages in %s"
msgstr "Fetching summary information for new messages in %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2376
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2419
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr "Cannot append message to folder '%s': %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2407
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
#, c-format
msgid "Cannot create message: %s"
msgstr "Cannot create message: %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:275
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
#, c-format
msgid "Cannot get folder container %s"
msgstr "Cannot get folder container %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:337
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
msgid "Cannot append message in offline mode: cache unavailable"
msgstr "Cannot append message in offline mode: cache unavailable"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:353
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Cannot append message in offline mode: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "Cannot append message in offline mode: "
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:49
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
msgid "Checking for new mail"
msgstr "Checking for new mail"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:51
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
msgid "C_heck for new messages in all folders"
msgstr "C_heck for new messages in all folders"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:71
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
#: ../camel/providers/local/camel-local-provider.c:42
#: ../camel/providers/local/camel-local-provider.c:82
#: ../camel/providers/local/camel-local-provider.c:102
msgid "Options"
msgstr "Options"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "_Apply filters to new messages in Inbox on this server"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:58
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
msgid "Check new messages for J_unk contents"
msgstr "Check new messages for J_unk contents"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "Only check for Junk messages in the IN_BOX folder"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
msgid "Automatically synchroni_ze account locally"
msgstr "Automatically synchroni_se account locally"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
msgid "SOAP Settings"
msgstr "SOAP Settings"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:70
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
msgid "Post Office Agent SOAP _Port:"
msgstr "Post Office Agent SOAP _Port:"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:82
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:84
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
msgid "For accessing Novell GroupWise servers"
msgstr "For accessing Novell GroupWise servers"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:99
-#: ../camel/providers/imap/camel-imap-provider.c:96
-#: ../camel/providers/imapx/camel-imapx-provider.c:103
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
#: ../camel/providers/nntp/camel-nntp-provider.c:72
#: ../camel/providers/pop3/camel-pop3-provider.c:70
msgid "Password"
msgstr "Password"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:101
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
msgid ""
"This option will connect to the GroupWise server using a plaintext password."
msgstr ""
"This option will connect to the GroupWise server using a plaintext password."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
msgid "Host or user not available in url"
msgstr "Host or user not available in url"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:197
-#: ../camel/providers/imap/camel-imap-store.c:1344
-#: ../camel/providers/imapx/camel-imapx-server.c:2301
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:2966
+#, c-format
msgid "You did not enter a password."
msgstr "You did not enter a password."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:312
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
msgid "Some features may not work correctly with your current server version"
msgstr "Some features may not work correctly with your current server version"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:533
-#: ../camel/providers/imap/camel-imap-store.c:1867
-#: ../camel/providers/imap/camel-imap-store.c:2065
-#: ../camel/providers/imapx/camel-imapx-store.c:316
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imapx/camel-imapx-store.c:410
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
msgid "Cannot create GroupWise folders in offline mode."
msgstr "Cannot create GroupWise folders in offline mode."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
-#: ../camel/providers/imap/camel-imap-store.c:1942
-#: ../camel/providers/imap/camel-imap-store.c:2343
-#: ../camel/providers/imapx/camel-imapx-store.c:751
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Cannot create a special system folder"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2257
+#: ../camel/providers/imapx/camel-imapx-store.c:873
+#, c-format
msgid "The parent folder is not allowed to contain subfolders"
msgstr "The parent folder is not allowed to contain subfolders"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
#, c-format
msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "Cannot rename GroupWise folder '%s' to '%s'"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:111
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise server %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "GroupWise service for %s on %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:113
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "GroupWise mail delivery via %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:155
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
msgid "Sending Message"
msgstr "Sending Message"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:203
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Cannot get folder: Invalid operation on this store"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
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 "
@@ -2753,38 +2974,36 @@ msgstr ""
"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
"of your mail.\n"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:205
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:201
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
#, c-format
msgid "Could not send message: %s"
msgstr "Could not send message: %s"
-#: ../camel/providers/imap/camel-imap-command.c:177
-#: ../camel/providers/imap/camel-imap-command.c:261
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
msgid "No output stream"
msgstr "No output stream"
-#: ../camel/providers/imap/camel-imap-command.c:182
-#: ../camel/providers/imap/camel-imap-command.c:266
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
msgid "No input stream"
msgstr "No input stream"
-#: ../camel/providers/imap/camel-imap-command.c:225
-#: ../camel/providers/imap/camel-imap-command.c:274
-#: ../camel/providers/imap/camel-imap-command.c:488
-#: ../camel/providers/imap/camel-imap-store.c:3114
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
msgid "Operation cancelled"
msgstr "Operation cancelled"
-#: ../camel/providers/imap/camel-imap-command.c:327
-#: ../camel/providers/imap/camel-imap-store.c:3119
+#: ../camel/providers/imap/camel-imap-command.c:353
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Server unexpectedly disconnected: %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:348
+#: ../camel/providers/imap/camel-imap-command.c:373
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -2793,113 +3012,101 @@ msgstr ""
"Alert from IMAP server %s %s:\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:417
+#: ../camel/providers/imap/camel-imap-command.c:444
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "Unexpected response from IMAP server: %s"
-#: ../camel/providers/imap/camel-imap-command.c:427
+#: ../camel/providers/imap/camel-imap-command.c:456
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP command failed: %s"
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
msgid "Server response ended too soon."
msgstr "Server response ended too soon."
-#: ../camel/providers/imap/camel-imap-command.c:708
+#: ../camel/providers/imap/camel-imap-command.c:740
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP server response did not contain %s information"
-#: ../camel/providers/imap/camel-imap-command.c:744
+#: ../camel/providers/imap/camel-imap-command.c:778
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "Unexpected OK response from IMAP server: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:69
+#: ../camel/providers/imap/camel-imap-folder.c:281
msgid "Always check for new mail in this folder"
msgstr "Always check for new mail in this folder"
-#: ../camel/providers/imap/camel-imap-folder.c:255
+#: ../camel/providers/imap/camel-imap-folder.c:353
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Could not create directory %s: %s"
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:897
-#: ../camel/providers/imapx/camel-imapx-server.c:3000
+#: ../camel/providers/imap/camel-imap-folder.c:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3751
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Scanning for changed messages in %s"
-#: ../camel/providers/imap/camel-imap-folder.c:1966
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Unexpected response status '%s' after APPEND command"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1981
-msgid "No response on continuation after APPEND command"
-msgstr "No response on continuation after APPEND command"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2026
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Unknown error occurred during APPEND command!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2857
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+msgid "Unable to retrieve message: "
+msgstr "Unable to retrieve message: "
-#: ../camel/providers/imap/camel-imap-folder.c:2892
-#: ../camel/providers/imapx/camel-imapx-server.c:3981
+#: ../camel/providers/imap/camel-imap-folder.c:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4928
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "Cannot get message with message ID %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2893
-#: ../camel/providers/imapx/camel-imapx-server.c:3982
+#: ../camel/providers/imap/camel-imap-folder.c:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4929
msgid "No such message available."
msgstr "No such message available."
-#: ../camel/providers/imap/camel-imap-folder.c:2954
-#: ../camel/providers/imap/camel-imap-folder.c:3799
-#: ../camel/providers/nntp/camel-nntp-folder.c:222
+#: ../camel/providers/imap/camel-imap-folder.c:3341
+#: ../camel/providers/imap/camel-imap-folder.c:4211
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
msgid "This message is not currently available"
msgstr "This message is not currently available"
-#: ../camel/providers/imap/camel-imap-folder.c:3612
+#: ../camel/providers/imap/camel-imap-folder.c:4021
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "Incomplete server response: no information provided for message %d"
-#: ../camel/providers/imap/camel-imap-folder.c:3620
+#: ../camel/providers/imap/camel-imap-folder.c:4031
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "Incomplete server response: no UID provided for message %d"
-#: ../camel/providers/imap/camel-imap-folder.c:3837
+#: ../camel/providers/imap/camel-imap-folder.c:4251
+#, c-format
msgid "Could not find message body in FETCH response."
msgstr "Could not find message body in FETCH response."
-#: ../camel/providers/imap/camel-imap-message-cache.c:176
-#: ../camel/providers/imap/camel-imap-message-cache.c:239
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Could not open cache directory: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "Could not open cache directory: "
-#: ../camel/providers/imap/camel-imap-message-cache.c:325
-#: ../camel/providers/imap/camel-imap-message-cache.c:382
-#: ../camel/providers/imap/camel-imap-message-cache.c:413
-#: ../camel/providers/imap/camel-imap-message-cache.c:445
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "Failed to cache message %s: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
+msgid "Failed to cache message %s: "
+msgstr "Failed to cache message %s: "
+
#: ../camel/providers/imap/camel-imap-message-cache.c:525
#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
+msgstr "Failed to cache %s: "
#: ../camel/providers/imap/camel-imap-provider.c:40
#: ../camel/providers/imapx/camel-imapx-provider.c:41
@@ -2907,58 +3114,56 @@ msgid "Checking for New Mail"
msgstr "Checking for New Mail"
#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
msgid "Ch_eck for new messages in subscribed folders"
msgstr "Ch_eck for new messages in subscribed folders"
#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
msgid "Connection to Server"
msgstr "Connection to Server"
#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
msgid "_Use custom command to connect to server"
msgstr "_Use custom command to connect to server"
#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
-msgid "Command:"
-msgstr "Command:"
+msgid "Co_mmand:"
+msgstr "Co_mmand:"
#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
#: ../camel/providers/nntp/camel-nntp-provider.c:42
msgid "Folders"
msgstr "Folders"
#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
msgid "_Show only subscribed folders"
msgstr "_Show only subscribed folders"
#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
msgid "O_verride server-supplied folder namespace"
msgstr "O_verride server-supplied folder namespace"
#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
-msgid "Namespace:"
-msgstr "Namespace:"
+msgid "Names_pace:"
+msgstr "Names_pace:"
#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
msgid "_Apply filters to new messages in INBOX on this server"
msgstr "_Apply filters to new messages in INBOX on this server"
#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
msgid "Check new messages for Jun_k contents"
msgstr "Check new messages for Jun_k contents"
#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
msgid "Automatically synchroni_ze remote mail locally"
msgstr "Automatically synchroni_se remote mail locally"
@@ -2967,111 +3172,116 @@ msgid "IMAP"
msgstr "IMAP"
#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
msgid "For reading and storing mail on IMAP servers."
msgstr "For reading and storing mail on IMAP servers."
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"This option will connect to the IMAP server using a plaintext password."
-#: ../camel/providers/imap/camel-imap-store.c:423
-#: ../camel/providers/imapx/camel-imapx-store.c:186
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:220
#, c-format
msgid "IMAP server %s"
msgstr "IMAP server %s"
-#: ../camel/providers/imap/camel-imap-store.c:425
-#: ../camel/providers/imapx/camel-imapx-store.c:188
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:222
#, c-format
msgid "IMAP service for %s on %s"
msgstr "IMAP service for %s on %s"
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/nntp/camel-nntp-store.c:176
-#: ../camel/providers/nntp/camel-nntp-store.c:191
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#: ../camel/providers/pop3/camel-pop3-store.c:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
#, c-format
msgid "Could not connect to %s: %s"
msgstr "Could not connect to %s: %s"
-#: ../camel/providers/imap/camel-imap-store.c:555
-#: ../camel/providers/nntp/camel-nntp-store.c:177
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:247
+#: ../camel/providers/imap/camel-imap-store.c:448
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
msgid "SSL unavailable"
msgstr "SSL unavailable"
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:848
-#: ../camel/providers/imapx/camel-imapx-server.c:2163
-msgid "Connection cancelled"
-msgstr "Connection cancelled"
+#: ../camel/providers/imap/camel-imap-store.c:466
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Could not connect to %s: "
-#: ../camel/providers/imap/camel-imap-store.c:677
-#: ../camel/providers/imap/camel-imap-store.c:696
-#: ../camel/providers/imap/camel-imap-store.c:702
-#: ../camel/providers/imap/camel-imap-store.c:728
-#: ../camel/providers/imapx/camel-imapx-server.c:2208
-#: ../camel/providers/imapx/camel-imapx-server.c:2230
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/imapx/camel-imapx-server.c:2819
+#: ../camel/providers/imapx/camel-imapx-server.c:2855
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Failed to connect to IMAP server %s in secure mode: %s"
-#: ../camel/providers/imap/camel-imap-store.c:678
-#: ../camel/providers/imapx/camel-imapx-server.c:2209
-#: ../camel/providers/smtp/camel-smtp-transport.c:319
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2820
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
msgid "STARTTLS not supported"
msgstr "STARTTLS not supported"
-#: ../camel/providers/imap/camel-imap-store.c:697
-#: ../camel/providers/imapx/camel-imapx-server.c:2231
+#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imapx/camel-imapx-server.c:2856
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: ../camel/providers/imap/camel-imap-store.c:703
-#: ../camel/providers/smtp/camel-smtp-transport.c:358
+#: ../camel/providers/imap/camel-imap-store.c:600
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
msgid "SSL is not available in this build"
msgstr "SSL is not available in this build"
-#: ../camel/providers/imap/camel-imap-store.c:851
+#: ../camel/providers/imap/camel-imap-store.c:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2656
+#, c-format
+msgid "Connection cancelled"
+msgstr "Connection cancelled"
+
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2661
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not connect with command \"%s\": %s"
#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1039
-#: ../camel/providers/imap/camel-imap-store.c:2439
-#: ../camel/providers/imapx/camel-imapx-store.c:368
-#: ../camel/providers/imapx/camel-imapx-store.c:920
-#: ../camel/providers/local/camel-maildir-folder.c:76
-#: ../camel/providers/local/camel-maildir-store.c:214
-#: ../camel/providers/local/camel-maildir-store.c:286
-#: ../camel/providers/local/camel-maildir-store.c:512
-#: ../camel/providers/local/camel-maildir-store.c:525
-#: ../camel/providers/local/camel-spool-store.c:455
+#: ../camel/providers/imap/camel-imap-store.c:926
+#: ../camel/providers/imap/camel-imap-store.c:2350
+#: ../camel/providers/imapx/camel-imapx-store.c:457
+#: ../camel/providers/imapx/camel-imapx-store.c:1054
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
msgid "Inbox"
msgstr "Inbox"
-#: ../camel/providers/imap/camel-imap-store.c:1291
+#: ../camel/providers/imap/camel-imap-store.c:1129
+#: ../camel/providers/imapx/camel-imapx-server.c:2922
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP server %s does not support requested authentication type %s"
-#: ../camel/providers/imap/camel-imap-store.c:1301
-#: ../camel/providers/smtp/camel-smtp-transport.c:493
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:2934
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: ../camel/providers/imap/camel-imap-store.c:1375
-#: ../camel/providers/imapx/camel-imapx-server.c:2329
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:3004
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3082,96 +3292,136 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2281
-#: ../camel/providers/imapx/camel-imapx-store.c:736
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
+#: ../camel/providers/imapx/camel-imapx-store.c:852
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
msgstr ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
-#: ../camel/providers/imap/camel-imap-store.c:1996
-#: ../camel/providers/local/camel-maildir-store.c:187
-#: ../camel/providers/local/camel-mbox-store.c:196
-#: ../camel/providers/local/camel-mh-store.c:243
+#: ../camel/providers/imap/camel-imap-store.c:1887
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
#, c-format
msgid "Cannot create folder '%s': folder exists."
msgstr "Cannot create folder '%s': folder exists."
-#: ../camel/providers/imap/camel-imap-store.c:2292
-#: ../camel/providers/imapx/camel-imapx-store.c:744
+#: ../camel/providers/imap/camel-imap-store.c:2206
+#: ../camel/providers/imapx/camel-imapx-store.c:863
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
-#: ../camel/providers/imap/camel-imap-store.c:3116
+#: ../camel/providers/imap/camel-imap-store.c:3062
+#, c-format
msgid "Server unexpectedly disconnected"
msgstr "Server unexpectedly disconnected"
-#: ../camel/providers/imapx/camel-imapx-folder.c:73
+#: ../camel/providers/imap/camel-imap-store.c:3065
+msgid "Server unexpectedly disconnected: "
+msgstr "Server unexpectedly disconnected: "
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
#, c-format
msgid "Could not create folder summary for %s"
msgstr "Could not create folder summary for %s"
-#: ../camel/providers/imapx/camel-imapx-folder.c:81
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
#, c-format
-msgid "Could not create cache for %s"
-msgstr "Could not create cache for %s"
+msgid "Could not create cache for %s: "
+msgstr "Could not create cache for %s: "
#: ../camel/providers/imapx/camel-imapx-provider.c:43
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Use _Quick Resync if the server supports it"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
msgid "Use I_dle if the server supports it"
msgstr "Use I_dle if the server supports it"
#: ../camel/providers/imapx/camel-imapx-provider.c:57
+msgid "Command:"
+msgstr "Command:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
msgid "Numbe_r of cached connections to use"
msgstr "Numbe_r of cached connections to use"
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Namespace:"
+msgstr "Namespace:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapx/camel-imapx-server.c:2166
+#: ../camel/providers/imapx/camel-imapx-server.c:1365
+msgid "Error writing to cache stream: "
+msgstr "Error writing to cache stream: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2013
#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Could not connect to %s (port %s): %s"
+msgid "Not authenticated"
+msgstr "Not authenticated"
-#: ../camel/providers/local/camel-local-folder.c:171
-msgid "Index message body data"
-msgstr "Index message body data"
+#: ../camel/providers/imapx/camel-imapx-server.c:2747
+#, c-format
+msgid "Could not connect to %s (port %s): "
+msgstr "Could not connect to %s (port %s): "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3176
+msgid "Closing tmp stream failed: "
+msgstr "Closing tmp stream failed: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5052
+#, c-format
+msgid "Cannot create spool file: %s"
+msgstr "Cannot create spool file: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5067
+msgid "Cannot create spool file: "
+msgstr "Cannot create spool file: "
+
+#: ../camel/providers/imapx/camel-imapx-store.c:426
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
+#, c-format
+msgid "No such folder: %s"
+msgstr "No such folder: %s"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:71
+#, c-format
+msgid "Source stream returned no data"
+msgstr "Source stream returned no data"
-#. Translators: This is used for a folder description, for folders being under $HOME.
-#. The first %s is replaced with a relative path under $HOME,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#: ../camel/providers/local/camel-local-folder.c:390
+#: ../camel/providers/imapx/camel-imapx-stream.c:80
+#, c-format
+msgid "Source stream unavailable"
+msgstr "Source stream unavailable"
+
+#: ../camel/providers/local/camel-local-folder.c:199
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#. Translators: This is used for a folder description, for folders being under /var/spool/mail.
-#. The first %s is replaced with a relative path under /var/spool/mail,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#. Translators: This is used for a folder description, for folders being under /var/mail.
-#. The first %s is replaced with a relative path under /var/mail,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
#, c-format
msgid "mailbox: %s (%s)"
msgstr "mailbox: %s (%s)"
-#. Translators: This is used for a folder description.
-#. The first %s is replaced with a folder's full path,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#: ../camel/providers/local/camel-local-folder.c:408
+#: ../camel/providers/local/camel-local-folder.c:227
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#. Translators: The first %s is replaced with a message ID,
-#. the second %s is replaced with the folder path,
-#. the third %s is replaced with a detailed error string
-#: ../camel/providers/local/camel-local-folder.c:664
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
+msgstr "Index message body data"
+
+#: ../camel/providers/local/camel-local-folder.c:686
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -3238,96 +3488,100 @@ msgstr ""
msgid "Standard Unix mbox spool directory"
msgstr "Standard Unix mbox spool directory"
-#: ../camel/providers/local/camel-local-store.c:156
-#: ../camel/providers/local/camel-local-store.c:267
-#: ../camel/providers/local/camel-mbox-store.c:351
-#: ../camel/providers/local/camel-spool-store.c:120
+#: ../camel/providers/local/camel-local-store.c:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "Store root %s is not an absolute path"
-#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:158
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "Store root %s is not a regular directory"
-#: ../camel/providers/local/camel-local-store.c:172
-#: ../camel/providers/local/camel-local-store.c:180
-#: ../camel/providers/local/camel-local-store.c:278
+#: ../camel/providers/local/camel-local-store.c:169
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:297
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Cannot get folder: %s: %s"
-#: ../camel/providers/local/camel-local-store.c:192
+#: ../camel/providers/local/camel-local-store.c:193
+#, c-format
msgid "Local stores do not have an inbox"
msgstr "Local stores do not have an inbox"
-#: ../camel/providers/local/camel-local-store.c:238
+#: ../camel/providers/local/camel-local-store.c:250
#, c-format
msgid "Local mail file %s"
msgstr "Local mail file %s"
-#: ../camel/providers/local/camel-local-store.c:333
+#: ../camel/providers/local/camel-local-store.c:358
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "Could not rename folder %s to %s: %s"
-#: ../camel/providers/local/camel-local-store.c:401
+#: ../camel/providers/local/camel-local-store.c:431
#, c-format
msgid "Could not rename '%s': %s"
msgstr "Could not rename '%s': %s"
-#: ../camel/providers/local/camel-local-store.c:426
-#: ../camel/providers/local/camel-mbox-store.c:292
+#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-mbox-store.c:304
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "Could not delete folder index file '%s': %s"
-#: ../camel/providers/local/camel-local-store.c:449
-#: ../camel/providers/local/camel-mbox-store.c:316
+#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-mbox-store.c:333
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "Could not delete folder meta file '%s': %s"
-#: ../camel/providers/local/camel-local-summary.c:509
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
msgid "Unable to add message to summary: unknown reason"
msgstr "Unable to add message to summary: unknown reason"
-#: ../camel/providers/local/camel-maildir-folder.c:225
-msgid "Maildir append message canceled"
-msgstr "Maildir append message cancelled"
-
-#: ../camel/providers/local/camel-maildir-folder.c:228
+#: ../camel/providers/local/camel-maildir-folder.c:195
#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Cannot append message to maildir folder: %s: "
-#: ../camel/providers/local/camel-maildir-folder.c:306
-msgid "Invalid message contents"
-msgstr "Invalid message contents"
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Cannot get message %s from folder %s: "
-#: ../camel/providers/local/camel-maildir-folder.c:408
-msgid "Cannot transfer message to destination folder"
-msgstr "Cannot transfer message to destination folder"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Cannot transfer message to destination folder: %s"
-#: ../camel/providers/local/camel-maildir-store.c:143
-#: ../camel/providers/local/camel-maildir-store.c:168
-#: ../camel/providers/local/camel-mbox-store.c:168
-#: ../camel/providers/local/camel-mbox-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "Cannot create folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:156
-#: ../camel/providers/local/camel-mbox-store.c:139
-#: ../camel/providers/local/camel-mh-store.c:211
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "Cannot get folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:160
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:218
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
+#: ../camel/providers/local/camel-mh-store.c:224
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "Cannot get folder '%s': folder does not exist."
@@ -3337,88 +3591,80 @@ msgstr "Cannot get folder '%s': folder does not exist."
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "Cannot get folder '%s': not a maildir directory."
-#: ../camel/providers/local/camel-maildir-store.c:229
-#: ../camel/providers/local/camel-maildir-store.c:267
-#: ../camel/providers/local/camel-mh-store.c:267
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "Could not delete folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:231
+#: ../camel/providers/local/camel-maildir-store.c:244
msgid "not a maildir directory"
msgstr "not a maildir directory"
-#: ../camel/providers/local/camel-maildir-store.c:435
-#: ../camel/providers/local/camel-spool-store.c:322
-#: ../camel/providers/local/camel-spool-store.c:336
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "Could not scan folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-summary.c:423
-#: ../camel/providers/local/camel-maildir-summary.c:542
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "Cannot open maildir directory path: %s: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:535
+#: ../camel/providers/local/camel-maildir-summary.c:549
msgid "Checking folder consistency"
msgstr "Checking folder consistency"
-#: ../camel/providers/local/camel-maildir-summary.c:628
+#: ../camel/providers/local/camel-maildir-summary.c:641
msgid "Checking for new messages"
msgstr "Checking for new messages"
-#: ../camel/providers/local/camel-maildir-summary.c:715
-#: ../camel/providers/local/camel-mbox-summary.c:517
-#: ../camel/providers/local/camel-mbox-summary.c:713
-#: ../camel/providers/local/camel-mbox-summary.c:833
-#: ../camel/providers/local/camel-spool-summary.c:144
+#: ../camel/providers/local/camel-maildir-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
+#: ../camel/providers/local/camel-spool-summary.c:130
msgid "Storing folder"
msgstr "Storing folder"
-#: ../camel/providers/local/camel-mbox-folder.c:155
-#: ../camel/providers/local/camel-spool-folder.c:139
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "Cannot create folder lock on %s: %s"
-#: ../camel/providers/local/camel-mbox-folder.c:219
+#: ../camel/providers/local/camel-mbox-folder.c:194
#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Cannot open mailbox: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:285
-msgid "Mail append canceled"
-msgstr "Mail append cancelled"
+msgid "Cannot open mailbox: %s: "
+msgstr "Cannot open mailbox: %s: "
-#: ../camel/providers/local/camel-mbox-folder.c:288
+#: ../camel/providers/local/camel-mbox-folder.c:260
#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Cannot append message to mbox file: %s: "
-#: ../camel/providers/local/camel-mbox-folder.c:454
+#: ../camel/providers/local/camel-mbox-folder.c:433
msgid "The folder appears to be irrecoverably corrupted."
msgstr "The folder appears to be irrecoverably corrupted."
-#: ../camel/providers/local/camel-mbox-folder.c:461
-#: ../camel/providers/local/camel-mh-folder.c:238
-msgid "Message construction failed."
-msgstr "Message construction failed."
-
-#: ../camel/providers/local/camel-mbox-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
msgid "Cannot create a folder by this name."
msgstr "Cannot create a folder by this name."
-#: ../camel/providers/local/camel-mbox-store.c:190
+#: ../camel/providers/local/camel-mbox-store.c:186
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "Cannot get folder '%s': not a regular file."
-#: ../camel/providers/local/camel-mbox-store.c:220
+#: ../camel/providers/local/camel-mbox-store.c:218
#: ../camel/providers/local/camel-mbox-store.c:231
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:260
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3427,164 +3673,170 @@ msgstr ""
"Could not delete folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:239
+#: ../camel/providers/local/camel-mbox-store.c:241
#, c-format
msgid "'%s' is not a regular file."
msgstr "'%s' is not a regular file."
-#: ../camel/providers/local/camel-mbox-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:250
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "Folder '%s' is not empty. Not deleted."
-#: ../camel/providers/local/camel-mbox-store.c:268
-#: ../camel/providers/local/camel-mbox-store.c:280
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:290
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "Could not delete folder summary file '%s': %s"
-#: ../camel/providers/local/camel-mbox-store.c:370
+#: ../camel/providers/local/camel-mbox-store.c:395
#, c-format
msgid "Cannot create directory '%s': %s."
msgstr "Cannot create directory '%s': %s."
-#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:411
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Cannot create folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:386
+#: ../camel/providers/local/camel-mbox-store.c:413
msgid "Folder already exists"
msgstr "Folder already exists"
-#: ../camel/providers/local/camel-mbox-store.c:477
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
msgid "The new folder name is illegal."
msgstr "The new folder name is illegal."
-#: ../camel/providers/local/camel-mbox-store.c:490
+#: ../camel/providers/local/camel-mbox-store.c:522
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "Could not rename '%s': '%s': %s"
-#: ../camel/providers/local/camel-mbox-store.c:571
+#: ../camel/providers/local/camel-mbox-store.c:605
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Could not rename '%s' to %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:523
+#: ../camel/providers/local/camel-mbox-summary.c:473
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "Could not open folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:573
+#: ../camel/providers/local/camel-mbox-summary.c:533
#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "Fatal mail parser error near position %s in folder %s"
-#: ../camel/providers/local/camel-mbox-summary.c:650
+#: ../camel/providers/local/camel-mbox-summary.c:615
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "Cannot check folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:718
-#: ../camel/providers/local/camel-mbox-summary.c:838
-#: ../camel/providers/local/camel-spool-summary.c:149
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-spool-summary.c:137
#, c-format
msgid "Could not open file: %s: %s"
msgstr "Could not open file: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:730
-#: ../camel/providers/local/camel-spool-summary.c:162
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-spool-summary.c:152
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "Cannot open temporary mailbox: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:743
-#: ../camel/providers/local/camel-mbox-summary.c:948
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:932
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Could not close source folder %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:752
+#: ../camel/providers/local/camel-mbox-summary.c:726
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "Could not close temporary folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:767
+#: ../camel/providers/local/camel-mbox-summary.c:743
#, c-format
msgid "Could not rename folder: %s"
msgstr "Could not rename folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:849
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1070
#, c-format
msgid "Could not store folder: %s"
msgstr "Could not store folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:888
-#: ../camel/providers/local/camel-mbox-summary.c:896
-#: ../camel/providers/local/camel-mbox-summary.c:1105
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1102
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:878
+#: ../camel/providers/local/camel-mbox-summary.c:1111
+#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "Summary and folder mismatch, even after a sync"
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:328
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:337
#, c-format
msgid "Unknown error: %s"
msgstr "Unknown error: %s"
#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1211
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "Writing to temporary mailbox failed: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1200
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "Writing to temporary mailbox failed: %s: %s"
-#: ../camel/providers/local/camel-mh-folder.c:176
-msgid "MH append message canceled"
-msgstr "MH append message cancelled"
-
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../camel/providers/local/camel-mh-folder.c:165
#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Cannot append message to mh folder: %s: "
-#: ../camel/providers/local/camel-mh-store.c:226
+#: ../camel/providers/local/camel-mh-store.c:234
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "Could not create folder '%s': %s"
-#: ../camel/providers/local/camel-mh-store.c:238
+#: ../camel/providers/local/camel-mh-store.c:248
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "Cannot get folder '%s': not a directory."
-#: ../camel/providers/local/camel-mh-summary.c:237
+#: ../camel/providers/local/camel-mh-summary.c:228
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "Cannot open MH directory path: %s: %s"
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-spool-store.c:118
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "Spool '%s' cannot be opened: %s"
-#: ../camel/providers/local/camel-spool-store.c:138
+#: ../camel/providers/local/camel-spool-store.c:132
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "Spool '%s' is not a regular file or directory"
-#: ../camel/providers/local/camel-spool-store.c:157
+#: ../camel/providers/local/camel-spool-store.c:158
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "Folder '%s/%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:167
+#: ../camel/providers/local/camel-spool-store.c:170
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3593,12 +3845,12 @@ msgstr ""
"Could not open folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:171
+#: ../camel/providers/local/camel-spool-store.c:176
#, c-format
msgid "Folder '%s' does not exist."
msgstr "Folder '%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:183
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -3607,48 +3859,51 @@ msgstr ""
"Could not create folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:193
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "'%s' is not a mailbox file."
-#: ../camel/providers/local/camel-spool-store.c:201
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
msgid "Store does not support an INBOX"
msgstr "Store does not support an INBOX"
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:226
#, c-format
msgid "Spool mail file %s"
msgstr "Spool mail file %s"
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:226
#, c-format
msgid "Spool folder tree %s"
msgstr "Spool folder tree %s"
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
msgid "Spool folders cannot be renamed"
msgstr "Spool folders cannot be renamed"
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
msgid "Spool folders cannot be deleted"
msgstr "Spool folders cannot be deleted"
-#: ../camel/providers/local/camel-spool-summary.c:174
-#: ../camel/providers/local/camel-spool-summary.c:184
-#: ../camel/providers/local/camel-spool-summary.c:194
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
+#: ../camel/providers/local/camel-spool-summary.c:190
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr "Could not synchronise temporary folder %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:210
+#: ../camel/providers/local/camel-spool-summary.c:208
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "Could not synchronise spool folder %s: %s"
#: ../camel/providers/local/camel-spool-summary.c:240
-#: ../camel/providers/local/camel-spool-summary.c:257
-#: ../camel/providers/local/camel-spool-summary.c:268
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
@@ -3657,34 +3912,41 @@ msgstr ""
"Could not synchronise spool folder %s: %s\n"
"Folder may be corrupt; copy saved in '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:121
-#: ../camel/providers/nntp/camel-nntp-folder.c:178
-#: ../camel/providers/nntp/camel-nntp-folder.c:210
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "Internal error: UID in invalid format: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:159
#: ../camel/providers/nntp/camel-nntp-folder.c:234
-#: ../camel/providers/nntp/camel-nntp-folder.c:395
-#: ../camel/providers/nntp/camel-nntp-store.c:1309
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "User cancelled the operation"
-msgstr "User cancelled the operation"
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Cannot get message %s: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:351
-#: ../camel/providers/nntp/camel-nntp-folder.c:354
-#: ../camel/providers/nntp/camel-nntp-folder.c:397
-#: ../camel/providers/nntp/camel-nntp-folder.c:399
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
#, c-format
msgid "Posting failed: %s"
msgstr "Posting failed: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:417
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "Posting failed: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
msgid "You cannot post NNTP messages while working offline!"
msgstr "You cannot post NNTP messages while working offline!"
-#: ../camel/providers/nntp/camel-nntp-folder.c:428
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "You cannot copy messages from a NNTP folder!"
@@ -3714,29 +3976,22 @@ msgstr ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
-#: ../camel/providers/nntp/camel-nntp-store.c:188
-#: ../camel/providers/nntp/camel-nntp-store.c:207
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:258
-msgid "Connection canceled"
-msgstr "Connection cancelled"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:210
+#: ../camel/providers/nntp/camel-nntp-store.c:265
#, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Could not read greeting from %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Could not read greeting from %s: "
-#: ../camel/providers/nntp/camel-nntp-store.c:222
+#: ../camel/providers/nntp/camel-nntp-store.c:278
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP server %s returned error code %d: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:404
+#: ../camel/providers/nntp/camel-nntp-store.c:434
#, c-format
msgid "USENET News via %s"
msgstr "USENET News via %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:813
+#: ../camel/providers/nntp/camel-nntp-store.c:927
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -3747,7 +4002,8 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:907
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
@@ -3757,7 +4013,8 @@ msgstr ""
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
-#: ../camel/providers/nntp/camel-nntp-store.c:939
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
@@ -3767,93 +4024,92 @@ msgstr ""
"\n"
"newsgroup does not exist!"
-#: ../camel/providers/nntp/camel-nntp-store.c:964
+#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "You cannot create a folder in a News store: subscribe instead."
-#: ../camel/providers/nntp/camel-nntp-store.c:972
+#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "You cannot rename a folder in a News store."
-#: ../camel/providers/nntp/camel-nntp-store.c:980
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "You cannot remove a folder in a News store: unsubscribe instead."
-#: ../camel/providers/nntp/camel-nntp-store.c:1174
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
msgid "Authentication requested but no username provided"
msgstr "Authentication requested but no username provided"
-#: ../camel/providers/nntp/camel-nntp-store.c:1186
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
#, c-format
msgid "Cannot authenticate to server: %s"
msgstr "Cannot authenticate to server: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1311
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
+msgid "NNTP Command failed: "
+msgstr "NNTP Command failed: "
-#: ../camel/providers/nntp/camel-nntp-store.c:1365
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#, c-format
msgid "Not connected."
msgstr "Not connected."
-#: ../camel/providers/nntp/camel-nntp-store.c:1418
-#, c-format
-msgid "No such folder: %s"
-msgstr "No such folder: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:263
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Scanning new messages"
-#: ../camel/providers/nntp/camel-nntp-summary.c:273
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "Unexpected server response from xover: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "Unexpected server response from head: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
#, c-format
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:247
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
msgid "Retrieving POP summary"
msgstr "Retrieving POP summary"
-#: ../camel/providers/pop3/camel-pop3-folder.c:265
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "Cannot get POP summary: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:308
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
msgid "Expunging old messages"
msgstr "Expunging old messages"
-#: ../camel/providers/pop3/camel-pop3-folder.c:316
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
msgid "Expunging deleted messages"
msgstr "Expunging deleted messages"
-#: ../camel/providers/pop3/camel-pop3-folder.c:533
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
#, c-format
msgid "No message with UID %s"
msgstr "No message with 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:562
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
#, c-format
msgid "Retrieving POP message %d"
msgstr "Retrieving POP message %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:652
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
msgid "Unknown reason"
msgstr "Unknown reason"
@@ -3901,47 +4157,42 @@ msgstr ""
"claim to support it."
#. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:156
+#: ../camel/providers/pop3/camel-pop3-store.c:98
msgid ": "
msgstr ": "
-#: ../camel/providers/pop3/camel-pop3-store.c:219
+#: ../camel/providers/pop3/camel-pop3-store.c:168
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "Failed to read a valid greeting from POP server %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:236
-#: ../camel/providers/pop3/camel-pop3-store.c:265
-#: ../camel/providers/pop3/camel-pop3-store.c:271
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../camel/providers/pop3/camel-pop3-store.c:224
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "Failed to connect to POP server %s in secure mode: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:237
+#: ../camel/providers/pop3/camel-pop3-store.c:187
msgid "STLS not supported by server"
msgstr "STLS not supported by server"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:253
+#: ../camel/providers/pop3/camel-pop3-store.c:205
#, c-format
msgid "Failed to connect to POP server %s in secure mode%s"
msgstr "Failed to connect to POP server %s in secure mode%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:266
+#: ../camel/providers/pop3/camel-pop3-store.c:218
msgid "TLS negotiations failed"
msgstr "TLS negotiations failed"
-#: ../camel/providers/pop3/camel-pop3-store.c:272
+#: ../camel/providers/pop3/camel-pop3-store.c:225
msgid "TLS is not available in this build"
msgstr "TLS is not available in this build"
-#: ../camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Could not connect to POP server %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:419
-#: ../camel/providers/pop3/camel-pop3-store.c:557
+#: ../camel/providers/pop3/camel-pop3-store.c:300
+#: ../camel/providers/pop3/camel-pop3-store.c:452
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -3951,22 +4202,22 @@ msgstr ""
"mechanism."
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:438
+#: ../camel/providers/pop3/camel-pop3-store.c:323
#, c-format
msgid "SASL '%s' Login failed for POP server %s%s"
msgstr "SASL '%s' Login failed for POP server %s%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:452
+#: ../camel/providers/pop3/camel-pop3-store.c:340
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "Cannot login to POP server %s: SASL Protocol error"
-#: ../camel/providers/pop3/camel-pop3-store.c:471
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Failed to authenticate on POP server %s: "
-#: ../camel/providers/pop3/camel-pop3-store.c:530
+#: ../camel/providers/pop3/camel-pop3-store.c:421
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -3975,7 +4226,7 @@ msgstr ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
"attack suspected. Please contact your admin."
-#: ../camel/providers/pop3/camel-pop3-store.c:571
+#: ../camel/providers/pop3/camel-pop3-store.c:471
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -3985,7 +4236,7 @@ msgstr ""
"Error sending password: %s"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:581
+#: ../camel/providers/pop3/camel-pop3-store.c:484
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -3995,7 +4246,7 @@ msgstr ""
"Error sending username%s"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:591
+#: ../camel/providers/pop3/camel-pop3-store.c:497
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4004,11 +4255,31 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:697
+#: ../camel/providers/pop3/camel-pop3-store.c:653
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Could not connect to POP server %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:666
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 server %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "POP3 server for %s on %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:685
#, c-format
msgid "No such folder '%s'."
msgstr "No such folder '%s'."
+#: ../camel/providers/pop3/camel-pop3-store.c:709
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 stores have no folder hierarchy"
+
#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
msgid "Sendmail"
msgstr "Sendmail"
@@ -4021,40 +4292,45 @@ msgstr ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:107
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
msgid "Could not parse recipient list"
msgstr "Could not parse recipient list"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "Could not create pipe to sendmail: %s: mail not sent"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:159
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "Could not fork sendmail: %s: mail not sent"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "Could not send message: "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail exited with signal %s: mail not sent."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:236
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "Could not execute %s: mail not sent."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:241
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail exited with status %d: mail not sent."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
msgid "sendmail"
msgstr "sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:257
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
msgid "Mail delivery via the sendmail program"
msgstr "Mail delivery via the sendmail program"
@@ -4066,128 +4342,126 @@ msgstr "SMTP"
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "For delivering mail by connecting to a remote mailhub using SMTP."
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
msgid "Syntax error, command unrecognized"
msgstr "Syntax error, command unrecognised"
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
msgid "Syntax error in parameters or arguments"
msgstr "Syntax error in parameters or arguments"
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
msgid "Command not implemented"
msgstr "Command not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
msgid "Command parameter not implemented"
msgstr "Command parameter not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
msgid "System status, or system help reply"
msgstr "System status, or system help reply"
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
msgid "Help message"
msgstr "Help message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
msgid "Service ready"
msgstr "Service ready"
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
msgid "Service closing transmission channel"
msgstr "Service closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
msgid "Service not available, closing transmission channel"
msgstr "Service not available, closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
msgid "Requested mail action okay, completed"
msgstr "Requested mail action okay, completed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
msgid "User not local; will forward to <forward-path>"
msgstr "User not local; will forward to <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Requested mail action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
msgid "Requested action not taken: mailbox unavailable"
msgstr "Requested action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
msgid "Requested action aborted: error in processing"
msgstr "Requested action aborted: error in processing"
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
msgid "User not local; please try <forward-path>"
msgstr "User not local; please try <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
msgid "Requested action not taken: insufficient system storage"
msgstr "Requested action not taken: insufficient system storage"
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Requested mail action aborted: exceeded storage allocation"
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
msgid "Requested action not taken: mailbox name not allowed"
msgstr "Requested action not taken: mailbox name not allowed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Start mail input; end with <CRLF>.<CRLF>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
msgid "Transaction failed"
msgstr "Transaction failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
msgid "A password transition is needed"
msgstr "A password transition is needed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
msgid "Authentication mechanism is too weak"
msgstr "Authentication mechanism is too weak"
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
msgid "Encryption required for requested authentication mechanism"
msgstr "Encryption required for requested authentication mechanism"
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
msgid "Temporary authentication failure"
msgstr "Temporary authentication failure"
-#: ../camel/providers/smtp/camel-smtp-transport.c:283
-msgid "Welcome response error"
-msgstr "Welcome response error"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "Welcome response error: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:318
-#: ../camel/providers/smtp/camel-smtp-transport.c:351
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr "Failed to connect to SMTP server %s in secure mode: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:327
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS command failed: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:342
-msgid "STARTTLS command failed"
-msgstr "STARTTLS command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:483
+#: ../camel/providers/smtp/camel-smtp-transport.c:450
#, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP server %s does not support requested authentication type %s."
-#: ../camel/providers/smtp/camel-smtp-transport.c:554
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -4198,202 +4472,182 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:687
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
#, c-format
msgid "SMTP server %s"
msgstr "SMTP server %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:689
+#: ../camel/providers/smtp/camel-smtp-transport.c:666
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "SMTP mail delivery via %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#: ../camel/providers/smtp/camel-smtp-transport.c:686
+#, c-format
msgid "Cannot send message: service not connected."
msgstr "Cannot send message: service not connected."
-#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#: ../camel/providers/smtp/camel-smtp-transport.c:693
+#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "Cannot send message: sender address not valid."
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:697
msgid "Sending message"
msgstr "Sending message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:732
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#, c-format
msgid "Cannot send message: no recipients defined."
msgstr "Cannot send message: no recipients defined."
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#, c-format
msgid "Cannot send message: one or more invalid recipients"
msgstr "Cannot send message: one or more invalid recipients"
-#: ../camel/providers/smtp/camel-smtp-transport.c:972
+#: ../camel/providers/smtp/camel-smtp-transport.c:961
msgid "SMTP Greeting"
msgstr "SMTP Greeting"
-#: ../camel/providers/smtp/camel-smtp-transport.c:997
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO command failed: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1014
-msgid "HELO command failed"
-msgstr "HELO command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1000
+#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+msgid "HELO command failed: "
+msgstr "HELO command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1080
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
msgid "SMTP Authentication"
msgstr "SMTP Authentication"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#, c-format
msgid "Error creating SASL authentication object."
msgstr "Error creating SASL authentication object."
-#: ../camel/providers/smtp/camel-smtp-transport.c:1103
-#: ../camel/providers/smtp/camel-smtp-transport.c:1114
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH command failed: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
-msgid "AUTH command failed"
-msgstr "AUTH command failed"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1190
-msgid "Bad authentication response from server.\n"
-msgstr "Bad authentication response from server.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1217
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM command failed: %s: mail not sent"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1234
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM command failed"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1258
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO command failed: %s: mail not sent"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1277
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> failed"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1317
-#: ../camel/providers/smtp/camel-smtp-transport.c:1386
-#: ../camel/providers/smtp/camel-smtp-transport.c:1405
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA command failed: %s: mail not sent"
-
-#. 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:1334
-#: ../camel/providers/smtp/camel-smtp-transport.c:1421
-msgid "DATA command failed"
-msgstr "DATA command failed"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1444
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET command failed: %s"
-
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+msgid "AUTH command failed: "
+msgstr "AUTH command failed: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1214
+#: ../camel/providers/smtp/camel-smtp-transport.c:1226
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM command failed: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO command failed: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1270
+#: ../camel/providers/smtp/camel-smtp-transport.c:1278
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> failed: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1316
+#: ../camel/providers/smtp/camel-smtp-transport.c:1325
+#: ../camel/providers/smtp/camel-smtp-transport.c:1335
+#: ../camel/providers/smtp/camel-smtp-transport.c:1392
+#: ../camel/providers/smtp/camel-smtp-transport.c:1408
+#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../camel/providers/smtp/camel-smtp-transport.c:1426
+msgid "DATA command failed: "
+msgstr "DATA command failed: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1448
#: ../camel/providers/smtp/camel-smtp-transport.c:1460
-msgid "RSET command failed"
-msgstr "RSET command failed"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1483
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
+msgid "RSET command failed: "
+msgstr "RSET command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-msgid "QUIT command failed"
-msgstr "QUIT command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1489
+#: ../camel/providers/smtp/camel-smtp-transport.c:1502
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+msgid "QUIT command failed: "
+msgstr "QUIT command failed: "
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:46
msgid "Business"
msgstr "Business"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
msgid "Competition"
msgstr "Competition"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
msgid "Favorites"
msgstr "Favourites"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
msgid "Gifts"
msgstr "Gifts"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
msgid "Goals/Objectives"
msgstr "Goals/Objectives"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
msgid "Holiday"
msgstr "Holiday"
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
msgid "Holiday Cards"
msgstr "Holiday Cards"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
msgid "Hot Contacts"
msgstr "Hot Contacts"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:55
msgid "Ideas"
msgstr "Ideas"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
msgid "International"
msgstr "International"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
msgid "Key Customer"
msgstr "Key Customer"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
msgid "Miscellaneous"
msgstr "Miscellaneous"
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
msgid "Personal"
msgstr "Personal"
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
msgid "Phone Calls"
msgstr "Phone Calls"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
msgid "Status"
msgstr "Status"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:63
msgid "Strategies"
msgstr "Strategies"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
msgid "Suppliers"
msgstr "Suppliers"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
msgid "Time & Expenses"
msgstr "Time & Expenses"
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
msgid "Waiting"
msgstr "Waiting"
@@ -4525,11 +4779,13 @@ msgstr "%H%M"
msgid "%I %p"
msgstr "%I %p"
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:668
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:430
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
@@ -4541,7 +4797,7 @@ msgstr "Category Icon"
msgid "_No Image"
msgstr "_No Image"
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:368
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
@@ -4550,11 +4806,11 @@ msgstr ""
"There is already a category '%s' in the configuration. Please use another "
"name"
-#: ../libedataserverui/e-categories-dialog.c:680
+#: ../libedataserverui/e-categories-dialog.c:676
msgid "Icon"
msgstr "Icon"
-#: ../libedataserverui/e-categories-dialog.c:685
+#: ../libedataserverui/e-categories-dialog.c:681
msgid "Category"
msgstr "Category"
@@ -4591,19 +4847,19 @@ msgstr "categories"
msgid "Create category \"%s\""
msgstr "Create category \"%s\""
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:319
msgid "Select Contacts from Address Book"
msgstr "Select Contacts from Address Book"
-#: ../libedataserverui/e-name-selector-dialog.c:587
+#: ../libedataserverui/e-name-selector-dialog.c:658
msgid "_Add"
msgstr "_Add"
-#: ../libedataserverui/e-name-selector-dialog.c:612
+#: ../libedataserverui/e-name-selector-dialog.c:662
msgid "_Remove"
msgstr "_Remove"
-#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.c:890
#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "Any Category"
@@ -4645,30 +4901,30 @@ msgid "_Search:"
msgstr "_Search:"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2511
+#: ../libedataserverui/e-name-selector-entry.c:2626
#, c-format
msgid "E_xpand %s Inline"
msgstr "E_xpand %s Inline"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2526
+#: ../libedataserverui/e-name-selector-entry.c:2641
#, c-format
msgid "Cop_y %s"
msgstr "Cop_y %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2536
+#: ../libedataserverui/e-name-selector-entry.c:2651
#, c-format
msgid "C_ut %s"
msgstr "C_ut %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2553
+#: ../libedataserverui/e-name-selector-entry.c:2668
#, c-format
msgid "_Edit %s"
msgstr "_Edit %s"
-#: ../libedataserverui/e-name-selector-list.c:479
+#: ../libedataserverui/e-name-selector-list.c:517
#, c-format
msgid "_Delete %s"
msgstr "_Delete %s"
@@ -4678,23 +4934,23 @@ msgstr "_Delete %s"
msgid "Keyring key is unusable: no user or host name"
msgstr "Keyring key is unusable: no user or host name"
-#: ../libedataserverui/e-passwords.c:1116
+#: ../libedataserverui/e-passwords.c:1120
msgid "You have the Caps Lock key on."
msgstr "You have the Caps Lock key on."
-#: ../libedataserverui/e-passwords.c:1238
+#: ../libedataserverui/e-passwords.c:1241
msgid "_Remember this passphrase"
msgstr "_Remember this passphrase"
-#: ../libedataserverui/e-passwords.c:1239
+#: ../libedataserverui/e-passwords.c:1242
msgid "_Remember this passphrase for the remainder of this session"
msgstr "_Remember this passphrase for the remainder of this session"
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:1247
msgid "_Remember this password"
msgstr "_Remember this password"
-#: ../libedataserverui/e-passwords.c:1245
+#: ../libedataserverui/e-passwords.c:1248
msgid "_Remember this password for the remainder of this session"
msgstr "_Remember this password for the remainder of this session"
@@ -4723,6 +4979,105 @@ msgstr "No response from the server"
msgid "Bad parameter"
msgstr "Bad parameter"
+#~ msgid "Cannot complete operation"
+#~ msgstr "Cannot complete operation"
+
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "Could not create thread for getting deltas"
+
+#~ msgid "Offline mode unavailable"
+#~ msgstr "Offline mode unavailable"
+
+#~ msgid "Cannot open message"
+#~ msgstr "Cannot open message"
+
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Unsupported operation: append message: for %s"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Unsupported operation: search by expression: for %s"
+
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Unsupported operation: count by expression: for %s"
+
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "Unsupported operation: search by UIDs: for %s"
+
+#~ msgid "Canceled."
+#~ msgstr "Cancelled."
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr "Cannot verify message signature: could not create temp file: %s"
+
+#~ msgid "Unable to parse message content"
+#~ msgstr "Unable to parse message content"
+
+#~ msgid "cannot create thread"
+#~ msgstr "cannot create thread"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "Cannot create folder: Invalid operation on this store"
+
+#~ msgid "User canceled"
+#~ msgstr "User cancelled"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "Wastebasket Folder Full. Please Empty."
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "Unexpected response status '%s' after APPEND command"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "No response on continuation after APPEND command"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "Unknown error occurred during APPEND command!"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Maildir append message cancelled"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "Invalid message contents"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "Mail append cancelled"
+
+#~ msgid "Message construction failed."
+#~ msgstr "Message construction failed."
+
+#~ msgid "MH append message canceled"
+#~ msgstr "MH append message cancelled"
+
+#~ msgid "User cancelled the operation"
+#~ msgstr "User cancelled the operation"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "STARTTLS command failed"
+
+#~ msgid "HELO command failed"
+#~ msgstr "HELO command failed"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "AUTH command failed"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "Bad authentication response from server.\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "MAIL FROM command failed: %s: mail not sent"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "RCPT TO command failed: %s: mail not sent"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "DATA command failed: %s: mail not sent"
+
+#~ msgid "RSET command failed"
+#~ msgstr "RSET command failed"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "QUIT command failed"
+
#~ msgid "Learning junk"
#~ msgstr "Learning junk"
@@ -4738,9 +5093,6 @@ msgstr "Bad parameter"
#~ msgid "export keys: unimplemented"
#~ msgstr "export keys: unimplemented"
-#~ msgid "Namespace"
-#~ msgstr "Namespace"
-
#~ msgid "Hula"
#~ msgstr "Hula"
@@ -4770,9 +5122,6 @@ msgstr "Bad parameter"
#~ msgid "Failed to send command to IMAP server %s: %s"
#~ msgstr "Failed to send command to IMAP server %s: %s"
-#~ msgid "service unavailable"
-#~ msgstr "service unavailable"
-
#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
#~ msgstr "IMAP4 server %s unexpectedly disconnected: %s"
@@ -4885,9 +5234,6 @@ msgstr "Bad parameter"
#~ msgid "Cannot create folder '%s': Bad command"
#~ msgstr "Cannot create folder '%s': Bad command"
-#~ msgid "Cannot delete folder '%s': Special folder"
-#~ msgstr "Cannot delete folder '%s': Special folder"
-
#~ msgid "Cannot delete IMAP folders in offline mode."
#~ msgstr "Cannot delete IMAP folders in offline mode."
@@ -5149,9 +5495,6 @@ msgstr "Bad parameter"
#~ msgid "The specified folder type is not valid"
#~ msgstr "The specified folder type is not valid"
-#~ msgid "I/O error"
-#~ msgstr "I/O error"
-
#~ msgid "Not enough space to create the folder"
#~ msgstr "Not enough space to create the folder"
@@ -5242,9 +5585,6 @@ msgstr "Bad parameter"
#~ msgid "%s: there is no current operation"
#~ msgstr "%s: there is no current operation"
-#~ msgid "%s: could not cancel"
-#~ msgstr "%s: could not cancel"
-
#~ msgid "\"%s\" on book after \"%s\""
#~ msgstr "\"%s\" on book after \"%s\""
@@ -5420,9 +5760,6 @@ msgstr "Bad parameter"
#~ msgid "%sPlease enter the IMAP password for %s on host %s"
#~ msgstr "%sPlease enter the IMAP password for %s on host %s"
-#~ msgid "Error writing to temp mailbox: %s"
-#~ msgstr "Error writing to temp mailbox: %s"
-
#~ msgid "Please enter the NNTP password for %s %s"
#~ msgstr "Please enter the NNTP password for %s %s"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
