[evolution-data-server] Updated British English translation
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Updated British English translation
- Date: Wed, 14 Apr 2010 07:02:53 +0000 (UTC)
commit da6cbdc2dca32853975a39dd1b448b6c942db1d2
Author: Philip Withnall <philip tecnocode co uk>
Date: Tue Apr 13 18:22:58 2010 +0100
Updated British English translation
po/en_GB.po | 2563 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 1222 insertions(+), 1341 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 3de6721..88017ff 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,20 +2,20 @@
# Copyright (C) 2000 Free Software Foundation, Inc.
# Robert Brady <rwb197 zepler org>, 2000.
# Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
-# Philip Withnall <philip tecnocode co uk>, 2009.
+# Philip Withnall <philip tecnocode co uk>, 2009, 2010.
# Bruce Cowan <bcowan fastmail co uk>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-24 15:58+0000\n"
+"POT-Creation-Date: 2010-04-13 18:10+0100\n"
"PO-Revision-Date: 2010-02-24 16:00+0100\n"
-"Last-Translator: Bruce Cowan <bcowan fastmail co uk>\n"
+"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
"Language-Team: British English <en li org>\n"
-"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Virtaal 0.5.2\n"
@@ -29,13 +29,13 @@ 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:4551
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
msgid "Searching..."
msgstr "Searchingâ?¦"
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "Downloading contacts (%d)â?¦ "
@@ -47,42 +47,42 @@ msgstr "Downloading contacts (%d)â?¦ "
msgid "Updating contacts cache (%d)... "
msgstr "Updating contacts cache (%d)â?¦ "
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
msgid "Using Distinguished Name (DN)"
msgstr "Using Distinguished Name (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
msgid "Using Email Address"
msgstr "Using E-mail Address"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
msgid "Reconnecting to LDAP server..."
msgstr "Reconnecting to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
msgid "Adding contact to LDAP server..."
msgstr "Adding contact to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
msgid "Removing contact from LDAP server..."
msgstr "Removing contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
msgid "Modifying contact from LDAP server..."
msgstr "Modifying contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
msgid "Receiving LDAP search results..."
msgstr "Receiving LDAP search resultsâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
msgid "Error performing search"
msgstr "Error performing search"
-#: ../addressbook/libebook/e-book.c:2149
+#: ../addressbook/libebook/e-book.c:2152
#, 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."
+msgstr "%s: there was no source for UID '%s' stored in GConf."
#. Dummy row as EContactField starts from 1
#: ../addressbook/libebook/e-contact.c:115
@@ -351,27 +351,27 @@ msgstr "GroupWise Work Screen Name 3"
#: ../addressbook/libebook/e-contact.c:203
msgid "Jabber Home Id 1"
-msgstr "Jabber Home Id 1"
+msgstr "Jabber Home ID 1"
#: ../addressbook/libebook/e-contact.c:204
msgid "Jabber Home Id 2"
-msgstr "Jabber Home Id 2"
+msgstr "Jabber Home ID 2"
#: ../addressbook/libebook/e-contact.c:205
msgid "Jabber Home Id 3"
-msgstr "Jabber Home Id 3"
+msgstr "Jabber Home ID 3"
#: ../addressbook/libebook/e-contact.c:206
msgid "Jabber Work Id 1"
-msgstr "Jabber Work Id 1"
+msgstr "Jabber Work ID 1"
#: ../addressbook/libebook/e-contact.c:207
msgid "Jabber Work Id 2"
-msgstr "Jabber Work Id 2"
+msgstr "Jabber Work ID 2"
#: ../addressbook/libebook/e-contact.c:208
msgid "Jabber Work Id 3"
-msgstr "Jabber Work Id 3"
+msgstr "Jabber Work ID 3"
#: ../addressbook/libebook/e-contact.c:209
msgid "Yahoo! Home Screen Name 1"
@@ -423,27 +423,27 @@ msgstr "MSN Work Screen Name 3"
#: ../addressbook/libebook/e-contact.c:221
msgid "ICQ Home Id 1"
-msgstr "ICQ Home Id 1"
+msgstr "ICQ Home ID 1"
#: ../addressbook/libebook/e-contact.c:222
msgid "ICQ Home Id 2"
-msgstr "ICQ Home Id 2"
+msgstr "ICQ Home ID 2"
#: ../addressbook/libebook/e-contact.c:223
msgid "ICQ Home Id 3"
-msgstr "ICQ Home Id 3"
+msgstr "ICQ Home ID 3"
#: ../addressbook/libebook/e-contact.c:224
msgid "ICQ Work Id 1"
-msgstr "ICQ Work Id 1"
+msgstr "ICQ Work ID 1"
#: ../addressbook/libebook/e-contact.c:225
msgid "ICQ Work Id 2"
-msgstr "ICQ Work Id 2"
+msgstr "ICQ Work ID 2"
#: ../addressbook/libebook/e-contact.c:226
msgid "ICQ Work Id 3"
-msgstr "ICQ Work Id 3"
+msgstr "ICQ Work ID 3"
#. Last modified time
#: ../addressbook/libebook/e-contact.c:229
@@ -500,11 +500,11 @@ msgstr "AIM Screen Name List"
#: ../addressbook/libebook/e-contact.c:250
msgid "GroupWise Id List"
-msgstr "GroupWise Id List"
+msgstr "GroupWise ID List"
#: ../addressbook/libebook/e-contact.c:251
msgid "Jabber Id List"
-msgstr "Jabber Id List"
+msgstr "Jabber ID List"
#: ../addressbook/libebook/e-contact.c:252
msgid "Yahoo! Screen Name List"
@@ -516,7 +516,7 @@ msgstr "MSN Screen Name List"
#: ../addressbook/libebook/e-contact.c:254
msgid "ICQ Id List"
-msgstr "ICQ Id List"
+msgstr "ICQ ID List"
#: ../addressbook/libebook/e-contact.c:256
msgid "Wants HTML Mail"
@@ -547,31 +547,31 @@ msgstr "X.509 Certificate"
#: ../addressbook/libebook/e-contact.c:267
msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu Home Id 1"
+msgstr "Gadu-Gadu Home ID 1"
#: ../addressbook/libebook/e-contact.c:268
msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu Home Id 2"
+msgstr "Gadu-Gadu Home ID 2"
#: ../addressbook/libebook/e-contact.c:269
msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu Home Id 3"
+msgstr "Gadu-Gadu Home ID 3"
#: ../addressbook/libebook/e-contact.c:270
msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu Work Id 1"
+msgstr "Gadu-Gadu Work ID 1"
#: ../addressbook/libebook/e-contact.c:271
msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu Work Id 2"
+msgstr "Gadu-Gadu Work ID 2"
#: ../addressbook/libebook/e-contact.c:272
msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu Work Id 3"
+msgstr "Gadu-Gadu Work ID 3"
#: ../addressbook/libebook/e-contact.c:273
msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Id List"
+msgstr "Gadu-Gadu ID List"
#. Geo information
#: ../addressbook/libebook/e-contact.c:276
@@ -614,7 +614,7 @@ msgstr "Skype Name List"
msgid "SIP address"
msgstr "SIP address"
-#: ../addressbook/libebook/e-contact.c:1513
+#: ../addressbook/libebook/e-contact.c:1515
#: ../addressbook/libebook/e-destination.c:739
msgid "Unnamed List"
msgstr "Unnamed List"
@@ -668,7 +668,7 @@ msgid "Cannot remove contacts"
msgstr "Cannot remove contacts"
#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
msgid "Invalid query"
msgstr "Invalid query"
@@ -710,53 +710,53 @@ msgstr "Could not create thread for getting deltas"
#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
#: ../calendar/backends/google/e-cal-backend-google.c:1144
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1081
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1089
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1387
#: ../calendar/backends/http/e-cal-backend-http.c:678
#: ../calendar/backends/weather/e-cal-backend-weather.c:492
msgid "Could not create cache file"
msgstr "Could not create cache file"
#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1102
msgid "Could not create thread for populating cache"
msgstr "Could not create thread for populating cache"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
msgid "Reply Requested: by "
msgstr "Reply Requested: by "
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2141
msgid "Reply Requested: When convenient"
msgstr "Reply Requested: When convenient"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:283
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:294
#, c-format
msgid "Loading %s items"
msgstr "Loading %s items"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:919
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:928
msgid "Calendar"
msgstr "Calendar"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:986
msgid "Invalid server URI"
msgstr "Invalid server URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:996
#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1005
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1107
#: ../calendar/libecal/e-cal.c:4020
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1378
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1393
#: ../camel/providers/groupwise/camel-groupwise-store.c:591
#: ../camel/providers/groupwise/camel-groupwise-store.c:766
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:145
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:172
msgid "Authentication failed"
msgstr "Authentication failed"
@@ -984,23 +984,23 @@ msgid "Backend is busy"
msgstr "Backend is busy"
#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
msgid "Repository is offline"
msgstr "Repository is offline"
#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
msgid "No such calendar"
msgstr "No such calendar"
#: ../calendar/libecal/e-cal.c:4000
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Object not found"
msgstr "Object not found"
#: ../calendar/libecal/e-cal.c:4002
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "Invalid object"
@@ -1014,18 +1014,18 @@ msgid "URI already loaded"
msgstr "URI already loaded"
#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
msgid "Permission denied"
msgstr "Permission denied"
#: ../calendar/libecal/e-cal.c:4010
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
#: ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "Unknown User"
#: ../calendar/libecal/e-cal.c:4012
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
msgid "Object ID already exists"
msgstr "Object ID already exists"
@@ -1038,13 +1038,13 @@ msgid "Operation has been canceled"
msgstr "Operation has been cancelled"
#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
msgid "Could not cancel operation"
msgstr "Could not cancel operation"
#: ../calendar/libecal/e-cal.c:4022
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
msgid "Authentication required"
msgstr "Authentication required"
@@ -1053,25 +1053,18 @@ msgid "A CORBA exception has occurred"
msgstr "A CORBA exception has occurred"
#: ../calendar/libecal/e-cal.c:4026
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/camel-net-utils.c:523
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:582
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:534
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:205
+#: ../camel/providers/imap/camel-imap-command.c:428
+#: ../camel/providers/imap/camel-imap-store.c:729
+#: ../camel/providers/pop3/camel-pop3-store.c:574
#: ../servers/groupwise/e-gw-connection.c:243
msgid "Unknown error"
msgstr "Unknown error"
#: ../calendar/libecal/e-cal.c:4028
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
msgid "No error"
msgstr "No error"
@@ -1170,157 +1163,157 @@ msgstr ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
"be a boolean false (#f)"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
msgid "Invalid range"
msgstr "Invalid range"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
msgid "Unsupported field"
msgstr "Unsupported field"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
msgid "Unsupported method"
msgstr "Unsupported method"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
msgid "Unsupported authentication method"
msgstr "Unsupported authentication method"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
msgid "TLS not available"
msgstr "TLS not available"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
msgid "Offline mode unavailable"
msgstr "Offline mode unavailable"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
msgid "Search size limit exceeded"
msgstr "Search size limit exceeded"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
msgid "Search time limit exceeded"
msgstr "Search time limit exceeded"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
msgid "Query refused"
msgstr "Query refused"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
msgid "Invalid server version"
msgstr "Invalid server version"
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#: ../calendar/libedata-cal/e-data-cal.c:501
#, c-format
msgid "Cannot retrieve calendar address"
msgstr "Cannot retrieve calendar address"
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#: ../calendar/libedata-cal/e-data-cal.c:519
#, c-format
msgid "Cannot retrieve calendar alarm e-mail address"
msgstr "Cannot retrieve calendar alarm e-mail address"
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#: ../calendar/libedata-cal/e-data-cal.c:537
#, c-format
msgid "Cannot retrieve calendar's ldap attribute"
msgstr "Cannot retrieve calendar's ldap attribute"
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#: ../calendar/libedata-cal/e-data-cal.c:555
#, c-format
msgid "Cannot retrieve calendar scheduling information"
msgstr "Cannot retrieve calendar scheduling information"
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#: ../calendar/libedata-cal/e-data-cal.c:572
#, c-format
msgid "Cannot open calendar"
msgstr "Cannot open calendar"
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#: ../calendar/libedata-cal/e-data-cal.c:591
#, c-format
msgid "Cannot refresh calendar"
msgstr "Cannot refresh calendar"
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#: ../calendar/libedata-cal/e-data-cal.c:608
#, c-format
msgid "Cannot remove calendar"
msgstr "Cannot remove calendar"
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#: ../calendar/libedata-cal/e-data-cal.c:627
#, c-format
msgid "Cannot create calendar object"
msgstr "Cannot create calendar object"
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#: ../calendar/libedata-cal/e-data-cal.c:649
#, c-format
msgid "Cannot modify calendar object"
msgstr "Cannot modify calendar object"
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#: ../calendar/libedata-cal/e-data-cal.c:673
#, c-format
msgid "Cannot remove calendar object"
msgstr "Cannot remove calendar object"
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#: ../calendar/libedata-cal/e-data-cal.c:692
#, c-format
msgid "Cannot receive calendar objects"
msgstr "Cannot receive calendar objects"
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#: ../calendar/libedata-cal/e-data-cal.c:709
#, c-format
msgid "Cannot discard calendar alarm"
msgstr "Cannot discard calendar alarm"
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#: ../calendar/libedata-cal/e-data-cal.c:728
#, c-format
msgid "Cannot send calendar objects"
msgstr "Cannot send calendar objects"
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#: ../calendar/libedata-cal/e-data-cal.c:763
#, c-format
msgid "Cannot retrieve default calendar object path"
msgstr "Cannot retrieve default calendar object path"
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#: ../calendar/libedata-cal/e-data-cal.c:781
#, c-format
msgid "Cannot retrieve calendar object path"
msgstr "Cannot retrieve calendar object path"
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#: ../calendar/libedata-cal/e-data-cal.c:799
#, c-format
msgid "Cannot retrieve calendar object list"
msgstr "Cannot retrieve calendar object list"
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#: ../calendar/libedata-cal/e-data-cal.c:837
#, c-format
msgid "Could not retrieve attachment list"
msgstr "Could not retrieve attachment list"
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#: ../calendar/libedata-cal/e-data-cal.c:859
#, c-format
msgid "Could not complete calendar query"
msgstr "Could not complete calendar query"
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#: ../calendar/libedata-cal/e-data-cal.c:877
#, c-format
msgid "Could not retrieve calendar time zone"
msgstr "Could not retrieve calendar time zone"
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#: ../calendar/libedata-cal/e-data-cal.c:895
#, c-format
msgid "Could not add calendar time zone"
msgstr "Could not add calendar time zone"
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#: ../calendar/libedata-cal/e-data-cal.c:912
#, c-format
msgid "Could not set default calendar time zone"
msgstr "Could not set default calendar time zone"
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#: ../calendar/libedata-cal/e-data-cal.c:933
#, c-format
msgid "Cannot retrieve calendar changes"
msgstr "Cannot retrieve calendar changes"
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#: ../calendar/libedata-cal/e-data-cal.c:983
#, c-format
msgid "Cannot retrieve calendar free/busy list"
msgstr "Cannot retrieve calendar free/busy list"
@@ -1340,60 +1333,60 @@ msgstr "No backend factory for '%s' of '%s'"
msgid "Could not instantiate backend"
msgstr "Could not instantiate backend"
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:65
msgid "Signing is not supported by this cipher"
msgstr "Signing is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:100
msgid "Signing message"
msgstr "Signing message"
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:120
msgid "Verifying is not supported by this cipher"
msgstr "Verifying is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:153
msgid "Verifying message"
msgstr "Verifying message"
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:176
msgid "Encryption is not supported by this cipher"
msgstr "Encryption is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:211
msgid "Encrypting message"
msgstr "Encrypting message"
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:233
msgid "Decryption is not supported by this cipher"
msgstr "Decryption is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:263
msgid "Decrypting message"
msgstr "Decrypting message"
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:283
msgid "You may not import keys with this cipher"
msgstr "You may not import keys with this cypher"
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:323
msgid "You may not export keys with this cipher"
msgstr "You may not export keys with this cypher"
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-data-cache.c:137
msgid "Unable to create cache path"
msgstr "Unable to create cache path"
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:427
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not remove cache entry: %s: %s"
-#: ../camel/camel-db.c:411
+#: ../camel/camel-db.c:458
msgid "Insufficient memory"
msgstr "Insufficient memory"
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:196
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -1405,7 +1398,7 @@ msgstr ""
"reconnect to the network."
#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/providers/imap/camel-imap-journal.c:313
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1416,7 +1409,7 @@ msgstr ""
"%s\n"
"Changes made to this folder will not be resynchronised."
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:300
msgid "Resynchronizing with server"
msgstr "Resynchronising with server"
@@ -1435,10 +1428,14 @@ msgstr "Preparing folder '%s' for offline"
#: ../camel/camel-disco-store.c:400
#: ../camel/providers/groupwise/camel-groupwise-store.c:216
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imap/camel-imap-store.c:1843
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/providers/imap/camel-imap-store.c:989
+#: ../camel/providers/imap/camel-imap-store.c:1831
+#: ../camel/providers/imap/camel-imap-store.c:2268
+#: ../camel/providers/imap/camel-imap-store.c:3077
+#: ../camel/providers/imapx/camel-imapx-store.c:152
+#: ../camel/providers/imapx/camel-imapx-store.c:605
+#: ../camel/providers/imapx/camel-imapx-store.c:665
+#: ../camel/providers/imapx/camel-imapx-store.c:714
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
@@ -1446,66 +1443,66 @@ msgstr "You must be working online to complete this operation"
msgid "No description available"
msgstr "No description available"
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:579
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "Failed to create child process '%s': %s"
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:837
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Invalid message stream received from %s: %s"
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
msgid "Syncing folders"
msgstr "Syncing folders"
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1122 ../camel/camel-filter-driver.c:1523
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Error parsing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1532
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Error executing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1217
msgid "Unable to open spool folder"
msgstr "Unable to open spool folder"
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1226
msgid "Unable to process spool folder"
msgstr "Unable to process spool folder"
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1242
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Getting message %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1245
+#: ../camel/camel-filter-driver.c:1246
msgid "Cannot open message"
msgstr "Cannot open message"
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1265
#, c-format
msgid "Failed on message %d"
msgstr "Failed on message %d"
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1279 ../camel/camel-filter-driver.c:1369
msgid "Syncing folder"
msgstr "Syncing folder"
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
msgid "Complete"
msgstr "Complete"
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1339
#, c-format
msgid "Getting message %d of %d"
msgstr "Getting message %d of %d"
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1354
#, c-format
msgid "Failed at message %d of %d"
msgstr "Failed at message %d of %d"
@@ -1528,8 +1525,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:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:350 ../camel/camel-folder-search.c:454
+#: ../camel/camel-folder-search.c:609
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -1538,8 +1535,8 @@ msgstr ""
"Cannot parse search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:464
+#: ../camel/camel-folder-search.c:619
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1548,73 +1545,85 @@ msgstr ""
"Error executing search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:811 ../camel/camel-folder-search.c:853
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) requires a single bool result"
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:906
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) not allowed inside %s"
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) requires a match type string"
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:946
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) expects an array result"
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:955
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) requires the folder set"
-#: ../camel/camel-folder.c:676
+#: ../camel/camel-folder.c:689
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "Unsupported operation: append message: for %s"
-#: ../camel/camel-folder.c:1381
+#: ../camel/camel-folder.c:1400
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "Unsupported operation: search by expression: for %s"
-#: ../camel/camel-folder.c:1422
+#: ../camel/camel-folder.c:1441
#, c-format
msgid "Unsupported operation: count by expression: for %s"
msgstr "Unsupported operation: count by expression: for %s"
-#: ../camel/camel-folder.c:1461
+#: ../camel/camel-folder.c:1482
#, c-format
msgid "Unsupported operation: search by UIDs: for %s"
msgstr "Unsupported operation: search by UIDs: for %s"
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:1595
+#: ../camel/providers/local/camel-maildir-folder.c:378
msgid "Moving messages"
msgstr "Moving messages"
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:1595
msgid "Copying messages"
msgstr "Copying messages"
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "Learning junk"
+#. Translators: The %s is replaced with a folder name where the operation is running.
+#: ../camel/camel-folder.c:1945
+#, 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:1933
-msgid "Learning non-junk"
-msgstr "Learning non-junk"
+#. Translators: The %s is replaced with a folder name where the operation is running.
+#: ../camel/camel-folder.c:1964
+#, 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:1953
-msgid "Filtering new message(s)"
-msgstr "Filtering new message(s)"
+#. Translators: The %s is replaced with a folder name where the operation is running.
+#: ../camel/camel-folder.c:1985
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Filtering new message in '%s'"
+msgstr[1] "Filtering new messages in '%s'"
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:734
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1625,15 +1634,15 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:751
msgid "Failed to parse gpg userid hint."
msgstr "Failed to parse gpg userid hint."
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:776 ../camel/camel-gpg-context.c:791
msgid "Failed to parse gpg passphrase request."
msgstr "Failed to parse gpg passphrase request."
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:811
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1642,7 +1651,7 @@ msgstr ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:815
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1651,226 +1660,223 @@ msgstr ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:821
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Unexpected request from GnuPG for '%s'"
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
+#: ../camel/camel-gpg-context.c:849 ../camel/camel-gpg-context.c:1101
msgid "Canceled."
msgstr "Cancelled."
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:864
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:889
+#: ../camel/camel-gpg-context.c:876
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Unexpected response from GnuPG: %s"
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:976
msgid "Failed to encrypt: No valid recipients specified."
msgstr "Failed to encrypt: No valid recipients specified."
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
+#: ../camel/camel-gpg-context.c:1255 ../camel/camel-gpg-context.c:1394
+#: ../camel/camel-gpg-context.c:2017 ../camel/camel-gpg-context.c:2069
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Failed to execute gpg: %s"
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
+#: ../camel/camel-gpg-context.c:1360 ../camel/camel-smime-context.c:758
#, c-format
msgid "Could not generate signing data: %s"
msgstr "Could not generate signing data: %s"
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+#: ../camel/camel-gpg-context.c:1413 ../camel/camel-gpg-context.c:1659
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1771
+#: ../camel/camel-gpg-context.c:1790 ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1933 ../camel/camel-gpg-context.c:2036
+#: ../camel/camel-gpg-context.c:2088
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../camel/camel-gpg-context.c:1553 ../camel/camel-gpg-context.c:1561
+#: ../camel/camel-gpg-context.c:1569 ../camel/camel-gpg-context.c:1586
+#: ../camel/camel-smime-context.c:880 ../camel/camel-smime-context.c:893
+#: ../camel/camel-smime-context.c:901
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1600
+#: ../camel/camel-gpg-context.c:1627
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "Cannot verify message signature: could not create temp file: %s"
-#: ../camel/camel-gpg-context.c:1711
+#: ../camel/camel-gpg-context.c:1752
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "Could not generate encrypting data: %s"
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1808
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1865 ../camel/camel-gpg-context.c:1874
+#: ../camel/camel-gpg-context.c:1896
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Cannot decrypt message: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1885
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Failed to decrypt MIME part: protocol error"
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-smime-context.c:1174
msgid "Encrypted content"
msgstr "Encrypted content"
-#: ../camel/camel-gpg-context.c:1930
+#: ../camel/camel-gpg-context.c:1991
msgid "Unable to parse message content"
msgstr "Unable to parse message content"
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/camel-gpg-context.c:2018 ../camel/camel-gpg-context.c:2070
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
+#: ../camel/providers/smtp/camel-smtp-transport.c:207
msgid "Unknown"
msgstr "Unknown"
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
#, c-format
msgid "Cannot build locking helper pipe: %s"
msgstr "Cannot build locking helper pipe: %s"
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:129
#, c-format
msgid "Cannot fork locking helper: %s"
msgstr "Cannot fork locking helper: %s"
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:209 ../camel/camel-lock-client.c:235
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
msgstr "Could not lock '%s': protocol error with lock-helper"
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:224
#, c-format
msgid "Could not lock '%s'"
msgstr "Could not lock '%s'"
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:104
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "Could not create lock file for %s: %s"
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:147
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr "Timed out trying to get lock file on %s. Try again later."
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:206
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "Failed to get lock using fcntl(2): %s"
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "Failed to get lock using flock(2): %s"
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:108
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "Could not check mail file %s: %s"
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:121
#, c-format
msgid "Could not open mail file %s: %s"
msgstr "Could not open mail file %s: %s"
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:130
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "Could not open temporary mail file %s: %s"
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "Failed to store mail in temp file %s: %s"
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:192
#, c-format
msgid "Could not create pipe: %s"
msgstr "Could not create pipe: %s"
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:205
#, c-format
msgid "Could not fork: %s"
msgstr "Could not fork: %s"
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:243
#, c-format
msgid "Movemail program failed: %s"
msgstr "Movemail program failed: %s"
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:244
msgid "(Unknown error)"
msgstr "(Unknown error)"
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:270
#, c-format
msgid "Error reading mail file: %s"
msgstr "Error reading mail file: %s"
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:282
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "Error writing mail temp file: %s"
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
#, c-format
msgid "Error copying mail temp file: %s"
msgstr "Error copying mail temp file: %s"
-#: ../camel/camel-multipart-signed.c:592
+#: ../camel/camel-multipart-signed.c:596
msgid "parse error"
msgstr "parse error"
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:673
-#: ../camel/camel-net-utils.c:802
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
+#: ../camel/camel-net-utils.c:511 ../camel/camel-net-utils.c:694
+#: ../camel/camel-net-utils.c:842
+#: ../camel/providers/pop3/camel-pop3-store.c:468
+#: ../camel/providers/pop3/camel-pop3-store.c:568
msgid "Canceled"
msgstr "Cancelled"
-#: ../camel/camel-net-utils.c:523
+#: ../camel/camel-net-utils.c:533
msgid "cannot create thread"
msgstr "cannot create thread"
-#: ../camel/camel-net-utils.c:677
+#: ../camel/camel-net-utils.c:698
#, c-format
msgid "Resolving: %s"
msgstr "Resolving: %s"
-#: ../camel/camel-net-utils.c:699
+#: ../camel/camel-net-utils.c:720
msgid "Host lookup failed"
msgstr "Host lookup failed"
-#: ../camel/camel-net-utils.c:701
+#: ../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:806
+#: ../camel/camel-net-utils.c:846
msgid "Resolving address"
msgstr "Resolving address"
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:866
msgid "Name lookup failed"
msgstr "Name lookup failed"
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:871
#, c-format
msgid "Name lookup failed: %s"
msgstr "Name lookup failed: %s"
@@ -1885,47 +1891,47 @@ msgstr "Syncing messages in folder '%s' to disk"
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "Cannot write offline journal for folder '%s': %s"
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:59
msgid "Virtual folder email provider"
msgstr "Virtual folder e-mail provider"
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:61
msgid "For reading mail as a query of another set of folders"
msgstr "For reading mail as a query of another set of folders"
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:185
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "Could not load %s: Module loading not supported on this system."
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:194
#, c-format
msgid "Could not load %s: %s"
msgstr "Could not load %s: %s"
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:203
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "Could not load %s: No initialisation code in module."
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:383 ../camel/camel-session.c:116
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "No provider available for protocol '%s'"
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
msgid "Anonymous"
msgstr "Anonymous"
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
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:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:65
msgid "Authentication failed."
msgstr "Authentication failed."
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:75
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -1934,7 +1940,7 @@ msgstr ""
"Invalid e-mail address trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:88
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -1943,7 +1949,7 @@ msgstr ""
"Invalid opaque trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:101
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -1952,11 +1958,11 @@ msgstr ""
"Invalid trace information:\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../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."
@@ -1964,11 +1970,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:48
+#: ../camel/camel-sasl-digest-md5.c:52
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:54
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -1976,40 +1982,40 @@ 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:844
+#: ../camel/camel-sasl-digest-md5.c:812
msgid "Server challenge too long (>2048 octets)"
msgstr "Server challenge too long (>2048 octets)"
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:822
msgid "Server challenge invalid\n"
msgstr "Server challenge invalid\n"
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:829
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "Server challenge contained invalid \"Quality of Protection\" token"
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:860
msgid "Server response did not contain authorization data"
msgstr "Server response did not contain authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:880
msgid "Server response contained incomplete authorization data"
msgstr "Server response contained incomplete authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:892
msgid "Server response does not match"
msgstr "Server response does not match"
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:76
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:78
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:168
+#: ../camel/camel-sasl-gssapi.c:115
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
@@ -2017,11 +2023,11 @@ msgstr ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognised by the implementation."
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:120
msgid "The provided target_name parameter was ill-formed."
msgstr "The provided target_name parameter was ill-formed."
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:123
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
@@ -2029,7 +2035,7 @@ msgstr ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:127
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
@@ -2037,7 +2043,7 @@ msgstr ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:132
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
@@ -2045,7 +2051,7 @@ msgstr ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:136
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
@@ -2053,49 +2059,49 @@ msgstr ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:141
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:197
+#: ../camel/camel-sasl-gssapi.c:144
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:200
+#: ../camel/camel-sasl-gssapi.c:147
msgid "The consistency checks performed on the credential failed."
msgstr "The consistency checks performed on the credential failed."
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:150
msgid "The referenced credentials have expired."
msgstr "The referenced credentials have expired."
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:156 ../camel/camel-sasl-gssapi.c:287
+#: ../camel/camel-sasl-gssapi.c:330 ../camel/camel-sasl-gssapi.c:346
+#: ../camel/providers/imap/camel-imap-store.c:1260
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:357
msgid "Unsupported security layer."
msgstr "Unsupported security layer."
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
msgid "Login"
msgstr "Login"
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../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:134
+#: ../camel/camel-sasl-login.c:96
msgid "Unknown authentication state."
msgstr "Unknown authentication state."
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:39
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
@@ -2103,51 +2109,51 @@ msgstr ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
msgid "PLAIN"
msgstr "PLAIN"
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:43
msgid "POP before SMTP"
msgstr "POP before SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:45
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:106
+#: ../camel/camel-sasl-popb4smtp.c:79
msgid "POP Source URI"
msgstr "POP Source URI"
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:85
msgid "POP Before SMTP auth using an unknown transport"
msgstr "POP Before SMTP auth using an unknown transport"
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:92
msgid "POP Before SMTP auth using a non-pop source"
msgstr "POP Before SMTP auth using a non-pop source"
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:113
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "Regular expression compilation failed: %s: %s"
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:207
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' needs a username component"
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:211
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' needs a host component"
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:215
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' needs a path component"
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:174
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2156,214 +2162,202 @@ msgstr ""
"Could not create directory %s:\n"
"%s"
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:641
#, 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-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel session doesn't support forwarding of a message."
-
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:340 ../camel/camel-smime-context.c:975
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Cannot find certificate for '%s'"
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:346
msgid "Cannot create CMS message"
msgstr "Cannot create CMS message"
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:351
msgid "Cannot create CMS signed data"
msgstr "Cannot create CMS signed data"
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:357
msgid "Cannot attach CMS signed data"
msgstr "Cannot attach CMS signed data"
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:364
msgid "Cannot attach CMS data"
msgstr "Cannot attach CMS data"
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:370
msgid "Cannot create CMS Signer information"
msgstr "Cannot create CMS Signer information"
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:376
msgid "Cannot find certificate chain"
msgstr "Cannot find certificate chain"
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:382
msgid "Cannot add CMS Signing time"
msgstr "Cannot add CMS Signing time"
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:406 ../camel/camel-smime-context.c:421
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "Encryption certificate for '%s' does not exist"
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:428
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "Cannot add SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:433
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:438
msgid "Cannot add encryption certificate"
msgstr "Cannot add encryption certificate"
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:444
msgid "Cannot add CMS Signer information"
msgstr "Cannot add CMS Signer information"
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "Cannot create encoder context"
-
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "Failed to add data to CMS encoder"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "Failed to encode data"
-
-#: ../camel/camel-smime-context.c:700
+#: ../camel/camel-smime-context.c:476
msgid "Unverified"
msgstr "Unverified"
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:478
msgid "Good signature"
msgstr "Good signature"
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:480
msgid "Bad signature"
msgstr "Bad signature"
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:482
msgid "Content tampered with or altered in transit"
msgstr "Content tampered with or altered in transit"
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:484
msgid "Signing certificate not found"
msgstr "Signing certificate not found"
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:486
msgid "Signing certificate not trusted"
msgstr "Signing certificate not trusted"
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:488
msgid "Signature algorithm unknown"
msgstr "Signature algorithm unknown"
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:490
msgid "Signature algorithm unsupported"
msgstr "Signature algorithm unsupported"
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:492
msgid "Malformed signature"
msgstr "Malformed signature"
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:494
msgid "Processing error"
msgstr "Processing error"
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:536
msgid "No signed data in signature"
msgstr "No signed data in signature"
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:541
msgid "Digests missing from enveloped data"
msgstr "Digests missing from enveloped data"
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:554 ../camel/camel-smime-context.c:565
msgid "Cannot calculate digests"
msgstr "Cannot calculate digests"
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:572 ../camel/camel-smime-context.c:576
msgid "Cannot set message digests"
msgstr "Cannot set message digests"
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:591
msgid "Certificate import failed"
msgstr "Certificate import failed"
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:601
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "Certificate is the only message, cannot verify certificates"
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:604
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "Certificate is the only message, certificates imported and verified"
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:608
msgid "Cannot find signature digests"
msgstr "Cannot find signature digests"
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:624
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "Signer: %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:769 ../camel/camel-smime-context.c:1047
+msgid "Cannot create encoder context"
+msgstr "Cannot create encoder context"
+
+#: ../camel/camel-smime-context.c:775
+msgid "Failed to add data to CMS encoder"
+msgstr "Failed to add data to CMS encoder"
+
+#: ../camel/camel-smime-context.c:780 ../camel/camel-smime-context.c:1065
+msgid "Failed to encode data"
+msgstr "Failed to encode data"
+
+#: ../camel/camel-smime-context.c:915 ../camel/camel-smime-context.c:1153
msgid "Decoder failed"
msgstr "Decoder failed"
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:982
msgid "Cannot find common bulk encryption algorithm"
msgstr "Cannot find common bulk encryption algorithm"
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:990
msgid "Cannot allocate slot for encryption bulk key"
msgstr "Cannot allocate slot for encryption bulk key"
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1001
msgid "Cannot create CMS Message"
msgstr "Cannot create CMS Message"
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1007
msgid "Cannot create CMS Enveloped data"
msgstr "Cannot create CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1013
msgid "Cannot attach CMS Enveloped data"
msgstr "Cannot attach CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1019
msgid "Cannot attach CMS data object"
msgstr "Cannot attach CMS data object"
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1028
msgid "Cannot create CMS Recipient information"
msgstr "Cannot create CMS Recipient information"
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1033
msgid "Cannot add CMS Recipient information"
msgstr "Cannot add CMS Recipient information"
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1059
msgid "Failed to add data to encoder"
msgstr "Failed to add data to encoder"
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1160
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: No encrypted content found"
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "import keys: unimplemented"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "export keys: unimplemented"
-
#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:162
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Cannot get folder: Invalid operation on this store"
@@ -2381,14 +2375,14 @@ msgstr "Cannot create folder: Invalid operation on this store"
msgid "Cannot create folder: %s: folder exists"
msgstr "Cannot create folder: %s: folder exists"
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:389
+#: ../camel/providers/local/camel-maildir-store.c:214
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Cannot delete folder: %s: Invalid operation"
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:426
+#: ../camel/providers/local/camel-maildir-store.c:286
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Cannot rename folder: %s: Invalid operation"
@@ -2403,7 +2397,7 @@ msgstr "Wastebasket"
msgid "Junk"
msgstr "Junk"
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:712
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2416,16 +2410,16 @@ msgstr ""
"Fingerprint: %s\n"
"Signature: %s"
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:718
msgid "GOOD"
msgstr "GOOD"
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:718
msgid "BAD"
msgstr "BAD"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:722
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2440,7 +2434,7 @@ msgstr ""
"\n"
"Do you wish to accept?"
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:766
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2449,7 +2443,7 @@ msgstr ""
"Certificate problem: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:818
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2458,7 +2452,7 @@ msgstr ""
"Bad certificate domain: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:836
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2467,7 +2461,7 @@ msgstr ""
"Certificate expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:853
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2476,7 +2470,7 @@ msgstr ""
"Certificate revocation list expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:315
#, c-format
msgid "Could not parse URL '%s'"
msgstr "Could not parse URL '%s'"
@@ -2495,17 +2489,17 @@ msgstr "No such message %s in %s"
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "Cannot copy or move messages into a Virtual Folder"
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:118 ../camel/camel-vee-store.c:119
+#: ../camel/camel-vee-store.c:365
msgid "Unmatched"
msgstr "Unmatched"
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:412
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Cannot delete folder: %s: No such folder"
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:434
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Cannot rename folder: %s: No such folder"
@@ -2518,7 +2512,7 @@ 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:137
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:130
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -2527,178 +2521,164 @@ msgstr ""
"Cannot get message: %s\n"
" %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:293
-#: ../camel/providers/local/camel-maildir-folder.c:401
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:130
+#: ../camel/providers/local/camel-maildir-folder.c:258
+#: ../camel/providers/local/camel-maildir-folder.c:286
+#: ../camel/providers/local/camel-maildir-folder.c:391
+#: ../camel/providers/local/camel-mbox-folder.c:354
+#: ../camel/providers/local/camel-mbox-folder.c:404
+#: ../camel/providers/local/camel-mh-folder.c:221
msgid "No such message"
msgstr "No such message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "User cancelled"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:142
+#: ../camel/providers/pop3/camel-pop3-folder.c:262
#: ../camel/providers/pop3/camel-pop3-folder.c:581
#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
#: ../camel/providers/pop3/camel-pop3-folder.c:660
+msgid "User canceled"
+msgstr "User cancelled"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
+#: ../camel/providers/nntp/camel-nntp-folder.c:150
+#: ../camel/providers/nntp/camel-nntp-folder.c:152
+#: ../camel/providers/nntp/camel-nntp-folder.c:161
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/pop3/camel-pop3-folder.c:382
+#: ../camel/providers/pop3/camel-pop3-folder.c:584
+#: ../camel/providers/pop3/camel-pop3-folder.c:645
+#: ../camel/providers/pop3/camel-pop3-folder.c:652
+#: ../camel/providers/pop3/camel-pop3-folder.c:663
#, c-format
msgid "Cannot get message %s: %s"
msgstr "Cannot get message %s: %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:166
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:174
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2522
msgid "This message is not available in offline mode."
msgstr "This message is not available in offline mode."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:188
#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2024
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2075
msgid "Could not get message"
msgstr "Could not get message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:990
+#: ../camel/providers/imap/camel-imap-folder.c:274
#, c-format
msgid "Could not load summary for %s"
msgstr "Could not load summary for %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1063
#, c-format
msgid "Checking for deleted messages %s"
msgstr "Checking for deleted messages %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1338
msgid "Trash Folder Full. Please Empty."
msgstr "Wastebasket Folder Full. Please Empty."
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1572
#: ../camel/providers/groupwise/camel-groupwise-store.c:626
#: ../camel/providers/groupwise/camel-groupwise-store.c:756
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2741
-#: ../camel/providers/imapx/camel-imapx-server.c:2826
+#: ../camel/providers/imap/camel-imap-folder.c:3409
+#: ../camel/providers/imap/camel-imap-folder.c:3485
+#: ../camel/providers/imapx/camel-imapx-server.c:2971
+#: ../camel/providers/imapx/camel-imapx-server.c:3057
#, 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:2360
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2376
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2419
#, 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:2391
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2407
#, c-format
msgid "Cannot create message: %s"
msgstr "Cannot create message: %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:275
#, c-format
msgid "Cannot get folder container %s"
msgstr "Cannot get folder container %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:337
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:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:353
#, c-format
msgid "Cannot append message in offline mode: %s"
msgstr "Cannot append message in offline mode: %s"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:49
msgid "Checking for new mail"
msgstr "Checking for new mail"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:51
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
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:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
msgid "Options"
msgstr "Options"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "_Apply filters to new messages in Inbox on this server"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:58
msgid "Check new messages for J_unk contents"
msgstr "Check new messages for J_unk contents"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "Only check for Junk messages in the IN_BOX folder"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
msgid "Automatically synchroni_ze account locally"
msgstr "Automatically synchroni_se account locally"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
msgid "SOAP Settings"
msgstr "SOAP Settings"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:70
msgid "Post Office Agent SOAP _Port:"
msgstr "Post Office Agent SOAP _Port:"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:82
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:84
msgid "For accessing Novell GroupWise servers"
msgstr "For accessing Novell GroupWise servers"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:99
+#: ../camel/providers/imap/camel-imap-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:103
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
msgid "Password"
msgstr "Password"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:101
msgid ""
"This option will connect to the GroupWise server using a plaintext password."
msgstr ""
@@ -2709,7 +2689,8 @@ msgid "Host or user not available in url"
msgstr "Host or user not available in url"
#: ../camel/providers/groupwise/camel-groupwise-store.c:197
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/imap/camel-imap-store.c:1344
+#: ../camel/providers/imapx/camel-imapx-server.c:2301
msgid "You did not enter a password."
msgstr "You did not enter a password."
@@ -2718,9 +2699,9 @@ msgid "Some features may not work correctly with your current server version"
msgstr "Some features may not work correctly with your current server version"
#: ../camel/providers/groupwise/camel-groupwise-store.c:533
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:297
+#: ../camel/providers/imap/camel-imap-store.c:1867
+#: ../camel/providers/imap/camel-imap-store.c:2065
+#: ../camel/providers/imapx/camel-imapx-store.c:316
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
@@ -2730,8 +2711,9 @@ msgid "Cannot create GroupWise folders in offline mode."
msgstr "Cannot create GroupWise folders in offline mode."
#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/imap/camel-imap-store.c:1942
+#: ../camel/providers/imap/camel-imap-store.c:2343
+#: ../camel/providers/imapx/camel-imapx-store.c:751
msgid "The parent folder is not allowed to contain subfolders"
msgstr "The parent folder is not allowed to contain subfolders"
@@ -2742,7 +2724,7 @@ msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "Cannot rename GroupWise folder '%s' to '%s'"
#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:111
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise server %s"
@@ -2752,16 +2734,16 @@ msgstr "GroupWise server %s"
msgid "GroupWise service for %s on %s"
msgstr "GroupWise service for %s on %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:113
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "GroupWise mail delivery via %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:155
msgid "Sending Message"
msgstr "Sending Message"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:203
msgid ""
"You have exceeded this account's storage limit. Your messages are queued in "
"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2771,101 +2753,38 @@ msgstr ""
"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
"of your mail.\n"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:205
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:201
#, c-format
msgid "Could not send message: %s"
msgstr "Could not send message: %s"
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Checking for New Mail"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "Connection to Server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "_Use custom command to connect to server"
-msgstr "_Use custom command to connect to server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "Command:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Folders"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-msgid "_Show only subscribed folders"
-msgstr "_Show only subscribed folders"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
-msgid "O_verride server-supplied folder namespace"
-msgstr "O_verride server-supplied folder namespace"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "Namespace"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "For accessing Hula servers"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr ""
-"This option will connect to the Hula server using a plaintext password."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:177
+#: ../camel/providers/imap/camel-imap-command.c:261
msgid "No output stream"
msgstr "No output stream"
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:182
+#: ../camel/providers/imap/camel-imap-command.c:266
msgid "No input stream"
msgstr "No input stream"
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3105
+#: ../camel/providers/imap/camel-imap-command.c:225
+#: ../camel/providers/imap/camel-imap-command.c:274
+#: ../camel/providers/imap/camel-imap-command.c:488
+#: ../camel/providers/imap/camel-imap-store.c:3114
msgid "Operation cancelled"
msgstr "Operation cancelled"
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:327
+#: ../camel/providers/imap/camel-imap-store.c:3119
#, 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:352
+#: ../camel/providers/imap/camel-imap-command.c:348
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -2874,260 +2793,285 @@ msgstr ""
"Alert from IMAP server %s %s:\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:417
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "Unexpected response from IMAP server: %s"
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:427
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP command failed: %s"
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:502
msgid "Server response ended too soon."
msgstr "Server response ended too soon."
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:708
#, 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:748
+#: ../camel/providers/imap/camel-imap-command.c:744
#, 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:90
+#: ../camel/providers/imap/camel-imap-folder.c:69
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:276
+#: ../camel/providers/imap/camel-imap-folder.c:255
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Could not create directory %s: %s"
#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2771
+#: ../camel/providers/imap/camel-imap-folder.c:897
+#: ../camel/providers/imapx/camel-imapx-server.c:3000
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Scanning for changed messages in %s"
-#: ../camel/providers/imap/camel-imap-folder.c:1986
+#: ../camel/providers/imap/camel-imap-folder.c:1966
#, c-format
msgid "Unexpected response status '%s' after APPEND command"
msgstr "Unexpected response status '%s' after APPEND command"
-#: ../camel/providers/imap/camel-imap-folder.c:2001
+#: ../camel/providers/imap/camel-imap-folder.c:1981
msgid "No response on continuation after APPEND command"
msgstr "No response on continuation after APPEND command"
-#: ../camel/providers/imap/camel-imap-folder.c:2046
+#: ../camel/providers/imap/camel-imap-folder.c:2026
msgid "Unknown error occurred during APPEND command!"
msgstr "Unknown error occurred during APPEND command!"
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2857
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "Unable to retrieve message: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:2892
+#: ../camel/providers/imapx/camel-imapx-server.c:3981
#, 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:2913
+#: ../camel/providers/imap/camel-imap-folder.c:2893
+#: ../camel/providers/imapx/camel-imapx-server.c:3982
msgid "No such message available."
msgstr "No such message available."
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:2954
+#: ../camel/providers/imap/camel-imap-folder.c:3799
+#: ../camel/providers/nntp/camel-nntp-folder.c:222
msgid "This message is not currently available"
msgstr "This message is not currently available"
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3612
#, 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:3640
+#: ../camel/providers/imap/camel-imap-folder.c:3620
#, 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:3857
+#: ../camel/providers/imap/camel-imap-folder.c:3837
msgid "Could not find message body in FETCH response."
msgstr "Could not find message body in FETCH response."
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
+#: ../camel/providers/imap/camel-imap-message-cache.c:176
+#: ../camel/providers/imap/camel-imap-message-cache.c:239
#, c-format
msgid "Could not open cache directory: %s"
msgstr "Could not open cache directory: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:325
+#: ../camel/providers/imap/camel-imap-message-cache.c:382
+#: ../camel/providers/imap/camel-imap-message-cache.c:413
+#: ../camel/providers/imap/camel-imap-message-cache.c:445
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "Failed to cache message %s: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
#, c-format
msgid "Failed to cache %s: %s"
msgstr "Failed to cache %s: %s"
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "Checking for New Mail"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
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:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Connection to Server"
+msgstr "Connection to Server"
+
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "_Use custom command to connect to server"
+msgstr "_Use custom command to connect to server"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "Command:"
+msgstr "Command:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Folders"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+msgid "_Show only subscribed folders"
+msgstr "_Show only subscribed folders"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
+msgid "O_verride server-supplied folder namespace"
+msgstr "O_verride server-supplied folder namespace"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
msgid "Namespace:"
msgstr "Namespace:"
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
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:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
msgid "Check new messages for Jun_k contents"
msgstr "Check new messages for Jun_k contents"
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
msgid "Automatically synchroni_ze remote mail locally"
msgstr "Automatically synchroni_se remote mail locally"
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
msgid "IMAP"
msgstr "IMAP"
-#: ../camel/providers/imap/camel-imap-provider.c:85
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
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:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
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:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imap/camel-imap-store.c:423
+#: ../camel/providers/imapx/camel-imapx-store.c:186
#, c-format
msgid "IMAP server %s"
msgstr "IMAP server %s"
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:169
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/imapx/camel-imapx-store.c:188
#, c-format
msgid "IMAP service for %s on %s"
msgstr "IMAP service for %s on %s"
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:581
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/nntp/camel-nntp-store.c:176
+#: ../camel/providers/nntp/camel-nntp-store.c:191
+#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:261
#, c-format
msgid "Could not connect to %s: %s"
msgstr "Could not connect to %s: %s"
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:555
+#: ../camel/providers/nntp/camel-nntp-store.c:177
+#: ../camel/providers/pop3/camel-pop3-store.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:247
msgid "SSL unavailable"
msgstr "SSL unavailable"
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2031
+#: ../camel/providers/imap/camel-imap-store.c:566
+#: ../camel/providers/imap/camel-imap-store.c:848
+#: ../camel/providers/imapx/camel-imapx-server.c:2163
msgid "Connection cancelled"
msgstr "Connection cancelled"
-#: ../camel/providers/imap/camel-imap-store.c:689
-#: ../camel/providers/imap/camel-imap-store.c:708
-#: ../camel/providers/imap/camel-imap-store.c:714
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:2071
-#: ../camel/providers/imapx/camel-imapx-server.c:2085
+#: ../camel/providers/imap/camel-imap-store.c:677
+#: ../camel/providers/imap/camel-imap-store.c:696
+#: ../camel/providers/imap/camel-imap-store.c:702
+#: ../camel/providers/imap/camel-imap-store.c:728
+#: ../camel/providers/imapx/camel-imapx-server.c:2208
+#: ../camel/providers/imapx/camel-imapx-server.c:2230
#, 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:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2072
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:678
+#: ../camel/providers/imapx/camel-imapx-server.c:2209
+#: ../camel/providers/smtp/camel-smtp-transport.c:319
msgid "STARTTLS not supported"
msgstr "STARTTLS not supported"
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2086
+#: ../camel/providers/imap/camel-imap-store.c:697
+#: ../camel/providers/imapx/camel-imapx-server.c:2231
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:358
msgid "SSL is not available in this build"
msgstr "SSL is not available in this build"
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:851
#, 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:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:349
-#: ../camel/providers/imapx/camel-imapx-store.c:578
-#: ../camel/providers/local/camel-maildir-folder.c:81
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:461
+#: ../camel/providers/imap/camel-imap-store.c:1039
+#: ../camel/providers/imap/camel-imap-store.c:2439
+#: ../camel/providers/imapx/camel-imapx-store.c:368
+#: ../camel/providers/imapx/camel-imapx-store.c:920
+#: ../camel/providers/local/camel-maildir-folder.c:76
+#: ../camel/providers/local/camel-maildir-store.c:214
+#: ../camel/providers/local/camel-maildir-store.c:286
+#: ../camel/providers/local/camel-maildir-store.c:512
+#: ../camel/providers/local/camel-maildir-store.c:525
+#: ../camel/providers/local/camel-spool-store.c:455
msgid "Inbox"
msgstr "Inbox"
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1291
#, 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:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1301
+#: ../camel/providers/smtp/camel-smtp-transport.c:493
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:1375
+#: ../camel/providers/imapx/camel-imapx-server.c:2329
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3138,419 +3082,121 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1891
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2281
+#: ../camel/providers/imapx/camel-imapx-store.c:736
#, 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:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1996
+#: ../camel/providers/local/camel-maildir-store.c:187
+#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mh-store.c:243
#, c-format
msgid "Cannot create folder '%s': folder exists."
msgstr "Cannot create folder '%s': folder exists."
-#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imap/camel-imap-store.c:2292
+#: ../camel/providers/imapx/camel-imapx-store.c:744
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3116
msgid "Server unexpectedly disconnected"
msgstr "Server unexpectedly disconnected"
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Failed sending command to IMAP server %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Unexpected response from IMAP4 server %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Unexpected greeting from IMAP server %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Cannot select folder '%s': Invalid mailbox name"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Cannot select folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Failed to send command to IMAP server %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "service unavailable"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 server %s unexpectedly disconnected: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Expire cached messages that haven't been read in X seconds"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "Expire cached messages older than X seconds"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Cannot access folder '%s': %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Cannot syncronise flags to folder '%s': Unknown error"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Cannot syncronise flags to folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Cannot expunge folder '%s': Unknown error"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Cannot expunge folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Cannot get message %s from folder '%s': No such message"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Cannot get message %s from folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "Cannot append message to folder '%s': Folder is read-only"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Cannot append message to folder '%s': Unknown error"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Cannot append message to folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "Cannot move messages from folder '%s' to folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "Check new messages for _Junk contents"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Only check for Junk messa_ges in the INBOX folder"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "For reading and storing mail on IMAPv4rev1 servers."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "Connection cancelled"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-msgid "TLS negotiations failed"
-msgstr "TLS negotiations failed"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Cannot authenticate to IMAP server %s using %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Cannot create IMAP folders in offline mode."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Cannot get folder '%s' on IMAP server %s: Unknown error"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "Cannot get LIST information for '%s' on IMAP server %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Cannot create folder '%s': Invalid mailbox name"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Cannot create folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Cannot delete folder '%s': Special folder"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Cannot delete IMAP folders in offline mode."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Cannot delete folder '%s': Invalid mailbox name"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Cannot delete folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Cannot rename folder '%s' to '%s': Special folder"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Cannot rename IMAP folders in offline mode."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Cannot rename folder '%s' to '%s': Bad command"
-
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Cannot subscribe to IMAP folders in offline mode."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Cannot subscribe to folder '%s': Invalid mailbox name"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Cannot subscribe to folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Cannot unsubscribe from IMAP folders in offline mode."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Cannot unsubscribe from folder '%s': Bad command"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "Scanning for changed messages"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP server %s is in an inconsistent state."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "Fetching envelopes of new messages"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Unexpected token in response from IMAP server %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "No data"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP server %s unexpectedly disconnected: %s"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
+#: ../camel/providers/imapx/camel-imapx-folder.c:73
#, 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:92
+#: ../camel/providers/imapx/camel-imapx-folder.c:81
#, c-format
msgid "Could not create cache for %s"
msgstr "Could not create cache for %s"
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
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:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
msgid "Numbe_r of cached connections to use"
msgstr "Numbe_r of cached connections to use"
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapx/camel-imapx-server.c:2034
+#: ../camel/providers/imapx/camel-imapx-server.c:2166
#, c-format
msgid "Could not connect to %s (port %s): %s"
msgstr "Could not connect to %s (port %s): %s"
-#: ../camel/providers/imapx/camel-imapx-server.c:2114
-#, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%sPlease enter the IMAP password for %s %s"
-
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:171
msgid "Index message body data"
msgstr "Index message body data"
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#. Translators: This is used for a folder description, for folders being under $HOME.
+#. The first %s is replaced with a relative path under $HOME,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#: ../camel/providers/local/camel-local-folder.c:390
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
+#. Translators: This is used for a folder description, for folders being under /var/spool/mail.
+#. The first %s is replaced with a relative path under /var/spool/mail,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#. Translators: This is used for a folder description, for folders being under /var/mail.
+#. The first %s is replaced with a relative path under /var/mail,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#: ../camel/providers/local/camel-local-folder.c:396
#: ../camel/providers/local/camel-local-folder.c:402
#, c-format
msgid "mailbox: %s (%s)"
msgstr "mailbox: %s (%s)"
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#. Translators: This is used for a folder description.
+#. The first %s is replaced with a folder's full path,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#: ../camel/providers/local/camel-local-folder.c:408
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-provider.c:48
+#. Translators: The first %s is replaced with a message ID,
+#. the second %s is replaced with the folder path,
+#. the third %s is replaced with a detailed error string
+#: ../camel/providers/local/camel-local-folder.c:664
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Cannot get message %s from folder %s\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
msgid "_Use the '.folders' folder summary file (exmh)"
msgstr "_Use the '.folders' folder summary file (exmh)"
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
msgid "MH-format mail directories"
msgstr "MH-format mail directories"
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
msgid "For storing local mail in MH-like mail directories."
msgstr "For storing local mail in MH-like mail directories."
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
msgid "Local delivery"
msgstr "Local delivery"
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
msgid ""
"For retrieving (moving) local mail from standard mbox-formatted spools into "
"folders managed by Evolution."
@@ -3558,29 +3204,29 @@ msgstr ""
"For retrieving (moving) local mail from standard mbox-formatted spools into "
"folders managed by Evolution."
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
msgid "_Apply filters to new messages in INBOX"
msgstr "_Apply filters to new messages in INBOX"
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
msgid "Maildir-format mail directories"
msgstr "Maildir-format mail directories"
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
msgid "For storing local mail in maildir directories."
msgstr "For storing local mail in maildir directories."
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
msgid "_Store status headers in Elm/Pine/Mutt format"
msgstr "_Store status headers in Elm/Pine/Mutt format"
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
msgid "Standard Unix mbox spool file"
msgstr "Standard Unix mbox spool file"
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
msgid ""
"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3588,212 +3234,191 @@ msgstr ""
"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
msgid "Standard Unix mbox spool directory"
msgstr "Standard Unix mbox spool directory"
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:156
+#: ../camel/providers/local/camel-local-store.c:267
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-spool-store.c:120
#, 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:170
+#: ../camel/providers/local/camel-local-store.c:163
#, 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:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:180
+#: ../camel/providers/local/camel-local-store.c:278
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Cannot get folder: %s: %s"
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:192
msgid "Local stores do not have an inbox"
msgstr "Local stores do not have an inbox"
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:238
#, c-format
msgid "Local mail file %s"
msgstr "Local mail file %s"
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:333
#, 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:408
+#: ../camel/providers/local/camel-local-store.c:401
#, c-format
msgid "Could not rename '%s': %s"
msgstr "Could not rename '%s': %s"
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:426
+#: ../camel/providers/local/camel-mbox-store.c:292
#, 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:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:449
+#: ../camel/providers/local/camel-mbox-store.c:316
#, 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:515
+#: ../camel/providers/local/camel-local-summary.c:509
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:230
+#: ../camel/providers/local/camel-maildir-folder.c:225
msgid "Maildir append message canceled"
msgstr "Maildir append message cancelled"
-#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:228
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Cannot append message to maildir folder: %s: %s"
-#: ../camel/providers/local/camel-maildir-folder.c:263
-#: ../camel/providers/local/camel-maildir-folder.c:292
#: ../camel/providers/local/camel-maildir-folder.c:306
-#: ../camel/providers/local/camel-maildir-folder.c:314
-#: ../camel/providers/local/camel-maildir-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:315
msgid "Invalid message contents"
msgstr "Invalid message contents"
-#: ../camel/providers/local/camel-maildir-folder.c:418
+#: ../camel/providers/local/camel-maildir-folder.c:408
msgid "Cannot transfer message to destination folder"
msgstr "Cannot transfer message to destination folder"
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:143
+#: ../camel/providers/local/camel-maildir-store.c:168
+#: ../camel/providers/local/camel-mbox-store.c:168
+#: ../camel/providers/local/camel-mbox-store.c:180
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "Cannot create folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:156
+#: ../camel/providers/local/camel-mbox-store.c:139
+#: ../camel/providers/local/camel-mh-store.c:211
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "Cannot get folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:160
+#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mh-store.c:218
#, 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:189
+#: ../camel/providers/local/camel-maildir-store.c:184
#, 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:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:229
+#: ../camel/providers/local/camel-maildir-store.c:267
+#: ../camel/providers/local/camel-mh-store.c:267
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "Could not delete folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:231
msgid "not a maildir directory"
msgstr "not a maildir directory"
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:435
+#: ../camel/providers/local/camel-spool-store.c:322
+#: ../camel/providers/local/camel-spool-store.c:336
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "Could not scan folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:423
+#: ../camel/providers/local/camel-maildir-summary.c:542
#, 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:544
+#: ../camel/providers/local/camel-maildir-summary.c:535
msgid "Checking folder consistency"
msgstr "Checking folder consistency"
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:628
msgid "Checking for new messages"
msgstr "Checking for new messages"
-#: ../camel/providers/local/camel-maildir-summary.c:724
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:517
+#: ../camel/providers/local/camel-mbox-summary.c:713
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:144
msgid "Storing folder"
msgstr "Storing folder"
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:155
+#: ../camel/providers/local/camel-spool-folder.c:139
#, 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:231
+#: ../camel/providers/local/camel-mbox-folder.c:219
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "Cannot open mailbox: %s: %s\n"
-#: ../camel/providers/local/camel-mbox-folder.c:297
+#: ../camel/providers/local/camel-mbox-folder.c:285
msgid "Mail append canceled"
msgstr "Mail append cancelled"
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:288
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "Cannot append message to mbox file: %s: %s"
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:454
msgid "The folder appears to be irrecoverably corrupted."
msgstr "The folder appears to be irrecoverably corrupted."
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
+#: ../camel/providers/local/camel-mbox-folder.c:461
+#: ../camel/providers/local/camel-mh-folder.c:238
msgid "Message construction failed."
msgstr "Message construction failed."
-#: ../camel/providers/local/camel-mbox-store.c:164
-#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:158
+#: ../camel/providers/local/camel-mbox-store.c:357
msgid "Cannot create a folder by this name."
msgstr "Cannot create a folder by this name."
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:190
#, 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:226
-#: ../camel/providers/local/camel-mbox-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:220
+#: ../camel/providers/local/camel-mbox-store.c:231
+#: ../camel/providers/local/camel-mbox-store.c:254
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3802,164 +3427,164 @@ msgstr ""
"Could not delete folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:239
#, c-format
msgid "'%s' is not a regular file."
msgstr "'%s' is not a regular file."
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:246
#, 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:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:280
#, 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:376
+#: ../camel/providers/local/camel-mbox-store.c:370
#, c-format
msgid "Cannot create directory '%s': %s."
msgstr "Cannot create directory '%s': %s."
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:384
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Cannot create folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:386
msgid "Folder already exists"
msgstr "Folder already exists"
-#: ../camel/providers/local/camel-mbox-store.c:483
+#: ../camel/providers/local/camel-mbox-store.c:477
msgid "The new folder name is illegal."
msgstr "The new folder name is illegal."
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:490
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "Could not rename '%s': '%s': %s"
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:571
#, 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:532
+#: ../camel/providers/local/camel-mbox-summary.c:523
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "Could not open folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:573
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "Fatal mail parser error near position %ld in folder %s"
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:650
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "Cannot check folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:718
+#: ../camel/providers/local/camel-mbox-summary.c:838
+#: ../camel/providers/local/camel-spool-summary.c:149
#, c-format
msgid "Could not open file: %s: %s"
msgstr "Could not open file: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:730
+#: ../camel/providers/local/camel-spool-summary.c:162
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "Cannot open temporary mailbox: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:957
+#: ../camel/providers/local/camel-mbox-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:948
#, 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:761
+#: ../camel/providers/local/camel-mbox-summary.c:752
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "Could not close temporary folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:767
#, c-format
msgid "Could not rename folder: %s"
msgstr "Could not rename folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:849
+#: ../camel/providers/local/camel-mbox-summary.c:1075
#, c-format
msgid "Could not store folder: %s"
msgstr "Could not store folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1114
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:888
+#: ../camel/providers/local/camel-mbox-summary.c:896
+#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:1113
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:1047
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1038
+#: ../camel/providers/local/camel-spool-summary.c:328
#, c-format
msgid "Unknown error: %s"
msgstr "Unknown error: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1190
-#: ../camel/providers/local/camel-mbox-summary.c:1216
+#: ../camel/providers/local/camel-mbox-summary.c:1181
+#: ../camel/providers/local/camel-mbox-summary.c:1207
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "Writing to temporary mailbox failed: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1198
#, 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:180
+#: ../camel/providers/local/camel-mh-folder.c:176
msgid "MH append message canceled"
msgstr "MH append message cancelled"
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:179
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr "Cannot append message to mh folder: %s: %s"
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:226
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "Could not create folder '%s': %s"
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:238
#, 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:240
+#: ../camel/providers/local/camel-mh-summary.c:237
#, 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:132
+#: ../camel/providers/local/camel-spool-store.c:126
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "Spool '%s' cannot be opened: %s"
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:138
#, 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:163
+#: ../camel/providers/local/camel-spool-store.c:157
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "Folder '%s/%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:167
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3968,12 +3593,12 @@ msgstr ""
"Could not open folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:171
#, c-format
msgid "Folder '%s' does not exist."
msgstr "Folder '%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:176
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -3982,98 +3607,106 @@ msgstr ""
"Could not create folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:184
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "'%s' is not a mailbox file."
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:201
msgid "Store does not support an INBOX"
msgstr "Store does not support an INBOX"
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:213
#, c-format
msgid "Spool mail file %s"
msgstr "Spool mail file %s"
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:213
#, c-format
msgid "Spool folder tree %s"
msgstr "Spool folder tree %s"
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:221
msgid "Spool folders cannot be renamed"
msgstr "Spool folders cannot be renamed"
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:229
msgid "Spool folders cannot be deleted"
msgstr "Spool folders cannot be deleted"
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
+#: ../camel/providers/local/camel-spool-summary.c:174
+#: ../camel/providers/local/camel-spool-summary.c:184
+#: ../camel/providers/local/camel-spool-summary.c:194
#, c-format
msgid "Could not sync temporary folder %s: %s"
-msgstr "Could not sync temporary folder %s: %s"
+msgstr "Could not synchronise temporary folder %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:210
#, c-format
msgid "Could not sync spool folder %s: %s"
-msgstr "Could not sync spool folder %s: %s"
+msgstr "Could not synchronise spool folder %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:257
+#: ../camel/providers/local/camel-spool-summary.c:268
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
"Folder may be corrupt, copy saved in '%s'"
msgstr ""
-"Could not syncronise spool folder %s: %s\n"
+"Could not synchronise spool folder %s: %s\n"
"Folder may be corrupt; copy saved in '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:121
+#: ../camel/providers/nntp/camel-nntp-folder.c:178
+#: ../camel/providers/nntp/camel-nntp-folder.c:210
#, 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:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:159
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:395
+#: ../camel/providers/nntp/camel-nntp-store.c:1309
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
+msgid "User cancelled the operation"
+msgstr "User cancelled the operation"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:351
+#: ../camel/providers/nntp/camel-nntp-folder.c:354
+#: ../camel/providers/nntp/camel-nntp-folder.c:397
+#: ../camel/providers/nntp/camel-nntp-folder.c:399
#, c-format
msgid "Posting failed: %s"
msgstr "Posting failed: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:417
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:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:428
msgid "You cannot copy messages from a NNTP folder!"
msgstr "You cannot copy messages from a NNTP folder!"
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
msgid ""
"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
msgstr ""
"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
msgid "In the subscription _dialog, show relative folder names"
msgstr "In the subscription _dialogue, show relative folder names"
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
msgid "USENET news"
msgstr "USENET news"
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
msgid "This is a provider for reading from and posting to USENET newsgroups."
msgstr "This is a provider for reading from and posting to USENET newsgroups."
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
@@ -4081,22 +3714,29 @@ msgstr ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:188
+#: ../camel/providers/nntp/camel-nntp-store.c:207
+#: ../camel/providers/pop3/camel-pop3-store.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Connection canceled"
+msgstr "Connection cancelled"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:210
#, c-format
msgid "Could not read greeting from %s: %s"
msgstr "Could not read greeting from %s: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:222
#, 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:410
+#: ../camel/providers/nntp/camel-nntp-store.c:404
#, c-format
msgid "USENET News via %s"
msgstr "USENET News via %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:813
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4107,7 +3747,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:907
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
@@ -4117,7 +3757,7 @@ msgstr ""
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:939
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
@@ -4127,126 +3767,122 @@ msgstr ""
"\n"
"newsgroup does not exist!"
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:964
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:978
+#: ../camel/providers/nntp/camel-nntp-store.c:972
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:986
+#: ../camel/providers/nntp/camel-nntp-store.c:980
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:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1174
msgid "Authentication requested but no username provided"
msgstr "Authentication requested but no username provided"
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1186
#, c-format
msgid "Cannot authenticate to server: %s"
msgstr "Cannot authenticate to server: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1311
#, c-format
msgid "NNTP Command failed: %s"
msgstr "NNTP Command failed: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1365
msgid "Not connected."
msgstr "Not connected."
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
+#: ../camel/providers/nntp/camel-nntp-store.c:1418
#, c-format
msgid "No such folder: %s"
msgstr "No such folder: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:263
+#: ../camel/providers/nntp/camel-nntp-summary.c:364
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Scanning new messages"
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:273
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "Unexpected server response from xover: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:378
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "Unexpected server response from head: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "Use cancel"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:416
#, c-format
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:247
msgid "Retrieving POP summary"
msgstr "Retrieving POP summary"
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:265
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "Cannot get POP summary: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:308
msgid "Expunging old messages"
msgstr "Expunging old messages"
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:316
msgid "Expunging deleted messages"
msgstr "Expunging deleted messages"
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
#, 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:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:562
#, c-format
msgid "Retrieving POP message %d"
msgstr "Retrieving POP message %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:652
msgid "Unknown reason"
msgstr "Unknown reason"
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
msgid "Message storage"
msgstr "Message storage"
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
msgid "_Leave messages on server"
msgstr "_Leave messages on server"
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
#, c-format
msgid "_Delete after %s day(s)"
msgstr "_Delete after %s day(s)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
msgid "Disable _support for all POP3 extensions"
msgstr "Disable _support for all POP3 extensions"
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
msgid "POP"
msgstr "POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
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:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4254,7 +3890,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:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
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 "
@@ -4264,38 +3900,48 @@ msgstr ""
"the APOP protocol. This may not work for all users even on servers that "
"claim to support it."
-#: ../camel/providers/pop3/camel-pop3-store.c:229
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:156
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:219
#, 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:246
-#: ../camel/providers/pop3/camel-pop3-store.c:274
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:236
+#: ../camel/providers/pop3/camel-pop3-store.c:265
+#: ../camel/providers/pop3/camel-pop3-store.c:271
#, 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:247
+#: ../camel/providers/pop3/camel-pop3-store.c:237
msgid "STLS not supported by server"
msgstr "STLS not supported by server"
-#: ../camel/providers/pop3/camel-pop3-store.c:262
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:253
#, 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:281
+#: ../camel/providers/pop3/camel-pop3-store.c:266
+msgid "TLS negotiations failed"
+msgstr "TLS negotiations failed"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:272
msgid "TLS is not available in this build"
msgstr "TLS is not available in this build"
-#: ../camel/providers/pop3/camel-pop3-store.c:387
+#: ../camel/providers/pop3/camel-pop3-store.c:378
#, c-format
msgid "Could not connect to POP server %s"
msgstr "Could not connect to POP server %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:419
+#: ../camel/providers/pop3/camel-pop3-store.c:557
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4304,22 +3950,23 @@ msgstr ""
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:438
#, 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:460
+#: ../camel/providers/pop3/camel-pop3-store.c:452
#, 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:479
+#: ../camel/providers/pop3/camel-pop3-store.c:471
#, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "Failed to authenticate on POP server %s: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:530
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4328,7 +3975,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:579
+#: ../camel/providers/pop3/camel-pop3-store.c:571
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4337,16 +3984,18 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:588
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:581
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
"Error sending username%s"
msgstr ""
"Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:597
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:591
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4355,16 +4004,16 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:697
#, c-format
msgid "No such folder '%s'."
msgstr "No such folder '%s'."
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
msgid "Sendmail"
msgstr "Sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
msgid ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
@@ -4372,173 +4021,173 @@ msgstr ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:107
msgid "Could not parse recipient list"
msgstr "Could not parse recipient list"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
#, 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:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:159
#, 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:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
#, 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:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:236
#, 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:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:241
#, 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:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
msgid "sendmail"
msgstr "sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:257
msgid "Mail delivery via the sendmail program"
msgstr "Mail delivery via the sendmail program"
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
msgid "SMTP"
msgstr "SMTP"
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
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:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
msgid "Syntax error, command unrecognized"
msgstr "Syntax error, command unrecognised"
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
msgid "Syntax error in parameters or arguments"
msgstr "Syntax error in parameters or arguments"
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
msgid "Command not implemented"
msgstr "Command not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
msgid "Command parameter not implemented"
msgstr "Command parameter not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
msgid "System status, or system help reply"
msgstr "System status, or system help reply"
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
msgid "Help message"
msgstr "Help message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
msgid "Service ready"
msgstr "Service ready"
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:168
msgid "Service closing transmission channel"
msgstr "Service closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
msgid "Service not available, closing transmission channel"
msgstr "Service not available, closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:172
msgid "Requested mail action okay, completed"
msgstr "Requested mail action okay, completed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:174
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:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:176
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Requested mail action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:178
msgid "Requested action not taken: mailbox unavailable"
msgstr "Requested action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:180
msgid "Requested action aborted: error in processing"
msgstr "Requested action aborted: error in processing"
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:182
msgid "User not local; please try <forward-path>"
msgstr "User not local; please try <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:184
msgid "Requested action not taken: insufficient system storage"
msgstr "Requested action not taken: insufficient system storage"
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:186
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Requested mail action aborted: exceeded storage allocation"
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:188
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:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:190
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Start mail input; end with <CRLF>.<CRLF>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
msgid "Transaction failed"
msgstr "Transaction failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
msgid "A password transition is needed"
msgstr "A password transition is needed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:198
msgid "Authentication mechanism is too weak"
msgstr "Authentication mechanism is too weak"
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
msgid "Encryption required for requested authentication mechanism"
msgstr "Encryption required for requested authentication mechanism"
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
msgid "Temporary authentication failure"
msgstr "Temporary authentication failure"
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
+#: ../camel/providers/smtp/camel-smtp-transport.c:283
msgid "Welcome response error"
msgstr "Welcome response error"
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:318
+#: ../camel/providers/smtp/camel-smtp-transport.c:351
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
#, 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:340
+#: ../camel/providers/smtp/camel-smtp-transport.c:327
#, c-format
msgid "STARTTLS command failed: %s"
msgstr "STARTTLS command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
+#: ../camel/providers/smtp/camel-smtp-transport.c:342
msgid "STARTTLS command failed"
msgstr "STARTTLS command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:483
#, 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:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:554
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -4549,93 +4198,93 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:687
#, c-format
msgid "SMTP server %s"
msgstr "SMTP server %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:689
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "SMTP mail delivery via %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
msgid "Cannot send message: service not connected."
msgstr "Cannot send message: service not connected."
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
msgid "Cannot send message: sender address not valid."
msgstr "Cannot send message: sender address not valid."
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:717
msgid "Sending message"
msgstr "Sending message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
msgid "Cannot send message: no recipients defined."
msgstr "Cannot send message: no recipients defined."
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
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:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:972
msgid "SMTP Greeting"
msgstr "SMTP Greeting"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
+#: ../camel/providers/smtp/camel-smtp-transport.c:997
#, c-format
msgid "HELO command failed: %s"
msgstr "HELO command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
+#: ../camel/providers/smtp/camel-smtp-transport.c:1014
msgid "HELO command failed"
msgstr "HELO command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1080
msgid "SMTP Authentication"
msgstr "SMTP Authentication"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1086
msgid "Error creating SASL authentication object."
msgstr "Error creating SASL authentication object."
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+#: ../camel/providers/smtp/camel-smtp-transport.c:1103
+#: ../camel/providers/smtp/camel-smtp-transport.c:1114
#, c-format
msgid "AUTH command failed: %s"
msgstr "AUTH command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
+#: ../camel/providers/smtp/camel-smtp-transport.c:1120
msgid "AUTH command failed"
msgstr "AUTH command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
+#: ../camel/providers/smtp/camel-smtp-transport.c:1190
msgid "Bad authentication response from server.\n"
msgstr "Bad authentication response from server.\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
+#: ../camel/providers/smtp/camel-smtp-transport.c:1217
#, c-format
msgid "MAIL FROM command failed: %s: mail not sent"
msgstr "MAIL FROM command failed: %s: mail not sent"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
+#: ../camel/providers/smtp/camel-smtp-transport.c:1234
msgid "MAIL FROM command failed"
msgstr "MAIL FROM command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
+#: ../camel/providers/smtp/camel-smtp-transport.c:1258
#, c-format
msgid "RCPT TO command failed: %s: mail not sent"
msgstr "RCPT TO command failed: %s: mail not sent"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1277
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1317
+#: ../camel/providers/smtp/camel-smtp-transport.c:1386
+#: ../camel/providers/smtp/camel-smtp-transport.c:1405
#, c-format
msgid "DATA command failed: %s: mail not sent"
msgstr "DATA command failed: %s: mail not sent"
@@ -4643,26 +4292,26 @@ msgstr "DATA command failed: %s: mail not sent"
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1334
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
msgid "DATA command failed"
msgstr "DATA command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
#, c-format
msgid "RSET command failed: %s"
msgstr "RSET command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
+#: ../camel/providers/smtp/camel-smtp-transport.c:1460
msgid "RSET command failed"
msgstr "RSET command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
#, c-format
msgid "QUIT command failed: %s"
msgstr "QUIT command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
msgid "QUIT command failed"
msgstr "QUIT command failed"
@@ -4752,7 +4401,7 @@ msgstr "Waiting"
#. in 12-hour format.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -4760,7 +4409,7 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
#. in 24-hour format.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -4768,7 +4417,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
#. in 12-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
@@ -4776,78 +4425,78 @@ msgstr "%a %d/%m/%Y %I:%M %p"
#. in 24-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1653
+#: ../libedataserver/e-time-utils.c:1655
msgid "%a %m/%d/%Y %I %p"
msgstr "%a %d/%m/%Y %I %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1658
+#: ../libedataserver/e-time-utils.c:1660
msgid "%a %m/%d/%Y %H"
msgstr "%a %d/%m/%Y %H"
#. strptime format of a weekday and a date.
#. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
#. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1668
+#: ../libedataserver/e-time-utils.c:1670
msgid "%m/%d/%Y %I:%M:%S %p"
msgstr "%d/%m/%Y %I:%M:%S %p"
#. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1672
+#: ../libedataserver/e-time-utils.c:1674
msgid "%m/%d/%Y %H:%M:%S"
msgstr "%d/%m/%Y %H:%M:%S"
#. strptime format of a date and a time, in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1677
+#: ../libedataserver/e-time-utils.c:1679
msgid "%m/%d/%Y %I:%M %p"
msgstr "%d/%m/%Y %I:%M %p"
#. strptime format of a date and a time, in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1684
msgid "%m/%d/%Y %H:%M"
msgstr "%d/%m/%Y %H:%M"
#. strptime format of a date and a time, in 12-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1689
msgid "%m/%d/%Y %I %p"
msgstr "%d/%m/%Y %I %p"
#. strptime format of a date and a time, in 24-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1692
+#: ../libedataserver/e-time-utils.c:1694
msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y %H"
#. strptime format of a weekday and a date.
#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
#. strptime format for a time of day, in 12-hour format.
#. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
#. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -4855,24 +4504,24 @@ msgstr "%H:%M:%S"
#. in 12-hour format.
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
#. strftime format of a time in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
msgid "%H:%M"
msgstr "%H:%M"
#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1838
+#: ../libedataserver/e-time-utils.c:1842
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1846
msgid "%I %p"
msgstr "%I %p"
@@ -4922,8 +4571,8 @@ msgid "Category _Name"
msgstr "Category _Name"
#: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "Item(s) _belong to these categories:"
+msgid "Currently _used categories:"
+msgstr "Currently _used categories:"
#: ../libedataserverui/e-categories-dialog.ui.h:5
msgid "_Available Categories:"
@@ -4942,14 +4591,6 @@ msgstr "categories"
msgid "Create category \"%s\""
msgstr "Create category \"%s\""
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Colour Info"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "The colour to render"
-
#: ../libedataserverui/e-name-selector-dialog.c:292
msgid "Select Contacts from Address Book"
msgstr "Select Contacts from Address Book"
@@ -5004,56 +4645,56 @@ msgid "_Search:"
msgstr "_Search:"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2511
#, c-format
msgid "E_xpand %s Inline"
msgstr "E_xpand %s Inline"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2526
#, c-format
msgid "Cop_y %s"
msgstr "Cop_y %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2536
#, c-format
msgid "C_ut %s"
msgstr "C_ut %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2553
#, c-format
msgid "_Edit %s"
msgstr "_Edit %s"
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:479
#, c-format
msgid "_Delete %s"
msgstr "_Delete %s"
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
#, 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:1093
+#: ../libedataserverui/e-passwords.c:1116
msgid "You have the Caps Lock key on."
msgstr "You have the Caps Lock key on."
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1238
msgid "_Remember this passphrase"
msgstr "_Remember this passphrase"
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1239
msgid "_Remember this passphrase for the remainder of this session"
msgstr "_Remember this passphrase for the remainder of this session"
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1244
msgid "_Remember this password"
msgstr "_Remember this password"
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1245
msgid "_Remember this password for the remainder of this session"
msgstr "_Remember this password for the remainder of this session"
@@ -5062,7 +4703,7 @@ msgstr "_Remember this password for the remainder of this session"
msgid "Select destination"
msgstr "Select destination"
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
msgid "_Destination"
msgstr "_Destination"
@@ -5082,6 +4723,246 @@ msgstr "No response from the server"
msgid "Bad parameter"
msgstr "Bad parameter"
+#~ msgid "Learning junk"
+#~ msgstr "Learning junk"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "Learning non-junk"
+
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel session doesn't support forwarding of a message."
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "import keys: unimplemented"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "export keys: unimplemented"
+
+#~ msgid "Namespace"
+#~ msgstr "Namespace"
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "For accessing Hula servers"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "This option will connect to the Hula server using a plaintext password."
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Failed sending command to IMAP server %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "Unexpected response from IMAP4 server %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Unexpected greeting from IMAP server %s."
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "Cannot select folder '%s': Invalid mailbox name"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "Cannot select folder '%s': Bad command"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Failed to send command to IMAP server %s: %s"
+
+#~ msgid "service unavailable"
+#~ msgstr "service unavailable"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP4 server %s unexpectedly disconnected: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "Expire cached messages that haven't been read in X seconds"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "Expire cached messages older than X seconds"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "Cannot access folder '%s': %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "Cannot syncronise flags to folder '%s': Unknown error"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "Cannot syncronise flags to folder '%s': Bad command"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "Cannot expunge folder '%s': Unknown error"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "Cannot expunge folder '%s': Bad command"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "Cannot get message %s from folder '%s': No such message"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "Cannot get message %s from folder '%s': Bad command"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr "Cannot append message to folder '%s': Folder is read-only"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "Cannot append message to folder '%s': Unknown error"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "Cannot append message to folder '%s': Bad command"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "Cannot move messages from folder '%s' to folder '%s': Bad command"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Check new messages for _Junk contents"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "Only check for Junk messa_ges in the INBOX folder"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAP4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "For reading and storing mail on IMAPv4rev1 servers."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "Cannot authenticate to IMAP server %s using %s"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "Cannot create IMAP folders in offline mode."
+
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "Cannot get folder '%s' on IMAP server %s: Unknown error"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "Cannot get LIST information for '%s' on IMAP server %s: %s"
+
+#~ msgid "Bad command"
+#~ msgstr "Bad command"
+
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "Cannot create folder '%s': Invalid mailbox name"
+
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "Cannot create folder '%s': Bad command"
+
+#~ msgid "Cannot delete folder '%s': Special folder"
+#~ msgstr "Cannot delete folder '%s': Special folder"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "Cannot delete IMAP folders in offline mode."
+
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "Cannot delete folder '%s': Invalid mailbox name"
+
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "Cannot delete folder '%s': Bad command"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "Cannot rename folder '%s' to '%s': Special folder"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "Cannot rename IMAP folders in offline mode."
+
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "Cannot rename folder '%s' to '%s': Bad command"
+
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "Cannot subscribe to IMAP folders in offline mode."
+
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "Cannot subscribe to folder '%s': Invalid mailbox name"
+
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "Cannot subscribe to folder '%s': Bad command"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "Cannot unsubscribe from IMAP folders in offline mode."
+
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "Cannot unsubscribe from folder '%s': Bad command"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "Scanning for changed messages"
+
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP server %s is in an inconsistent state."
+
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "Fetching envelopes of new messages"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Unexpected token in response from IMAP server %s: "
+
+#~ msgid "No data"
+#~ msgstr "No data"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP server %s unexpectedly disconnected: %s"
+
+#~ msgid "%sPlease enter the IMAP password for %s %s"
+#~ msgstr "%sPlease enter the IMAP password for %s %s"
+
+#~ msgid "Use cancel"
+#~ msgstr "Use cancel"
+
+#~ msgid "Item(s) _belong to these categories:"
+#~ msgstr "Item(s) _belong to these categories:"
+
+#~ msgid "Color Info"
+#~ msgstr "Colour Info"
+
+#~ msgid "The color to render"
+#~ msgstr "The colour to render"
+
#~ msgid ""
#~ "Experimental IMAP 4(.1) client\n"
#~ "This is untested and unsupported code, you want to use plain imap "
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
