summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <pwithnall@svn.gnome.org>2008-05-25 13:04:12 +0000
committerPhilip Withnall <pwithnall@src.gnome.org>2008-05-25 13:04:12 +0000
commitf2239f361c2b0f28b2262cd5aeba966287668486 (patch)
treebd686db7274418021efa7ba729de111c80d101e0
parent4547176724aa45ddd6e42e48fab0639a3baca87f (diff)
downloadevolution-data-server-f2239f361c2b0f28b2262cd5aeba966287668486.tar.gz
Updated British English translation.
2008-05-25 Philip Withnall <pwithnall@svn.gnome.org> * en_GB.po: Updated British English translation. svn path=/trunk/; revision=8850
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_GB.po1252
2 files changed, 646 insertions, 610 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index d35ddafd5..1b35ba8af 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-25 Philip Withnall <pwithnall@svn.gnome.org>
+
+ * en_GB.po: Updated British English translation.
+
2008-05-25 Clytie Siddall <clytie@riverland.net.au>
* vi.po: Updated Vietnamese translation.
diff --git a/po/en_GB.po b/po/en_GB.po
index f1e1ff2fd..595650a4a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,13 +2,13 @@
# Copyright (C) 2000 Free Software Foundation, Inc.
# Robert Brady <rwb197@zepler.org>, 2000.
# Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
-#
-#
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 23:26+0000\n"
+"POT-Creation-Date: 2008-05-25 14:03+0100\n"
"PO-Revision-Date: 2008-03-02 17:11+0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: <en@li.org>\n"
@@ -16,30 +16,30 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:554
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2317
+#: ../addressbook/backends/file/e-book-backend-file.c:555
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
msgid "Loading..."
msgstr "Loading..."
-#: ../addressbook/backends/file/e-book-backend-file.c:557
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2276
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2296
+#: ../addressbook/backends/file/e-book-backend-file.c:558
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358
#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4220
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
msgstr "Searching..."
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2677
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725
#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4384
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "Downloading contacts (%d)... "
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2832
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3023
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3067
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr "Updating contacts cache (%d)... "
@@ -50,7 +50,7 @@ msgstr "Using Distinguished Name (DN)"
#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745
msgid "Using Email Address"
-msgstr "Using Email Address"
+msgstr "Using E-mail Address"
#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1005
msgid "Reconnecting to LDAP server..."
@@ -171,16 +171,16 @@ msgid "%s: there was no source for uid `%s' stored in gconf."
msgstr "%s: there was no source for uid `%s' stored in gconf."
#. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:113
msgid "Unique ID"
msgstr "Unique ID"
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:114
msgid "File Under"
msgstr "File Under"
#. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:116
msgid "Book URI"
msgstr "Book URI"
@@ -188,559 +188,564 @@ msgstr "Book URI"
#. FN isn't really a structured field - we use a getter/setter
#. so we can set the N property (since evo 1.4 works fine with
#. vcards that don't even have a N attribute. *sigh*)
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:122
msgid "Full Name"
msgstr "Full Name"
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:123
msgid "Given Name"
msgstr "Given Name"
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:124
msgid "Family Name"
msgstr "Surname"
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:125
msgid "Nickname"
msgstr "Nickname"
#. Email fields
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:128
msgid "Email 1"
-msgstr "Email 1"
+msgstr "E-mail 1"
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:129
msgid "Email 2"
-msgstr "Email 2"
+msgstr "E-mail 2"
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:130
msgid "Email 3"
-msgstr "Email 3"
+msgstr "E-mail 3"
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:131
msgid "Email 4"
-msgstr "Email 4"
+msgstr "E-mail 4"
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:133
msgid "Mailer"
msgstr "Mailer"
#. Address Labels
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:136
msgid "Home Address Label"
msgstr "Home Address Label"
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:137
msgid "Work Address Label"
msgstr "Work Address Label"
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:138
msgid "Other Address Label"
msgstr "Other Address Label"
#. Phone fields
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:141
msgid "Assistant Phone"
msgstr "Assistant Phone"
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:142
msgid "Business Phone"
msgstr "Business Phone"
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:143
msgid "Business Phone 2"
msgstr "Business Phone 2"
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:144
msgid "Business Fax"
msgstr "Business Fax"
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:145
msgid "Callback Phone"
msgstr "Callback Phone"
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:146
msgid "Car Phone"
msgstr "Car Phone"
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:147
msgid "Company Phone"
msgstr "Company Phone"
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:148
msgid "Home Phone"
msgstr "Home Phone"
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:149
msgid "Home Phone 2"
msgstr "Home Phone 2"
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:150
msgid "Home Fax"
msgstr "Home Fax"
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:151
msgid "ISDN"
msgstr "ISDN"
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:152
msgid "Mobile Phone"
msgstr "Mobile Phone"
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:153
msgid "Other Phone"
msgstr "Other Phone"
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:154
msgid "Other Fax"
msgstr "Other Fax"
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:155
msgid "Pager"
msgstr "Pager"
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:156
msgid "Primary Phone"
msgstr "Primary Phone"
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:157
msgid "Radio"
msgstr "Radio"
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:158
msgid "Telex"
msgstr "Telex"
#. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:160
msgid "TTY"
msgstr "TTY"
#. Organizational fields
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:163
msgid "Organization"
msgstr "Organisation"
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:164
msgid "Organizational Unit"
msgstr "Organisational Unit"
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:165
msgid "Office"
msgstr "Office"
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:166
msgid "Title"
msgstr "Title"
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:167
msgid "Role"
msgstr "Role"
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:168
msgid "Manager"
msgstr "Manager"
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:169
msgid "Assistant"
msgstr "Assistant"
#. Web fields
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:172
msgid "Homepage URL"
msgstr "Homepage URL"
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:173
msgid "Weblog URL"
msgstr "Weblog URL"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:176
#: ../libedataserverui/e-categories-dialog.c:439
msgid "Categories"
msgstr "Categories"
#. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:179
msgid "Calendar URI"
msgstr "Calendar URI"
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:180
msgid "Free/Busy URL"
msgstr "Free/Busy URL"
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:181
msgid "ICS Calendar"
msgstr "ICS Calendar"
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:182
msgid "Video Conferencing URL"
msgstr "Video Conferencing URL"
#. Misc fields
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:185
msgid "Spouse's Name"
msgstr "Spouse's Name"
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:186
msgid "Note"
msgstr "Note"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:189
msgid "AIM Home Screen Name 1"
msgstr "AIM Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:190
msgid "AIM Home Screen Name 2"
msgstr "AIM Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:191
msgid "AIM Home Screen Name 3"
msgstr "AIM Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:192
msgid "AIM Work Screen Name 1"
msgstr "AIM Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:193
msgid "AIM Work Screen Name 2"
msgstr "AIM Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:194
msgid "AIM Work Screen Name 3"
msgstr "AIM Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:195
msgid "GroupWise Home Screen Name 1"
msgstr "GroupWise Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:196
msgid "GroupWise Home Screen Name 2"
msgstr "GroupWise Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:197
msgid "GroupWise Home Screen Name 3"
msgstr "GroupWise Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:198
msgid "GroupWise Work Screen Name 1"
msgstr "GroupWise Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:199
msgid "GroupWise Work Screen Name 2"
msgstr "GroupWise Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:200
msgid "GroupWise Work Screen Name 3"
msgstr "GroupWise Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:201
msgid "Jabber Home Id 1"
msgstr "Jabber Home Id 1"
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:202
msgid "Jabber Home Id 2"
msgstr "Jabber Home Id 2"
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:203
msgid "Jabber Home Id 3"
msgstr "Jabber Home Id 3"
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:204
msgid "Jabber Work Id 1"
msgstr "Jabber Work Id 1"
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:205
msgid "Jabber Work Id 2"
msgstr "Jabber Work Id 2"
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:206
msgid "Jabber Work Id 3"
msgstr "Jabber Work Id 3"
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:207
msgid "Yahoo! Home Screen Name 1"
msgstr "Yahoo! Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:208
msgid "Yahoo! Home Screen Name 2"
msgstr "Yahoo! Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:209
msgid "Yahoo! Home Screen Name 3"
msgstr "Yahoo! Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:210
msgid "Yahoo! Work Screen Name 1"
msgstr "Yahoo! Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:211
msgid "Yahoo! Work Screen Name 2"
msgstr "Yahoo! Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:212
msgid "Yahoo! Work Screen Name 3"
msgstr "Yahoo! Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:213
msgid "MSN Home Screen Name 1"
msgstr "MSN Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:214
msgid "MSN Home Screen Name 2"
msgstr "MSN Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:215
msgid "MSN Home Screen Name 3"
msgstr "MSN Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:216
msgid "MSN Work Screen Name 1"
msgstr "MSN Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:217
msgid "MSN Work Screen Name 2"
msgstr "MSN Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:218
msgid "MSN Work Screen Name 3"
msgstr "MSN Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:219
msgid "ICQ Home Id 1"
msgstr "ICQ Home Id 1"
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:220
msgid "ICQ Home Id 2"
msgstr "ICQ Home Id 2"
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:221
msgid "ICQ Home Id 3"
msgstr "ICQ Home Id 3"
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:222
msgid "ICQ Work Id 1"
msgstr "ICQ Work Id 1"
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:223
msgid "ICQ Work Id 2"
msgstr "ICQ Work Id 2"
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:224
msgid "ICQ Work Id 3"
msgstr "ICQ Work Id 3"
#. Last modified time
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:227
msgid "Last Revision"
msgstr "Last Revision"
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:228
msgid "Name or Org"
msgstr "Name or Org"
#. Address fields
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:231
msgid "Address List"
msgstr "Address List"
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:232
msgid "Home Address"
msgstr "Home Address"
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:233
msgid "Work Address"
msgstr "Work Address"
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:234
msgid "Other Address"
msgstr "Other Address"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:237
msgid "Category List"
msgstr "Category List"
#. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:240
msgid "Photo"
msgstr "Photo"
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:241
msgid "Logo"
msgstr "Logo"
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:243
msgid "Name"
msgstr "Name"
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:244
msgid "Email List"
-msgstr "Email List"
+msgstr "E-mail List"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:247
msgid "AIM Screen Name List"
msgstr "AIM Screen Name List"
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:248
msgid "GroupWise Id List"
msgstr "GroupWise Id List"
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:249
msgid "Jabber Id List"
msgstr "Jabber Id List"
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:250
msgid "Yahoo! Screen Name List"
msgstr "Yahoo! Screen Name List"
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:251
msgid "MSN Screen Name List"
msgstr "MSN Screen Name List"
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:252
msgid "ICQ Id List"
msgstr "ICQ Id List"
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:254
msgid "Wants HTML Mail"
msgstr "Wants HTML Mail"
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:256
msgid "List"
msgstr "List"
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:257
msgid "List Show Addresses"
msgstr "List Show Addresses"
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook/e-contact.c:259
msgid "Birth Date"
msgstr "Birth Date"
-#: ../addressbook/libebook/e-contact.c:261
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:462
+#: ../addressbook/libebook/e-contact.c:260
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461
#: ../libedataserver/e-categories.c:43
msgid "Anniversary"
msgstr "Anniversary"
#. Security fields
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:263
msgid "X.509 Certificate"
msgstr "X.509 Certificate"
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:265
msgid "Gadu-Gadu Home Id 1"
msgstr "Gadu-Gadu Home Id 1"
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:266
msgid "Gadu-Gadu Home Id 2"
msgstr "Gadu-Gadu Home Id 2"
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:267
msgid "Gadu-Gadu Home Id 3"
msgstr "Gadu-Gadu Home Id 3"
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:268
msgid "Gadu-Gadu Work Id 1"
msgstr "Gadu-Gadu Work Id 1"
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:269
msgid "Gadu-Gadu Work Id 2"
msgstr "Gadu-Gadu Work Id 2"
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:270
msgid "Gadu-Gadu Work Id 3"
msgstr "Gadu-Gadu Work Id 3"
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:271
msgid "Gadu-Gadu Id List"
msgstr "Gadu-Gadu Id List"
#. Geo information
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:274
msgid "Geographic Information"
msgstr "Geographic Information"
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook/e-contact.c:276
msgid "Telephone"
msgstr "Telephone"
-#: ../addressbook/libebook/e-contact.c:1494
+#: ../addressbook/libebook/e-contact.c:1493
#: ../addressbook/libebook/e-destination.c:761
msgid "Unnamed List"
msgstr "Unnamed List"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:464
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463
#: ../libedataserver/e-categories.c:44
msgid "Birthday"
msgstr "Birthday"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:490
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489
#, c-format
msgid "Birthday: %s"
msgstr "Birthday: %s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:514
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513
#, c-format
msgid "Anniversary: %s"
msgstr "Anniversary: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:203
+#: ../calendar/backends/file/e-cal-backend-file.c:213
msgid "Cannot save calendar data: Malformed URI."
msgstr "Cannot save calendar data: Malformed URI."
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+#: ../calendar/backends/file/e-cal-backend-file.c:220
+#: ../calendar/backends/file/e-cal-backend-file.c:226
+msgid "Cannot save calendar data"
+msgstr "Cannot save calendar data"
+
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:335
msgid "Could not create thread for getting deltas"
msgstr "Could not create thread for getting deltas"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1179
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1039
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1338
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:367
+#: ../calendar/backends/google/e-cal-backend-google.c:1190
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1049
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1348
#: ../calendar/backends/http/e-cal-backend-http.c:569
#: ../calendar/backends/weather/e-cal-backend-weather.c:466
msgid "Could not create cache file"
msgstr "Could not create cache file"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1051
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:380
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1061
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:1028
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1785
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1801
msgid "Reply Requested: by "
msgstr "Reply Requested: by "
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1033
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1790
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1806
msgid "Reply Requested: When convenient"
msgstr "Reply Requested: When convenient"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:275
#, c-format
msgid "Loading %s items"
msgstr "Loading %s items"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:875
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:885
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
msgid "Calendar"
msgstr "Calendar"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:933
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:943
msgid "Invalid server URI"
msgstr "Invalid server URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:952
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:961
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1057
-#: ../calendar/libecal/e-cal.c:5031
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1070
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1102
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1140
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:962
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:971
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1067
+#: ../calendar/libecal/e-cal.c:5035
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145
#: ../camel/providers/groupwise/camel-groupwise-store.c:594
#: ../camel/providers/groupwise/camel-groupwise-store.c:746
#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
@@ -953,7 +958,7 @@ msgstr "%.1f-%.1fcm snow\n"
msgid "%.1f-%.1fin snow\n"
msgstr "%.1f-%.1fin snow\n"
-#: ../calendar/libecal/e-cal-component.c:1315
+#: ../calendar/libecal/e-cal-component.c:1316
msgid "Untitled appointment"
msgstr "Untitled appointment"
@@ -1112,87 +1117,87 @@ msgstr "Enter password for %s (user %s)"
msgid "Enter password for %s to enable proxy for user %s"
msgstr "Enter password for %s to enable proxy for user %s"
-#: ../calendar/libecal/e-cal.c:5003
+#: ../calendar/libecal/e-cal.c:5007
msgid "Invalid argument"
msgstr "Invalid argument"
-#: ../calendar/libecal/e-cal.c:5005
+#: ../calendar/libecal/e-cal.c:5009
msgid "Backend is busy"
msgstr "Backend is busy"
-#: ../calendar/libecal/e-cal.c:5007
+#: ../calendar/libecal/e-cal.c:5011
msgid "Repository is offline"
msgstr "Repository is offline"
-#: ../calendar/libecal/e-cal.c:5009
+#: ../calendar/libecal/e-cal.c:5013
msgid "No such calendar"
msgstr "No such calendar"
-#: ../calendar/libecal/e-cal.c:5011 ../servers/groupwise/e-gw-connection.c:232
+#: ../calendar/libecal/e-cal.c:5015 ../servers/groupwise/e-gw-connection.c:232
msgid "Object not found"
msgstr "Object not found"
-#: ../calendar/libecal/e-cal.c:5013 ../servers/groupwise/e-gw-connection.c:226
+#: ../calendar/libecal/e-cal.c:5017 ../servers/groupwise/e-gw-connection.c:226
msgid "Invalid object"
msgstr "Invalid object"
-#: ../calendar/libecal/e-cal.c:5015
+#: ../calendar/libecal/e-cal.c:5019
msgid "URI not loaded"
msgstr "URI not loaded"
-#: ../calendar/libecal/e-cal.c:5017
+#: ../calendar/libecal/e-cal.c:5021
msgid "URI already loaded"
msgstr "URI already loaded"
-#: ../calendar/libecal/e-cal.c:5019
+#: ../calendar/libecal/e-cal.c:5023
#: ../servers/exchange/storage/e-storage.c:571
msgid "Permission denied"
msgstr "Permission denied"
-#: ../calendar/libecal/e-cal.c:5021 ../servers/groupwise/e-gw-connection.c:234
+#: ../calendar/libecal/e-cal.c:5025 ../servers/groupwise/e-gw-connection.c:234
msgid "Unknown User"
msgstr "Unknown User"
-#: ../calendar/libecal/e-cal.c:5023
+#: ../calendar/libecal/e-cal.c:5027
msgid "Object ID already exists"
msgstr "Object ID already exists"
-#: ../calendar/libecal/e-cal.c:5025
+#: ../calendar/libecal/e-cal.c:5029
msgid "Protocol not supported"
msgstr "Protocol not supported"
-#: ../calendar/libecal/e-cal.c:5027
+#: ../calendar/libecal/e-cal.c:5031
msgid "Operation has been canceled"
msgstr "Operation has been cancelled"
-#: ../calendar/libecal/e-cal.c:5029
+#: ../calendar/libecal/e-cal.c:5033
msgid "Could not cancel operation"
msgstr "Could not cancel operation"
-#: ../calendar/libecal/e-cal.c:5033
+#: ../calendar/libecal/e-cal.c:5037
#: ../camel/providers/smtp/camel-smtp-transport.c:216
msgid "Authentication required"
msgstr "Authentication required"
-#: ../calendar/libecal/e-cal.c:5035
+#: ../calendar/libecal/e-cal.c:5039
msgid "A CORBA exception has occurred"
msgstr "A CORBA exception has occurred"
-#: ../calendar/libecal/e-cal.c:5037
+#: ../calendar/libecal/e-cal.c:5041
#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
#: ../camel/providers/imap/camel-imap-command.c:312
#: ../camel/providers/imap/camel-imap-command.c:412
-#: ../camel/providers/imap/camel-imap-store.c:762
-#: ../camel/providers/imap4/camel-imap4-store.c:313
-#: ../camel/providers/pop3/camel-pop3-store.c:559
+#: ../camel/providers/imap/camel-imap-store.c:763
+#: ../camel/providers/imap4/camel-imap4-store.c:315
+#: ../camel/providers/pop3/camel-pop3-store.c:553
+#: ../camel/providers/pop3/camel-pop3-store.c:560
#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../camel/providers/pop3/camel-pop3-store.c:572
#: ../servers/exchange/storage/e-storage.c:585
#: ../servers/groupwise/e-gw-connection.c:240
msgid "Unknown error"
msgstr "Unknown error"
-#: ../calendar/libecal/e-cal.c:5039
+#: ../calendar/libecal/e-cal.c:5043
#: ../servers/exchange/storage/e-storage.c:553
msgid "No error"
msgstr "No error"
@@ -1355,11 +1360,11 @@ msgstr ""
#: ../camel/camel-disco-diary.c:261
#, c-format
msgid ""
-"Could not open `%s':\n"
+"Could not open '%s':\n"
"%s\n"
"Changes made to this folder will not be resynchronized."
msgstr ""
-"Could not open `%s':\n"
+"Could not open '%s':\n"
"%s\n"
"Changes made to this folder will not be resynchronised."
@@ -1381,7 +1386,7 @@ msgid "Preparing folder '%s' for offline"
msgstr "Preparing folder '%s' for offline"
#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/imap/camel-imap-store.c:3018
+#: ../camel/providers/imap/camel-imap-store.c:3026
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
@@ -1524,42 +1529,42 @@ msgstr "(%s) requires the folder set"
msgid "Performing query on unknown header: %s"
msgstr "Performing query on unknown header: %s"
-#: ../camel/camel-folder.c:618
+#: ../camel/camel-folder.c:628
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "Unsupported operation: append message: for %s"
-#: ../camel/camel-folder.c:1240
+#: ../camel/camel-folder.c:1250
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "Unsupported operation: search by expression: for %s"
-#: ../camel/camel-folder.c:1281
+#: ../camel/camel-folder.c:1291
#, c-format
msgid "Unsupported operation: search by UIDs: for %s"
msgstr "Unsupported operation: search by UIDs: for %s"
-#: ../camel/camel-folder.c:1397
+#: ../camel/camel-folder.c:1407
msgid "Moving messages"
msgstr "Moving messages"
-#: ../camel/camel-folder.c:1397
+#: ../camel/camel-folder.c:1407
msgid "Copying messages"
msgstr "Copying messages"
-#: ../camel/camel-folder.c:1651
+#: ../camel/camel-folder.c:1750
msgid "Learning junk"
msgstr "Learning junk"
-#: ../camel/camel-folder.c:1668
+#: ../camel/camel-folder.c:1767
msgid "Learning non-junk"
msgstr "Learning non-junk"
-#: ../camel/camel-folder.c:1687
+#: ../camel/camel-folder.c:1786
msgid "Filtering new message(s)"
msgstr "Filtering new message(s)"
-#: ../camel/camel-gpg-context.c:754
+#: ../camel/camel-gpg-context.c:755
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1570,15 +1575,15 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:769
+#: ../camel/camel-gpg-context.c:770
msgid "Failed to parse gpg userid hint."
msgstr "Failed to parse gpg userid hint."
-#: ../camel/camel-gpg-context.c:793 ../camel/camel-gpg-context.c:807
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
msgid "Failed to parse gpg passphrase request."
msgstr "Failed to parse gpg passphrase request."
-#: ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:828
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1587,7 +1592,7 @@ msgstr ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
-#: ../camel/camel-gpg-context.c:831
+#: ../camel/camel-gpg-context.c:832
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1596,99 +1601,99 @@ msgstr ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:837
#, c-format
-msgid "Unexpected request from GnuPG for `%s'"
-msgstr "Unexpected request from GnuPG for `%s'"
+msgid "Unexpected request from GnuPG for '%s'"
+msgstr "Unexpected request from GnuPG for '%s'"
-#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:1066
+#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068
#: ../camel/providers/nntp/camel-nntp-store.c:1281
msgid "Canceled."
msgstr "Cancelled."
-#: ../camel/camel-gpg-context.c:875
+#: ../camel/camel-gpg-context.c:876
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:883
+#: ../camel/camel-gpg-context.c:884
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Unexpected response from GnuPG: %s"
-#: ../camel/camel-gpg-context.c:936
+#: ../camel/camel-gpg-context.c:937
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:1204 ../camel/camel-gpg-context.c:1332
-#: ../camel/camel-gpg-context.c:1826 ../camel/camel-gpg-context.c:1871
+#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1334
+#: ../camel/camel-gpg-context.c:1829 ../camel/camel-gpg-context.c:1874
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Failed to execute gpg: %s"
-#: ../camel/camel-gpg-context.c:1300 ../camel/camel-smime-context.c:392
+#: ../camel/camel-gpg-context.c:1302 ../camel/camel-smime-context.c:392
#, c-format
msgid "Could not generate signing data: %s"
msgstr "Could not generate signing data: %s"
-#: ../camel/camel-gpg-context.c:1347 ../camel/camel-gpg-context.c:1531
-#: ../camel/camel-gpg-context.c:1616 ../camel/camel-gpg-context.c:1631
-#: ../camel/camel-gpg-context.c:1748 ../camel/camel-gpg-context.c:1763
-#: ../camel/camel-gpg-context.c:1842 ../camel/camel-gpg-context.c:1887
+#: ../camel/camel-gpg-context.c:1349 ../camel/camel-gpg-context.c:1534
+#: ../camel/camel-gpg-context.c:1619 ../camel/camel-gpg-context.c:1634
+#: ../camel/camel-gpg-context.c:1750 ../camel/camel-gpg-context.c:1765
+#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1890
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
-#: ../camel/camel-gpg-context.c:1366
+#: ../camel/camel-gpg-context.c:1368
msgid "This is a digitally signed message part"
msgstr "This is a digitally signed message part"
-#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457
-#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1479
+#: ../camel/camel-gpg-context.c:1453 ../camel/camel-gpg-context.c:1459
+#: ../camel/camel-gpg-context.c:1465 ../camel/camel-gpg-context.c:1480
#: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706
#: ../camel/camel-smime-context.c:713
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1516
+#: ../camel/camel-gpg-context.c:1519
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "Cannot verify message signature: could not create temp file: %s"
-#: ../camel/camel-gpg-context.c:1599
+#: ../camel/camel-gpg-context.c:1602
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "Could not generate encrypting data: %s"
-#: ../camel/camel-gpg-context.c:1649
+#: ../camel/camel-gpg-context.c:1652
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: ../camel/camel-gpg-context.c:1702 ../camel/camel-gpg-context.c:1710
-#: ../camel/camel-gpg-context.c:1730
+#: ../camel/camel-gpg-context.c:1705 ../camel/camel-gpg-context.c:1713
+#: ../camel/camel-gpg-context.c:1732
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Cannot decrypt message: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1719
+#: ../camel/camel-gpg-context.c:1722
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Failed to decrypt MIME part: protocol error"
-#: ../camel/camel-gpg-context.c:1784 ../camel/camel-smime-context.c:969
+#: ../camel/camel-gpg-context.c:1787 ../camel/camel-smime-context.c:969
msgid "Encrypted content"
msgstr "Encrypted content"
-#: ../camel/camel-gpg-context.c:1803
+#: ../camel/camel-gpg-context.c:1806
msgid "Unable to parse message content"
msgstr "Unable to parse message content"
-#: ../camel/camel-gpg-context.c:1827 ../camel/camel-gpg-context.c:1872
+#: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875
#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-engine.c:1548
-#: ../camel/providers/imap4/camel-imap4-engine.c:1587
-#: ../camel/providers/imap4/camel-imap4-engine.c:1632
-#: ../camel/providers/imap4/camel-imap4-engine.c:1688
-#: ../camel/providers/imap4/camel-imap4-store.c:820
-#: ../camel/providers/imap4/camel-imap4-store.c:1495
-#: ../camel/providers/imap4/camel-imap4-utils.c:557
+#: ../camel/providers/imap4/camel-imap4-engine.c:1570
+#: ../camel/providers/imap4/camel-imap4-engine.c:1609
+#: ../camel/providers/imap4/camel-imap4-engine.c:1654
+#: ../camel/providers/imap4/camel-imap4-engine.c:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:823
+#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imap4/camel-imap4-utils.c:624
#: ../camel/providers/smtp/camel-smtp-transport.c:164
#: ../camel/providers/smtp/camel-smtp-transport.c:219
msgid "Unknown"
@@ -1788,44 +1793,44 @@ msgstr "Error writing mail temp file: %s"
msgid "Error copying mail temp file: %s"
msgstr "Error copying mail temp file: %s"
-#: ../camel/camel-multipart-signed.c:595
+#: ../camel/camel-multipart-signed.c:593
msgid "parse error"
msgstr "parse error"
-#: ../camel/camel-net-utils.c:506 ../camel/camel-net-utils.c:668
-#: ../camel/camel-net-utils.c:800
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#: ../camel/providers/pop3/camel-pop3-store.c:553
+#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
+#: ../camel/camel-net-utils.c:799
+#: ../camel/providers/pop3/camel-pop3-store.c:447
+#: ../camel/providers/pop3/camel-pop3-store.c:547
msgid "Canceled"
msgstr "Cancelled"
-#: ../camel/camel-net-utils.c:525
+#: ../camel/camel-net-utils.c:524
msgid "cannot create thread"
msgstr "cannot create thread"
-#: ../camel/camel-net-utils.c:672
+#: ../camel/camel-net-utils.c:671
#, c-format
msgid "Resolving: %s"
msgstr "Resolving: %s"
-#: ../camel/camel-net-utils.c:694
+#: ../camel/camel-net-utils.c:693
msgid "Host lookup failed"
msgstr "Host lookup failed"
-#: ../camel/camel-net-utils.c:696
+#: ../camel/camel-net-utils.c:695
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "Host lookup failed: %s: %s"
-#: ../camel/camel-net-utils.c:804
+#: ../camel/camel-net-utils.c:803
msgid "Resolving address"
msgstr "Resolving address"
-#: ../camel/camel-net-utils.c:824
+#: ../camel/camel-net-utils.c:823
msgid "Name lookup failed"
msgstr "Name lookup failed"
-#: ../camel/camel-net-utils.c:827
+#: ../camel/camel-net-utils.c:826
#, c-format
msgid "Name lookup failed: %s"
msgstr "Name lookup failed: %s"
@@ -1837,12 +1842,12 @@ msgstr "Syncing messages in folder '%s' to disk"
#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
#, c-format
-msgid "Cannot write offline journal for folder `%s': %s"
-msgstr "Cannot write offline journal for folder `%s': %s"
+msgid "Cannot write offline journal for folder '%s': %s"
+msgstr "Cannot write offline journal for folder '%s': %s"
#: ../camel/camel-provider.c:62
msgid "Virtual folder email provider"
-msgstr "Virtual folder email provider"
+msgstr "Virtual folder e-mail provider"
#: ../camel/camel-provider.c:64
msgid "For reading mail as a query of another set of folders"
@@ -1865,8 +1870,8 @@ msgstr "Could not load %s: No initialisation code in module."
#: ../camel/camel-provider.c:376 ../camel/camel-session.c:177
#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "No provider available for protocol `%s'"
+msgid "No provider available for protocol '%s'"
+msgstr "No provider available for protocol '%s'"
#: ../camel/camel-sasl-anonymous.c:37
msgid "Anonymous"
@@ -1886,7 +1891,7 @@ msgid ""
"Invalid email address trace information:\n"
"%s"
msgstr ""
-"Invalid email address trace information:\n"
+"Invalid e-mail address trace information:\n"
"%s"
#: ../camel/camel-sasl-anonymous.c:145
@@ -1907,11 +1912,11 @@ msgstr ""
"Invalid trace information:\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:38
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:42
+#: ../camel/camel-sasl-cram-md5.c:40
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
@@ -1919,11 +1924,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:50
+#: ../camel/camel-sasl-digest-md5.c:48
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:52
+#: ../camel/camel-sasl-digest-md5.c:50
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -1931,27 +1936,27 @@ 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:820
+#: ../camel/camel-sasl-digest-md5.c:845
msgid "Server challenge too long (>2048 octets)"
msgstr "Server challenge too long (>2048 octets)"
-#: ../camel/camel-sasl-digest-md5.c:829
+#: ../camel/camel-sasl-digest-md5.c:854
msgid "Server challenge invalid\n"
msgstr "Server challenge invalid\n"
-#: ../camel/camel-sasl-digest-md5.c:835
+#: ../camel/camel-sasl-digest-md5.c:860
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "Server challenge contained invalid \"Quality of Protection\" token"
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:890
msgid "Server response did not contain authorization data"
msgstr "Server response did not contain authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:883
+#: ../camel/camel-sasl-digest-md5.c:908
msgid "Server response contained incomplete authorization data"
msgstr "Server response contained incomplete authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:893
+#: ../camel/camel-sasl-digest-md5.c:918
msgid "Server response does not match"
msgstr "Server response does not match"
@@ -2027,7 +2032,7 @@ msgstr "The referenced credentials have expired."
#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1317
+#: ../camel/providers/imap/camel-imap-store.c:1318
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
@@ -2135,7 +2140,7 @@ msgstr ""
msgid "Please enter the %s password for %s on host %s."
msgstr "Please enter the %s password for %s on host %s."
-#: ../camel/camel-smime-context.c:234
+#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Cannot find certificate for '%s'"
@@ -2284,11 +2289,6 @@ msgstr "Signer: %s <%s>: %s\n"
msgid "Decoder failed"
msgstr "Decoder failed"
-#: ../camel/camel-smime-context.c:778
-#, c-format
-msgid "Cannot find certificate for `%s'"
-msgstr "Cannot find certificate for `%s'"
-
#: ../camel/camel-smime-context.c:785
msgid "Cannot find common bulk encryption algorithm"
msgstr "Cannot find common bulk encryption algorithm"
@@ -2350,8 +2350,8 @@ msgstr "Cannot get folder: Invalid operation on this store"
#: ../camel/camel-store.c:252
#, c-format
-msgid "Cannot create folder `%s': folder exists"
-msgstr "Cannot create folder `%s': folder exists"
+msgid "Cannot create folder '%s': folder exists"
+msgstr "Cannot create folder '%s': folder exists"
#: ../camel/camel-store.c:316
msgid "Cannot create folder: Invalid operation on this store"
@@ -2376,7 +2376,7 @@ msgstr "Cannot rename folder: %s: Invalid operation"
#. the name of the Trash folder, used for deleted messages
#: ../camel/camel-store.c:799 ../camel/camel-vtrash-folder.c:52
-#: ../camel/providers/imap/camel-imap-store.c:1077
+#: ../camel/providers/imap/camel-imap-store.c:1078
msgid "Trash"
msgstr "Wastebasket"
@@ -2501,7 +2501,7 @@ msgstr "Key usage does not support certificate signing"
msgid "Error in application verification"
msgstr "Error in application verification"
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:871
+#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:879
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2514,11 +2514,11 @@ msgstr ""
"Fingerprint: %s\n"
"Signature: %s"
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885
msgid "GOOD"
msgstr "GOOD"
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885
msgid "BAD"
msgstr "BAD"
@@ -2542,7 +2542,7 @@ msgstr ""
"Do you wish to accept anyway?"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:881
+#: ../camel/camel-tcp-stream-ssl.c:889
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2557,7 +2557,7 @@ msgstr ""
"\n"
"Do you wish to accept?"
-#: ../camel/camel-tcp-stream-ssl.c:925
+#: ../camel/camel-tcp-stream-ssl.c:933
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2566,7 +2566,7 @@ msgstr ""
"Certificate problem: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:977
+#: ../camel/camel-tcp-stream-ssl.c:985
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2575,7 +2575,7 @@ msgstr ""
"Bad certificate domain: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:995
+#: ../camel/camel-tcp-stream-ssl.c:1003
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2584,7 +2584,7 @@ msgstr ""
"Certificate expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:1012
+#: ../camel/camel-tcp-stream-ssl.c:1020
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2595,20 +2595,20 @@ msgstr ""
#: ../camel/camel-url.c:313
#, c-format
-msgid "Could not parse URL `%s'"
-msgstr "Could not parse URL `%s'"
+msgid "Could not parse URL '%s'"
+msgstr "Could not parse URL '%s'"
-#: ../camel/camel-vee-folder.c:482
+#: ../camel/camel-vee-folder.c:486
#, c-format
-msgid "Error storing `%s': %s"
-msgstr "Error storing `%s': %s"
+msgid "Error storing '%s': %s"
+msgstr "Error storing '%s': %s"
-#: ../camel/camel-vee-folder.c:524
+#: ../camel/camel-vee-folder.c:528
#, c-format
msgid "No such message %s in %s"
msgstr "No such message %s in %s"
-#: ../camel/camel-vee-folder.c:649 ../camel/camel-vee-folder.c:655
+#: ../camel/camel-vee-folder.c:653 ../camel/camel-vee-folder.c:659
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "Cannot copy or move messages into a Virtual Folder"
@@ -2635,7 +2635,7 @@ msgid "Cannot copy messages to the Junk folder"
msgstr "Cannot copy messages to the Junk folder"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:118
-#: ../camel/providers/imap/camel-imap-folder.c:2167
+#: ../camel/providers/imap/camel-imap-folder.c:2486
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -2645,7 +2645,7 @@ msgstr ""
" %s"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:118
-#: ../camel/providers/imap/camel-imap-folder.c:2167
+#: ../camel/providers/imap/camel-imap-folder.c:2486
#: ../camel/providers/local/camel-maildir-folder.c:251
#: ../camel/providers/local/camel-mbox-folder.c:348
#: ../camel/providers/local/camel-mh-folder.c:204
@@ -2653,71 +2653,72 @@ msgid "No such message"
msgstr "No such message"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:130
-#: ../camel/providers/imap4/camel-imap4-folder.c:791
+#: ../camel/providers/imap4/camel-imap4-folder.c:812
#: ../camel/providers/nntp/camel-nntp-folder.c:156
#: ../camel/providers/nntp/camel-nntp-folder.c:232
#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/pop3/camel-pop3-folder.c:262
-#: ../camel/providers/pop3/camel-pop3-folder.c:518
-#: ../camel/providers/pop3/camel-pop3-folder.c:579
-#: ../camel/providers/pop3/camel-pop3-folder.c:597
+#: ../camel/providers/pop3/camel-pop3-folder.c:266
+#: ../camel/providers/pop3/camel-pop3-folder.c:560
+#: ../camel/providers/pop3/camel-pop3-folder.c:621
+#: ../camel/providers/pop3/camel-pop3-folder.c:639
msgid "User canceled"
msgstr "User cancelled"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/imap4/camel-imap4-folder.c:796
+#: ../camel/providers/imap4/camel-imap4-folder.c:817
#: ../camel/providers/nntp/camel-nntp-folder.c:147
#: ../camel/providers/nntp/camel-nntp-folder.c:149
#: ../camel/providers/nntp/camel-nntp-folder.c:158
#: ../camel/providers/nntp/camel-nntp-folder.c:234
-#: ../camel/providers/pop3/camel-pop3-folder.c:521
-#: ../camel/providers/pop3/camel-pop3-folder.c:582
-#: ../camel/providers/pop3/camel-pop3-folder.c:589
-#: ../camel/providers/pop3/camel-pop3-folder.c:600
+#: ../camel/providers/pop3/camel-pop3-folder.c:388
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
+#: ../camel/providers/pop3/camel-pop3-folder.c:624
+#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:642
#, c-format
msgid "Cannot get message %s: %s"
msgstr "Cannot get message %s: %s"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:154
#: ../camel/providers/groupwise/camel-groupwise-folder.c:162
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2142
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2169
+#: ../camel/providers/imap4/camel-imap4-folder.c:835
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:174
#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1691
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1738
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1702
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1753
msgid "Could not get message"
msgstr "Could not get message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:817
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:818
+#: ../camel/providers/imap/camel-imap-folder.c:268
#, c-format
msgid "Could not load summary for %s"
msgstr "Could not load summary for %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1066
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071
msgid "Trash Folder Full. Please Empty."
msgstr "Wastebasket Folder Full. Please Empty."
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1243
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248
#: ../camel/providers/groupwise/camel-groupwise-store.c:623
#: ../camel/providers/groupwise/camel-groupwise-store.c:736
-#: ../camel/providers/imap/camel-imap-folder.c:2538
-#: ../camel/providers/imap/camel-imap-folder.c:2608
+#: ../camel/providers/imap/camel-imap-folder.c:2858
+#: ../camel/providers/imap/camel-imap-folder.c:2932
#, 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:2009
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2051
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2036
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
#, c-format
-msgid "Cannot append message to folder `%s': %s"
-msgstr "Cannot append message to folder `%s': %s"
+msgid "Cannot append message to folder '%s': %s"
+msgstr "Cannot append message to folder '%s': %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2039
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2066
#, c-format
msgid "Cannot create message: %s"
msgstr "Cannot create message: %s"
@@ -2739,20 +2740,20 @@ msgid "Cannot append message in offline mode: %s"
msgstr "Cannot append message in offline mode: %s"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/imap4/camel-imap4-provider.c:39
msgid "Checking for new mail"
msgstr "Checking for new mail"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
#: ../camel/providers/hula/camel-hula-provider.c:51
#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imap4/camel-imap4-provider.c:41
msgid "C_heck for new messages in all folders"
msgstr "C_heck for new messages in all folders"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imap4/camel-imap4-provider.c:52
#: ../camel/providers/local/camel-local-provider.c:46
#: ../camel/providers/local/camel-local-provider.c:86
#: ../camel/providers/local/camel-local-provider.c:106
@@ -2795,7 +2796,7 @@ msgstr "For accessing Novell GroupWise servers"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
#: ../camel/providers/hula/camel-hula-provider.c:95
#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
+#: ../camel/providers/imap4/camel-imap4-provider.c:84
#: ../camel/providers/imapp/camel-imapp-provider.c:67
#: ../camel/providers/nntp/camel-nntp-provider.c:74
#: ../camel/providers/pop3/camel-pop3-provider.c:72
@@ -2813,7 +2814,7 @@ msgid "Host or user not available in url"
msgstr "Host or user not available in url"
#: ../camel/providers/groupwise/camel-groupwise-store.c:206
-#: ../camel/providers/imap/camel-imap-store.c:1401
+#: ../camel/providers/imap/camel-imap-store.c:1402
msgid "You did not enter a password."
msgstr "You did not enter a password."
@@ -2822,8 +2823,8 @@ 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:532
-#: ../camel/providers/imap/camel-imap-store.c:1912
-#: ../camel/providers/imap/camel-imap-store.c:2103
+#: ../camel/providers/imap/camel-imap-store.c:1913
+#: ../camel/providers/imap/camel-imap-store.c:2111
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
@@ -2833,16 +2834,16 @@ msgid "Cannot create GroupWise folders in offline mode."
msgstr "Cannot create GroupWise folders in offline mode."
#: ../camel/providers/groupwise/camel-groupwise-store.c:1231
-#: ../camel/providers/imap/camel-imap-store.c:1987
-#: ../camel/providers/imap/camel-imap-store.c:2356
+#: ../camel/providers/imap/camel-imap-store.c:1988
+#: ../camel/providers/imap/camel-imap-store.c:2364
msgid "The parent folder is not allowed to contain subfolders"
msgstr "The parent folder is not allowed to contain subfolders"
#: ../camel/providers/groupwise/camel-groupwise-store.c:1307
#: ../camel/providers/groupwise/camel-groupwise-store.c:1328
#, c-format
-msgid "Cannot rename Groupwise folder `%s' to `%s'"
-msgstr "Cannot rename Groupwise folder `%s' to `%s'"
+msgid "Cannot rename Groupwise folder '%s' to '%s'"
+msgstr "Cannot rename Groupwise folder '%s' to '%s'"
#: ../camel/providers/groupwise/camel-groupwise-store.c:1360
#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
@@ -2902,20 +2903,20 @@ msgstr "Command:"
#: ../camel/providers/hula/camel-hula-provider.c:61
#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imap4/camel-imap4-provider.c:44
#: ../camel/providers/nntp/camel-nntp-provider.c:44
msgid "Folders"
msgstr "Folders"
#: ../camel/providers/hula/camel-hula-provider.c:63
#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imap4/camel-imap4-provider.c:46
msgid "_Show only subscribed folders"
msgstr "_Show only subscribed folders"
#: ../camel/providers/hula/camel-hula-provider.c:65
#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imap4/camel-imap4-provider.c:48
msgid "O_verride server-supplied folder namespace"
msgstr "O_verride server-supplied folder namespace"
@@ -2939,12 +2940,12 @@ msgstr ""
#: ../camel/providers/imap/camel-imap-command.c:224
#: ../camel/providers/imap/camel-imap-command.c:266
#: ../camel/providers/imap/camel-imap-command.c:472
-#: ../camel/providers/imap/camel-imap-store.c:3058
+#: ../camel/providers/imap/camel-imap-store.c:3066
msgid "Operation cancelled"
msgstr "Operation cancelled"
#: ../camel/providers/imap/camel-imap-command.c:311
-#: ../camel/providers/imap/camel-imap-store.c:3061
+#: ../camel/providers/imap/camel-imap-store.c:3069
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Server unexpectedly disconnected: %s"
@@ -2984,54 +2985,54 @@ msgstr "IMAP server response did not contain %s information"
msgid "Unexpected OK response from IMAP server: %s"
msgstr "Unexpected OK response from IMAP server: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:87
+#: ../camel/providers/imap/camel-imap-folder.c:88
msgid "Always check for new mail in this folder"
msgstr "Always check for new mail in this folder"
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:249
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Could not create directory %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:350
+#: ../camel/providers/imap/camel-imap-folder.c:353
msgid "Folder was destroyed and recreated on server."
msgstr "Folder was destroyed and recreated on server."
#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:682
+#: ../camel/providers/imap/camel-imap-folder.c:839
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Scanning for changed messages in %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2127
+#: ../camel/providers/imap/camel-imap-folder.c:2446
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "Unable to retrieve message: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2206
-#: ../camel/providers/imap/camel-imap-folder.c:2892
+#: ../camel/providers/imap/camel-imap-folder.c:2525
+#: ../camel/providers/imap/camel-imap-folder.c:3226
#: ../camel/providers/nntp/camel-nntp-folder.c:220
msgid "This message is not currently available"
msgstr "This message is not currently available"
-#: ../camel/providers/imap/camel-imap-folder.c:2727
+#: ../camel/providers/imap/camel-imap-folder.c:3061
#, 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:2735
+#: ../camel/providers/imap/camel-imap-folder.c:3069
#, 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:2748
+#: ../camel/providers/imap/camel-imap-folder.c:3082
#, c-format
msgid ""
"Unexpected server response: Identical UIDs provided for messages %d and %d"
msgstr ""
"Unexpected server response: Identical UIDs provided for messages %d and %d"
-#: ../camel/providers/imap/camel-imap-folder.c:2930
+#: ../camel/providers/imap/camel-imap-folder.c:3264
msgid "Could not find message body in FETCH response."
msgstr "Could not find message body in FETCH response."
@@ -3054,12 +3055,12 @@ msgid "Failed to cache %s: %s"
msgstr "Failed to cache %s: %s"
#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
+#: ../camel/providers/imap4/camel-imap4-provider.c:50
msgid "Namespace:"
msgstr "Namespace:"
#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imap4/camel-imap4-provider.c:54
msgid "_Apply filters to new messages in INBOX on this server"
msgstr "_Apply filters to new messages in INBOX on this server"
@@ -3068,7 +3069,7 @@ msgid "Check new messages for Jun_k contents"
msgstr "Check new messages for Jun_k contents"
#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap4/camel-imap4-provider.c:60
msgid "Automatically synchroni_ze remote mail locally"
msgstr "Automatically synchroni_se remote mail locally"
@@ -3087,80 +3088,80 @@ msgstr ""
"This option will connect to the IMAP server using a plaintext password."
#: ../camel/providers/imap/camel-imap-store.c:457
-#: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imap4/camel-imap4-store.c:214
#, c-format
msgid "IMAP server %s"
msgstr "IMAP server %s"
#: ../camel/providers/imap/camel-imap-store.c:459
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../camel/providers/imap4/camel-imap4-store.c:216
#, c-format
msgid "IMAP service for %s on %s"
msgstr "IMAP service for %s on %s"
-#: ../camel/providers/imap/camel-imap-store.c:587
-#: ../camel/providers/imap/camel-imap-store.c:602
-#: ../camel/providers/imap4/camel-imap4-store.c:249
-#: ../camel/providers/imap4/camel-imap4-store.c:264
+#: ../camel/providers/imap/camel-imap-store.c:588
+#: ../camel/providers/imap/camel-imap-store.c:603
+#: ../camel/providers/imap4/camel-imap4-store.c:251
+#: ../camel/providers/imap4/camel-imap4-store.c:266
#: ../camel/providers/nntp/camel-nntp-store.c:183
#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/pop3/camel-pop3-store.c:187
+#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/pop3/camel-pop3-store.c:185
#: ../camel/providers/smtp/camel-smtp-transport.c:258
#: ../camel/providers/smtp/camel-smtp-transport.c:273
#, c-format
msgid "Could not connect to %s: %s"
msgstr "Could not connect to %s: %s"
-#: ../camel/providers/imap/camel-imap-store.c:588
-#: ../camel/providers/imap4/camel-imap4-store.c:250
+#: ../camel/providers/imap/camel-imap-store.c:589
+#: ../camel/providers/imap4/camel-imap4-store.c:252
#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:174
+#: ../camel/providers/pop3/camel-pop3-store.c:172
#: ../camel/providers/smtp/camel-smtp-transport.c:259
msgid "SSL unavailable"
msgstr "SSL unavailable"
-#: ../camel/providers/imap/camel-imap-store.c:599
-#: ../camel/providers/imap/camel-imap-store.c:881
+#: ../camel/providers/imap/camel-imap-store.c:600
+#: ../camel/providers/imap/camel-imap-store.c:882
msgid "Connection cancelled"
msgstr "Connection cancelled"
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:729
-#: ../camel/providers/imap/camel-imap-store.c:735
-#: ../camel/providers/imap/camel-imap-store.c:761
-#: ../camel/providers/imap4/camel-imap4-store.c:312
-#: ../camel/providers/imap4/camel-imap4-store.c:327
-#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:730
+#: ../camel/providers/imap/camel-imap-store.c:736
+#: ../camel/providers/imap/camel-imap-store.c:762
+#: ../camel/providers/imap4/camel-imap4-store.c:314
+#: ../camel/providers/imap4/camel-imap4-store.c:329
+#: ../camel/providers/imap4/camel-imap4-store.c:338
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Failed to connect to IMAP server %s in secure mode: %s"
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:712
#: ../camel/providers/smtp/camel-smtp-transport.c:331
msgid "STARTTLS not supported"
msgstr "STARTTLS not supported"
-#: ../camel/providers/imap/camel-imap-store.c:730
+#: ../camel/providers/imap/camel-imap-store.c:731
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: ../camel/providers/imap/camel-imap-store.c:736
-#: ../camel/providers/imap4/camel-imap4-store.c:336
+#: ../camel/providers/imap/camel-imap-store.c:737
+#: ../camel/providers/imap4/camel-imap4-store.c:339
#: ../camel/providers/smtp/camel-smtp-transport.c:370
msgid "SSL is not available in this build"
msgstr "SSL is not available in this build"
-#: ../camel/providers/imap/camel-imap-store.c:884
+#: ../camel/providers/imap/camel-imap-store.c:885
#, 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:1069
-#: ../camel/providers/imap/camel-imap-store.c:2452
+#: ../camel/providers/imap/camel-imap-store.c:1070
+#: ../camel/providers/imap/camel-imap-store.c:2460
#: ../camel/providers/imap4/camel-imap4-store-summary.c:367
-#: ../camel/providers/imap4/camel-imap4-store.c:1326
+#: ../camel/providers/imap4/camel-imap4-store.c:1408
#: ../camel/providers/local/camel-maildir-folder.c:77
#: ../camel/providers/local/camel-maildir-store.c:218
#: ../camel/providers/local/camel-maildir-store.c:290
@@ -3171,31 +3172,31 @@ msgstr "Could not connect with command \"%s\": %s"
msgid "Inbox"
msgstr "Inbox"
-#: ../camel/providers/imap/camel-imap-store.c:1071
+#: ../camel/providers/imap/camel-imap-store.c:1072
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
msgid "Drafts"
msgstr "Drafts"
-#: ../camel/providers/imap/camel-imap-store.c:1073
+#: ../camel/providers/imap/camel-imap-store.c:1074
msgid "Sent"
msgstr "Sent"
-#: ../camel/providers/imap/camel-imap-store.c:1075
+#: ../camel/providers/imap/camel-imap-store.c:1076
msgid "Templates"
msgstr "Templates"
-#: ../camel/providers/imap/camel-imap-store.c:1348
+#: ../camel/providers/imap/camel-imap-store.c:1349
#, 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:1358
+#: ../camel/providers/imap/camel-imap-store.c:1359
#: ../camel/providers/smtp/camel-smtp-transport.c:504
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: ../camel/providers/imap/camel-imap-store.c:1430
+#: ../camel/providers/imap/camel-imap-store.c:1431
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3206,35 +3207,35 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2294
-#: ../camel/providers/imap4/camel-imap4-store.c:956
+#: ../camel/providers/imap/camel-imap-store.c:1925
+#: ../camel/providers/imap/camel-imap-store.c:2302
+#: ../camel/providers/imap4/camel-imap4-store.c:959
#, 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:2041
+#: ../camel/providers/imap/camel-imap-store.c:2042
#: ../camel/providers/local/camel-maildir-store.c:191
#: ../camel/providers/local/camel-mbox-store.c:204
#: ../camel/providers/local/camel-mh-store.c:249
#, c-format
-msgid "Cannot create folder `%s': folder exists."
-msgstr "Cannot create folder `%s': folder exists."
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Cannot create folder '%s': folder exists."
-#: ../camel/providers/imap/camel-imap-store.c:2305
+#: ../camel/providers/imap/camel-imap-store.c:2313
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
-#: ../camel/providers/imap4/camel-imap4-command.c:550
-#: ../camel/providers/imap4/camel-imap4-command.c:557
+#: ../camel/providers/imap4/camel-imap4-command.c:576
+#: ../camel/providers/imap4/camel-imap4-command.c:583
#, c-format
msgid "Failed sending command to IMAP server %s: %s"
msgstr "Failed sending command to IMAP server %s: %s"
-#: ../camel/providers/imap4/camel-imap4-command.c:660
+#: ../camel/providers/imap4/camel-imap4-command.c:686
#, c-format
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "Unexpected response from IMAP4 server %s: %s"
@@ -3244,132 +3245,151 @@ msgstr "Unexpected response from IMAP4 server %s: %s"
msgid "Unexpected greeting from IMAP server %s."
msgstr "Unexpected greeting from IMAP server %s."
-#: ../camel/providers/imap4/camel-imap4-engine.c:431
+#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#, c-format
+msgid "Cannot select folder '%s': Invalid mailbox name"
+msgstr "Cannot select folder '%s': Invalid mailbox name"
+
+#: ../camel/providers/imap4/camel-imap4-engine.c:456
#, c-format
-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"
-#: ../camel/providers/imap4/camel-imap4-engine.c:437
+#: ../camel/providers/imap4/camel-imap4-engine.c:1433
#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "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"
+
+#: ../camel/providers/imap4/camel-imap4-engine.c:1435
+msgid "service unavailable"
+msgstr "service unavailable"
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1586
-#: ../camel/providers/imap4/camel-imap4-engine.c:1631
-#: ../camel/providers/imap4/camel-imap4-engine.c:1687
+#: ../camel/providers/imap4/camel-imap4-engine.c:1569
+#: ../camel/providers/imap4/camel-imap4-engine.c:1608
+#: ../camel/providers/imap4/camel-imap4-engine.c:1653
+#: ../camel/providers/imap4/camel-imap4-engine.c:1709
#, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "IMAP4 server %s unexpectedly disconnected: %s"
#: ../camel/providers/imap4/camel-imap4-folder.c:89
msgid ""
-"Enable Mailing-List detection required for some filter and vFolder rules"
+"Enable extended Mailing-List detection required for some filter and vFolder "
+"rules"
msgstr ""
-"Enable Mailing-List detection required for some filter and vFolder rules"
+"Enable extended Mailing-List detection required for some filter and vFolder "
+"rules"
+
+#: ../camel/providers/imap4/camel-imap4-folder.c:90
+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:91
+msgid "Expire cached messages older than X seconds"
+msgstr "Expire cached messages older than X seconds"
-#: ../camel/providers/imap4/camel-imap4-folder.c:402
+#: ../camel/providers/imap4/camel-imap4-folder.c:423
#, c-format
-msgid "Cannot access folder `%s': %s"
-msgstr "Cannot access folder `%s': %s"
+msgid "Cannot access folder '%s': %s"
+msgstr "Cannot access folder '%s': %s"
-#: ../camel/providers/imap4/camel-imap4-folder.c:461
+#: ../camel/providers/imap4/camel-imap4-folder.c:482
#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Cannot sync flags to folder `%s': Unknown"
+msgid "Cannot sync flags to folder '%s': Unknown"
+msgstr "Cannot syncronise flags to folder '%s': Unknown"
-#: ../camel/providers/imap4/camel-imap4-folder.c:467
+#: ../camel/providers/imap4/camel-imap4-folder.c:488
#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Cannot sync flags to folder `%s': Bad command"
+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:607
+#: ../camel/providers/imap4/camel-imap4-folder.c:628
#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Cannot expunge folder `%s': Unknown"
+msgid "Cannot expunge folder '%s': Unknown"
+msgstr "Cannot expunge folder '%s': Unknown"
-#: ../camel/providers/imap4/camel-imap4-folder.c:612
+#: ../camel/providers/imap4/camel-imap4-folder.c:633
#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Cannot expunge folder `%s': Bad command"
+msgid "Cannot expunge folder '%s': Bad command"
+msgstr "Cannot expunge folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-folder.c:868
+#: ../camel/providers/imap4/camel-imap4-folder.c:889
#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Cannot get message %s from folder `%s': No such message"
+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:873
+#: ../camel/providers/imap4/camel-imap4-folder.c:894
#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Cannot get message %s from folder `%s': Bad command"
+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:917
+#: ../camel/providers/imap4/camel-imap4-folder.c:938
#, c-format
-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': Folder is read-only"
+msgstr "Cannot append message to folder '%s': Folder is read-only"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1010
+#: ../camel/providers/imap4/camel-imap4-folder.c:1031
#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Cannot append message to folder `%s': Unknown error"
+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:1040
+#: ../camel/providers/imap4/camel-imap4-folder.c:1061
#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Cannot append message to folder `%s': Bad command"
+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:1160
+#: ../camel/providers/imap4/camel-imap4-folder.c:1181
#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgid "Cannot move messages from folder '%s' to folder '%s': Unknown"
+msgstr "Cannot move messages from folder '%s' to folder '%s': Unknown"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1164
+#: ../camel/providers/imap4/camel-imap4-folder.c:1185
#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown"
+msgstr "Cannot copy messages from folder '%s' to folder '%s': Unknown"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1172
+#: ../camel/providers/imap4/camel-imap4-folder.c:1193
#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
+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:1176
+#: ../camel/providers/imap4/camel-imap4-folder.c:1197
#, 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"
+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
+#: ../camel/providers/imap4/camel-imap4-provider.c:56
msgid "Check new messages for _Junk contents"
msgstr "Check new messages for _Junk contents"
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
+#: ../camel/providers/imap4/camel-imap4-provider.c:58
msgid "Only check for Junk messa_ges in the INBOX folder"
msgstr "Only check for Junk messa_ges in the INBOX folder"
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
+#: ../camel/providers/imap4/camel-imap4-provider.c:67
msgid "IMAP4rev1"
msgstr "IMAP4rev1"
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
+#: ../camel/providers/imap4/camel-imap4-provider.c:69
msgid "For reading and storing mail on IMAPv4rev1 servers."
msgstr "For reading and storing mail on IMAPv4rev1 servers."
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
+#: ../camel/providers/imap4/camel-imap4-provider.c:86
msgid ""
"This option will connect to the IMAPv4rev1 server using a plaintext password."
msgstr ""
"This option will connect to the IMAPv4rev1 server using a plaintext password."
-#: ../camel/providers/imap4/camel-imap4-store.c:261
+#: ../camel/providers/imap4/camel-imap4-store.c:263
#: ../camel/providers/imapp/camel-imapp-store.c:249
#: ../camel/providers/nntp/camel-nntp-store.c:195
#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:182
#: ../camel/providers/smtp/camel-smtp-transport.c:270
msgid "Connection canceled"
msgstr "Connection cancelled"
-#: ../camel/providers/imap4/camel-imap4-store.c:298
+#: ../camel/providers/imap4/camel-imap4-store.c:300
#, c-format
msgid ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
@@ -3378,147 +3398,147 @@ msgstr ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
"STARTTLS"
-#: ../camel/providers/imap4/camel-imap4-store.c:328
-#: ../camel/providers/pop3/camel-pop3-store.c:252
+#: ../camel/providers/imap4/camel-imap4-store.c:330
+#: ../camel/providers/pop3/camel-pop3-store.c:250
msgid "TLS negotiations failed"
msgstr "TLS negotiations failed"
-#: ../camel/providers/imap4/camel-imap4-store.c:412
+#: ../camel/providers/imap4/camel-imap4-store.c:415
#, c-format
msgid ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
msgstr ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-#: ../camel/providers/imap4/camel-imap4-store.c:535
+#: ../camel/providers/imap4/camel-imap4-store.c:538
#, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "Cannot authenticate to IMAP server %s using %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:698
-#: ../camel/providers/imap4/camel-imap4-store.c:966
+#: ../camel/providers/imap4/camel-imap4-store.c:701
+#: ../camel/providers/imap4/camel-imap4-store.c:969
msgid "Cannot create IMAP folders in offline mode."
msgstr "Cannot create IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:737
+#: ../camel/providers/imap4/camel-imap4-store.c:740
#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgid "Cannot get folder '%s' on IMAP server %s: Unknown"
+msgstr "Cannot get folder '%s' on IMAP server %s: Unknown"
-#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:821
#, c-format
-msgid "Cannot get LIST information for `%s' on IMAP server %s: %s"
-msgstr "Cannot get LIST information for `%s' on IMAP server %s: %s"
+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:820
-#: ../camel/providers/imap4/camel-imap4-store.c:1495
+#: ../camel/providers/imap4/camel-imap4-store.c:823
+#: ../camel/providers/imap4/camel-imap4-store.c:1577
msgid "Bad command"
msgstr "Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:899
+#: ../camel/providers/imap4/camel-imap4-store.c:902
#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Cannot create folder `%s': Invalid mailbox name"
+msgid "Cannot create folder '%s': Invalid mailbox name"
+msgstr "Cannot create folder '%s': Invalid mailbox name"
-#: ../camel/providers/imap4/camel-imap4-store.c:904
+#: ../camel/providers/imap4/camel-imap4-store.c:907
#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Cannot create folder `%s': Bad command"
+msgid "Cannot create folder '%s': Bad command"
+msgstr "Cannot create folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:1010
+#: ../camel/providers/imap4/camel-imap4-store.c:1013
#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Cannot delete folder `%s': Special folder"
+msgid "Cannot delete folder '%s': Special folder"
+msgstr "Cannot delete folder '%s': Special folder"
-#: ../camel/providers/imap4/camel-imap4-store.c:1017
+#: ../camel/providers/imap4/camel-imap4-store.c:1020
msgid "Cannot delete IMAP folders in offline mode."
msgstr "Cannot delete IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:1076
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Cannot delete folder `%s': Invalid mailbox name"
+msgid "Cannot delete folder '%s': Invalid mailbox name"
+msgstr "Cannot delete folder '%s': Invalid mailbox name"
-#: ../camel/providers/imap4/camel-imap4-store.c:1081
+#: ../camel/providers/imap4/camel-imap4-store.c:1084
#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Cannot delete folder `%s': Bad command"
+msgid "Cannot delete folder '%s': Bad command"
+msgstr "Cannot delete folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:1101
+#: ../camel/providers/imap4/camel-imap4-store.c:1104
#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Cannot rename folder `%s' to `%s': Special folder"
+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:1108
+#: ../camel/providers/imap4/camel-imap4-store.c:1111
msgid "Cannot rename IMAP folders in offline mode."
msgstr "Cannot rename IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:1139
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+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:1144
+#: ../camel/providers/imap4/camel-imap4-store.c:1147
#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Cannot rename folder `%s' to `%s': Bad command"
+msgid "Cannot rename folder '%s' to '%s': Bad command"
+msgstr "Cannot rename folder '%s' to '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:1493
+#: ../camel/providers/imap4/camel-imap4-store.c:1575
#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+msgstr "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:1533
+#: ../camel/providers/imap4/camel-imap4-store.c:1636
msgid "Cannot subscribe to IMAP folders in offline mode."
msgstr "Cannot subscribe to IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:1578
+#: ../camel/providers/imap4/camel-imap4-store.c:1681
#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
+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:1583
+#: ../camel/providers/imap4/camel-imap4-store.c:1686
#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Cannot subscribe to folder `%s': Bad command"
+msgid "Cannot subscribe to folder '%s': Bad command"
+msgstr "Cannot subscribe to folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:1605
+#: ../camel/providers/imap4/camel-imap4-store.c:1708
msgid "Cannot unsubscribe from IMAP folders in offline mode."
msgstr "Cannot unsubscribe from IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:1650
+#: ../camel/providers/imap4/camel-imap4-store.c:1753
#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+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:1655
+#: ../camel/providers/imap4/camel-imap4-store.c:1758
#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Cannot unsubscribe from folder `%s': Bad command"
+msgid "Cannot unsubscribe from folder '%s': Bad command"
+msgstr "Cannot unsubscribe from folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1451
+#: ../camel/providers/imap4/camel-imap4-summary.c:1596
msgid "Scanning for changed messages"
msgstr "Scanning for changed messages"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1472
+#: ../camel/providers/imap4/camel-imap4-summary.c:1617
#, c-format
msgid "IMAP server %s is in an inconsistent state."
msgstr "IMAP server %s is in an inconsistent state."
-#: ../camel/providers/imap4/camel-imap4-summary.c:1499
+#: ../camel/providers/imap4/camel-imap4-summary.c:1644
msgid "Fetching envelopes of new messages"
msgstr "Fetching envelopes of new messages"
-#: ../camel/providers/imap4/camel-imap4-utils.c:370
+#: ../camel/providers/imap4/camel-imap4-utils.c:437
#, c-format
msgid "Unexpected token in response from IMAP server %s: "
msgstr "Unexpected token in response from IMAP server %s: "
-#: ../camel/providers/imap4/camel-imap4-utils.c:393
+#: ../camel/providers/imap4/camel-imap4-utils.c:460
msgid "No data"
msgstr "No data"
-#: ../camel/providers/imap4/camel-imap4-utils.c:556
+#: ../camel/providers/imap4/camel-imap4-utils.c:623
#, c-format
msgid "IMAP server %s unexpectedly disconnected: %s"
msgstr "IMAP server %s unexpectedly disconnected: %s"
@@ -3540,9 +3560,9 @@ msgid ""
" !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n"
msgstr ""
"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
+"This is untested and unsupported code, you want to use plain IMAP instead.\n"
"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n"
+" !!! DO NOT USE THIS FOR PRODUCTION E-MAIL !!!\n"
#: ../camel/providers/imapp/camel-imapp-store.c:252
#, c-format
@@ -3578,8 +3598,8 @@ msgid "%s (%s)"
msgstr "%s (%s)"
#: ../camel/providers/local/camel-local-provider.c:48
-msgid "_Use the `.folders' folder summary file (exmh)"
-msgstr "_Use the `.folders' folder summary file (exmh)"
+msgid "_Use the '.folders' folder summary file (exmh)"
+msgstr "_Use the '.folders' folder summary file (exmh)"
#: ../camel/providers/local/camel-local-provider.c:55
msgid "MH-format mail directories"
@@ -3679,20 +3699,20 @@ msgstr "Could not rename '%s': %s"
#: ../camel/providers/local/camel-mbox-store.c:276
#: ../camel/providers/local/camel-mbox-store.c:288
#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Could not delete folder summary file `%s': %s"
+msgid "Could not delete folder summary file '%s': %s"
+msgstr "Could not delete folder summary file '%s': %s"
#: ../camel/providers/local/camel-local-store.c:472
#: ../camel/providers/local/camel-mbox-store.c:300
#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Could not delete folder index file `%s': %s"
+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:495
#: ../camel/providers/local/camel-mbox-store.c:324
#, c-format
-msgid "Could not delete folder meta file `%s': %s"
-msgstr "Could not delete folder meta file `%s': %s"
+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:409
#, c-format
@@ -3739,34 +3759,34 @@ msgstr "Invalid message contents"
#: ../camel/providers/local/camel-mbox-store.c:176
#: ../camel/providers/local/camel-mbox-store.c:188
#, c-format
-msgid "Cannot create folder `%s': %s"
-msgstr "Cannot create folder `%s': %s"
+msgid "Cannot create folder '%s': %s"
+msgstr "Cannot create folder '%s': %s"
#: ../camel/providers/local/camel-maildir-store.c:160
#: ../camel/providers/local/camel-mbox-store.c:147
#: ../camel/providers/local/camel-mh-store.c:217
#, c-format
-msgid "Cannot get folder `%s': %s"
-msgstr "Cannot get folder `%s': %s"
+msgid "Cannot get folder '%s': %s"
+msgstr "Cannot get folder '%s': %s"
#: ../camel/providers/local/camel-maildir-store.c:164
#: ../camel/providers/local/camel-mbox-store.c:155
#: ../camel/providers/local/camel-mh-store.c:224
#, c-format
-msgid "Cannot get folder `%s': folder does not exist."
-msgstr "Cannot get folder `%s': folder does not exist."
+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:188
#, c-format
-msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "Cannot get folder `%s': not a maildir directory."
+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:233
#: ../camel/providers/local/camel-maildir-store.c:271
#: ../camel/providers/local/camel-mh-store.c:273
#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Could not delete folder `%s': %s"
+msgid "Could not delete folder '%s': %s"
+msgstr "Could not delete folder '%s': %s"
#: ../camel/providers/local/camel-maildir-store.c:235
msgid "not a maildir directory"
@@ -3776,8 +3796,8 @@ msgstr "not a maildir directory"
#: ../camel/providers/local/camel-spool-store.c:331
#: ../camel/providers/local/camel-spool-store.c:345
#, c-format
-msgid "Could not scan folder `%s': %s"
-msgstr "Could not scan folder `%s': %s"
+msgid "Could not scan folder '%s': %s"
+msgstr "Could not scan folder '%s': %s"
#: ../camel/providers/local/camel-maildir-summary.c:433
#: ../camel/providers/local/camel-maildir-summary.c:567
@@ -3837,34 +3857,34 @@ msgstr "Cannot create a folder by this name."
#: ../camel/providers/local/camel-mbox-store.c:198
#, c-format
-msgid "Cannot get folder `%s': not a regular file."
-msgstr "Cannot get folder `%s': not a regular file."
+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:228
#: ../camel/providers/local/camel-mbox-store.c:239
#: ../camel/providers/local/camel-mbox-store.c:262
#, c-format
msgid ""
-"Could not delete folder `%s':\n"
+"Could not delete folder '%s':\n"
"%s"
msgstr ""
-"Could not delete folder `%s':\n"
+"Could not delete folder '%s':\n"
"%s"
#: ../camel/providers/local/camel-mbox-store.c:247
#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' is not a regular file."
+msgid "'%s' is not a regular file."
+msgstr "'%s' is not a regular file."
#: ../camel/providers/local/camel-mbox-store.c:254
#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Folder `%s' is not empty. Not deleted."
+msgid "Folder '%s' is not empty. Not deleted."
+msgstr "Folder '%s' is not empty. Not deleted."
#: ../camel/providers/local/camel-mbox-store.c:378
#, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Cannot create directory `%s': %s."
+msgid "Cannot create directory '%s': %s."
+msgstr "Cannot create directory '%s': %s."
#: ../camel/providers/local/camel-mbox-store.c:392
#, c-format
@@ -3881,8 +3901,8 @@ msgstr "The new folder name is illegal."
#: ../camel/providers/local/camel-mbox-store.c:498
#, c-format
-msgid "Could not rename `%s': `%s': %s"
-msgstr "Could not rename `%s': `%s': %s"
+msgid "Could not rename '%s': '%s': %s"
+msgstr "Could not rename '%s': '%s': %s"
#: ../camel/providers/local/camel-mbox-store.c:579
#, c-format
@@ -3979,13 +3999,13 @@ msgstr "Cannot append message to mh folder: %s: %s"
#: ../camel/providers/local/camel-mh-store.c:232
#, c-format
-msgid "Could not create folder `%s': %s"
-msgstr "Could not create folder `%s': %s"
+msgid "Could not create folder '%s': %s"
+msgstr "Could not create folder '%s': %s"
#: ../camel/providers/local/camel-mh-store.c:244
#, c-format
-msgid "Cannot get folder `%s': not a directory."
-msgstr "Cannot get folder `%s': not a directory."
+msgid "Cannot get folder '%s': not a directory."
+msgstr "Cannot get folder '%s': not a directory."
#: ../camel/providers/local/camel-mh-summary.c:246
#, c-format
@@ -3994,46 +4014,46 @@ msgstr "Cannot open MH directory path: %s: %s"
#: ../camel/providers/local/camel-spool-store.c:135
#, c-format
-msgid "Spool `%s' cannot be opened: %s"
-msgstr "Spool `%s' cannot be opened: %s"
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "Spool '%s' cannot be opened: %s"
#: ../camel/providers/local/camel-spool-store.c:147
#, c-format
-msgid "Spool `%s' is not a regular file or directory"
-msgstr "Spool `%s' is not a regular file or directory"
+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:166
#, c-format
-msgid "Folder `%s/%s' does not exist."
-msgstr "Folder `%s/%s' does not exist."
+msgid "Folder '%s/%s' does not exist."
+msgstr "Folder '%s/%s' does not exist."
#: ../camel/providers/local/camel-spool-store.c:176
#, c-format
msgid ""
-"Could not open folder `%s':\n"
+"Could not open folder '%s':\n"
"%s"
msgstr ""
-"Could not open folder `%s':\n"
+"Could not open folder '%s':\n"
"%s"
#: ../camel/providers/local/camel-spool-store.c:180
#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Folder `%s' does not exist."
+msgid "Folder '%s' does not exist."
+msgstr "Folder '%s' does not exist."
#: ../camel/providers/local/camel-spool-store.c:185
#, c-format
msgid ""
-"Could not create folder `%s':\n"
+"Could not create folder '%s':\n"
"%s"
msgstr ""
-"Could not create folder `%s':\n"
+"Could not create folder '%s':\n"
"%s"
#: ../camel/providers/local/camel-spool-store.c:193
#, c-format
-msgid "`%s' is not a mailbox file."
-msgstr "`%s' is not a mailbox file."
+msgid "'%s' is not a mailbox file."
+msgstr "'%s' is not a mailbox file."
#: ../camel/providers/local/camel-spool-store.c:210
msgid "Store does not support an INBOX"
@@ -4075,10 +4095,10 @@ msgstr "Could not sync spool folder %s: %s"
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in `%s'"
+"Folder may be corrupt, copy saved in '%s'"
msgstr ""
-"Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in `%s'"
+"Could not syncronise spool folder %s: %s\n"
+"Folder may be corrupt; copy saved in '%s'"
#: ../camel/providers/nntp/camel-nntp-folder.c:176
#: ../camel/providers/nntp/camel-nntp-folder.c:208
@@ -4234,36 +4254,36 @@ msgstr "Use cancel"
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:247
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
msgid "Retrieving POP summary"
msgstr "Retrieving POP summary"
-#: ../camel/providers/pop3/camel-pop3-folder.c:265
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "Cannot get POP summary: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:308
+#: ../camel/providers/pop3/camel-pop3-folder.c:312
msgid "Expunging old messages"
msgstr "Expunging old messages"
-#: ../camel/providers/pop3/camel-pop3-folder.c:316
+#: ../camel/providers/pop3/camel-pop3-folder.c:320
msgid "Expunging deleted messages"
msgstr "Expunging deleted messages"
-#: ../camel/providers/pop3/camel-pop3-folder.c:492
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
#, c-format
msgid "No message with UID %s"
msgstr "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:499
+#: ../camel/providers/pop3/camel-pop3-folder.c:541
#, c-format
msgid "Retrieving POP message %d"
msgstr "Retrieving POP message %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:589
+#: ../camel/providers/pop3/camel-pop3-folder.c:631
msgid "Unknown reason"
msgstr "Unknown reason"
@@ -4306,34 +4326,34 @@ 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:210
+#: ../camel/providers/pop3/camel-pop3-store.c:208
#, 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:227
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:239
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:255
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "Failed to connect to POP server %s in secure mode: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:228
+#: ../camel/providers/pop3/camel-pop3-store.c:226
msgid "STLS not supported by server"
msgstr "STLS not supported by server"
-#: ../camel/providers/pop3/camel-pop3-store.c:258
+#: ../camel/providers/pop3/camel-pop3-store.c:256
msgid "TLS is not available in this build"
msgstr "TLS is not available in this build"
-#: ../camel/providers/pop3/camel-pop3-store.c:364
+#: ../camel/providers/pop3/camel-pop3-store.c:362
#, c-format
msgid "Could not connect to POP server %s"
msgstr "Could not connect to POP server %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:405
-#: ../camel/providers/pop3/camel-pop3-store.c:542
+#: ../camel/providers/pop3/camel-pop3-store.c:403
+#: ../camel/providers/pop3/camel-pop3-store.c:536
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4342,22 +4362,22 @@ msgstr ""
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
-#: ../camel/providers/pop3/camel-pop3-store.c:421
+#: ../camel/providers/pop3/camel-pop3-store.c:419
#, c-format
-msgid "SASL `%s' Login failed for POP server %s: %s"
-msgstr "SASL `%s' Login failed for POP server %s: %s"
+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:433
+#: ../camel/providers/pop3/camel-pop3-store.c:431
#, 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:452
+#: ../camel/providers/pop3/camel-pop3-store.c:450
#, 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:512
+#: ../camel/providers/pop3/camel-pop3-store.c:509
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4366,8 +4386,8 @@ 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:556
-#: ../camel/providers/pop3/camel-pop3-store.c:569
+#: ../camel/providers/pop3/camel-pop3-store.c:550
+#: ../camel/providers/pop3/camel-pop3-store.c:563
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4376,7 +4396,7 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:557
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4385,10 +4405,10 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending username: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../camel/providers/pop3/camel-pop3-store.c:663
#, c-format
-msgid "No such folder `%s'."
-msgstr "No such folder `%s'."
+msgid "No such folder '%s'."
+msgstr "No such folder '%s'."
#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
msgid "Sendmail"
@@ -5045,19 +5065,28 @@ msgstr "_Edit %s"
msgid "_Delete %s"
msgstr "_Delete %s"
-#: ../libedataserverui/e-passwords.c:986
+#: ../libedataserverui/e-passwords.c:214
+#, 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:1044
+msgid "You have the Caps Lock key on."
+msgstr "You have the Caps Lock key on."
+
+#: ../libedataserverui/e-passwords.c:1164
msgid "_Remember this passphrase"
msgstr "_Remember this passphrase"
-#: ../libedataserverui/e-passwords.c:987
+#: ../libedataserverui/e-passwords.c:1165
msgid "_Remember this passphrase for the remainder of this session"
msgstr "_Remember this passphrase for the remainder of this session"
-#: ../libedataserverui/e-passwords.c:992
+#: ../libedataserverui/e-passwords.c:1170
msgid "_Remember this password"
msgstr "_Remember this password"
-#: ../libedataserverui/e-passwords.c:993
+#: ../libedataserverui/e-passwords.c:1171
msgid "_Remember this password for the remainder of this session"
msgstr "_Remember this password for the remainder of this session"
@@ -5071,13 +5100,13 @@ msgid "_Destination"
msgstr "_Destination"
#: ../servers/exchange/lib/e2k-autoconfig.c:1660
-#: ../servers/exchange/storage/exchange-account.c:939
+#: ../servers/exchange/storage/exchange-account.c:971
#, c-format
msgid "Enter password for %s"
msgstr "Enter password for %s"
#: ../servers/exchange/lib/e2k-autoconfig.c:1661
-#: ../servers/exchange/storage/exchange-account.c:944
+#: ../servers/exchange/storage/exchange-account.c:976
msgid "Enter password"
msgstr "Enter password"
@@ -5181,26 +5210,26 @@ msgstr "This operation cannot be performed in off-line mode"
#. i18n: This is the title of an "other user's folders"
#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:635
+#: ../servers/exchange/storage/exchange-account.c:662
#, c-format
msgid "%s's Folders"
msgstr "%s's Folders"
-#: ../servers/exchange/storage/exchange-account.c:1245
+#: ../servers/exchange/storage/exchange-account.c:1277
msgid "Personal Folders"
msgstr "Personal Folders"
-#: ../servers/exchange/storage/exchange-account.c:1260
+#: ../servers/exchange/storage/exchange-account.c:1292
msgid "Favorite Public Folders"
msgstr "Favourite Public Folders"
#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1277
+#: ../servers/exchange/storage/exchange-account.c:1309
msgid "All Public Folders"
msgstr "All Public Folders"
#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1291
+#: ../servers/exchange/storage/exchange-account.c:1323
msgid "Global Address List"
msgstr "Global Address List"
@@ -5262,7 +5291,7 @@ msgstr "Evolution Data Server logging service"
# dialog display isn't working out
#. dialog display isn't working out
-#: ../src/server.c:110
+#: ../src/server.c:109
#, c-format
msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
msgstr "Multiple segmentation faults occurred; cannot display error dialogue\n"
@@ -5275,6 +5304,9 @@ msgstr "Colour Info"
msgid "The color to render"
msgstr "The colour to render"
+#~ msgid "Cannot find certificate for `%s'"
+#~ msgstr "Cannot find certificate for `%s'"
+
#~ msgid "%sPlease enter the GroupWise password for %s@%s"
#~ msgstr "%sPlease enter the GroupWise password for %s@%s"