[evolution-data-server] Updated British English translation
- From: Bruce Cowan <bcowan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Updated British English translation
- Date: Sun, 13 Mar 2011 16:01:54 +0000 (UTC)
commit 0c7296fc8a64158f33041d282c0b01eaaabf5b49
Author: Bruce Cowan <bruce bcowan me uk>
Date: Sun Mar 13 16:01:43 2011 +0000
Updated British English translation
po/en_GB.po | 2574 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 1369 insertions(+), 1205 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 3f32a1d..f38ff07 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,21 +3,21 @@
# Robert Brady <rwb197 zepler org>, 2000.
# Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
# Philip Withnall <philip tecnocode co uk>, 2009, 2010.
-# Bruce Cowan <bcowan fastmail co uk>, 2010.
+# Bruce Cowan <bruce bcowan me uk>, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-01 09:21+0100\n"
-"PO-Revision-Date: 2010-02-24 16:00+0100\n"
-"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
+"POT-Creation-Date: 2011-03-13 15:56+0000\n"
+"PO-Revision-Date: 2011-03-13 15:59+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me 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"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.5.2\n"
+"X-Generator: Virtaal 0.6.1\n"
#: ../addressbook/backends/file/e-book-backend-file.c:570
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
@@ -29,74 +29,142 @@ msgstr "Loadingâ?¦"
#: ../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:4482
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
msgstr "Searchingâ?¦"
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ?¦"
+msgstr "Querying for updated contactsâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "Personal"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "Friends"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "Family"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "Coworkers"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ?¦"
+msgstr "Querying for updated groupsâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ?¦"
+msgstr "Creating new contactâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
+msgstr "Deleting contactâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contactâ?¦"
+msgstr "Modifying contactâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loadingâ?¦"
+msgstr "Loadingâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the serverâ?¦"
+msgstr "Authenticating with the serverâ?¦"
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "Downloading contacts (%d)â?¦ "
-#: ../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
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr "Updating contacts cache (%d)â?¦ "
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
msgid "Not connected"
msgstr "Not connected"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
msgid "Using Distinguished Name (DN)"
msgstr "Using Distinguished Name (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
msgid "Using Email Address"
msgstr "Using E-mail Address"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
msgid "Reconnecting to LDAP server..."
msgstr "Reconnecting to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
msgid "Invalid DN syntax"
msgstr "Invalid DN syntax"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
msgid "Adding contact to LDAP server..."
msgstr "Adding contact to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
msgid "Removing contact from LDAP server..."
msgstr "Removing contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
msgid "Modifying contact from LDAP server..."
msgstr "Modifying contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
msgid "Receiving LDAP search results..."
msgstr "Receiving LDAP search resultsâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
msgid "Error performing search"
msgstr "Error performing search"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4177
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
#, c-format
-msgid "Create resource '%s' failed with HTTP status: %d"
-msgstr "Create resource '%s' failed with HTTP status: %d"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "Create resource '%s' failed with HTTP status: %d (%s)"
-#: ../addressbook/libebook/e-book.c:2995
+#: ../addressbook/libebook/e-book.c:3160
#, 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."
+#: ../addressbook/libebook/e-book.c:3516
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "Address book does not exist"
+
#. Dummy row as EContactField starts from 1
#: ../addressbook/libebook/e-contact.c:115
msgid "Unique ID"
@@ -283,7 +351,7 @@ msgstr "Weblog URL"
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:667
+#: ../libedataserverui/e-categories-dialog.c:757
msgid "Categories"
msgstr "Categories"
@@ -548,8 +616,7 @@ msgid "Birth Date"
msgstr "Birth Date"
#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:44
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
msgid "Anniversary"
msgstr "Anniversary"
@@ -632,495 +699,517 @@ msgstr "SIP address"
msgid "Unnamed List"
msgstr "Unnamed List"
-#: ../addressbook/libedata-book/e-data-book-factory.c:287
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
#, c-format
msgid "Empty URI"
msgstr "Empty URI"
-#: ../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
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:358
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
#, c-format
msgid "Invalid source"
msgstr "Invalid source"
-#: ../addressbook/libedata-book/e-data-book.c:171
-#: ../calendar/libedata-cal/e-data-cal.c:109
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
msgid "Success"
msgstr "Success"
-#: ../addressbook/libedata-book/e-data-book.c:172
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
msgid "Repository offline"
msgstr "Repository offline"
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libecal/e-cal.c:4065 ../calendar/libedata-cal/e-data-cal.c:111
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
msgid "Permission denied"
msgstr "Permission denied"
-#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../addressbook/libedata-book/e-data-book.c:176
msgid "Contact not found"
msgstr "Contact not found"
-#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../addressbook/libedata-book/e-data-book.c:177
msgid "Contact ID already exists"
msgstr "Contact ID already exists"
-#: ../addressbook/libedata-book/e-data-book.c:176
-#: ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:115
msgid "Authentication Failed"
msgstr "Authentication Failed"
-#: ../addressbook/libedata-book/e-data-book.c:177
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
msgid "Authentication Required"
msgstr "Authentication Required"
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
msgid "Unsupported field"
msgstr "Unsupported field"
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
msgid "Unsupported authentication method"
msgstr "Unsupported authentication method"
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
msgid "TLS not available"
msgstr "TLS not available"
-#: ../addressbook/libedata-book/e-data-book.c:181
-msgid "Address book does not exist"
-msgstr "Address book does not exist"
-
-#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../addressbook/libedata-book/e-data-book.c:184
msgid "Book removed"
msgstr "Book removed"
-#: ../addressbook/libedata-book/e-data-book.c:183
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
msgid "Not available in offline mode"
msgstr "Not available in offline mode"
-#: ../addressbook/libedata-book/e-data-book.c:184
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
msgid "Search size limit exceeded"
msgstr "Search size limit exceeded"
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
msgid "Search time limit exceeded"
msgstr "Search time limit exceeded"
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
msgid "Invalid query"
msgstr "Invalid query"
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
msgid "Query refused"
msgstr "Query refused"
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
msgid "Could not cancel"
msgstr "Could not cancel"
#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
#. { OtherError, N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:130
msgid "Invalid server version"
msgstr "Invalid server version"
-#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../addressbook/libedata-book/e-data-book.c:193
msgid "No space"
msgstr "No space"
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
msgid "Invalid argument"
msgstr "Invalid argument"
-#: ../addressbook/libedata-book/e-data-book.c:193
-#: ../calendar/libecal/e-cal.c:4087 ../calendar/libedata-cal/e-data-cal.c:133
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
msgid "Not supported"
msgstr "Not supported"
-#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:204
#: ../calendar/libedata-cal/e-data-cal.c:141
msgid "Other error"
msgstr "Other error"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../addressbook/libedata-book/e-data-book.c:325
#, 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:344
+#: ../addressbook/libedata-book/e-data-book.c:347
#, 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:361
-#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
#, 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:395
+#: ../addressbook/libedata-book/e-data-book.c:402
#, 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:411
+#: ../addressbook/libedata-book/e-data-book.c:418
#, 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:448
+#: ../addressbook/libedata-book/e-data-book.c:457
#, 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:463
-#: ../addressbook/libedata-book/e-data-book.c:482
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
#, 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:500
-#: ../addressbook/libedata-book/e-data-book.c:519
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
#, 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:558
+#: ../addressbook/libedata-book/e-data-book.c:571
#, 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:595
+#: ../addressbook/libedata-book/e-data-book.c:610
#, 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:610
+#: ../addressbook/libedata-book/e-data-book.c:625
#, 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:625
+#: ../addressbook/libedata-book/e-data-book.c:640
#, c-format
msgid "Cannot get supported authentication 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:651
-#: ../addressbook/libedata-book/e-data-book.c:662
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
#, 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:698
+#: ../addressbook/libedata-book/e-data-book.c:713
#, 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:737
+#: ../addressbook/libedata-book/e-data-book.c:755
#, c-format
msgid "Cancel operation failed: %s"
msgstr "Cancel operation failed: %s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
#, c-format
-msgid "Unexpected HTTP status code %d returned"
-msgstr "Unexpected HTTP status code %d returned"
+msgid "Server is unreachable (%s)"
+msgstr "Server is unreachable (%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "Unexpected HTTP status code %d returned (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
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
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
msgid "Birthday"
msgstr "Birthday"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
#, c-format
msgid "Birthday: %s"
msgstr "Birthday: %s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
#, c-format
msgid "Anniversary: %s"
msgstr "Anniversary: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:239
+#: ../calendar/backends/file/e-cal-backend-file.c:251
msgid "Cannot save calendar data: Malformed URI."
msgstr "Cannot save calendar data: Malformed URI."
-#: ../calendar/backends/file/e-cal-backend-file.c:246
-#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
msgid "Cannot save calendar data"
msgstr "Cannot save calendar data"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
msgid "Reply Requested: by "
msgstr "Reply Requested: by "
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
msgid "Reply Requested: When convenient"
msgstr "Reply Requested: When convenient"
-#: ../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:329
+msgid "Loading Appointment items"
+msgstr "Loading Appointment items"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+msgid "Loading Task items"
+msgstr "Loading Task items"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+msgid "Loading Note items"
+msgstr "Loading Note items"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+msgid "Loading items"
+msgstr "Loading items"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
msgid "Calendar"
msgstr "Calendar"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
msgid "Invalid server URI"
msgstr "Invalid server URI"
-#: ../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
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
msgid "Could not create cache file"
msgstr "Could not create cache file"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
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
+#: ../calendar/backends/http/e-cal-backend-http.c:423
msgid "Redirected to Invalid URI"
msgstr "Redirected to Invalid URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:350
+#: ../calendar/backends/http/e-cal-backend-http.c:456
msgid "Bad file format."
msgstr "Bad file format."
-#: ../calendar/backends/http/e-cal-backend-http.c:357
+#: ../calendar/backends/http/e-cal-backend-http.c:463
msgid "Not a calendar."
msgstr "Not a calendar."
-#: ../calendar/backends/weather/e-cal-backend-weather.c:154
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
msgid "Could not retrieve weather data"
msgstr "Could not retrieve weather data"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
msgid "Weather: Fog"
msgstr "Weather: Fog"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
msgid "Weather: Cloudy Night"
msgstr "Weather: Cloudy Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
msgid "Weather: Cloudy"
msgstr "Weather: Cloudy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
msgid "Weather: Overcast"
msgstr "Weather: Overcast"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
msgid "Weather: Showers"
msgstr "Weather: Showers"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
msgid "Weather: Snow"
msgstr "Weather: Snow"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
msgid "Weather: Clear Night"
msgstr "Weather: Clear Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:260
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
msgid "Weather: Sunny"
msgstr "Weather: Sunny"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:261
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
msgid "Weather: Thunderstorms"
msgstr "Weather: Thunderstorms"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:407
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
msgid "Forecast"
msgstr "Forecast"
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal-component.c:1299
msgid "Untitled appointment"
msgstr "Untitled appointment"
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3986
msgid "1st"
msgstr "1st"
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3987
msgid "2nd"
msgstr "2nd"
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3988
msgid "3rd"
msgstr "3rd"
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3989
msgid "4th"
msgstr "4th"
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3990
msgid "5th"
msgstr "5th"
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3991
msgid "6th"
msgstr "6th"
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3992
msgid "7th"
msgstr "7th"
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3993
msgid "8th"
msgstr "8th"
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3994
msgid "9th"
msgstr "9th"
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3995
msgid "10th"
msgstr "10th"
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3996
msgid "11th"
msgstr "11th"
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3997
msgid "12th"
msgstr "12th"
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3998
msgid "13th"
msgstr "13th"
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3999
msgid "14th"
msgstr "14th"
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:4000
msgid "15th"
msgstr "15th"
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4001
msgid "16th"
msgstr "16th"
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4002
msgid "17th"
msgstr "17th"
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4003
msgid "18th"
msgstr "18th"
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4004
msgid "19th"
msgstr "19th"
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4005
msgid "20th"
msgstr "20th"
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4006
msgid "21st"
msgstr "21st"
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4007
msgid "22nd"
msgstr "22nd"
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4008
msgid "23rd"
msgstr "23rd"
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4009
msgid "24th"
msgstr "24th"
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4010
msgid "25th"
msgstr "25th"
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4011
msgid "26th"
msgstr "26th"
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4012
msgid "27th"
msgstr "27th"
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4013
msgid "28th"
msgstr "28th"
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4014
msgid "29th"
msgstr "29th"
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4015
msgid "30th"
msgstr "30th"
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4016
msgid "31st"
msgstr "31st"
-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
msgid "High"
msgstr "High"
-#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
msgid "Normal"
msgstr "Normal"
-#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
msgid "Low"
msgstr "Low"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:703
msgid "Undefined"
msgstr "Undefined"
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
@@ -1129,91 +1218,82 @@ 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:1241
+#: ../calendar/libecal/e-cal.c:1250
#, 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:4051
+#: ../calendar/libecal/e-cal.c:4145
msgid "Backend is busy"
msgstr "Backend is busy"
-#: ../calendar/libecal/e-cal.c:4053
+#: ../calendar/libecal/e-cal.c:4147
msgid "Repository is offline"
msgstr "Repository is offline"
-#: ../calendar/libecal/e-cal.c:4055
+#: ../calendar/libecal/e-cal.c:4149
msgid "No such calendar"
msgstr "No such calendar"
-#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:112
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Object not found"
msgstr "Object not found"
-#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:113
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "Invalid object"
-#: ../calendar/libecal/e-cal.c:4061
+#: ../calendar/libecal/e-cal.c:4155
msgid "URI not loaded"
msgstr "URI not loaded"
-#: ../calendar/libecal/e-cal.c:4063
+#: ../calendar/libecal/e-cal.c:4157
msgid "URI already loaded"
msgstr "URI already loaded"
-#: ../calendar/libecal/e-cal.c:4067 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "Unknown User"
-#: ../calendar/libecal/e-cal.c:4069 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:114
msgid "Object ID already exists"
msgstr "Object ID already exists"
-#: ../calendar/libecal/e-cal.c:4071
+#: ../calendar/libecal/e-cal.c:4165
msgid "Protocol not supported"
msgstr "Protocol not supported"
-#: ../calendar/libecal/e-cal.c:4073
+#: ../calendar/libecal/e-cal.c:4167
msgid "Operation has been canceled"
msgstr "Operation has been cancelled"
-#: ../calendar/libecal/e-cal.c:4075
+#: ../calendar/libecal/e-cal.c:4169
msgid "Could not cancel operation"
msgstr "Could not cancel operation"
-#: ../calendar/libecal/e-cal.c:4077
-#: ../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
+#: ../calendar/libecal/e-cal.c:4171
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "Authentication failed"
msgstr "Authentication failed"
-#: ../calendar/libecal/e-cal.c:4079
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../calendar/libecal/e-cal.c:4173
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
msgid "Authentication required"
msgstr "Authentication required"
-#: ../calendar/libecal/e-cal.c:4081
+#: ../calendar/libecal/e-cal.c:4175
msgid "A D-Bus exception has occurred"
msgstr "A D-Bus exception has occurred"
-#: ../calendar/libecal/e-cal.c:4083
-#: ../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:4085
+#: ../calendar/libecal/e-cal.c:4179
msgid "No error"
msgstr "No error"
@@ -1312,237 +1392,233 @@ msgstr ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
"be a boolean false (#f)"
-#: ../calendar/libedata-cal/e-data-cal.c:112
+#: ../calendar/libedata-cal/e-data-cal.c:111
msgid "Invalid range"
msgstr "Invalid range"
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libedata-cal/e-data-cal.c:118
msgid "Unsupported method"
msgstr "Unsupported method"
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:121
msgid "Calendar does not exist"
msgstr "Calendar does not exist"
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:122
msgid "Unknown user"
msgstr "Unknown user"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:604
+#: ../calendar/libedata-cal/e-data-cal.c:608
#, c-format
msgid "Cannot retrieve calendar address: %s"
msgstr "Cannot retrieve calendar address: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:624
+#: ../calendar/libedata-cal/e-data-cal.c:633
#, c-format
msgid "Cannot retrieve calendar alarm e-mail address: %s"
msgstr "Cannot retrieve calendar alarm e-mail address: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:644
+#: ../calendar/libedata-cal/e-data-cal.c:658
#, c-format
msgid "Cannot retrieve calendar's LDAP attribute: %s"
msgstr "Cannot retrieve calendar's LDAP attribute: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:664
+#: ../calendar/libedata-cal/e-data-cal.c:683
#, c-format
msgid "Cannot retrieve calendar scheduling information: %s"
msgstr "Cannot retrieve calendar scheduling information: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:683
+#: ../calendar/libedata-cal/e-data-cal.c:707
#, c-format
msgid "Cannot open calendar: %s"
msgstr "Cannot open calendar: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:704
+#: ../calendar/libedata-cal/e-data-cal.c:728
#, c-format
msgid "Cannot refresh calendar: %s"
msgstr "Cannot refresh calendar: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:723
+#: ../calendar/libedata-cal/e-data-cal.c:747
#, c-format
msgid "Cannot remove calendar: %s"
msgstr "Cannot remove calendar: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:744
+#: ../calendar/libedata-cal/e-data-cal.c:768
#, c-format
msgid "Cannot create calendar object: %s"
msgstr "Cannot create calendar object: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:768
+#: ../calendar/libedata-cal/e-data-cal.c:796
#, c-format
msgid "Cannot modify calendar object: %s"
msgstr "Cannot modify calendar object: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:794
+#: ../calendar/libedata-cal/e-data-cal.c:822
#, c-format
msgid "Cannot remove calendar object: %s"
msgstr "Cannot remove calendar object: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:815
+#: ../calendar/libedata-cal/e-data-cal.c:843
#, c-format
msgid "Cannot receive calendar objects: %s"
msgstr "Cannot receive calendar objects: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:834
+#: ../calendar/libedata-cal/e-data-cal.c:862
#, c-format
msgid "Cannot discard calendar alarm: %s"
msgstr "Cannot discard calendar alarm: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:855
+#: ../calendar/libedata-cal/e-data-cal.c:883
#, c-format
msgid "Cannot send calendar objects: %s"
msgstr "Cannot send calendar objects: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:880
+#: ../calendar/libedata-cal/e-data-cal.c:910
#, c-format
msgid "Cannot retrieve default calendar object path: %s"
msgstr "Cannot retrieve default calendar object path: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#: ../calendar/libedata-cal/e-data-cal.c:935
#, c-format
msgid "Cannot retrieve calendar object path: %s"
msgstr "Cannot retrieve calendar object path: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:920
+#: ../calendar/libedata-cal/e-data-cal.c:960
#, c-format
msgid "Cannot retrieve calendar object list: %s"
msgstr "Cannot retrieve calendar object list: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:948
+#: ../calendar/libedata-cal/e-data-cal.c:988
#, c-format
msgid "Could not retrieve attachment list: %s"
msgstr "Could not retrieve attachment list: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:974
+#: ../calendar/libedata-cal/e-data-cal.c:1014
#, c-format
msgid "Could not complete calendar query: %s"
msgstr "Could not complete calendar query: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:994
+#: ../calendar/libedata-cal/e-data-cal.c:1039
#, c-format
msgid "Could not retrieve calendar time zone: %s"
msgstr "Could not retrieve calendar time zone: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:1064
#, c-format
msgid "Could not add calendar time zone: %s"
msgstr "Could not add calendar time zone: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1033
+#: ../calendar/libedata-cal/e-data-cal.c:1083
#, c-format
msgid "Could not set default calendar time zone: %s"
msgstr "Could not set default calendar time zone: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1056
+#: ../calendar/libedata-cal/e-data-cal.c:1106
#, c-format
msgid "Cannot retrieve calendar changes: %s"
msgstr "Cannot retrieve calendar changes: %s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1087
+#: ../calendar/libedata-cal/e-data-cal.c:1137
#, c-format
msgid "Cannot retrieve calendar free/busy list: %s"
msgstr "Cannot retrieve calendar free/busy list: %s"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:353
+#: ../calendar/libedata-cal/e-data-cal-factory.c:372
#, c-format
msgid "Invalid URI"
msgstr "Invalid URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:371
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
#, 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:421
+#: ../calendar/libedata-cal/e-data-cal-factory.c:440
#, c-format
msgid "Could not instantiate backend"
msgstr "Could not instantiate backend"
-#: ../camel/camel-cipher-context.c:75
+#: ../camel/camel-cipher-context.c:200
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "Signing is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:110
-msgid "Signing message"
-msgstr "Signing message"
-
-#: ../camel/camel-cipher-context.c:131
+#: ../camel/camel-cipher-context.c:213
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "Verifying is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:164
-msgid "Verifying message"
-msgstr "Verifying message"
-
-#: ../camel/camel-cipher-context.c:188
+#: ../camel/camel-cipher-context.c:229
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "Encryption is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:223
-msgid "Encrypting message"
-msgstr "Encrypting message"
-
-#: ../camel/camel-cipher-context.c:246
+#: ../camel/camel-cipher-context.c:243
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "Decryption is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:276
-msgid "Decrypting message"
-msgstr "Decrypting message"
-
-#: ../camel/camel-cipher-context.c:297
+#: ../camel/camel-cipher-context.c:256
#, 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:341
+#: ../camel/camel-cipher-context.c:270
#, 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:181
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "Signing message"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "Encrypting message"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "Decrypting message"
+
+#: ../camel/camel-data-cache.c:178
#, c-format
msgid "Unable to create cache path"
msgstr "Unable to create cache path"
-#: ../camel/camel-data-cache.c:494
+#: ../camel/camel-data-cache.c:496
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not remove cache entry: %s: %s"
-#: ../camel/camel-data-wrapper.c:89
+#: ../camel/camel-data-wrapper.c:143
#, c-format
msgid "No stream available"
msgstr "No stream available"
-#: ../camel/camel-db.c:464
+#: ../camel/camel-db.c:455
#, c-format
msgid "Insufficient memory"
msgstr "Insufficient memory"
@@ -1558,8 +1634,8 @@ msgstr ""
"Further operations on this server will not be replayed when you\n"
"reconnect to the network."
-#: ../camel/camel-disco-diary.c:258
-#: ../camel/providers/imap/camel-imap-journal.c:298
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1570,119 +1646,107 @@ msgstr ""
"%s\n"
"Changes made to this folder will not be resynchronised."
-#: ../camel/camel-disco-diary.c:299
+#: ../camel/camel-disco-diary.c:304
msgid "Resynchronizing with server"
msgstr "Resynchronising with server"
-#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
msgid "Downloading new messages for offline mode"
msgstr "Downloading new messages for offline mode"
-#: ../camel/camel-disco-folder.c:379
+#: ../camel/camel-disco-folder.c:398
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "Preparing folder '%s' for offline"
-#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
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
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
#, c-format
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
-#: ../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:4654
-#: ../camel/providers/imapx/camel-imapx-server.c:4671
-#: ../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
+#: ../camel/camel-file-utils.c:722
#, c-format
msgid "Canceled"
msgstr "Cancelled"
-#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:817 ../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:853
+#: ../camel/camel-filter-driver.c:864
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Invalid message stream received from %s: %s"
-#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
msgid "Syncing folders"
msgstr "Syncing folders"
-#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Error parsing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Error executing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1240
+#: ../camel/camel-filter-driver.c:1256
#, c-format
msgid "Unable to open spool folder"
msgstr "Unable to open spool folder"
-#: ../camel/camel-filter-driver.c:1251
+#: ../camel/camel-filter-driver.c:1267
#, c-format
msgid "Unable to process spool folder"
msgstr "Unable to process spool folder"
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1285
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Getting message %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
#, c-format
msgid "Failed on message %d"
msgstr "Failed on message %d"
-#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
msgid "Syncing folder"
msgstr "Syncing folder"
-#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
msgid "Complete"
msgstr "Complete"
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1398
#, c-format
msgid "Getting message %d of %d"
msgstr "Getting message %d of %d"
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1416
#, c-format
msgid "Failed at message %d of %d"
msgstr "Failed at message %d of %d"
@@ -1704,8 +1768,8 @@ msgstr "Invalid arguments to (user-tag)"
msgid "Error executing filter search: %s: %s"
msgstr "Error executing filter search: %s: %s"
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -1714,8 +1778,8 @@ msgstr ""
"Cannot parse search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1724,74 +1788,79 @@ msgstr ""
"Error executing search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) requires a single bool result"
-#: ../camel/camel-folder-search.c:938
+#: ../camel/camel-folder-search.c:935
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) not allowed inside %s"
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) requires a match type string"
-#: ../camel/camel-folder-search.c:978
+#: ../camel/camel-folder-search.c:975
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) expects an array result"
-#: ../camel/camel-folder-search.c:987
+#: ../camel/camel-folder-search.c:984
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) requires the folder set"
-#: ../camel/camel-folder.c:125
+#: ../camel/camel-folder.c:216
#, 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'"
-#: ../camel/camel-folder.c:147
+#: ../camel/camel-folder.c:240
#, 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'"
-#: ../camel/camel-folder.c:171
+#: ../camel/camel-folder.c:266
#, 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-folder.c:688
-#: ../camel/providers/local/camel-maildir-folder.c:366
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:293
msgid "Moving messages"
msgstr "Moving messages"
-#: ../camel/camel-folder.c:690
+#: ../camel/camel-folder.c:878
msgid "Copying messages"
msgstr "Copying messages"
-#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
-#: ../camel/camel-gpg-context.c:1330
+#: ../camel/camel-folder.c:3247
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Retrieving message '%s'"
+
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
#, 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
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
msgid "Unknown"
msgstr "Unknown"
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:711
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1802,17 +1871,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:787
+#: ../camel/camel-gpg-context.c:728
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "Failed to parse gpg userid hint."
-#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "Failed to parse gpg passphrase request."
-#: ../camel/camel-gpg-context.c:848
+#: ../camel/camel-gpg-context.c:789
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1821,7 +1890,7 @@ msgstr ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:793
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1830,68 +1899,83 @@ msgstr ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:799
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Unexpected request from GnuPG for '%s'"
-#: ../camel/camel-gpg-context.c:905
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#: ../camel/camel-gpg-context.c:846
#, 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:917
+#: ../camel/camel-gpg-context.c:858
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Unexpected response from GnuPG: %s"
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:989
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "Failed to encrypt: No valid recipients specified."
-#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
msgid "Could not generate signing data: "
msgstr "Could not generate signing data: "
-#: ../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
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
-#: ../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
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1695
+#: ../camel/camel-gpg-context.c:1737
msgid "Cannot verify message signature: "
msgstr "Cannot verify message signature: "
-#: ../camel/camel-gpg-context.c:1814
+#: ../camel/camel-gpg-context.c:1858
msgid "Could not generate encrypting data: "
msgstr "Could not generate encrypting data: "
-#: ../camel/camel-gpg-context.c:1866
+#: ../camel/camel-gpg-context.c:1911
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
-#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Cannot decrypt message: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1942
+#: ../camel/camel-gpg-context.c:1989
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Failed to decrypt MIME part: protocol error"
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
msgid "Encrypted content"
msgstr "Encrypted content"
@@ -1989,54 +2073,54 @@ msgstr "Error writing mail temp file: %s"
msgid "Error copying mail temp file: %s"
msgstr "Error copying mail temp file: %s"
-#: ../camel/camel-multipart-signed.c:285
+#: ../camel/camel-multipart-signed.c:327
#, c-format
msgid "No content available"
msgstr "No content available"
-#: ../camel/camel-multipart-signed.c:293
+#: ../camel/camel-multipart-signed.c:335
#, c-format
msgid "No signature available"
msgstr "No signature available"
-#: ../camel/camel-multipart-signed.c:612
+#: ../camel/camel-multipart-signed.c:663
#, c-format
msgid "parse error"
msgstr "parse error"
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:695
#, c-format
msgid "Resolving: %s"
msgstr "Resolving: %s"
-#: ../camel/camel-net-utils.c:715
+#: ../camel/camel-net-utils.c:718
msgid "Host lookup failed"
msgstr "Host lookup failed"
-#: ../camel/camel-net-utils.c:719
+#: ../camel/camel-net-utils.c:724
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "Host lookup failed: %s: %s"
-#: ../camel/camel-net-utils.c:842
+#: ../camel/camel-net-utils.c:845
msgid "Resolving address"
msgstr "Resolving address"
-#: ../camel/camel-net-utils.c:862
+#: ../camel/camel-net-utils.c:866
msgid "Name lookup failed"
msgstr "Name lookup failed"
-#: ../camel/camel-net-utils.c:867
+#: ../camel/camel-net-utils.c:872
#, c-format
msgid "Name lookup failed: %s"
msgstr "Name lookup failed: %s"
-#: ../camel/camel-offline-folder.c:169
+#: ../camel/camel-offline-folder.c:189
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "Syncing messages in folder '%s' to disk"
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "Cannot write offline journal for folder '%s': %s"
@@ -2064,7 +2148,7 @@ msgstr "Could not load %s: %s"
msgid "Could not load %s: No initialization code in module."
msgstr "Could not load %s: No initialisation code in module."
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "No provider available for protocol '%s'"
@@ -2077,12 +2161,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:69
+#: ../camel/camel-sasl-anonymous.c:70
#, c-format
msgid "Authentication failed."
msgstr "Authentication failed."
-#: ../camel/camel-sasl-anonymous.c:80
+#: ../camel/camel-sasl-anonymous.c:81
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -2091,7 +2175,7 @@ msgstr ""
"Invalid e-mail address trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:94
+#: ../camel/camel-sasl-anonymous.c:95
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -2100,7 +2184,7 @@ msgstr ""
"Invalid opaque trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:108
+#: ../camel/camel-sasl-anonymous.c:109
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -2109,11 +2193,11 @@ msgstr ""
"Invalid trace information:\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:41
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:47
+#: ../camel/camel-sasl-cram-md5.c:43
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
@@ -2121,11 +2205,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:56
+#: ../camel/camel-sasl-digest-md5.c:54
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:56
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -2133,46 +2217,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:818
+#: ../camel/camel-sasl-digest-md5.c:817
#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "Server challenge too long (>2048 octets)"
-#: ../camel/camel-sasl-digest-md5.c:829
+#: ../camel/camel-sasl-digest-md5.c:828
#, c-format
msgid "Server challenge invalid\n"
msgstr "Server challenge invalid\n"
-#: ../camel/camel-sasl-digest-md5.c:837
+#: ../camel/camel-sasl-digest-md5.c:836
#, 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:869
+#: ../camel/camel-sasl-digest-md5.c:871
#, c-format
msgid "Server response did not contain authorization data"
msgstr "Server response did not contain authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:892
#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "Server response contained incomplete authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:903
+#: ../camel/camel-sasl-digest-md5.c:905
#, c-format
msgid "Server response does not match"
msgstr "Server response does not match"
-#: ../camel/camel-sasl-gssapi.c:80
+#: ../camel/camel-sasl-gssapi.c:86
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:88
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:119
+#: ../camel/camel-sasl-gssapi.c:129
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
@@ -2180,11 +2264,11 @@ msgstr ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognised by the implementation."
-#: ../camel/camel-sasl-gssapi.c:124
+#: ../camel/camel-sasl-gssapi.c:134
msgid "The provided target_name parameter was ill-formed."
msgstr "The provided target_name parameter was ill-formed."
-#: ../camel/camel-sasl-gssapi.c:127
+#: ../camel/camel-sasl-gssapi.c:137
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
@@ -2192,7 +2276,7 @@ msgstr ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
-#: ../camel/camel-sasl-gssapi.c:131
+#: ../camel/camel-sasl-gssapi.c:141
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
@@ -2200,7 +2284,7 @@ msgstr ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:146
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
@@ -2208,7 +2292,7 @@ msgstr ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:150
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
@@ -2216,52 +2300,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:145
+#: ../camel/camel-sasl-gssapi.c:155
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:148
+#: ../camel/camel-sasl-gssapi.c:158
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:151
+#: ../camel/camel-sasl-gssapi.c:161
msgid "The consistency checks performed on the credential failed."
msgstr "The consistency checks performed on the credential failed."
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:164
msgid "The referenced credentials have expired."
msgstr "The referenced credentials have expired."
-#: ../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
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
#, c-format
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
-#: ../camel/camel-sasl-gssapi.c:369
+#: ../camel/camel-sasl-gssapi.c:383
#, c-format
msgid "Unsupported security layer."
msgstr "Unsupported security layer."
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:35
msgid "Login"
msgstr "Login"
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
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:94
+#: ../camel/camel-sasl-login.c:91
#, c-format
msgid "Unknown authentication state."
msgstr "Unknown authentication state."
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:37
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:39
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
@@ -2269,28 +2353,28 @@ msgstr ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
msgid "PLAIN"
msgstr "PLAIN"
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
msgid "POP before SMTP"
msgstr "POP before SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
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:82
+#: ../camel/camel-sasl-popb4smtp.c:79
msgid "POP Source URI"
msgstr "POP Source URI"
-#: ../camel/camel-sasl-popb4smtp.c:89
+#: ../camel/camel-sasl-popb4smtp.c:86
#, c-format
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "POP Before SMTP authentication using an unknown transport"
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../camel/camel-sasl-popb4smtp.c:94
#, c-format
msgid "POP Before SMTP authentication using a non-POP source"
msgstr "POP Before SMTP authentication using a non-POP source"
@@ -2300,22 +2384,22 @@ msgstr "POP Before SMTP authentication using a non-POP source"
msgid "Regular expression compilation failed: %s: %s"
msgstr "Regular expression compilation failed: %s: %s"
-#: ../camel/camel-service.c:88
+#: ../camel/camel-service.c:85
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' needs a username component"
-#: ../camel/camel-service.c:92
+#: ../camel/camel-service.c:89
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' needs a host component"
-#: ../camel/camel-service.c:96
+#: ../camel/camel-service.c:93
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' needs a path component"
-#: ../camel/camel-session.c:261
+#: ../camel/camel-session.c:256
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2324,102 +2408,103 @@ msgstr ""
"Could not create directory %s:\n"
"%s"
-#: ../camel/camel-session.c:758
+#: ../camel/camel-session.c:753
#, 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:348 ../camel/camel-smime-context.c:1041
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Cannot find certificate for '%s'"
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:372
msgid "Cannot create CMS message"
msgstr "Cannot create CMS message"
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
msgid "Cannot create CMS signed data"
msgstr "Cannot create CMS signed data"
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:383
msgid "Cannot attach CMS signed data"
msgstr "Cannot attach CMS signed data"
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:390
msgid "Cannot attach CMS data"
msgstr "Cannot attach CMS data"
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
msgid "Cannot create CMS Signer information"
msgstr "Cannot create CMS Signer information"
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:402
msgid "Cannot find certificate chain"
msgstr "Cannot find certificate chain"
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:408
msgid "Cannot add CMS Signing time"
msgstr "Cannot add CMS Signing time"
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "Encryption certificate for '%s' does not exist"
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:454
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "Cannot add SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:464
msgid "Cannot add encryption certificate"
msgstr "Cannot add encryption certificate"
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:470
msgid "Cannot add CMS Signer information"
msgstr "Cannot add CMS Signer information"
-#: ../camel/camel-smime-context.c:506
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
msgid "Unverified"
msgstr "Unverified"
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:505
msgid "Good signature"
msgstr "Good signature"
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:507
msgid "Bad signature"
msgstr "Bad signature"
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:509
msgid "Content tampered with or altered in transit"
msgstr "Content tampered with or altered in transit"
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:511
msgid "Signing certificate not found"
msgstr "Signing certificate not found"
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:513
msgid "Signing certificate not trusted"
msgstr "Signing certificate not trusted"
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:515
msgid "Signature algorithm unknown"
msgstr "Signature algorithm unknown"
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:517
msgid "Signature algorithm unsupported"
msgstr "Signature algorithm unsupported"
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:519
msgid "Malformed signature"
msgstr "Malformed signature"
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:521
msgid "Processing error"
msgstr "Processing error"
@@ -2462,163 +2547,175 @@ msgstr "Cannot find signature digests"
msgid "Signer: %s <%s>: %s\n"
msgstr "Signer: %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
msgid "Cannot create encoder context"
msgstr "Cannot create encoder context"
-#: ../camel/camel-smime-context.c:838
+#: ../camel/camel-smime-context.c:841
msgid "Failed to add data to CMS encoder"
msgstr "Failed to add data to CMS encoder"
-#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
msgid "Failed to encode data"
msgstr "Failed to encode data"
-#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
msgid "Decoder failed"
msgstr "Decoder failed"
-#: ../camel/camel-smime-context.c:1049
+#: ../camel/camel-smime-context.c:1056
msgid "Cannot find common bulk encryption algorithm"
msgstr "Cannot find common bulk encryption algorithm"
-#: ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:1064
msgid "Cannot allocate slot for encryption bulk key"
msgstr "Cannot allocate slot for encryption bulk key"
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1075
msgid "Cannot create CMS Message"
msgstr "Cannot create CMS Message"
-#: ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:1081
msgid "Cannot create CMS Enveloped data"
msgstr "Cannot create CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1087
msgid "Cannot attach CMS Enveloped data"
msgstr "Cannot attach CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1093
msgid "Cannot attach CMS data object"
msgstr "Cannot attach CMS data object"
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1102
msgid "Cannot create CMS Recipient information"
msgstr "Cannot create CMS Recipient information"
-#: ../camel/camel-smime-context.c:1100
+#: ../camel/camel-smime-context.c:1107
msgid "Cannot add CMS Recipient information"
msgstr "Cannot add CMS Recipient information"
-#: ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:1132
msgid "Failed to add data to encoder"
msgstr "Failed to add data to encoder"
-#: ../camel/camel-smime-context.c:1227
+#: ../camel/camel-smime-context.c:1240
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: No encrypted content found"
-#: ../camel/camel-store.c:444
+#: ../camel/camel-store.c:2181
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "Cannot create folder '%s': folder exists"
-#: ../camel/camel-store.c:543
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2372 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "Wastebasket"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "Junk"
+
+#: ../camel/camel-store.c:2829
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Cannot create folder: %s: folder exists"
-#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
-#: ../camel/providers/local/camel-maildir-store.c:224
+#: ../camel/camel-store.c:2956 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Cannot delete folder: %s: Invalid operation"
-#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
-#: ../camel/providers/local/camel-maildir-store.c:314
+#: ../camel/camel-store.c:3097 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
#, 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:1128 ../camel/camel-vtrash-folder.c:48
-msgid "Trash"
-msgstr "Wastebasket"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "The proxy host does not support SOCKS4"
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1131 ../camel/camel-vtrash-folder.c:50
-msgid "Junk"
-msgstr "Junk"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "The proxy host denied our request: code %d"
-#: ../camel/camel-tcp-stream-raw.c:809
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
#, 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
+#: ../camel/camel-tcp-stream-raw.c:879
#, 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
+#: ../camel/camel-tcp-stream-raw.c:891
msgid "General SOCKS server failure"
msgstr "General SOCKS server failure"
-#: ../camel/camel-tcp-stream-raw.c:828
+#: ../camel/camel-tcp-stream-raw.c:892
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
+#: ../camel/camel-tcp-stream-raw.c:893
msgid "Network is unreachable from SOCKS server"
msgstr "Network is unreachable from SOCKS server"
-#: ../camel/camel-tcp-stream-raw.c:830
+#: ../camel/camel-tcp-stream-raw.c:894
msgid "Host is unreachable from SOCKS server"
msgstr "Host is unreachable from SOCKS server"
-#: ../camel/camel-tcp-stream-raw.c:831
+#: ../camel/camel-tcp-stream-raw.c:895
msgid "Connection refused"
msgstr "Connection refused"
-#: ../camel/camel-tcp-stream-raw.c:832
+#: ../camel/camel-tcp-stream-raw.c:896
msgid "Time-to-live expired"
msgstr "Time-to-live expired"
-#: ../camel/camel-tcp-stream-raw.c:833
+#: ../camel/camel-tcp-stream-raw.c:897
msgid "Command not supported by SOCKS server"
msgstr "Command not supported by SOCKS server"
-#: ../camel/camel-tcp-stream-raw.c:834
+#: ../camel/camel-tcp-stream-raw.c:898
msgid "Address type not supported by SOCKS server"
msgstr "Address type not supported by SOCKS server"
-#: ../camel/camel-tcp-stream-raw.c:835
+#: ../camel/camel-tcp-stream-raw.c:899
msgid "Unknown error from SOCKS server"
msgstr "Unknown error from SOCKS server"
-#: ../camel/camel-tcp-stream-raw.c:865
+#: ../camel/camel-tcp-stream-raw.c:932
#, 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
+#: ../camel/camel-tcp-stream-raw.c:950
#, c-format
msgid "Incomplete reply from SOCKS server"
msgstr "Incomplete reply from SOCKS server"
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:970
#, 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
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
#, c-format
msgid "Invalid reply from proxy server"
msgstr "Invalid reply from proxy server"
-#: ../camel/camel-tcp-stream-ssl.c:457
+#: ../camel/camel-tcp-stream-ssl.c:453
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2631,16 +2728,16 @@ msgstr ""
"Fingerprint: %s\n"
"Signature: %s"
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
msgid "GOOD"
msgstr "GOOD"
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
msgid "BAD"
msgstr "BAD"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
+#: ../camel/camel-tcp-stream-ssl.c:463
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2655,7 +2752,7 @@ msgstr ""
"\n"
"Do you wish to accept?"
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2664,7 +2761,7 @@ msgstr ""
"Certificate problem: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:559
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2673,7 +2770,7 @@ msgstr ""
"Bad certificate domain: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:577
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2682,7 +2779,7 @@ msgstr ""
"Certificate expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:594
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2691,41 +2788,41 @@ msgstr ""
"Certificate revocation list expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-url.c:314
+#: ../camel/camel-url.c:316
#, c-format
msgid "Could not parse URL '%s'"
msgstr "Could not parse URL '%s'"
-#: ../camel/camel-vee-folder.c:1044
+#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
#, c-format
-msgid "Error storing '%s': "
-msgstr "Error storing '%s': "
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Cannot copy or move messages into a Virtual Folder"
-#: ../camel/camel-vee-folder.c:1117
+#: ../camel/camel-vee-folder.c:1271
#, c-format
msgid "No such message %s in %s"
msgstr "No such message %s in %s"
-#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#: ../camel/camel-vee-folder.c:1339
#, c-format
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Cannot copy or move messages into a Virtual Folder"
+msgid "Error storing '%s': "
+msgstr "Error storing '%s': "
#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:417
+#: ../camel/camel-vee-store.c:322
msgid "Unmatched"
msgstr "Unmatched"
-#: ../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-vee-store.c:289
+#: ../camel/camel-vee-store.c:393
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Cannot delete folder: %s: No such folder"
+#: ../camel/camel-vee-store.c:427
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Cannot rename 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"
@@ -2734,92 +2831,91 @@ msgstr "Cannot copy messages to the Wastebasket folder"
msgid "Cannot copy messages to the Junk folder"
msgstr "Cannot copy messages to the Junk folder"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-" %s"
-msgstr ""
-"Cannot get message: %s\n"
-" %s"
-
-#: ../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: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: "
-msgstr "Cannot get message %s: "
-
-#: ../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: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:1038
-#: ../camel/providers/imap/camel-imap-folder.c:376
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
#, c-format
msgid "Could not load summary for %s"
msgstr "Could not load summary for %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
#, c-format
msgid "Checking for deleted messages %s"
msgstr "Checking for deleted messages %s"
-#: ../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:3719
-#: ../camel/providers/imapx/camel-imapx-server.c:3844
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
#, 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:2475
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
+msgid "Could not get message"
+msgstr "Could not get message"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
#, 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:2511
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
#, c-format
msgid "Cannot create message: %s"
msgstr "Cannot create message: %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+" %s"
+msgstr ""
+"Cannot get message: %s\n"
+" %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "No such message"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "Cannot get message %s: "
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
+#, 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-journal.c:248
#, c-format
msgid "Cannot get folder container %s"
msgstr "Cannot get folder container %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
#, 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:320
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
msgid "Cannot append message in offline mode: "
msgstr "Cannot append message in offline mode: "
@@ -2829,13 +2925,13 @@ msgstr "Checking for new mail"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
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:53
#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
#: ../camel/providers/local/camel-local-provider.c:42
#: ../camel/providers/local/camel-local-provider.c:82
#: ../camel/providers/local/camel-local-provider.c:102
@@ -2843,6 +2939,8 @@ msgid "Options"
msgstr "Options"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "_Apply filters to new messages in Inbox on this server"
@@ -2852,7 +2950,7 @@ msgstr "Check new messages for J_unk contents"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "Only check for Junk messages in the IN_BOX folder"
@@ -2878,9 +2976,9 @@ msgstr "For accessing Novell GroupWise servers"
#: ../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/imapx/camel-imapx-provider.c:104
#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:70
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
msgid "Password"
msgstr "Password"
@@ -2890,14 +2988,14 @@ msgid ""
msgstr ""
"This option will connect to the GroupWise server using a plaintext password."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
#, 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:207
-#: ../camel/providers/imap/camel-imap-store.c:1188
-#: ../camel/providers/imapx/camel-imapx-server.c:2972
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
#, c-format
msgid "You did not enter a password."
msgstr "You did not enter a password."
@@ -2906,64 +3004,64 @@ msgstr "You did not enter a password."
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: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
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
#, 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:1196
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
#, 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
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
#, 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:1289
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
#, 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:1348
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise server %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "GroupWise service for %s on %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "GroupWise mail delivery via %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
msgid "Sending Message"
msgstr "Sending Message"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
#, 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
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
#, c-format
msgid ""
"You have exceeded this account's storage limit. Your messages are queued in "
@@ -2974,36 +3072,36 @@ msgstr ""
"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
"of your mail.\n"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
#, c-format
msgid "Could not send message: %s"
msgstr "Could not send message: %s"
-#: ../camel/providers/imap/camel-imap-command.c:190
-#: ../camel/providers/imap/camel-imap-command.c:288
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
#, c-format
msgid "No output stream"
msgstr "No output stream"
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:296
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
#, c-format
msgid "No input stream"
msgstr "No input stream"
-#: ../camel/providers/imap/camel-imap-command.c:245
+#: ../camel/providers/imap/camel-imap-command.c:255
#, c-format
msgid "Operation cancelled"
msgstr "Operation cancelled"
-#: ../camel/providers/imap/camel-imap-command.c:353
+#: ../camel/providers/imap/camel-imap-command.c:373
#, 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:373
+#: ../camel/providers/imap/camel-imap-command.c:394
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -3012,79 +3110,79 @@ msgstr ""
"Alert from IMAP server %s %s:\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:444
+#: ../camel/providers/imap/camel-imap-command.c:468
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "Unexpected response from IMAP server: %s"
-#: ../camel/providers/imap/camel-imap-command.c:456
+#: ../camel/providers/imap/camel-imap-command.c:480
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP command failed: %s"
-#: ../camel/providers/imap/camel-imap-command.c:532
+#: ../camel/providers/imap/camel-imap-command.c:560
#, c-format
msgid "Server response ended too soon."
msgstr "Server response ended too soon."
-#: ../camel/providers/imap/camel-imap-command.c:740
+#: ../camel/providers/imap/camel-imap-command.c:771
#, 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:778
+#: ../camel/providers/imap/camel-imap-command.c:809
#, 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:281
+#: ../camel/providers/imap/camel-imap-folder.c:292
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:353
+#: ../camel/providers/imap/camel-imap-folder.c:369
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Could not create directory %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3759
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Scanning for changed messages in %s"
-#: ../camel/providers/imap/camel-imap-folder.c:3231
+#: ../camel/providers/imap/camel-imap-folder.c:3369
msgid "Unable to retrieve message: "
msgstr "Unable to retrieve message: "
-#: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4935
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5193
#, 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:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4936
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5194
msgid "No such message available."
msgstr "No such message available."
-#: ../camel/providers/imap/camel-imap-folder.c:3341
-#: ../camel/providers/imap/camel-imap-folder.c:4211
-#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
#, c-format
msgid "This message is not currently available"
msgstr "This message is not currently available"
-#: ../camel/providers/imap/camel-imap-folder.c:4021
+#: ../camel/providers/imap/camel-imap-folder.c:4176
#, 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:4031
+#: ../camel/providers/imap/camel-imap-folder.c:4186
#, 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:4251
+#: ../camel/providers/imap/camel-imap-folder.c:4415
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "Could not find message body in FETCH response."
@@ -3099,33 +3197,33 @@ msgstr "Could not open cache directory: "
msgid "Failed to cache message %s: %s"
msgstr "Failed to cache message %s: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
#, c-format
msgid "Failed to cache message %s: "
msgstr "Failed to cache message %s: "
-#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
#, c-format
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
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
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:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
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:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
msgid "Connection to Server"
msgstr "Connection to Server"
#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
msgid "_Use custom command to connect to server"
msgstr "_Use custom command to connect to server"
@@ -3134,18 +3232,18 @@ msgid "Co_mmand:"
msgstr "Co_mmand:"
#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
#: ../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:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
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:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
msgid "O_verride server-supplied folder namespace"
msgstr "O_verride server-supplied folder namespace"
@@ -3153,18 +3251,13 @@ msgstr "O_verride server-supplied folder namespace"
msgid "Names_pace:"
msgstr "Names_pace:"
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../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:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
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:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
msgid "Automatically synchroni_ze remote mail locally"
msgstr "Automatically synchroni_se remote mail locally"
@@ -3173,116 +3266,90 @@ msgid "IMAP"
msgstr "IMAP"
#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:91
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
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:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
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: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: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: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
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
#, c-format
msgid "Could not connect to %s: %s"
msgstr "Could not connect to %s: %s"
-#: ../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
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:343
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
msgid "SSL unavailable"
msgstr "SSL unavailable"
-#: ../camel/providers/imap/camel-imap-store.c:466
-#: ../camel/providers/nntp/camel-nntp-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:362
#, c-format
msgid "Could not connect to %s: "
msgstr "Could not connect to %s: "
-#: ../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:2825
-#: ../camel/providers/imapx/camel-imapx-server.c:2861
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
#, 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:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2826
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
msgid "STARTTLS not supported"
msgstr "STARTTLS not supported"
-#: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2862
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: ../camel/providers/imap/camel-imap-store.c:600
-#: ../camel/providers/smtp/camel-smtp-transport.c:339
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
msgid "SSL is not available in this build"
msgstr "SSL is not available in this build"
-#: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2662
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
#, c-format
msgid "Connection cancelled"
msgstr "Connection cancelled"
-#: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2667
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
#, 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: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:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
#, 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:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2940
-#: ../camel/providers/smtp/camel-smtp-transport.c:462
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3010
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3293,136 +3360,158 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2193
-#: ../camel/providers/imapx/camel-imapx-store.c:852
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP service for %s on %s"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
#, 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: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
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
#, c-format
msgid "Cannot create folder '%s': folder exists."
msgstr "Cannot create folder '%s': folder exists."
-#: ../camel/providers/imap/camel-imap-store.c:2206
-#: ../camel/providers/imapx/camel-imapx-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
-#: ../camel/providers/imap/camel-imap-store.c:3062
+#: ../camel/providers/imap/camel-imap-store.c:3137
#, c-format
msgid "Server unexpectedly disconnected"
msgstr "Server unexpectedly disconnected"
-#: ../camel/providers/imap/camel-imap-store.c:3065
+#: ../camel/providers/imap/camel-imap-store.c:3140
msgid "Server unexpectedly disconnected: "
msgstr "Server unexpectedly disconnected: "
-#: ../camel/providers/imapx/camel-imapx-folder.c:75
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
#, 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:83
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
#, c-format
msgid "Could not create cache for %s: "
msgstr "Could not create cache for %s: "
-#: ../camel/providers/imapx/camel-imapx-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
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
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
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
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
msgid "Command:"
msgstr "Command:"
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
msgid "Numbe_r of cached connections to use"
msgstr "Numbe_r of cached connections to use"
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
msgid "Namespace:"
msgstr "Namespace:"
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapx/camel-imapx-server.c:1365
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
msgid "Error writing to cache stream: "
msgstr "Error writing to cache stream: "
-#: ../camel/providers/imapx/camel-imapx-server.c:2019
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
#, c-format
msgid "Not authenticated"
msgstr "Not authenticated"
-#: ../camel/providers/imapx/camel-imapx-server.c:2753
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
#, 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:3182
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
msgid "Closing tmp stream failed: "
msgstr "Closing tmp stream failed: "
-#: ../camel/providers/imapx/camel-imapx-server.c:5059
-#, c-format
-msgid "Cannot create spool file: %s"
-msgstr "Cannot create spool file: %s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5074
+#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
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
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
#, c-format
msgid "No such folder: %s"
msgstr "No such folder: %s"
-#: ../camel/providers/imapx/camel-imapx-stream.c:71
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
#, c-format
msgid "Source stream returned no data"
msgstr "Source stream returned no data"
-#: ../camel/providers/imapx/camel-imapx-stream.c:80
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
#, c-format
msgid "Source stream unavailable"
msgstr "Source stream unavailable"
-#: ../camel/providers/local/camel-local-folder.c:199
+#: ../camel/providers/local/camel-local-folder.c:178
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:209
-#: ../camel/providers/local/camel-local-folder.c:218
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
#, c-format
msgid "mailbox: %s (%s)"
msgstr "mailbox: %s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:227
+#: ../camel/providers/local/camel-local-folder.c:206
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:272
+#: ../camel/providers/local/camel-local-folder.c:466
msgid "Index message body data"
msgstr "Index message body data"
-#: ../camel/providers/local/camel-local-folder.c:686
+#: ../camel/providers/local/camel-local-folder.c:700
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -3489,183 +3578,216 @@ msgstr ""
msgid "Standard Unix mbox spool directory"
msgstr "Standard Unix mbox spool directory"
-#: ../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
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
#, 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:158
+#: ../camel/providers/local/camel-local-store.c:183
#, 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:169
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Cannot get folder: %s: %s"
-#: ../camel/providers/local/camel-local-store.c:193
+#: ../camel/providers/local/camel-local-store.c:220
#, 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:250
+#: ../camel/providers/local/camel-local-store.c:281
#, c-format
msgid "Local mail file %s"
msgstr "Local mail file %s"
-#: ../camel/providers/local/camel-local-store.c:358
+#: ../camel/providers/local/camel-local-store.c:393
#, 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:431
+#: ../camel/providers/local/camel-local-store.c:467
#, c-format
msgid "Could not rename '%s': %s"
msgstr "Could not rename '%s': %s"
-#: ../camel/providers/local/camel-local-store.c:461
-#: ../camel/providers/local/camel-mbox-store.c:304
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
#, 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:489
-#: ../camel/providers/local/camel-mbox-store.c:333
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
#, 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:537
+#: ../camel/providers/local/camel-local-summary.c:548
#, 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:195
+#: ../camel/providers/local/camel-maildir-folder.c:198
#, c-format
msgid "Cannot append message to maildir folder: %s: "
msgstr "Cannot append message to maildir folder: %s: "
-#: ../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
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
#, 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:399
+#: ../camel/providers/local/camel-maildir-folder.c:326
#, 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: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
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "Cannot create folder: %s : Folder name cannot contain a dot"
+
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:686
+#, c-format
+msgid "Folder %s already exists"
+msgstr "Folder %s already exists"
+
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "Cannot create folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:151
-#: ../camel/providers/local/camel-mbox-store.c:127
-#: ../camel/providers/local/camel-mh-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "Cannot get folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:157
-#: ../camel/providers/local/camel-mbox-store.c:137
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "Cannot get folder '%s': folder does not exist."
-#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-maildir-store.c:239
#, c-format
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:242
-#: ../camel/providers/local/camel-maildir-store.c:282
-#: ../camel/providers/local/camel-mh-store.c:287
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "Could not delete folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-maildir-store.c:295
msgid "not a maildir directory"
msgstr "not a maildir directory"
-#: ../camel/providers/local/camel-maildir-store.c:482
-#: ../camel/providers/local/camel-spool-store.c:364
-#: ../camel/providers/local/camel-spool-store.c:380
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:825
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "Could not scan folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-store.c:677
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "Cannot rename the folder: %s: Folder name cannot contain a dot"
+
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
#, 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:549
+#: ../camel/providers/local/camel-maildir-summary.c:557
msgid "Checking folder consistency"
msgstr "Checking folder consistency"
-#: ../camel/providers/local/camel-maildir-summary.c:641
+#: ../camel/providers/local/camel-maildir-summary.c:650
msgid "Checking for new messages"
msgstr "Checking for new messages"
-#: ../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
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
msgid "Storing folder"
msgstr "Storing folder"
-#: ../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:194
+#: ../camel/providers/local/camel-mbox-folder.c:183
#, c-format
msgid "Cannot open mailbox: %s: "
msgstr "Cannot open mailbox: %s: "
-#: ../camel/providers/local/camel-mbox-folder.c:260
+#: ../camel/providers/local/camel-mbox-folder.c:249
#, c-format
msgid "Cannot append message to mbox file: %s: "
msgstr "Cannot append message to mbox file: %s: "
-#: ../camel/providers/local/camel-mbox-folder.c:433
+#: ../camel/providers/local/camel-mbox-folder.c:378
msgid "The folder appears to be irrecoverably corrupted."
msgstr "The folder appears to be irrecoverably corrupted."
-#: ../camel/providers/local/camel-mbox-store.c:149
-#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Cannot create folder lock on %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
#, 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:186
+#: ../camel/providers/local/camel-mbox-store.c:400
#, 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:218
-#: ../camel/providers/local/camel-mbox-store.c:231
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "Cannot create directory '%s': %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Cannot create folder: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "Folder already exists"
+
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3674,103 +3796,89 @@ msgstr ""
"Could not delete folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:241
+#: ../camel/providers/local/camel-mbox-store.c:632
#, c-format
msgid "'%s' is not a regular file."
msgstr "'%s' is not a regular file."
-#: ../camel/providers/local/camel-mbox-store.c:250
+#: ../camel/providers/local/camel-mbox-store.c:641
#, 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:276
-#: ../camel/providers/local/camel-mbox-store.c:290
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
#, 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:395
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Cannot create directory '%s': %s."
-
-#: ../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:413
-msgid "Folder already exists"
-msgstr "Folder already exists"
-
-#: ../camel/providers/local/camel-mbox-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:761
#, c-format
msgid "The new folder name is illegal."
msgstr "The new folder name is illegal."
-#: ../camel/providers/local/camel-mbox-store.c:522
+#: ../camel/providers/local/camel-mbox-store.c:776
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "Could not rename '%s': '%s': %s"
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:859
#, 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:473
+#: ../camel/providers/local/camel-mbox-summary.c:476
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "Could not open folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:533
+#: ../camel/providers/local/camel-mbox-summary.c:537
#, c-format
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:615
+#: ../camel/providers/local/camel-mbox-summary.c:622
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "Cannot check folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:686
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
#, c-format
msgid "Could not open file: %s: %s"
msgstr "Could not open file: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "Cannot open temporary mailbox: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-mbox-summary.c:932
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
#, 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:726
+#: ../camel/providers/local/camel-mbox-summary.c:739
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "Could not close temporary folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:756
#, c-format
msgid "Could not rename folder: %s"
msgstr "Could not rename folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:829
-#: ../camel/providers/local/camel-mbox-summary.c:1070
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
#, c-format
msgid "Could not store folder: %s"
msgstr "Could not store folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1102
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
#, c-format
msgid ""
"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3779,65 +3887,75 @@ 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
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
#, 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:1029
-#: ../camel/providers/local/camel-spool-summary.c:337
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
#, 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:1211
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "Writing to temporary mailbox failed: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1200
+#: ../camel/providers/local/camel-mbox-summary.c:1229
#, 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:165
+#: ../camel/providers/local/camel-mh-folder.c:115
#, c-format
msgid "Cannot append message to mh folder: %s: "
msgstr "Cannot append message to mh folder: %s: "
-#: ../camel/providers/local/camel-mh-store.c:234
+#: ../camel/providers/local/camel-mh-store.c:483
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "Could not create folder '%s': %s"
-#: ../camel/providers/local/camel-mh-store.c:248
+#: ../camel/providers/local/camel-mh-store.c:497
#, 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:228
+#: ../camel/providers/local/camel-mh-summary.c:227
#, 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:118
+#: ../camel/providers/local/camel-spool-store.c:327
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "Spool '%s' cannot be opened: %s"
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:341
#, 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:158
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Spool mail file %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool folder tree %s"
+
+#: ../camel/providers/local/camel-spool-store.c:391
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "Folder '%s/%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:170
+#: ../camel/providers/local/camel-spool-store.c:403
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3846,12 +3964,12 @@ msgstr ""
"Could not open folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:409
#, c-format
msgid "Folder '%s' does not exist."
msgstr "Folder '%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:183
+#: ../camel/providers/local/camel-spool-store.c:416
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -3860,51 +3978,41 @@ msgstr ""
"Could not create folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "'%s' is not a mailbox file."
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:462
#, c-format
msgid "Store does not support an INBOX"
msgstr "Store does not support an INBOX"
-#: ../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:226
+#: ../camel/providers/local/camel-spool-store.c:476
#, c-format
-msgid "Spool folder tree %s"
-msgstr "Spool folder tree %s"
+msgid "Spool folders cannot be deleted"
+msgstr "Spool folders cannot be deleted"
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:491
#, c-format
msgid "Spool folders cannot be renamed"
msgstr "Spool folders cannot be renamed"
-#: ../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:166
-#: ../camel/providers/local/camel-spool-summary.c:178
-#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
#, c-format
msgid "Could not synchronize temporary folder %s: %s"
msgstr "Could not synchronise temporary folder %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:211
#, c-format
msgid "Could not synchronize 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:259
-#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
#, c-format
msgid ""
"Could not synchronize spool folder %s: %s\n"
@@ -3913,40 +4021,40 @@ msgstr ""
"Could not synchronise spool folder %s: %s\n"
"Folder may be corrupt; copy saved in '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:197
-#: ../camel/providers/nntp/camel-nntp-folder.c:271
-#: ../camel/providers/nntp/camel-nntp-folder.c:312
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
#, 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:234
-#: ../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
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
#, c-format
msgid "Cannot get message %s: %s"
msgstr "Cannot get message %s: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:465
-#: ../camel/providers/nntp/camel-nntp-folder.c:471
-#: ../camel/providers/nntp/camel-nntp-folder.c:518
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
#, c-format
msgid "Posting failed: %s"
msgstr "Posting failed: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
msgid "Posting failed: "
msgstr "Posting failed: "
-#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
#, 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:560
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "You cannot copy messages from a NNTP folder!"
@@ -3977,22 +4085,32 @@ msgstr ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
-#: ../camel/providers/nntp/camel-nntp-store.c:265
+#: ../camel/providers/nntp/camel-nntp-store.c:73
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "Authentication requested but no username provided"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:85
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Cannot authenticate to server: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:375
#, c-format
msgid "Could not read greeting from %s: "
msgstr "Could not read greeting from %s: "
-#: ../camel/providers/nntp/camel-nntp-store.c:278
+#: ../camel/providers/nntp/camel-nntp-store.c:388
#, 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:434
+#: ../camel/providers/nntp/camel-nntp-store.c:582
#, c-format
msgid "USENET News via %s"
msgstr "USENET News via %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:927
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4003,7 +4121,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4014,7 +4132,7 @@ msgstr ""
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
-#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4025,42 +4143,32 @@ msgstr ""
"\n"
"newsgroup does not exist!"
-#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
#, 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:1106
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
#, 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:1119
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
#, 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:1257
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "Authentication requested but no username provided"
-
-#: ../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:1395
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
msgid "NNTP Command failed: "
msgstr "NNTP Command failed: "
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
#, c-format
msgid "Not connected."
msgstr "Not connected."
-#: ../camel/providers/nntp/camel-nntp-summary.c:238
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Scanning new messages"
@@ -4070,50 +4178,48 @@ msgstr "%s: Scanning new messages"
msgid "Unexpected server response from xover: %s"
msgstr "Unexpected server response from xover: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:356
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "Unexpected server response from head: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
#, c-format
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:336
+#, c-format
+msgid "No message with UID %s"
+msgstr "No message with UID %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Retrieving POP message %d"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
msgid "Retrieving POP summary"
msgstr "Retrieving POP summary"
-#: ../camel/providers/pop3/camel-pop3-folder.c:274
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "Cannot get POP summary: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:324
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
msgid "Expunging old messages"
msgstr "Expunging old messages"
-#: ../camel/providers/pop3/camel-pop3-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
msgid "Expunging deleted messages"
msgstr "Expunging deleted messages"
-#: ../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:603
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Retrieving POP message %d"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
-msgid "Unknown reason"
-msgstr "Unknown reason"
-
#: ../camel/providers/pop3/camel-pop3-provider.c:39
msgid "Message storage"
msgstr "Message storage"
@@ -4122,24 +4228,29 @@ msgstr "Message storage"
msgid "_Leave messages on server"
msgstr "_Leave messages on server"
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
#, c-format
msgid "_Delete after %s day(s)"
msgstr "_Delete after %s day(s)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "Delete _expunged from local Inbox"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
msgid "Disable _support for all POP3 extensions"
msgstr "Disable _support for all POP3 extensions"
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
msgid "POP"
msgstr "POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
msgid "For connecting to and downloading mail from POP servers."
msgstr "For connecting to and downloading mail from POP servers."
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4147,7 +4258,7 @@ msgstr ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -4162,38 +4273,38 @@ msgstr ""
msgid ": "
msgstr ": "
-#: ../camel/providers/pop3/camel-pop3-store.c:168
+#: ../camel/providers/pop3/camel-pop3-store.c:181
#, 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:186
-#: ../camel/providers/pop3/camel-pop3-store.c:217
-#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
#, 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:187
+#: ../camel/providers/pop3/camel-pop3-store.c:200
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:205
+#: ../camel/providers/pop3/camel-pop3-store.c:218
#, 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:218
+#: ../camel/providers/pop3/camel-pop3-store.c:231
msgid "TLS negotiations failed"
msgstr "TLS negotiations failed"
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:238
msgid "TLS is not available in this build"
msgstr "TLS is not available in this build"
-#: ../camel/providers/pop3/camel-pop3-store.c:300
-#: ../camel/providers/pop3/camel-pop3-store.c:452
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4203,22 +4314,22 @@ msgstr ""
"mechanism."
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:323
+#: ../camel/providers/pop3/camel-pop3-store.c:340
#, 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:340
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, 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:357
+#: ../camel/providers/pop3/camel-pop3-store.c:374
#, c-format
msgid "Failed to authenticate on POP server %s: "
msgstr "Failed to authenticate on POP server %s: "
-#: ../camel/providers/pop3/camel-pop3-store.c:421
+#: ../camel/providers/pop3/camel-pop3-store.c:439
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4227,7 +4338,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:471
+#: ../camel/providers/pop3/camel-pop3-store.c:492
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4237,7 +4348,7 @@ msgstr ""
"Error sending password: %s"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:505
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4247,7 +4358,7 @@ msgstr ""
"Error sending username%s"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:497
+#: ../camel/providers/pop3/camel-pop3-store.c:518
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4256,27 +4367,27 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password%s"
-#: ../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
+#: ../camel/providers/pop3/camel-pop3-store.c:558
#, c-format
msgid "POP3 server %s"
msgstr "POP3 server %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:562
#, c-format
msgid "POP3 server for %s on %s"
msgstr "POP3 server for %s on %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:685
+#: ../camel/providers/pop3/camel-pop3-store.c:693
+#, 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:720
#, c-format
msgid "No such folder '%s'."
msgstr "No such folder '%s'."
-#: ../camel/providers/pop3/camel-pop3-store.c:709
+#: ../camel/providers/pop3/camel-pop3-store.c:737
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 stores have no folder hierarchy"
@@ -4293,48 +4404,48 @@ msgstr ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "Mail delivery via the sendmail program"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
#, c-format
msgid "Could not parse recipient list"
msgstr "Could not parse recipient list"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
#, 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:153
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
#, 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:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
msgid "Could not send message: "
msgstr "Could not send message: "
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
#, 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:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
#, 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:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
#, 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:248
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
-msgid "Mail delivery via the sendmail program"
-msgstr "Mail delivery via the sendmail program"
-
#: ../camel/providers/smtp/camel-smtp-provider.c:43
msgid "SMTP"
msgstr "SMTP"
@@ -4343,312 +4454,342 @@ 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:116
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "Welcome response error: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, 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:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS command failed: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP server %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP mail delivery via %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, 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:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "Cannot send message: service not connected."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, 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:624
+msgid "Sending message"
+msgstr "Sending message"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "Cannot send message: no recipients defined."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, 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:725
msgid "Syntax error, command unrecognized"
msgstr "Syntax error, command unrecognised"
-#: ../camel/providers/smtp/camel-smtp-transport.c:118
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
msgid "Syntax error in parameters or arguments"
msgstr "Syntax error in parameters or arguments"
-#: ../camel/providers/smtp/camel-smtp-transport.c:120
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
msgid "Command not implemented"
msgstr "Command not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:122
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
msgid "Command parameter not implemented"
msgstr "Command parameter not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:124
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
msgid "System status, or system help reply"
msgstr "System status, or system help reply"
-#: ../camel/providers/smtp/camel-smtp-transport.c:126
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
msgid "Help message"
msgstr "Help message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:128
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
msgid "Service ready"
msgstr "Service ready"
-#: ../camel/providers/smtp/camel-smtp-transport.c:130
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
msgid "Service closing transmission channel"
msgstr "Service closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
msgid "Service not available, closing transmission channel"
msgstr "Service not available, closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:134
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
msgid "Requested mail action okay, completed"
msgstr "Requested mail action okay, completed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
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:138
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Requested mail action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:140
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
msgid "Requested action not taken: mailbox unavailable"
msgstr "Requested action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:142
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
msgid "Requested action aborted: error in processing"
msgstr "Requested action aborted: error in processing"
-#: ../camel/providers/smtp/camel-smtp-transport.c:144
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
msgid "User not local; please try <forward-path>"
msgstr "User not local; please try <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:146
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
msgid "Requested action not taken: insufficient system storage"
msgstr "Requested action not taken: insufficient system storage"
-#: ../camel/providers/smtp/camel-smtp-transport.c:148
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Requested mail action aborted: exceeded storage allocation"
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
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:152
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Start mail input; end with <CRLF>.<CRLF>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
msgid "Transaction failed"
msgstr "Transaction failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
msgid "A password transition is needed"
msgstr "A password transition is needed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
msgid "Authentication mechanism is too weak"
msgstr "Authentication mechanism is too weak"
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
msgid "Encryption required for requested authentication mechanism"
msgstr "Encryption required for requested authentication mechanism"
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
msgid "Temporary authentication failure"
msgstr "Temporary authentication failure"
-#: ../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: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: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: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:526
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-
-#: ../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:666
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP mail delivery via %s"
-
-#: ../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: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:697
-msgid "Sending message"
-msgstr "Sending message"
-
-#: ../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: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:961
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
msgid "SMTP Greeting"
msgstr "SMTP Greeting"
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
-#: ../camel/providers/smtp/camel-smtp-transport.c:1000
-#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
msgid "HELO command failed: "
msgstr "HELO command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
msgid "SMTP Authentication"
msgstr "SMTP Authentication"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
#, c-format
msgid "Error creating SASL authentication object."
msgstr "Error creating SASL authentication object."
-#: ../camel/providers/smtp/camel-smtp-transport.c:1097
-#: ../camel/providers/smtp/camel-smtp-transport.c:1107
-#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
#, 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
msgid "DATA command failed: "
msgstr "DATA command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1448
-#: ../camel/providers/smtp/camel-smtp-transport.c:1460
-#: ../camel/providers/smtp/camel-smtp-transport.c:1467
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
msgid "RSET command failed: "
msgstr "RSET 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
msgid "QUIT command failed: "
msgstr "QUIT command failed: "
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "Anniversary"
+
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "Birthday"
+
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
msgid "Business"
msgstr "Business"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
msgid "Competition"
msgstr "Competition"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
msgid "Favorites"
msgstr "Favourites"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
msgid "Gifts"
msgstr "Gifts"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
msgid "Goals/Objectives"
msgstr "Goals/Objectives"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
msgid "Holiday"
msgstr "Holiday"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
msgid "Holiday Cards"
msgstr "Holiday Cards"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
msgid "Hot Contacts"
msgstr "Hot Contacts"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
msgid "Ideas"
msgstr "Ideas"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
msgid "International"
msgstr "International"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
msgid "Key Customer"
msgstr "Key Customer"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
msgid "Miscellaneous"
msgstr "Miscellaneous"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
msgid "Personal"
msgstr "Personal"
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
msgid "Phone Calls"
msgstr "Phone Calls"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
msgid "Status"
msgstr "Status"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
msgid "Strategies"
msgstr "Strategies"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
msgid "Suppliers"
msgstr "Suppliers"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
msgid "Time & Expenses"
msgstr "Time & Expenses"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
msgid "Waiting"
msgstr "Waiting"
@@ -4781,24 +4922,36 @@ msgid "%I %p"
msgstr "%I %p"
#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:668
+#: ../libedataserverui/e-book-auth-util.c:673
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
#: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:430
+#: ../libedataserverui/e-book-auth-util.c:435
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:127
+msgid "Category Properties"
+msgstr "Category Properties"
+
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "Category _Name"
+
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "Category _Icon"
+
+#: ../libedataserverui/e-categories-dialog.c:185
msgid "Category Icon"
msgstr "Category Icon"
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:191
msgid "_No Image"
msgstr "_No Image"
-#: ../libedataserverui/e-categories-dialog.c:368
+#: ../libedataserverui/e-categories-dialog.c:406
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
@@ -4807,151 +4960,141 @@ msgstr ""
"There is already a category '%s' in the configuration. Please use another "
"name"
-#: ../libedataserverui/e-categories-dialog.c:676
-msgid "Icon"
-msgstr "Icon"
-
-#: ../libedataserverui/e-categories-dialog.c:681
-msgid "Category"
-msgstr "Category"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "Category Properties"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "Category _Icon"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "Category _Name"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:4
+#: ../libedataserverui/e-categories-dialog.c:661
msgid "Currently _used categories:"
msgstr "Currently _used categories:"
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.c:668
msgid "_Available Categories:"
msgstr "_Available Categories:"
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.c:711
msgid "_Edit"
msgstr "_Edit"
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
-msgstr "categories"
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "Icon"
+
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
+msgstr "Category"
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-category-completion.c:294
#, c-format
msgid "Create category \"%s\""
msgstr "Create category \"%s\""
-#: ../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:176
+msgid "Show Contacts"
+msgstr "Show Contacts"
-#: ../libedataserverui/e-name-selector-dialog.c:658
-msgid "_Add"
-msgstr "_Add"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "Address B_ook:"
-#: ../libedataserverui/e-name-selector-dialog.c:662
-msgid "_Remove"
-msgstr "_Remove"
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "Cate_gory:"
-#: ../libedataserverui/e-name-selector-dialog.c:890
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "_Search:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
msgid "Any Category"
msgstr "Any Category"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>Co_ntacts</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "Co_ntacts"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Show Contacts</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "Address B_ook:"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "Search"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
msgid "Address Book"
msgstr "Address Book"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
-msgstr "Cate_gory:"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
+#: ../libedataserverui/e-name-selector-dialog.c:295
msgid "Contacts"
msgstr "Contacts"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
-msgid "Search"
-msgstr "Search"
+#: ../libedataserverui/e-name-selector-dialog.c:412
+msgid "Select Contacts from Address Book"
+msgstr "Select Contacts from Address Book"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "_Search:"
+#: ../libedataserverui/e-name-selector-dialog.c:747
+msgid "_Add"
+msgstr "_Add"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "_Remove"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, c-format
+msgid "Error loading address book: %s"
+msgstr "Error loading address book: %s"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2636
+#: ../libedataserverui/e-name-selector-entry.c:2661
#, c-format
msgid "E_xpand %s Inline"
msgstr "E_xpand %s Inline"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2651
+#: ../libedataserverui/e-name-selector-entry.c:2676
#, c-format
msgid "Cop_y %s"
msgstr "Cop_y %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2661
+#: ../libedataserverui/e-name-selector-entry.c:2686
#, c-format
msgid "C_ut %s"
msgstr "C_ut %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2678
+#: ../libedataserverui/e-name-selector-entry.c:2703
#, c-format
msgid "_Edit %s"
msgstr "_Edit %s"
-#: ../libedataserverui/e-name-selector-list.c:516
+#: ../libedataserverui/e-name-selector-list.c:509
#, c-format
msgid "_Delete %s"
msgstr "_Delete %s"
-#: ../libedataserverui/e-passwords.c:257
+#: ../libedataserverui/e-passwords.c:127
#, c-format
msgid "Keyring key is unusable: no user or host name"
msgstr "Keyring key is unusable: no user or host name"
-#: ../libedataserverui/e-passwords.c:1120
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
msgid "You have the Caps Lock key on."
msgstr "You have the Caps Lock key on."
-#: ../libedataserverui/e-passwords.c:1241
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
msgid "_Remember this passphrase"
msgstr "_Remember this passphrase"
-#: ../libedataserverui/e-passwords.c:1242
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
msgid "_Remember this passphrase for the remainder of this session"
msgstr "_Remember this passphrase for the remainder of this session"
-#: ../libedataserverui/e-passwords.c:1247
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
msgid "_Remember this password"
msgstr "_Remember this password"
-#: ../libedataserverui/e-passwords.c:1248
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
msgid "_Remember this password for the remainder of this session"
msgstr "_Remember this password for the remainder of this session"
@@ -4960,7 +5103,7 @@ msgstr "_Remember this password for the remainder of this session"
msgid "Select destination"
msgstr "Select destination"
-#: ../libedataserverui/e-source-selector-dialog.c:172
+#: ../libedataserverui/e-source-selector-dialog.c:170
msgid "_Destination"
msgstr "_Destination"
@@ -4980,6 +5123,27 @@ msgstr "No response from the server"
msgid "Bad parameter"
msgstr "Bad parameter"
+#~ msgid "Verifying message"
+#~ msgstr "Verifying message"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "_Apply filters to new messages in INBOX on this server"
+
+#~ msgid "Cannot create spool file: %s"
+#~ msgstr "Cannot create spool file: %s"
+
+#~ msgid "categories"
+#~ msgstr "categories"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>Co_ntacts</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>Show Contacts</b>"
+
#~ msgid "UnknownUser"
#~ msgstr "Unknown User"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
