[evolution-data-server] Updated British English translation
- From: Bruce Cowan <bcowan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Updated British English translation
- Date: Wed, 24 Feb 2010 16:01:50 +0000 (UTC)
commit 063ce5bcb4bdee2d60c70687a6c4ca41d9077cab
Author: Bruce Cowan <bcowan fastmail co uk>
Date: Wed Feb 24 16:01:02 2010 +0000
Updated British English translation
po/en_GB.po | 2204 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 1181 insertions(+), 1023 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 03c483e..3de6721 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,18 +3,21 @@
# Robert Brady <rwb197 zepler org>, 2000.
# Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
# Philip Withnall <philip tecnocode co uk>, 2009.
-#
+# Bruce Cowan <bcowan fastmail co uk>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-13 00:28+0100\n"
-"PO-Revision-Date: 2009-02-23 20:50+0000\n"
-"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
+"POT-Creation-Date: 2010-02-24 15:58+0000\n"
+"PO-Revision-Date: 2010-02-24 16:00+0100\n"
+"Last-Translator: Bruce Cowan <bcowan fastmail co uk>\n"
"Language-Team: British English <en li org>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.5.2\n"
#: ../addressbook/backends/file/e-book-backend-file.c:560
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
@@ -26,13 +29,13 @@ msgstr "Loadingâ?¦"
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
msgid "Searching..."
msgstr "Searchingâ?¦"
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "Downloading contacts (%d)â?¦ "
@@ -44,59 +47,54 @@ msgstr "Downloading contacts (%d)â?¦ "
msgid "Updating contacts cache (%d)... "
msgstr "Updating contacts cache (%d)â?¦ "
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
msgid "Using Distinguished Name (DN)"
msgstr "Using Distinguished Name (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
msgid "Using Email Address"
msgstr "Using E-mail Address"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
msgid "Reconnecting to LDAP server..."
msgstr "Reconnecting to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
msgid "Adding contact to LDAP server..."
msgstr "Adding contact to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
msgid "Removing contact from LDAP server..."
msgstr "Removing contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
msgid "Modifying contact from LDAP server..."
msgstr "Modifying contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
msgid "Receiving LDAP search results..."
msgstr "Receiving LDAP search resultsâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
msgid "Error performing search"
msgstr "Error performing search"
-#: ../addressbook/libebook/e-book.c:1837
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: there was no self contact UID stored in gconf"
-
-#: ../addressbook/libebook/e-book.c:1967
+#: ../addressbook/libebook/e-book.c:2149
#, c-format
msgid "%s: there was no source for uid `%s' stored in gconf."
msgstr "%s: there was no source for uid `%s' stored in gconf."
#. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
msgid "Unique ID"
msgstr "Unique ID"
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
msgid "File Under"
msgstr "File Under"
#. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
msgid "Book URI"
msgstr "Book URI"
@@ -104,806 +102,866 @@ 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:122
+#: ../addressbook/libebook/e-contact.c:124
msgid "Full Name"
msgstr "Full Name"
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
msgid "Given Name"
msgstr "Given Name"
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
msgid "Family Name"
msgstr "Family Name"
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
msgid "Nickname"
msgstr "Nickname"
#. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
msgid "Email 1"
msgstr "E-mail 1"
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
msgid "Email 2"
msgstr "E-mail 2"
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
msgid "Email 3"
msgstr "E-mail 3"
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
msgid "Email 4"
msgstr "E-mail 4"
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
msgid "Mailer"
msgstr "Mailer"
#. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
msgid "Home Address Label"
msgstr "Home Address Label"
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
msgid "Work Address Label"
msgstr "Work Address Label"
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
msgid "Other Address Label"
msgstr "Other Address Label"
#. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
msgid "Assistant Phone"
msgstr "Assistant Phone"
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
msgid "Business Phone"
msgstr "Business Phone"
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
msgid "Business Phone 2"
msgstr "Business Phone 2"
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
msgid "Business Fax"
msgstr "Business Fax"
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
msgid "Callback Phone"
msgstr "Callback Phone"
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
msgid "Car Phone"
msgstr "Car Phone"
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
msgid "Company Phone"
msgstr "Company Phone"
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
msgid "Home Phone"
msgstr "Home Phone"
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
msgid "Home Phone 2"
msgstr "Home Phone 2"
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
msgid "Home Fax"
msgstr "Home Fax"
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
msgid "ISDN"
msgstr "ISDN"
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
msgid "Mobile Phone"
msgstr "Mobile Phone"
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
msgid "Other Phone"
msgstr "Other Phone"
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
msgid "Other Fax"
msgstr "Other Fax"
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
msgid "Pager"
msgstr "Pager"
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
msgid "Primary Phone"
msgstr "Primary Phone"
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
msgid "Radio"
msgstr "Radio"
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
msgid "Telex"
msgstr "Telex"
#. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
msgid "TTY"
msgstr "TTY"
#. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
msgid "Organization"
msgstr "Organisation"
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
msgid "Organizational Unit"
msgstr "Organisational Unit"
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
msgid "Office"
msgstr "Office"
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
msgid "Title"
msgstr "Title"
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
msgid "Role"
msgstr "Role"
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
msgid "Manager"
msgstr "Manager"
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
msgid "Assistant"
msgstr "Assistant"
#. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
msgid "Homepage URL"
msgstr "Homepage URL"
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
msgid "Weblog URL"
msgstr "Weblog URL"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:632
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:671
msgid "Categories"
msgstr "Categories"
#. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
msgid "Calendar URI"
msgstr "Calendar URI"
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
msgid "Free/Busy URL"
msgstr "Free/Busy URL"
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
msgid "ICS Calendar"
msgstr "ICS Calendar"
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
msgid "Video Conferencing URL"
msgstr "Video Conferencing URL"
#. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
msgid "Spouse's Name"
msgstr "Spouse's Name"
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
msgid "Note"
msgstr "Note"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
msgid "AIM Home Screen Name 1"
msgstr "AIM Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
msgid "AIM Home Screen Name 2"
msgstr "AIM Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
msgid "AIM Home Screen Name 3"
msgstr "AIM Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
msgid "AIM Work Screen Name 1"
msgstr "AIM Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
msgid "AIM Work Screen Name 2"
msgstr "AIM Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
msgid "AIM Work Screen Name 3"
msgstr "AIM Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
msgid "GroupWise Home Screen Name 1"
msgstr "GroupWise Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
msgid "GroupWise Home Screen Name 2"
msgstr "GroupWise Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
msgid "GroupWise Home Screen Name 3"
msgstr "GroupWise Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
msgid "GroupWise Work Screen Name 1"
msgstr "GroupWise Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
msgid "GroupWise Work Screen Name 2"
msgstr "GroupWise Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
msgid "GroupWise Work Screen Name 3"
msgstr "GroupWise Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
msgid "Jabber Home Id 1"
msgstr "Jabber Home Id 1"
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
msgid "Jabber Home Id 2"
msgstr "Jabber Home Id 2"
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
msgid "Jabber Home Id 3"
msgstr "Jabber Home Id 3"
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
msgid "Jabber Work Id 1"
msgstr "Jabber Work Id 1"
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
msgid "Jabber Work Id 2"
msgstr "Jabber Work Id 2"
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
msgid "Jabber Work Id 3"
msgstr "Jabber Work Id 3"
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
msgid "Yahoo! Home Screen Name 1"
msgstr "Yahoo! Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
msgid "Yahoo! Home Screen Name 2"
msgstr "Yahoo! Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
msgid "Yahoo! Home Screen Name 3"
msgstr "Yahoo! Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
msgid "Yahoo! Work Screen Name 1"
msgstr "Yahoo! Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
msgid "Yahoo! Work Screen Name 2"
msgstr "Yahoo! Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
msgid "Yahoo! Work Screen Name 3"
msgstr "Yahoo! Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
msgid "MSN Home Screen Name 1"
msgstr "MSN Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
msgid "MSN Home Screen Name 2"
msgstr "MSN Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
msgid "MSN Home Screen Name 3"
msgstr "MSN Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
msgid "MSN Work Screen Name 1"
msgstr "MSN Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
msgid "MSN Work Screen Name 2"
msgstr "MSN Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
msgid "MSN Work Screen Name 3"
msgstr "MSN Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
msgid "ICQ Home Id 1"
msgstr "ICQ Home Id 1"
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
msgid "ICQ Home Id 2"
msgstr "ICQ Home Id 2"
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
msgid "ICQ Home Id 3"
msgstr "ICQ Home Id 3"
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
msgid "ICQ Work Id 1"
msgstr "ICQ Work Id 1"
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
msgid "ICQ Work Id 2"
msgstr "ICQ Work Id 2"
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
msgid "ICQ Work Id 3"
msgstr "ICQ Work Id 3"
#. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
msgid "Last Revision"
msgstr "Last Revision"
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
msgid "Name or Org"
msgstr "Name or Org"
#. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
msgid "Address List"
msgstr "Address List"
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
msgid "Home Address"
msgstr "Home Address"
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
msgid "Work Address"
msgstr "Work Address"
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
msgid "Other Address"
msgstr "Other Address"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
msgid "Category List"
msgstr "Category List"
#. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
msgid "Photo"
msgstr "Photo"
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
msgid "Logo"
msgstr "Logo"
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
msgid "Name"
msgstr "Name"
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
msgid "Email List"
msgstr "E-mail List"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
msgid "AIM Screen Name List"
msgstr "AIM Screen Name List"
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:250
msgid "GroupWise Id List"
msgstr "GroupWise Id List"
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:251
msgid "Jabber Id List"
msgstr "Jabber Id List"
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
msgid "Yahoo! Screen Name List"
msgstr "Yahoo! Screen Name List"
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
msgid "MSN Screen Name List"
msgstr "MSN Screen Name List"
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:254
msgid "ICQ Id List"
msgstr "ICQ Id List"
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
msgid "Wants HTML Mail"
msgstr "Wants HTML Mail"
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
msgid "List"
msgstr "List"
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
msgid "List Show Addresses"
msgstr "List Show Addresses"
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
msgid "Birth Date"
msgstr "Birth Date"
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
#: ../libedataserver/e-categories.c:45
msgid "Anniversary"
msgstr "Anniversary"
#. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
msgid "X.509 Certificate"
msgstr "X.509 Certificate"
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:267
msgid "Gadu-Gadu Home Id 1"
msgstr "Gadu-Gadu Home Id 1"
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:268
msgid "Gadu-Gadu Home Id 2"
msgstr "Gadu-Gadu Home Id 2"
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:269
msgid "Gadu-Gadu Home Id 3"
msgstr "Gadu-Gadu Home Id 3"
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:270
msgid "Gadu-Gadu Work Id 1"
msgstr "Gadu-Gadu Work Id 1"
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:271
msgid "Gadu-Gadu Work Id 2"
msgstr "Gadu-Gadu Work Id 2"
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:272
msgid "Gadu-Gadu Work Id 3"
msgstr "Gadu-Gadu Work Id 3"
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:273
msgid "Gadu-Gadu Id List"
msgstr "Gadu-Gadu Id List"
#. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
msgid "Geographic Information"
msgstr "Geographic Information"
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
msgid "Telephone"
msgstr "Telephone"
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
msgid "Skype Home Name 1"
msgstr "Skype Home Name 1"
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
msgid "Skype Home Name 2"
msgstr "Skype Home Name 2"
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
msgid "Skype Home Name 3"
msgstr "Skype Home Name 3"
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
msgid "Skype Work Name 1"
msgstr "Skype Work Name 1"
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
msgid "Skype Work Name 2"
msgstr "Skype Work Name 2"
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
msgid "Skype Work Name 3"
msgstr "Skype Work Name 3"
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
msgid "Skype Name List"
msgstr "Skype Name List"
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
msgid "SIP address"
msgstr "SIP address"
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1513
+#: ../addressbook/libebook/e-destination.c:739
msgid "Unnamed List"
msgstr "Unnamed List"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
+#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#, c-format
+msgid "Empty URI"
+msgstr "Empty URI"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:305
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:323
+#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#, c-format
+msgid "Invalid source"
+msgstr "Invalid source"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+msgid "Cannot open book"
+msgstr "Cannot open book"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "Cannot remove book"
+
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+msgid "Cannot get contact"
+msgstr "Cannot get contact"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "Empty query"
+
+#: ../addressbook/libedata-book/e-data-book.c:402
+msgid "Cannot authenticate user"
+msgstr "Cannot authenticate user"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+msgid "Cannot add contact"
+msgstr "Cannot add contact"
+
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+msgid "Cannot modify contact"
+msgstr "Cannot modify contact"
+
+#: ../addressbook/libedata-book/e-data-book.c:494
+msgid "Cannot remove contacts"
+msgstr "Cannot remove contacts"
+
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+msgid "Invalid query"
+msgstr "Invalid query"
+
+#: ../addressbook/libedata-book/e-data-book.c:598
+msgid "Cannot get changes"
+msgstr "Cannot get changes"
+
+#: ../addressbook/libedata-book/e-data-book.c:699
+msgid "Cannot complete operation"
+msgstr "Cannot complete operation"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
#: ../libedataserver/e-categories.c:46
msgid "Birthday"
msgstr "Birthday"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
#, c-format
msgid "Birthday: %s"
msgstr "Birthday: %s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
#, c-format
msgid "Anniversary: %s"
msgstr "Anniversary: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:236
msgid "Cannot save calendar data: Malformed URI."
msgstr "Cannot save calendar data: Malformed URI."
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
msgid "Cannot save calendar data"
msgstr "Cannot save calendar data"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
msgid "Could not create thread for getting deltas"
msgstr "Could not create thread for getting deltas"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
-#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
-#: ../calendar/backends/http/e-cal-backend-http.c:673
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
+#: ../calendar/backends/google/e-cal-backend-google.c:1144
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1081
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
+#: ../calendar/backends/http/e-cal-backend-http.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:492
msgid "Could not create cache file"
msgstr "Could not create cache file"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
msgid "Could not create thread for populating cache"
msgstr "Could not create thread for populating cache"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
msgid "Reply Requested: by "
msgstr "Reply Requested: by "
#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
msgid "Reply Requested: When convenient"
msgstr "Reply Requested: When convenient"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:283
#, c-format
msgid "Loading %s items"
msgstr "Loading %s items"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:919
msgid "Calendar"
msgstr "Calendar"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
msgid "Invalid server URI"
msgstr "Invalid server URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:5117
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:996
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1005
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
+#: ../calendar/libecal/e-cal.c:4020
#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
+#: ../camel/providers/groupwise/camel-groupwise-store.c:591
+#: ../camel/providers/groupwise/camel-groupwise-store.c:766
#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
msgid "Authentication failed"
msgstr "Authentication failed"
-#: ../calendar/backends/http/e-cal-backend-http.c:330
+#: ../calendar/backends/http/e-cal-backend-http.c:335
msgid "Redirected to Invalid URI"
msgstr "Redirected to Invalid URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:353
+#: ../calendar/backends/http/e-cal-backend-http.c:358
msgid "Bad file format."
msgstr "Bad file format."
-#: ../calendar/backends/http/e-cal-backend-http.c:360
+#: ../calendar/backends/http/e-cal-backend-http.c:365
msgid "Not a calendar."
msgstr "Not a calendar."
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
msgid "Could not retrieve weather data"
msgstr "Could not retrieve weather data"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
msgid "Weather: Fog"
msgstr "Weather: Fog"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "Weather: Cloudy"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
msgid "Weather: Cloudy Night"
msgstr "Weather: Cloudy Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+msgid "Weather: Cloudy"
+msgstr "Weather: Cloudy"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
msgid "Weather: Overcast"
msgstr "Weather: Overcast"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
msgid "Weather: Showers"
msgstr "Weather: Showers"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
msgid "Weather: Snow"
msgstr "Weather: Snow"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Sunny"
-msgstr "Weather: Sunny"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
msgid "Weather: Clear Night"
msgstr "Weather: Clear Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+msgid "Weather: Sunny"
+msgstr "Weather: Sunny"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
msgid "Weather: Thunderstorms"
msgstr "Weather: Thunderstorms"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
msgid "Forecast"
msgstr "Forecast"
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1286
msgid "Untitled appointment"
msgstr "Untitled appointment"
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3951
msgid "1st"
msgstr "1st"
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3952
msgid "2nd"
msgstr "2nd"
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3953
msgid "3rd"
msgstr "3rd"
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3954
msgid "4th"
msgstr "4th"
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3955
msgid "5th"
msgstr "5th"
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3956
msgid "6th"
msgstr "6th"
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3957
msgid "7th"
msgstr "7th"
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3958
msgid "8th"
msgstr "8th"
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3959
msgid "9th"
msgstr "9th"
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3960
msgid "10th"
msgstr "10th"
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3961
msgid "11th"
msgstr "11th"
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3962
msgid "12th"
msgstr "12th"
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3963
msgid "13th"
msgstr "13th"
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3964
msgid "14th"
msgstr "14th"
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3965
msgid "15th"
msgstr "15th"
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3966
msgid "16th"
msgstr "16th"
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3967
msgid "17th"
msgstr "17th"
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3968
msgid "18th"
msgstr "18th"
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3969
msgid "19th"
msgstr "19th"
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3970
msgid "20th"
msgstr "20th"
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3971
msgid "21st"
msgstr "21st"
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3972
msgid "22nd"
msgstr "22nd"
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3973
msgid "23rd"
msgstr "23rd"
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3974
msgid "24th"
msgstr "24th"
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3975
msgid "25th"
msgstr "25th"
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3976
msgid "26th"
msgstr "26th"
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3977
msgid "27th"
msgstr "27th"
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:3978
msgid "28th"
msgstr "28th"
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:3979
msgid "29th"
msgstr "29th"
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:3980
msgid "30th"
msgstr "30th"
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:3981
msgid "31st"
msgstr "31st"
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
msgid "High"
msgstr "High"
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
msgid "Normal"
msgstr "Normal"
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
msgid "Low"
msgstr "Low"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:713
msgid "Undefined"
msgstr "Undefined"
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
@@ -912,94 +970,94 @@ msgstr "Enter password for %s (user %s)"
#. This password prompt will be prompted rarely. Since the key that is passed to
#. the auth_func corresponds to the parent user.
#.
-#: ../calendar/libecal/e-cal.c:1707
+#: ../calendar/libecal/e-cal.c:1187
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "Enter password for %s to enable proxy for user %s"
-#: ../calendar/libecal/e-cal.c:5089
+#: ../calendar/libecal/e-cal.c:3992
msgid "Invalid argument"
msgstr "Invalid argument"
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:3994
msgid "Backend is busy"
msgstr "Backend is busy"
-#: ../calendar/libecal/e-cal.c:5093
+#: ../calendar/libecal/e-cal.c:3996
#: ../calendar/libedata-cal/e-cal-backend-util.c:105
msgid "Repository is offline"
msgstr "Repository is offline"
-#: ../calendar/libecal/e-cal.c:5095
+#: ../calendar/libecal/e-cal.c:3998
#: ../calendar/libedata-cal/e-cal-backend-util.c:129
msgid "No such calendar"
msgstr "No such calendar"
-#: ../calendar/libecal/e-cal.c:5097
+#: ../calendar/libecal/e-cal.c:4000
#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../servers/groupwise/e-gw-connection.c:235
msgid "Object not found"
msgstr "Object not found"
-#: ../calendar/libecal/e-cal.c:5099
+#: ../calendar/libecal/e-cal.c:4002
#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "Invalid object"
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:4004
msgid "URI not loaded"
msgstr "URI not loaded"
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:4006
msgid "URI already loaded"
msgstr "URI already loaded"
-#: ../calendar/libecal/e-cal.c:5105
+#: ../calendar/libecal/e-cal.c:4008
#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
msgid "Permission denied"
msgstr "Permission denied"
-#: ../calendar/libecal/e-cal.c:5107
+#: ../calendar/libecal/e-cal.c:4010
#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "Unknown User"
-#: ../calendar/libecal/e-cal.c:5109
+#: ../calendar/libecal/e-cal.c:4012
#: ../calendar/libedata-cal/e-cal-backend-util.c:115
msgid "Object ID already exists"
msgstr "Object ID already exists"
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:4014
msgid "Protocol not supported"
msgstr "Protocol not supported"
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:4016
msgid "Operation has been canceled"
msgstr "Operation has been cancelled"
-#: ../calendar/libecal/e-cal.c:5115
+#: ../calendar/libecal/e-cal.c:4018
#: ../calendar/libedata-cal/e-cal-backend-util.c:143
msgid "Could not cancel operation"
msgstr "Could not cancel operation"
-#: ../calendar/libecal/e-cal.c:5119
+#: ../calendar/libecal/e-cal.c:4022
#: ../calendar/libedata-cal/e-cal-backend-util.c:119
#: ../camel/providers/smtp/camel-smtp-transport.c:217
msgid "Authentication required"
msgstr "Authentication required"
-#: ../calendar/libecal/e-cal.c:5121
+#: ../calendar/libecal/e-cal.c:4024
msgid "A CORBA exception has occurred"
msgstr "A CORBA exception has occurred"
-#: ../calendar/libecal/e-cal.c:5123
+#: ../calendar/libecal/e-cal.c:4026
#: ../calendar/libedata-cal/e-cal-backend-util.c:146
+#: ../camel/camel-net-utils.c:523
#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:743
+#: ../camel/providers/imap/camel-imap-store.c:741
#: ../camel/providers/imap4/camel-imap4-engine.c:1547
#: ../camel/providers/imap4/camel-imap4-engine.c:1585
#: ../camel/providers/imap4/camel-imap4-engine.c:1629
@@ -1007,91 +1065,87 @@ msgstr "A CORBA exception has occurred"
#: ../camel/providers/imap4/camel-imap4-store.c:311
#: ../camel/providers/imap4/camel-imap4-store.c:818
#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:582
+#: ../servers/groupwise/e-gw-connection.c:243
msgid "Unknown error"
msgstr "Unknown error"
-#: ../calendar/libecal/e-cal.c:5125
+#: ../calendar/libecal/e-cal.c:4028
#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
msgid "No error"
msgstr "No error"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
#, c-format
msgid "\"%s\" expects no arguments"
msgstr "\"%s\" expects no arguments"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
#, c-format
msgid "\"%s\" expects one argument"
msgstr "\"%s\" expects one argument"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
#, c-format
msgid "\"%s\" expects the first argument to be a string"
msgstr "\"%s\" expects the first argument to be a string"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
#, c-format
msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
msgstr "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
#, c-format
msgid "\"%s\" expects two arguments"
msgstr "\"%s\" expects two arguments"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
#, c-format
msgid "\"%s\" expects the first argument to be a time_t"
msgstr "\"%s\" expects the first argument to be a time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
#, c-format
msgid "\"%s\" expects the second argument to be an integer"
msgstr "\"%s\" expects the second argument to be an integer"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
#, c-format
msgid "\"%s\" expects the second argument to be a time_t"
msgstr "\"%s\" expects the second argument to be a time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
#, c-format
msgid "\"%s\" expects the second argument to be a string"
msgstr "\"%s\" expects the second argument to be a string"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
#, c-format
msgid ""
"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1102,12 +1156,12 @@ msgstr ""
"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
"\"classification\""
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
#, c-format
msgid "\"%s\" expects at least one argument"
msgstr "\"%s\" expects at least one argument"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
#, c-format
msgid ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1148,10 +1202,6 @@ msgstr "Search size limit exceeded"
msgid "Search time limit exceeded"
msgstr "Search time limit exceeded"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Invalid query"
-
#: ../calendar/libedata-cal/e-cal-backend-util.c:141
msgid "Query refused"
msgstr "Query refused"
@@ -1160,6 +1210,136 @@ msgstr "Query refused"
msgid "Invalid server version"
msgstr "Invalid server version"
+#: ../calendar/libedata-cal/e-data-cal.c:491
+#, c-format
+msgid "Cannot retrieve calendar address"
+msgstr "Cannot retrieve calendar address"
+
+#: ../calendar/libedata-cal/e-data-cal.c:509
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "Cannot retrieve calendar alarm e-mail address"
+
+#: ../calendar/libedata-cal/e-data-cal.c:527
+#, c-format
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "Cannot retrieve calendar's ldap attribute"
+
+#: ../calendar/libedata-cal/e-data-cal.c:545
+#, c-format
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "Cannot retrieve calendar scheduling information"
+
+#: ../calendar/libedata-cal/e-data-cal.c:562
+#, c-format
+msgid "Cannot open calendar"
+msgstr "Cannot open calendar"
+
+#: ../calendar/libedata-cal/e-data-cal.c:579
+#, c-format
+msgid "Cannot refresh calendar"
+msgstr "Cannot refresh calendar"
+
+#: ../calendar/libedata-cal/e-data-cal.c:596
+#, c-format
+msgid "Cannot remove calendar"
+msgstr "Cannot remove calendar"
+
+#: ../calendar/libedata-cal/e-data-cal.c:615
+#, c-format
+msgid "Cannot create calendar object"
+msgstr "Cannot create calendar object"
+
+#: ../calendar/libedata-cal/e-data-cal.c:637
+#, c-format
+msgid "Cannot modify calendar object"
+msgstr "Cannot modify calendar object"
+
+#: ../calendar/libedata-cal/e-data-cal.c:661
+#, c-format
+msgid "Cannot remove calendar object"
+msgstr "Cannot remove calendar object"
+
+#: ../calendar/libedata-cal/e-data-cal.c:680
+#, c-format
+msgid "Cannot receive calendar objects"
+msgstr "Cannot receive calendar objects"
+
+#: ../calendar/libedata-cal/e-data-cal.c:697
+#, c-format
+msgid "Cannot discard calendar alarm"
+msgstr "Cannot discard calendar alarm"
+
+#: ../calendar/libedata-cal/e-data-cal.c:716
+#, c-format
+msgid "Cannot send calendar objects"
+msgstr "Cannot send calendar objects"
+
+#: ../calendar/libedata-cal/e-data-cal.c:751
+#, c-format
+msgid "Cannot retrieve default calendar object path"
+msgstr "Cannot retrieve default calendar object path"
+
+#: ../calendar/libedata-cal/e-data-cal.c:769
+#, c-format
+msgid "Cannot retrieve calendar object path"
+msgstr "Cannot retrieve calendar object path"
+
+#: ../calendar/libedata-cal/e-data-cal.c:787
+#, c-format
+msgid "Cannot retrieve calendar object list"
+msgstr "Cannot retrieve calendar object list"
+
+#: ../calendar/libedata-cal/e-data-cal.c:825
+#, c-format
+msgid "Could not retrieve attachment list"
+msgstr "Could not retrieve attachment list"
+
+#: ../calendar/libedata-cal/e-data-cal.c:847
+#, c-format
+msgid "Could not complete calendar query"
+msgstr "Could not complete calendar query"
+
+#: ../calendar/libedata-cal/e-data-cal.c:865
+#, c-format
+msgid "Could not retrieve calendar time zone"
+msgstr "Could not retrieve calendar time zone"
+
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, c-format
+msgid "Could not add calendar time zone"
+msgstr "Could not add calendar time zone"
+
+#: ../calendar/libedata-cal/e-data-cal.c:900
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "Could not set default calendar time zone"
+
+#: ../calendar/libedata-cal/e-data-cal.c:921
+#, c-format
+msgid "Cannot retrieve calendar changes"
+msgstr "Cannot retrieve calendar changes"
+
+#: ../calendar/libedata-cal/e-data-cal.c:971
+#, c-format
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "Cannot retrieve calendar free/busy list"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+msgid "Invalid URI"
+msgstr "Invalid URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "No backend factory for '%s' of '%s'"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "Could not instantiate backend"
+
#: ../camel/camel-cipher-context.c:102
msgid "Signing is not supported by this cipher"
msgstr "Signing is not supported by this cypher"
@@ -1200,16 +1380,16 @@ msgstr "You may not import keys with this cypher"
msgid "You may not export keys with this cipher"
msgstr "You may not export keys with this cypher"
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:135
msgid "Unable to create cache path"
msgstr "Unable to create cache path"
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:401
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not remove cache entry: %s: %s"
-#: ../camel/camel-db.c:412
+#: ../camel/camel-db.c:411
msgid "Insufficient memory"
msgstr "Insufficient memory"
@@ -1254,11 +1434,11 @@ msgid "Preparing folder '%s' for offline"
msgstr "Preparing folder '%s' for offline"
#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/providers/groupwise/camel-groupwise-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imap/camel-imap-store.c:1843
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imap/camel-imap-store.c:3068
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
@@ -1393,47 +1573,48 @@ msgstr "(%s) expects an array result"
msgid "(%s) requires the folder set"
msgstr "(%s) requires the folder set"
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:676
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "Unsupported operation: append message: for %s"
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:1381
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "Unsupported operation: search by expression: for %s"
-#: ../camel/camel-folder.c:1429
+#: ../camel/camel-folder.c:1422
#, c-format
msgid "Unsupported operation: count by expression: for %s"
msgstr "Unsupported operation: count by expression: for %s"
-#: ../camel/camel-folder.c:1468
+#: ../camel/camel-folder.c:1461
#, c-format
msgid "Unsupported operation: search by UIDs: for %s"
msgstr "Unsupported operation: search by UIDs: for %s"
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1574
+#: ../camel/providers/local/camel-maildir-folder.c:387
msgid "Moving messages"
msgstr "Moving messages"
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1574
msgid "Copying messages"
msgstr "Copying messages"
-#: ../camel/camel-folder.c:1922
+#: ../camel/camel-folder.c:1915
msgid "Learning junk"
msgstr "Learning junk"
-#: ../camel/camel-folder.c:1939
+#: ../camel/camel-folder.c:1933
msgid "Learning non-junk"
msgstr "Learning non-junk"
-#: ../camel/camel-folder.c:1958
+#: ../camel/camel-folder.c:1953
msgid "Filtering new message(s)"
msgstr "Filtering new message(s)"
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:760
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1444,15 +1625,15 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:775
msgid "Failed to parse gpg userid hint."
msgstr "Failed to parse gpg userid hint."
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
msgid "Failed to parse gpg passphrase request."
msgstr "Failed to parse gpg passphrase request."
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:833
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1461,7 +1642,7 @@ msgstr ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:837
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1470,93 +1651,88 @@ msgstr ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:842
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Unexpected request from GnuPG for '%s'"
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
+#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
#: ../camel/providers/nntp/camel-nntp-store.c:1313
msgid "Canceled."
msgstr "Cancelled."
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:881
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:880
+#: ../camel/camel-gpg-context.c:889
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Unexpected response from GnuPG: %s"
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:988
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:1212 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1859 ../camel/camel-gpg-context.c:1904
+#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
+#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Failed to execute gpg: %s"
-#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
#, c-format
msgid "Could not generate signing data: %s"
msgstr "Could not generate signing data: %s"
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1553
-#: ../camel/camel-gpg-context.c:1569 ../camel/camel-gpg-context.c:1649
-#: ../camel/camel-gpg-context.c:1664 ../camel/camel-gpg-context.c:1780
-#: ../camel/camel-gpg-context.c:1795 ../camel/camel-gpg-context.c:1875
-#: ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
+#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
+#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:2014
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "This is a digitally signed message part"
-
-#: ../camel/camel-gpg-context.c:1457 ../camel/camel-gpg-context.c:1463
-#: ../camel/camel-gpg-context.c:1469 ../camel/camel-gpg-context.c:1484
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
+#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
+#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
+#: ../camel/camel-smime-context.c:947
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1523
+#: ../camel/camel-gpg-context.c:1600
#, 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:1632
+#: ../camel/camel-gpg-context.c:1711
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "Could not generate encrypting data: %s"
-#: ../camel/camel-gpg-context.c:1682
+#: ../camel/camel-gpg-context.c:1761
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1743
-#: ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
+#: ../camel/camel-gpg-context.c:1841
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Cannot decrypt message: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1752
+#: ../camel/camel-gpg-context.c:1831
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Failed to decrypt MIME part: protocol error"
-#: ../camel/camel-gpg-context.c:1817 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
msgid "Encrypted content"
msgstr "Encrypted content"
-#: ../camel/camel-gpg-context.c:1836
+#: ../camel/camel-gpg-context.c:1930
msgid "Unable to parse message content"
msgstr "Unable to parse message content"
-#: ../camel/camel-gpg-context.c:1860 ../camel/camel-gpg-context.c:1905
-#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
#: ../camel/providers/imap4/camel-imap4-utils.c:614
#: ../camel/providers/smtp/camel-smtp-transport.c:165
#: ../camel/providers/smtp/camel-smtp-transport.c:220
@@ -1661,40 +1837,40 @@ msgstr "Error copying mail temp file: %s"
msgid "parse error"
msgstr "parse error"
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:673
+#: ../camel/camel-net-utils.c:802
+#: ../camel/providers/pop3/camel-pop3-store.c:476
+#: ../camel/providers/pop3/camel-pop3-store.c:576
msgid "Canceled"
msgstr "Cancelled"
-#: ../camel/camel-net-utils.c:522
+#: ../camel/camel-net-utils.c:523
msgid "cannot create thread"
msgstr "cannot create thread"
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:677
#, c-format
msgid "Resolving: %s"
msgstr "Resolving: %s"
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:699
msgid "Host lookup failed"
msgstr "Host lookup failed"
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:701
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "Host lookup failed: %s: %s"
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:806
msgid "Resolving address"
msgstr "Resolving address"
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:826
msgid "Name lookup failed"
msgstr "Name lookup failed"
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:829
#, c-format
msgid "Name lookup failed: %s"
msgstr "Name lookup failed: %s"
@@ -1732,7 +1908,7 @@ msgstr "Could not load %s: %s"
msgid "Could not load %s: No initialization code in module."
msgstr "Could not load %s: No initialisation code in module."
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "No provider available for protocol '%s'"
@@ -1824,16 +2000,16 @@ msgstr "Server response contained incomplete authorisation data"
msgid "Server response does not match"
msgstr "Server response does not match"
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:72
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:74
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr ""
"This option will connect to the server using Kerberos 5 authentication."
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:168
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
@@ -1841,11 +2017,11 @@ msgstr ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognised by the implementation."
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:173
msgid "The provided target_name parameter was ill-formed."
msgstr "The provided target_name parameter was ill-formed."
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:176
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
@@ -1853,7 +2029,7 @@ msgstr ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:180
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
@@ -1861,7 +2037,7 @@ msgstr ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:185
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
@@ -1869,7 +2045,7 @@ msgstr ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:189
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
@@ -1877,51 +2053,32 @@ msgstr ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:194
msgid "The supplied context handle did not refer to a valid context."
msgstr "The supplied context handle did not refer to a valid context."
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:197
msgid "The consistency checks performed on the input_token failed."
msgstr "The consistency checks performed on the input_token failed."
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:200
msgid "The consistency checks performed on the credential failed."
msgstr "The consistency checks performed on the credential failed."
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:203
msgid "The referenced credentials have expired."
msgstr "The referenced credentials have expired."
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
+#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/imap/camel-imap-store.c:1272
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:383
msgid "Unsupported security layer."
msgstr "Unsupported security layer."
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr ""
-"This option will connect to the server using Kerberos 4 authentication."
-
-#: ../camel/camel-sasl-kerberos4.c:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Could not get Kerberos ticket:\n"
-"%s"
-
#: ../camel/camel-sasl-login.c:36
msgid "Login"
msgstr "Login"
@@ -1970,7 +2127,7 @@ msgstr "POP Before SMTP auth using an unknown transport"
msgid "POP Before SMTP auth using a non-pop source"
msgstr "POP Before SMTP auth using a non-pop source"
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:147
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "Regular expression compilation failed: %s: %s"
@@ -1990,7 +2147,7 @@ msgstr "URL '%s' needs a host component"
msgid "URL '%s' needs a path component"
msgstr "URL '%s' needs a path component"
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:305
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -1999,209 +2156,209 @@ msgstr ""
"Could not create directory %s:\n"
"%s"
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:477
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "Please enter the %s password for %s on host %s."
-#: ../camel/camel-session.c:817
+#: ../camel/camel-session.c:815
msgid "Camel session doesn't support forwarding of a message."
msgstr "Camel session doesn't support forwarding of a message."
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Cannot find certificate for '%s'"
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
msgid "Cannot create CMS message"
msgstr "Cannot create CMS message"
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
msgid "Cannot create CMS signed data"
msgstr "Cannot create CMS signed data"
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
msgid "Cannot attach CMS signed data"
msgstr "Cannot attach CMS signed data"
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
msgid "Cannot attach CMS data"
msgstr "Cannot attach CMS data"
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
msgid "Cannot create CMS Signer information"
msgstr "Cannot create CMS Signer information"
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
msgid "Cannot find certificate chain"
msgstr "Cannot find certificate chain"
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
msgid "Cannot add CMS Signing time"
msgstr "Cannot add CMS Signing time"
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "Encryption certificate for '%s' does not exist"
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "Cannot add SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
msgid "Cannot add encryption certificate"
msgstr "Cannot add encryption certificate"
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
msgid "Cannot add CMS Signer information"
msgstr "Cannot add CMS Signer information"
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
msgid "Cannot create encoder context"
msgstr "Cannot create encoder context"
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
msgid "Failed to add data to CMS encoder"
msgstr "Failed to add data to CMS encoder"
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
msgid "Failed to encode data"
msgstr "Failed to encode data"
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
msgid "Unverified"
msgstr "Unverified"
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
msgid "Good signature"
msgstr "Good signature"
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
msgid "Bad signature"
msgstr "Bad signature"
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
msgid "Content tampered with or altered in transit"
msgstr "Content tampered with or altered in transit"
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:708
msgid "Signing certificate not found"
msgstr "Signing certificate not found"
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
msgid "Signing certificate not trusted"
msgstr "Signing certificate not trusted"
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
msgid "Signature algorithm unknown"
msgstr "Signature algorithm unknown"
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
msgid "Signature algorithm unsupported"
msgstr "Signature algorithm unsupported"
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
msgid "Malformed signature"
msgstr "Malformed signature"
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
msgid "Processing error"
msgstr "Processing error"
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
msgid "No signed data in signature"
msgstr "No signed data in signature"
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
msgid "Digests missing from enveloped data"
msgstr "Digests missing from enveloped data"
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
msgid "Cannot calculate digests"
msgstr "Cannot calculate digests"
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
msgid "Cannot set message digests"
msgstr "Cannot set message digests"
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
msgid "Certificate import failed"
msgstr "Certificate import failed"
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "Certificate is the only message, cannot verify certificates"
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "Certificate is the only message, certificates imported and verified"
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:843
msgid "Cannot find signature digests"
msgstr "Cannot find signature digests"
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "Signer: %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
msgid "Decoder failed"
msgstr "Decoder failed"
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
msgid "Cannot find common bulk encryption algorithm"
msgstr "Cannot find common bulk encryption algorithm"
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
msgid "Cannot allocate slot for encryption bulk key"
msgstr "Cannot allocate slot for encryption bulk key"
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
msgid "Cannot create CMS Message"
msgstr "Cannot create CMS Message"
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
msgid "Cannot create CMS Enveloped data"
msgstr "Cannot create CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
msgid "Cannot attach CMS Enveloped data"
msgstr "Cannot attach CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
msgid "Cannot attach CMS data object"
msgstr "Cannot attach CMS data object"
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
msgid "Cannot create CMS Recipient information"
msgstr "Cannot create CMS Recipient information"
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
msgid "Cannot add CMS Recipient information"
msgstr "Cannot add CMS Recipient information"
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1095
msgid "Failed to add data to encoder"
msgstr "Failed to add data to encoder"
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1191
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: No encrypted content found"
-#: ../camel/camel-smime-context.c:1200
+#: ../camel/camel-smime-context.c:1219
msgid "import keys: unimplemented"
msgstr "import keys: unimplemented"
-#: ../camel/camel-smime-context.c:1208
+#: ../camel/camel-smime-context.c:1227
msgid "export keys: unimplemented"
msgstr "export keys: unimplemented"
@@ -2246,123 +2403,7 @@ msgstr "Wastebasket"
msgid "Junk"
msgstr "Junk"
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "Unable to get issuer's certificate"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "Unable to get Certificate Revocation List"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "Unable to decrypt certificate signature"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Unable to decrypt Certificate Revocation List signature"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "Unable to decode issuer's public key"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "Certificate signature failure"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "Certificate Revocation List signature failure"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "Certificate not yet valid"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "Certificate has expired"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "Certificate Revocation List (CRL) not yet valid"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "Certificate Revocation List (CRL) has expired"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "Error in Certificate Revocation List (CRL)"
-
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "Out of memory"
-
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "Zero-depth self-signed certificate"
-
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "Self-signed certificate in chain"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "Unable to get issuer's certificate locally"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "Unable to verify leaf signature"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "Certificate chain too long"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "Certificate Revoked"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Invalid Certificate Authority (CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "Path length exceeded"
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "Invalid purpose"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "Certificate untrusted"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "Certificate rejected"
-
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "Subject/Issuer mismatch"
-
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID mismatch"
-
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/Issuer serial mismatch"
-
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "Key usage does not support certificate signing"
-
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "Error in application verification"
-
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:870
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2375,35 +2416,16 @@ msgstr ""
"Fingerprint: %s\n"
"Signature: %s"
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
msgid "GOOD"
msgstr "GOOD"
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
msgid "BAD"
msgstr "BAD"
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:880
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2418,7 +2440,7 @@ msgstr ""
"\n"
"Do you wish to accept?"
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:924
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2427,7 +2449,7 @@ msgstr ""
"Certificate problem: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:976
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2436,7 +2458,7 @@ msgstr ""
"Bad certificate domain: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:994
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2445,7 +2467,7 @@ msgstr ""
"Certificate expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:1011
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2459,17 +2481,17 @@ msgstr ""
msgid "Could not parse URL '%s'"
msgstr "Could not parse URL '%s'"
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:577
#, c-format
msgid "Error storing '%s': %s"
msgstr "Error storing '%s': %s"
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:654
#, c-format
msgid "No such message %s in %s"
msgstr "No such message %s in %s"
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
+#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "Cannot copy or move messages into a Virtual Folder"
@@ -2496,7 +2518,7 @@ msgstr "Cannot copy messages to the Wastebasket folder"
msgid "Cannot copy messages to the Junk folder"
msgstr "Cannot copy messages to the Junk folder"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -2505,20 +2527,21 @@ msgstr ""
"Cannot get message: %s\n"
" %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:262
-#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/local/camel-maildir-folder.c:264
+#: ../camel/providers/local/camel-maildir-folder.c:293
+#: ../camel/providers/local/camel-maildir-folder.c:401
#: ../camel/providers/local/camel-mbox-folder.c:363
#: ../camel/providers/local/camel-mbox-folder.c:414
#: ../camel/providers/local/camel-mh-folder.c:226
msgid "No such message"
msgstr "No such message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:173
+#: ../camel/providers/nntp/camel-nntp-folder.c:248
+#: ../camel/providers/nntp/camel-nntp-folder.c:408
#: ../camel/providers/pop3/camel-pop3-folder.c:268
#: ../camel/providers/pop3/camel-pop3-folder.c:578
#: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -2526,12 +2549,12 @@ msgstr "No such message"
msgid "User canceled"
msgstr "User cancelled"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
#: ../camel/providers/imap4/camel-imap4-folder.c:819
+#: ../camel/providers/nntp/camel-nntp-folder.c:164
#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
#: ../camel/providers/pop3/camel-pop3-folder.c:388
#: ../camel/providers/pop3/camel-pop3-folder.c:581
#: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -2541,51 +2564,53 @@ msgstr "User cancelled"
msgid "Cannot get message %s: %s"
msgstr "Cannot get message %s: %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
#: ../camel/providers/imap4/camel-imap4-folder.c:837
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:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
msgid "Could not get message"
msgstr "Could not get message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
+#: ../camel/providers/imap/camel-imap-folder.c:295
#, c-format
msgid "Could not load summary for %s"
msgstr "Could not load summary for %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
#, c-format
msgid "Checking for deleted messages %s"
msgstr "Checking for deleted messages %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
msgid "Trash Folder Full. Please Empty."
msgstr "Wastebasket Folder Full. Please Empty."
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
+#: ../camel/providers/groupwise/camel-groupwise-store.c:626
+#: ../camel/providers/groupwise/camel-groupwise-store.c:756
+#: ../camel/providers/imap/camel-imap-folder.c:3429
+#: ../camel/providers/imap/camel-imap-folder.c:3505
+#: ../camel/providers/imapx/camel-imapx-server.c:2741
+#: ../camel/providers/imapx/camel-imapx-server.c:2826
#, 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:2317
#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr "Cannot append message to folder '%s': %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
#, c-format
msgid "Cannot create message: %s"
msgstr "Cannot create message: %s"
@@ -2615,12 +2640,14 @@ msgstr "Checking for new mail"
#: ../camel/providers/hula/camel-hula-provider.c:50
#: ../camel/providers/imap/camel-imap-provider.c:46
#: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
msgid "C_heck for new messages in all folders"
msgstr "C_heck for new messages in all folders"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
#: ../camel/providers/imap/camel-imap-provider.c:68
#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
#: ../camel/providers/local/camel-local-provider.c:46
#: ../camel/providers/local/camel-local-provider.c:86
#: ../camel/providers/local/camel-local-provider.c:106
@@ -2637,6 +2664,7 @@ msgstr "Check new messages for J_unk contents"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "Only check for Junk messages in the IN_BOX folder"
@@ -2664,7 +2692,7 @@ msgstr "For accessing Novell GroupWise servers"
#: ../camel/providers/hula/camel-hula-provider.c:93
#: ../camel/providers/imap/camel-imap-provider.c:100
#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
#: ../camel/providers/nntp/camel-nntp-provider.c:74
#: ../camel/providers/pop3/camel-pop3-provider.c:74
msgid "Password"
@@ -2680,45 +2708,46 @@ msgstr ""
msgid "Host or user not available in url"
msgstr "Host or user not available in url"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
+#: ../camel/providers/groupwise/camel-groupwise-store.c:197
+#: ../camel/providers/imap/camel-imap-store.c:1356
msgid "You did not enter a password."
msgstr "You did not enter a password."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:312
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:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:533
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imapx/camel-imapx-store.c:297
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
msgid "Cannot create GroupWise folders in offline mode."
msgstr "Cannot create GroupWise folders in offline mode."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2334
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:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
#, c-format
msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "Cannot rename GroupWise folder '%s' to '%s'"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise server %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "GroupWise service for %s on %s"
@@ -2750,27 +2779,32 @@ msgstr "Could not send message: %s"
#: ../camel/providers/hula/camel-hula-provider.c:48
#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
msgid "Checking for New Mail"
msgstr "Checking for New Mail"
#: ../camel/providers/hula/camel-hula-provider.c:53
#: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
msgid "Connection to Server"
msgstr "Connection to Server"
#: ../camel/providers/hula/camel-hula-provider.c:55
#: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
msgid "_Use custom command to connect to server"
msgstr "_Use custom command to connect to server"
#: ../camel/providers/hula/camel-hula-provider.c:57
#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
msgid "Command:"
msgstr "Command:"
#: ../camel/providers/hula/camel-hula-provider.c:60
#: ../camel/providers/imap/camel-imap-provider.c:60
#: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
#: ../camel/providers/nntp/camel-nntp-provider.c:44
msgid "Folders"
msgstr "Folders"
@@ -2778,12 +2812,14 @@ msgstr "Folders"
#: ../camel/providers/hula/camel-hula-provider.c:62
#: ../camel/providers/imap/camel-imap-provider.c:62
#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
msgid "_Show only subscribed folders"
msgstr "_Show only subscribed folders"
#: ../camel/providers/hula/camel-hula-provider.c:64
#: ../camel/providers/imap/camel-imap-provider.c:64
#: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
msgid "O_verride server-supplied folder namespace"
msgstr "O_verride server-supplied folder namespace"
@@ -2817,12 +2853,12 @@ msgstr "No input stream"
#: ../camel/providers/imap/camel-imap-command.c:229
#: ../camel/providers/imap/camel-imap-command.c:278
#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/providers/imap/camel-imap-store.c:3105
msgid "Operation cancelled"
msgstr "Operation cancelled"
#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:3110
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Server unexpectedly disconnected: %s"
@@ -2862,65 +2898,66 @@ 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:91
+#: ../camel/providers/imap/camel-imap-folder.c:90
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:277
+#: ../camel/providers/imap/camel-imap-folder.c:276
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Could not create directory %s: %s"
#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
+#: ../camel/providers/imap/camel-imap-folder.c:918
+#: ../camel/providers/imapx/camel-imapx-server.c:2771
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Scanning for changed messages in %s"
-#: ../camel/providers/imap/camel-imap-folder.c:1987
+#: ../camel/providers/imap/camel-imap-folder.c:1986
#, c-format
msgid "Unexpected response status '%s' after APPEND command"
msgstr "Unexpected response status '%s' after APPEND command"
-#: ../camel/providers/imap/camel-imap-folder.c:2002
+#: ../camel/providers/imap/camel-imap-folder.c:2001
msgid "No response on continuation after APPEND command"
msgstr "No response on continuation after APPEND command"
-#: ../camel/providers/imap/camel-imap-folder.c:2047
+#: ../camel/providers/imap/camel-imap-folder.c:2046
msgid "Unknown error occurred during APPEND command!"
msgstr "Unknown error occurred during APPEND command!"
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2877
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "Unable to retrieve message: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:2912
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "Cannot get message with message ID %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:2913
msgid "No such message available."
msgstr "No such message available."
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/imap/camel-imap-folder.c:2974
+#: ../camel/providers/imap/camel-imap-folder.c:3819
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
msgid "This message is not currently available"
msgstr "This message is not currently available"
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:3632
#, 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:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3640
#, 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:3846
+#: ../camel/providers/imap/camel-imap-folder.c:3857
msgid "Could not find message body in FETCH response."
msgstr "Could not find message body in FETCH response."
@@ -2944,25 +2981,30 @@ msgid "Failed to cache %s: %s"
msgstr "Failed to cache %s: %s"
#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
msgid "Ch_eck for new messages in subscribed folders"
msgstr "Ch_eck for new messages in subscribed folders"
#: ../camel/providers/imap/camel-imap-provider.c:66
#: ../camel/providers/imap4/camel-imap4-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
msgid "Namespace:"
msgstr "Namespace:"
#: ../camel/providers/imap/camel-imap-provider.c:70
#: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
msgid "_Apply filters to new messages in INBOX on this server"
msgstr "_Apply filters to new messages in INBOX on this server"
#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
msgid "Check new messages for Jun_k contents"
msgstr "Check new messages for Jun_k contents"
#: ../camel/providers/imap/camel-imap-provider.c:76
#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
msgid "Automatically synchroni_ze remote mail locally"
msgstr "Automatically synchroni_se remote mail locally"
@@ -2971,112 +3013,121 @@ msgid "IMAP"
msgstr "IMAP"
#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
msgid "For reading and storing mail on IMAP servers."
msgstr "For reading and storing mail on IMAP servers."
#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"This option will connect to the IMAP server using a plaintext password."
-#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap/camel-imap-store.c:435
#: ../camel/providers/imap4/camel-imap4-store.c:210
+#: ../camel/providers/imapx/camel-imapx-store.c:167
#, c-format
msgid "IMAP server %s"
msgstr "IMAP server %s"
-#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/providers/imap/camel-imap-store.c:437
#: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imapx/camel-imapx-store.c:169
#, c-format
msgid "IMAP service for %s on %s"
msgstr "IMAP service for %s on %s"
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
+#: ../camel/providers/imap/camel-imap-store.c:566
+#: ../camel/providers/imap/camel-imap-store.c:581
#: ../camel/providers/imap4/camel-imap4-store.c:247
#: ../camel/providers/imap4/camel-imap4-store.c:262
#: ../camel/providers/nntp/camel-nntp-store.c:182
#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:192
+#: ../camel/providers/pop3/camel-pop3-store.c:206
#: ../camel/providers/smtp/camel-smtp-transport.c:259
#: ../camel/providers/smtp/camel-smtp-transport.c:274
#, c-format
msgid "Could not connect to %s: %s"
msgstr "Could not connect to %s: %s"
-#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/imap/camel-imap-store.c:567
#: ../camel/providers/imap4/camel-imap4-store.c:248
#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/pop3/camel-pop3-store.c:193
#: ../camel/providers/smtp/camel-smtp-transport.c:260
msgid "SSL unavailable"
msgstr "SSL unavailable"
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:578
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imapx/camel-imapx-server.c:2031
msgid "Connection cancelled"
msgstr "Connection cancelled"
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:689
+#: ../camel/providers/imap/camel-imap-store.c:708
+#: ../camel/providers/imap/camel-imap-store.c:714
+#: ../camel/providers/imap/camel-imap-store.c:740
#: ../camel/providers/imap4/camel-imap4-store.c:310
#: ../camel/providers/imap4/camel-imap4-store.c:325
#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imapx/camel-imapx-server.c:2071
+#: ../camel/providers/imapx/camel-imapx-server.c:2085
#, 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:692
+#: ../camel/providers/imap/camel-imap-store.c:690
+#: ../camel/providers/imapx/camel-imapx-server.c:2072
#: ../camel/providers/smtp/camel-smtp-transport.c:332
msgid "STARTTLS not supported"
msgstr "STARTTLS not supported"
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:2086
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap/camel-imap-store.c:715
#: ../camel/providers/imap4/camel-imap4-store.c:335
#: ../camel/providers/smtp/camel-smtp-transport.c:371
msgid "SSL is not available in this build"
msgstr "SSL is not available in this build"
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:863
#, 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:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
+#: ../camel/providers/imap/camel-imap-store.c:1051
+#: ../camel/providers/imap/camel-imap-store.c:2430
#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
+#: ../camel/providers/imapx/camel-imapx-store.c:349
+#: ../camel/providers/imapx/camel-imapx-store.c:578
+#: ../camel/providers/local/camel-maildir-folder.c:81
#: ../camel/providers/local/camel-maildir-store.c:219
#: ../camel/providers/local/camel-maildir-store.c:291
#: ../camel/providers/local/camel-maildir-store.c:517
#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/local/camel-spool-store.c:461
msgid "Inbox"
msgstr "Inbox"
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:1303
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP server %s does not support requested authentication type %s"
-#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/imap/camel-imap-store.c:1313
#: ../camel/providers/smtp/camel-smtp-transport.c:506
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:1387
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3087,8 +3138,8 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2272
#: ../camel/providers/imap4/camel-imap4-store.c:954
#, c-format
msgid ""
@@ -3096,20 +3147,20 @@ msgid ""
msgstr ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
-#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/imap/camel-imap-store.c:2008
#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:202
#: ../camel/providers/local/camel-mh-store.c:249
#, c-format
msgid "Cannot create folder '%s': folder exists."
msgstr "Cannot create folder '%s': folder exists."
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2283
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
-#: ../camel/providers/imap/camel-imap-store.c:3053
+#: ../camel/providers/imap/camel-imap-store.c:3107
msgid "Server unexpectedly disconnected"
msgstr "Server unexpectedly disconnected"
@@ -3265,10 +3316,9 @@ msgstr ""
"This option will connect to the IMAPv4rev1 server using a plaintext password."
#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
#: ../camel/providers/nntp/camel-nntp-store.c:194
#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:203
#: ../camel/providers/smtp/camel-smtp-transport.c:271
msgid "Connection canceled"
msgstr "Connection cancelled"
@@ -3283,7 +3333,7 @@ msgstr ""
"STARTTLS"
#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:275
msgid "TLS negotiations failed"
msgstr "TLS negotiations failed"
@@ -3429,36 +3479,37 @@ msgstr "No data"
msgid "IMAP server %s unexpectedly disconnected: %s"
msgstr "IMAP server %s unexpectedly disconnected: %s"
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "Message storage"
+#: ../camel/providers/imapx/camel-imapx-folder.c:84
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "Could not create folder summary for %s"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#, c-format
+msgid "Could not create cache for %s"
+msgstr "Could not create cache for %s"
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "Use I_dle if the server supports it"
+msgstr "Use I_dle if the server supports it"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:60
+msgid "Numbe_r of cached connections to use"
+msgstr "Numbe_r of cached connections to use"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! 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"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION E-MAIL !!!\n"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:2034
#, c-format
msgid "Could not connect to %s (port %s): %s"
msgstr "Could not connect to %s (port %s): %s"
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapx/camel-imapx-server.c:2114
#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Could not connect to POP server on %s"
+msgid "%sPlease enter the IMAP password for %s %s"
+msgstr "%sPlease enter the IMAP password for %s %s"
#: ../camel/providers/local/camel-local-folder.c:178
msgid "Index message body data"
@@ -3541,53 +3592,53 @@ msgstr ""
msgid "Standard Unix mbox spool directory"
msgstr "Standard Unix mbox spool directory"
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:128
+#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:126
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "Store root %s is not an absolute path"
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:170
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "Store root %s is not a regular directory"
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:285
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Cannot get folder: %s: %s"
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:199
msgid "Local stores do not have an inbox"
msgstr "Local stores do not have an inbox"
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:245
#, c-format
msgid "Local mail file %s"
msgstr "Local mail file %s"
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:340
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "Could not rename folder %s to %s: %s"
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:408
#, c-format
msgid "Could not rename '%s': %s"
msgstr "Could not rename '%s': %s"
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:433
+#: ../camel/providers/local/camel-mbox-store.c:298
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "Could not delete folder index file '%s': %s"
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:322
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "Could not delete folder meta file '%s': %s"
@@ -3596,19 +3647,20 @@ msgstr "Could not delete folder meta file '%s': %s"
msgid "Unable to add message to summary: unknown reason"
msgstr "Unable to add message to summary: unknown reason"
-#: ../camel/providers/local/camel-maildir-folder.c:228
+#: ../camel/providers/local/camel-maildir-folder.c:230
msgid "Maildir append message canceled"
msgstr "Maildir append message cancelled"
-#: ../camel/providers/local/camel-maildir-folder.c:231
+#: ../camel/providers/local/camel-maildir-folder.c:233
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Cannot append message to maildir folder: %s: %s"
-#: ../camel/providers/local/camel-maildir-folder.c:261
-#: ../camel/providers/local/camel-maildir-folder.c:290
-#: ../camel/providers/local/camel-maildir-folder.c:304
-#: ../camel/providers/local/camel-maildir-folder.c:312
+#: ../camel/providers/local/camel-maildir-folder.c:263
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-maildir-folder.c:306
+#: ../camel/providers/local/camel-maildir-folder.c:314
+#: ../camel/providers/local/camel-maildir-folder.c:400
#: ../camel/providers/local/camel-mbox-folder.c:362
#: ../camel/providers/local/camel-mbox-folder.c:413
#: ../camel/providers/local/camel-mbox-folder.c:434
@@ -3625,27 +3677,31 @@ msgstr ""
"Cannot get message: %s from folder %s\n"
" %s"
-#: ../camel/providers/local/camel-maildir-folder.c:313
+#: ../camel/providers/local/camel-maildir-folder.c:315
msgid "Invalid message contents"
msgstr "Invalid message contents"
+#: ../camel/providers/local/camel-maildir-folder.c:418
+msgid "Cannot transfer message to destination folder"
+msgstr "Cannot transfer message to destination folder"
+
#: ../camel/providers/local/camel-maildir-store.c:148
#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-mbox-store.c:174
+#: ../camel/providers/local/camel-mbox-store.c:186
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "Cannot create folder '%s': %s"
#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:145
#: ../camel/providers/local/camel-mh-store.c:217
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "Cannot get folder '%s': %s"
#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-mbox-store.c:153
#: ../camel/providers/local/camel-mh-store.c:224
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
@@ -3668,27 +3724,27 @@ msgid "not a maildir directory"
msgstr "not a maildir directory"
#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/local/camel-spool-store.c:342
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "Could not scan folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "Cannot open maildir directory path: %s: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:544
msgid "Checking folder consistency"
msgstr "Checking folder consistency"
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:637
msgid "Checking for new messages"
msgstr "Checking for new messages"
-#: ../camel/providers/local/camel-maildir-summary.c:748
+#: ../camel/providers/local/camel-maildir-summary.c:724
#: ../camel/providers/local/camel-mbox-summary.c:526
#: ../camel/providers/local/camel-mbox-summary.c:722
#: ../camel/providers/local/camel-mbox-summary.c:842
@@ -3725,19 +3781,19 @@ msgstr "The folder appears to be irrecoverably corrupted."
msgid "Message construction failed."
msgstr "Message construction failed."
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:363
msgid "Cannot create a folder by this name."
msgstr "Cannot create a folder by this name."
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:196
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "Cannot get folder '%s': not a regular file."
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:226
+#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:260
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3746,46 +3802,46 @@ msgstr ""
"Could not delete folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:245
#, c-format
msgid "'%s' is not a regular file."
msgstr "'%s' is not a regular file."
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:252
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "Folder '%s' is not empty. Not deleted."
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:286
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "Could not delete folder summary file '%s': %s"
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:376
#, c-format
msgid "Cannot create directory '%s': %s."
msgstr "Cannot create directory '%s': %s."
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:390
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Cannot create folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:392
msgid "Folder already exists"
msgstr "Folder already exists"
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:483
msgid "The new folder name is illegal."
msgstr "The new folder name is illegal."
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:496
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "Could not rename '%s': '%s': %s"
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:577
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Could not rename '%s' to %s: %s"
@@ -3819,7 +3875,7 @@ msgid "Cannot open temporary mailbox: %s"
msgstr "Cannot open temporary mailbox: %s"
#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:957
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Could not close source folder %s: %s"
@@ -3835,31 +3891,31 @@ msgid "Could not rename folder: %s"
msgstr "Could not rename folder: %s"
#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:1084
#, c-format
msgid "Could not store folder: %s"
msgstr "Could not store folder: %s"
#: ../camel/providers/local/camel-mbox-summary.c:897
#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:1114
+#: ../camel/providers/local/camel-mbox-summary.c:1122
msgid "Summary and folder mismatch, even after a sync"
msgstr "Summary and folder mismatch, even after a sync"
-#: ../camel/providers/local/camel-mbox-summary.c:1046
+#: ../camel/providers/local/camel-mbox-summary.c:1047
#: ../camel/providers/local/camel-spool-summary.c:334
#, c-format
msgid "Unknown error: %s"
msgstr "Unknown error: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1190
+#: ../camel/providers/local/camel-mbox-summary.c:1216
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "Writing to temporary mailbox failed: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1207
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "Writing to temporary mailbox failed: %s: %s"
@@ -3888,22 +3944,22 @@ msgstr "Cannot get folder '%s': not a directory."
msgid "Cannot open MH directory path: %s: %s"
msgstr "Cannot open MH directory path: %s: %s"
-#: ../camel/providers/local/camel-spool-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:132
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "Spool '%s' cannot be opened: %s"
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:144
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "Spool '%s' is not a regular file or directory"
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:163
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "Folder '%s/%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:173
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3912,12 +3968,12 @@ msgstr ""
"Could not open folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:177
#, c-format
msgid "Folder '%s' does not exist."
msgstr "Folder '%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:182
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -3926,30 +3982,30 @@ msgstr ""
"Could not create folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:190
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "'%s' is not a mailbox file."
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:207
msgid "Store does not support an INBOX"
msgstr "Store does not support an INBOX"
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
#, c-format
msgid "Spool mail file %s"
msgstr "Spool mail file %s"
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
#, c-format
msgid "Spool folder tree %s"
msgstr "Spool folder tree %s"
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:227
msgid "Spool folders cannot be renamed"
msgstr "Spool folders cannot be renamed"
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../camel/providers/local/camel-spool-store.c:235
msgid "Spool folders cannot be deleted"
msgstr "Spool folders cannot be deleted"
@@ -3976,26 +4032,26 @@ msgstr ""
"Could not syncronise spool folder %s: %s\n"
"Folder may be corrupt; copy saved in '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:135
+#: ../camel/providers/nntp/camel-nntp-folder.c:192
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "Internal error: UID in invalid format: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:365
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
#: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
#, c-format
msgid "Posting failed: %s"
msgstr "Posting failed: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
msgid "You cannot post NNTP messages while working offline!"
msgstr "You cannot post NNTP messages while working offline!"
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
msgid "You cannot copy messages from a NNTP folder!"
msgstr "You cannot copy messages from a NNTP folder!"
@@ -4165,6 +4221,10 @@ msgstr "Retrieving POP message %d"
msgid "Unknown reason"
msgstr "Unknown reason"
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
+msgid "Message storage"
+msgstr "Message storage"
+
#: ../camel/providers/pop3/camel-pop3-provider.c:45
msgid "_Leave messages on server"
msgstr "_Leave messages on server"
@@ -4204,34 +4264,38 @@ 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:207
+#: ../camel/providers/pop3/camel-pop3-store.c:229
#, 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:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
+#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:274
+#: ../camel/providers/pop3/camel-pop3-store.c:280
#, 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:225
+#: ../camel/providers/pop3/camel-pop3-store.c:247
msgid "STLS not supported by server"
msgstr "STLS not supported by server"
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#: ../camel/providers/pop3/camel-pop3-store.c:262
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "Failed to connect to POP server %s in secure mode%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:281
msgid "TLS is not available in this build"
msgstr "TLS is not available in this build"
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:387
#, 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:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:428
+#: ../camel/providers/pop3/camel-pop3-store.c:565
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4240,22 +4304,22 @@ msgstr ""
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#: ../camel/providers/pop3/camel-pop3-store.c:446
#, 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:430
+#: ../camel/providers/pop3/camel-pop3-store.c:460
#, 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:449
+#: ../camel/providers/pop3/camel-pop3-store.c:479
#, 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:508
+#: ../camel/providers/pop3/camel-pop3-store.c:538
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4264,8 +4328,7 @@ msgstr ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
"attack suspected. Please contact your admin."
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:579
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4274,16 +4337,25 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#: ../camel/providers/pop3/camel-pop3-store.c:588
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
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:597
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:703
#, c-format
msgid "No such folder '%s'."
msgstr "No such folder '%s'."
@@ -4680,7 +4752,7 @@ msgstr "Waiting"
#. in 12-hour format.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
+#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -4688,7 +4760,7 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
#. in 24-hour format.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
+#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -4696,7 +4768,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
#. in 12-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
+#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
@@ -4704,78 +4776,78 @@ msgstr "%a %d/%m/%Y %I:%M %p"
#. in 24-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
+#: ../libedataserver/e-time-utils.c:1648 ../libedataserver/e-time-utils.c:1885
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1655
+#: ../libedataserver/e-time-utils.c:1653
msgid "%a %m/%d/%Y %I %p"
msgstr "%a %d/%m/%Y %I %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1660
+#: ../libedataserver/e-time-utils.c:1658
msgid "%a %m/%d/%Y %H"
msgstr "%a %d/%m/%Y %H"
#. strptime format of a weekday and a date.
#. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
+#: ../libedataserver/e-time-utils.c:1880
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
#. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1668
msgid "%m/%d/%Y %I:%M:%S %p"
msgstr "%d/%m/%Y %I:%M:%S %p"
#. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1674
+#: ../libedataserver/e-time-utils.c:1672
msgid "%m/%d/%Y %H:%M:%S"
msgstr "%d/%m/%Y %H:%M:%S"
#. strptime format of a date and a time, in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1679
+#: ../libedataserver/e-time-utils.c:1677
msgid "%m/%d/%Y %I:%M %p"
msgstr "%d/%m/%Y %I:%M %p"
#. strptime format of a date and a time, in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1682
msgid "%m/%d/%Y %H:%M"
msgstr "%d/%m/%Y %H:%M"
#. strptime format of a date and a time, in 12-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1687
msgid "%m/%d/%Y %I %p"
msgstr "%d/%m/%Y %I %p"
#. strptime format of a date and a time, in 24-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1692
msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y %H"
#. strptime format of a weekday and a date.
#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
+#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
#. strptime format for a time of day, in 12-hour format.
#. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
#. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -4783,24 +4855,24 @@ msgstr "%H:%M:%S"
#. in 12-hour format.
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
#. strftime format of a time in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
msgid "%H:%M"
msgstr "%H:%M"
#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1838
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1842
msgid "%I %p"
msgstr "%I %p"
@@ -4812,7 +4884,15 @@ msgstr "Accessing LDAP Server anonymously"
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: ../libedataserverui/e-categories-dialog.c:338
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "Category Icon"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "_No Image"
+
+#: ../libedataserverui/e-categories-dialog.c:372
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
@@ -4821,47 +4901,43 @@ msgstr ""
"There is already a category '%s' in the configuration. Please use another "
"name"
-#: ../libedataserverui/e-categories-dialog.c:641
+#: ../libedataserverui/e-categories-dialog.c:680
msgid "Icon"
msgstr "Icon"
-#: ../libedataserverui/e-categories-dialog.c:646
+#: ../libedataserverui/e-categories-dialog.c:685
msgid "Category"
msgstr "Category"
#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Icon"
-msgstr "Category Icon"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
msgid "Category Properties"
msgstr "Category Properties"
-#: ../libedataserverui/e-categories-dialog.ui.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
msgid "Category _Icon"
msgstr "Category _Icon"
-#: ../libedataserverui/e-categories-dialog.ui.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
msgid "Category _Name"
msgstr "Category _Name"
-#: ../libedataserverui/e-categories-dialog.ui.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Item(s) belong to these _categories:"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Item(s) _belong to these categories:"
+msgstr "Item(s) _belong to these categories:"
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
msgid "_Available Categories:"
msgstr "_Available Categories:"
-#: ../libedataserverui/e-categories-dialog.ui.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
msgid "_Edit"
msgstr "_Edit"
-#: ../libedataserverui/e-categories-dialog.ui.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
msgid "categories"
msgstr "categories"
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
#, c-format
msgid "Create category \"%s\""
msgstr "Create category \"%s\""
@@ -4878,15 +4954,15 @@ msgstr "The colour to render"
msgid "Select Contacts from Address Book"
msgstr "Select Contacts from Address Book"
-#: ../libedataserverui/e-name-selector-dialog.c:579
+#: ../libedataserverui/e-name-selector-dialog.c:587
msgid "_Add"
msgstr "_Add"
-#: ../libedataserverui/e-name-selector-dialog.c:604
+#: ../libedataserverui/e-name-selector-dialog.c:612
msgid "_Remove"
msgstr "_Remove"
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:789
#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "Any Category"
@@ -4916,7 +4992,6 @@ msgid "Cate_gory:"
msgstr "Cate_gory:"
#: ../libedataserverui/e-name-selector-dialog.ui.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
msgid "Contacts"
msgstr "Contacts"
@@ -4929,25 +5004,25 @@ msgid "_Search:"
msgstr "_Search:"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2494
+#: ../libedataserverui/e-name-selector-entry.c:2508
#, c-format
msgid "E_xpand %s Inline"
msgstr "E_xpand %s Inline"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2509
+#: ../libedataserverui/e-name-selector-entry.c:2523
#, c-format
msgid "Cop_y %s"
msgstr "Cop_y %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2519
+#: ../libedataserverui/e-name-selector-entry.c:2533
#, c-format
msgid "C_ut %s"
msgstr "C_ut %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2536
+#: ../libedataserverui/e-name-selector-entry.c:2550
#, c-format
msgid "_Edit %s"
msgstr "_Edit %s"
@@ -4991,199 +5066,288 @@ msgstr "Select destination"
msgid "_Destination"
msgstr "_Destination"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:954
-#, c-format
-msgid "Enter password for %s"
-msgstr "Enter password for %s"
+#: ../servers/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "Invalid connection"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:959
-msgid "Enter password"
-msgstr "Enter password"
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "Invalid response from server"
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "Owner"
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "No response from the server"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "Publishing Editor"
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "Bad parameter"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "Editor"
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! 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"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION E-MAIL !!!\n"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "Publishing Author"
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "Could not connect to POP server on %s"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "Author"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: there was no self contact UID stored in gconf"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "Non-editing Author"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "This is a digitally signed message part"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "Reviewer"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "Contributor"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "None"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "Custom"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "Unable to get issuer's certificate"
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "Generic error"
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "Unable to get Certificate Revocation List"
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "A folder with the same name already exists"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "Unable to decrypt certificate signature"
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "The specified folder type is not valid"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "Unable to decrypt Certificate Revocation List signature"
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O error"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "Unable to decode issuer's public key"
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "Not enough space to create the folder"
+#~ msgid "Certificate signature failure"
+#~ msgstr "Certificate signature failure"
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "The folder is not empty"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Certificate Revocation List signature failure"
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "The specified folder was not found"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "Certificate not yet valid"
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "Function not implemented in this storage"
+#~ msgid "Certificate has expired"
+#~ msgstr "Certificate has expired"
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "Operation not supported"
+#~ msgid "Certificate Revocation List (CRL) not yet valid"
+#~ msgstr "Certificate Revocation List (CRL) not yet valid"
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "The specified type is not supported in this storage"
+#~ msgid "Certificate Revocation List (CRL) has expired"
+#~ msgstr "Certificate Revocation List (CRL) has expired"
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "The specified folder cannot be modified or removed"
+#~ msgid "Error in Certificate Revocation List (CRL)"
+#~ msgstr "Error in Certificate Revocation List (CRL)"
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Cannot make a folder a child of one of its descendants"
+#~ msgid "Out of memory"
+#~ msgstr "Out of memory"
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "Cannot create a folder with that name"
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Zero-depth self-signed certificate"
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "This operation cannot be performed in off-line mode"
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "Self-signed certificate in chain"
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:639
-#, c-format
-msgid "%s's Folders"
-msgstr "%s's Folders"
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "Unable to get issuer's certificate locally"
-#: ../servers/exchange/storage/exchange-account.c:1259
-msgid "Personal Folders"
-msgstr "Personal Folders"
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "Unable to verify leaf signature"
-#: ../servers/exchange/storage/exchange-account.c:1274
-msgid "Favorite Public Folders"
-msgstr "Favourite Public Folders"
+#~ msgid "Certificate chain too long"
+#~ msgstr "Certificate chain too long"
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1291
-msgid "All Public Folders"
-msgstr "All Public Folders"
+#~ msgid "Certificate Revoked"
+#~ msgstr "Certificate Revoked"
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1305
-msgid "Global Address List"
-msgstr "Global Address List"
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "Invalid Certificate Authority (CA)"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Deleted Items"
+#~ msgid "Path length exceeded"
+#~ msgstr "Path length exceeded"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Drafts"
+#~ msgid "Invalid purpose"
+#~ msgstr "Invalid purpose"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Journal"
+#~ msgid "Certificate untrusted"
+#~ msgstr "Certificate untrusted"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Notes"
+#~ msgid "Certificate rejected"
+#~ msgstr "Certificate rejected"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Outbox"
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Subject/Issuer mismatch"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Sent Items"
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID mismatch"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Tasks"
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/Issuer serial mismatch"
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Invalid connection"
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "Key usage does not support certificate signing"
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "Invalid response from server"
+#~ msgid "Error in application verification"
+#~ msgstr "Error in application verification"
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "No response from the server"
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "Bad parameter"
+#~ msgid "Enter password for %s"
+#~ msgstr "Enter password for %s"
+
+#~ msgid "Enter password"
+#~ msgstr "Enter password"
+
+#~ msgid "Owner"
+#~ msgstr "Owner"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "Publishing Editor"
+
+#~ msgid "Editor"
+#~ msgstr "Editor"
+
+#~ msgid "Publishing Author"
+#~ msgstr "Publishing Author"
+
+#~ msgid "Author"
+#~ msgstr "Author"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Evolution Addressbook file backend"
+#~ msgid "Non-editing Author"
+#~ msgstr "Non-editing Author"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolution Calendar file and webcal backend"
+#~ msgid "Reviewer"
+#~ msgstr "Reviewer"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Evolution Data Server interface check service"
+#~ msgid "Contributor"
+#~ msgstr "Contributor"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Evolution Data Server logging service"
+#~ msgid "None"
+#~ msgstr "None"
+
+#~ msgid "Custom"
+#~ msgstr "Custom"
+
+#~ msgid "Generic error"
+#~ msgstr "Generic error"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "A folder with the same name already exists"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "The specified folder type is not valid"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O error"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Not enough space to create the folder"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "The folder is not empty"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "The specified folder was not found"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Function not implemented in this storage"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operation not supported"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "The specified type is not supported in this storage"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "The specified folder cannot be modified or removed"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Cannot make a folder a child of one of its descendants"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Cannot create a folder with that name"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "This operation cannot be performed in off-line mode"
+
+#~ msgid "%s's Folders"
+#~ msgstr "%s's Folders"
+
+#~ msgid "Personal Folders"
+#~ msgstr "Personal Folders"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "Favourite Public Folders"
+
+#~ msgid "All Public Folders"
+#~ msgstr "All Public Folders"
+
+#~ msgid "Global Address List"
+#~ msgstr "Global Address List"
+
+#~ msgid "Deleted Items"
+#~ msgstr "Deleted Items"
+
+#~ msgid "Drafts"
+#~ msgstr "Drafts"
+
+#~ msgid "Journal"
+#~ msgstr "Journal"
+
+#~ msgid "Notes"
+#~ msgstr "Notes"
+
+#~ msgid "Outbox"
+#~ msgstr "Outbox"
+
+#~ msgid "Sent Items"
+#~ msgstr "Sent Items"
+
+#~ msgid "Tasks"
+#~ msgstr "Tasks"
+
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "Evolution Addressbook file backend"
+
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "Evolution Calendar file and webcal backend"
+
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "Evolution Data Server interface check service"
+
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "Evolution Data Server logging service"
#~ msgid "\"%s\" on book before \"%s\""
#~ msgstr "\"%s\" on book before \"%s\""
@@ -5206,9 +5370,6 @@ msgstr "Evolution Data Server logging service"
#~ msgid "%s: canceled"
#~ msgstr "%s: cancelled"
-#~ msgid "%s: Invalid source."
-#~ msgstr "%s: Invalid source."
-
#~ msgid "%s: no factories available for URI `%s'"
#~ msgstr "%s: no factories available for URI `%s'"
@@ -5375,9 +5536,6 @@ msgstr "Evolution Data Server logging service"
#~ msgid "Unable to authenticate to GroupWise server. "
#~ msgstr "Unable to authenticate to GroupWise server. "
-#~ msgid "%sPlease enter the IMAP password for %s %s"
-#~ msgstr "%sPlease enter the IMAP password for %s %s"
-
#~ msgid "%sPlease enter the IMAP password for %s on host %s"
#~ msgstr "%sPlease enter the IMAP password for %s on host %s"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
