[evolution-data-server] Update British English translation
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Update British English translation
- Date: Wed, 7 Sep 2016 08:31:21 +0000 (UTC)
commit f78ca1f1f0cddfcf09f55031cafa062da2240333
Author: David King <amigadave amigadave com>
Date: Wed Sep 7 10:30:51 2016 +0200
Update British English translation
po/en_GB.po | 5389 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 2988 insertions(+), 2401 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 3e8e016..39892fd 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,10 +8,11 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-16 13:07+0000\n"
-"PO-Revision-Date: 2013-03-16 13:10+0100\n"
-"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-08-24 15:50+0000\n"
+"PO-Revision-Date: 2016-07-07 09:27+0200\n"
+"Last-Translator: David King <amigadave amigadave com>\n"
"Language-Team: British English <en li org>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
@@ -21,131 +22,158 @@ msgstr ""
"X-Generator: Virtaal 0.7.1\n"
"X-Project-Style: gnome\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:114
+#: ../addressbook/backends/file/e-book-backend-file.c:120
#, c-format
msgid "Failed to remove file '%s': %s"
msgstr "Failed to remove file '%s': %s"
-#: ../addressbook/backends/file/e-book-backend-file.c:138
+#: ../addressbook/backends/file/e-book-backend-file.c:148
#, c-format
msgid "Failed to make directory %s: %s"
msgstr "Failed to make directory %s: %s"
-#: ../addressbook/backends/file/e-book-backend-file.c:385
+#: ../addressbook/backends/file/e-book-backend-file.c:419
#, c-format
msgid "Failed to create hardlink for resource '%s': %s"
msgstr "Failed to create hardlink for resource '%s': %s"
-#: ../addressbook/backends/file/e-book-backend-file.c:487
-#: ../addressbook/backends/file/e-book-backend-file.c:911
+#: ../addressbook/backends/file/e-book-backend-file.c:524
+#: ../addressbook/backends/file/e-book-backend-file.c:1256
msgid "No UID in the contact"
msgstr "No UID in the contact"
-#: ../addressbook/backends/file/e-book-backend-file.c:757
+#: ../addressbook/backends/file/e-book-backend-file.c:851
#, c-format
msgid "Conflicting UIDs found in added contacts"
msgstr "Conflicting UIDs found in added contacts"
-#: ../addressbook/backends/file/e-book-backend-file.c:844
-#: ../addressbook/backends/file/e-book-backend-file.c:1038
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2615
-#, c-format
-msgid "Contact '%s' not found"
-msgstr "Contact '%s' not found"
+#: ../addressbook/backends/file/e-book-backend-file.c:990
+msgid "Loading..."
+msgstr "Loading…"
-#: ../addressbook/backends/file/e-book-backend-file.c:940
+#: ../addressbook/backends/file/e-book-backend-file.c:992
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4357
+msgid "Searching..."
+msgstr "Searching…"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1284
#, c-format
msgid "Tried to modify contact '%s' with out of sync revision"
msgstr "Tried to modify contact '%s' with out of sync revision"
-#: ../addressbook/backends/file/e-book-backend-file.c:1089
-#: ../addressbook/backends/file/e-book-backend-file.c:1139
+#: ../addressbook/backends/file/e-book-backend-file.c:1475
+#: ../addressbook/backends/file/e-book-backend-file.c:1560
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
+#: ../addressbook/libedata-book/e-book-sqlite.c:7342
+#: ../addressbook/libedata-book/e-book-sqlite.c:7411
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "Contact '%s' not found"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1620
+#: ../addressbook/backends/file/e-book-backend-file.c:1701
#, c-format
msgid "Query '%s' not supported"
msgstr "Query '%s' not supported"
-#: ../addressbook/backends/file/e-book-backend-file.c:1098
-#: ../addressbook/backends/file/e-book-backend-file.c:1148
+#: ../addressbook/backends/file/e-book-backend-file.c:1629
+#: ../addressbook/backends/file/e-book-backend-file.c:1710
#, c-format
msgid "Invalid Query '%s'"
msgstr "Invalid Query '%s'"
-#: ../addressbook/backends/file/e-book-backend-file.c:1248
-msgid "Loading..."
-msgstr "Loading…"
-
-#: ../addressbook/backends/file/e-book-backend-file.c:1250
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4963
-msgid "Searching..."
-msgstr "Searching…"
+#: ../addressbook/backends/file/e-book-backend-file.c:1975
+msgid "Requested to delete an unrelated cursor"
+msgstr "Requested to delete an unrelated cursor"
-#: ../addressbook/backends/file/e-book-backend-file.c:1568
+#: ../addressbook/backends/file/e-book-backend-file.c:2046
#, c-format
msgid "Failed to rename old database from '%s' to '%s': %s"
msgstr "Failed to rename old database from '%s' to '%s': %s"
-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1222
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4858
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:338
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
-#: ../addressbook/libebook-contacts/e-phone-number.c:58
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:562
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:592
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
-#: ../calendar/libecal/e-cal.c:2339 ../calendar/libecal/e-cal-client.c:275
-#: ../camel/camel-imapx-command.c:596 ../libedataserver/e-client.c:179
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:867
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51
+#: ../addressbook/libebook-contacts/e-phone-number.c:56
+#: ../addressbook/libebook/e-book.c:1078
+#: ../addressbook/libebook/e-book-client.c:2131
+#: ../addressbook/libebook/e-book-client.c:2303
+#: ../addressbook/libebook/e-book-client.c:2516
+#: ../addressbook/libebook/e-book-client.c:2647
+#: ../addressbook/libebook/e-book-client.c:2806
+#: ../addressbook/libebook/e-book-client.c:2940
+#: ../addressbook/libebook/e-book-client.c:3071
+#: ../addressbook/libebook/e-book-client.c:3229
+#: ../addressbook/libebook/e-book-client.c:3424
+#: ../addressbook/libebook/e-book-client.c:3642
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:680
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:728
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:745
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
+#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
+#: ../calendar/libecal/e-cal-client.c:3520
+#: ../calendar/libecal/e-cal-client.c:3693
+#: ../calendar/libecal/e-cal-client.c:3957
+#: ../calendar/libecal/e-cal-client.c:4198
+#: ../calendar/libecal/e-cal-client.c:4388
+#: ../calendar/libecal/e-cal-client.c:4581
+#: ../calendar/libecal/e-cal-client.c:4790
+#: ../calendar/libecal/e-cal-client.c:4959
+#: ../calendar/libecal/e-cal-client.c:5162
+#: ../calendar/libecal/e-cal-client.c:5312
+#: ../calendar/libecal/e-cal-client.c:5506
+#: ../calendar/libecal/e-cal-client.c:5659
+#: ../calendar/libecal/e-cal-client.c:5876
+#: ../calendar/libecal/e-cal-client.c:6030
+#: ../calendar/libecal/e-cal-client.c:6256
+#: ../calendar/libecal/e-cal-client.c:6452
+#: ../calendar/libecal/e-cal-client.c:6815
+#: ../calendar/libecal/e-cal-client.c:7037
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
+#: ../camel/providers/imapx/camel-imapx-server.c:3051
+#: ../camel/providers/imapx/camel-imapx-server.c:3063
+#: ../camel/providers/nntp/camel-nntp-store.c:424
+#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
msgid "Unknown error"
msgstr "Unknown error"
#. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:649
+#: ../addressbook/backends/google/e-book-backend-google.c:781
msgid "Querying for updated contacts…"
msgstr "Querying for updated contacts…"
#. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:786
+#: ../addressbook/backends/google/e-book-backend-google.c:965
msgid "Querying for updated groups…"
msgstr "Querying for updated groups…"
-#: ../addressbook/backends/google/e-book-backend-google.c:1235
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1653
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:389
+#: ../addressbook/backends/google/e-book-backend-google.c:1748
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504
msgid "The backend does not support bulk additions"
msgstr "The backend does not support bulk additions"
-#. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1267
-msgid "Creating new contact…"
-msgstr "Creating new contact…"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:1358
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:506
-msgid "The backend does not support bulk removals"
-msgstr "The backend does not support bulk removals"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:1386
-msgid "Deleting contact…"
-msgstr "Deleting contact…"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:1640
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2319
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:567
+#: ../addressbook/backends/google/e-book-backend-google.c:1905
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1626
msgid "The backend does not support bulk modifications"
msgstr "The backend does not support bulk modifications"
-#. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1678
-msgid "Modifying contact…"
-msgstr "Modifying contact…"
+#: ../addressbook/backends/google/e-book-backend-google.c:2114
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1726
+msgid "The backend does not support bulk removals"
+msgstr "The backend does not support bulk removals"
-#: ../addressbook/backends/google/e-book-backend-google.c:1849
+#: ../addressbook/backends/google/e-book-backend-google.c:2236
msgid "Loading…"
msgstr "Loading…"
#. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1602
+#: ../addressbook/backends/google/e-book-google-utils.c:1653
#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
@@ -154,158 +182,165 @@ msgid "Personal"
msgstr "Personal"
#. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1604
+#: ../addressbook/backends/google/e-book-google-utils.c:1655
msgid "Friends"
msgstr "Friends"
#. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1606
+#: ../addressbook/backends/google/e-book-google-utils.c:1657
msgid "Family"
msgstr "Family"
#. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1608
+#: ../addressbook/backends/google/e-book-google-utils.c:1659
msgid "Coworkers"
msgstr "Coworkers"
#. Translators: An error message shown to a user when trying to do an
#. * operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:114
msgid "Not connected"
msgstr "Not connected"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:950
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:892
msgid "Failed to bind using either v3 or v2 binds"
msgstr "Failed to bind using either v3 or v2 binds"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1073
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1016
msgid "Reconnecting to LDAP server..."
msgstr "Reconnecting to LDAP server…"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1203
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
msgid "Invalid DN syntax"
msgstr "Invalid DN syntax"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1219
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4857
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
#, c-format
msgid "LDAP error 0x%x (%s)"
msgstr "LDAP error 0x%x (%s)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1737
-msgid "Adding contact to LDAP server..."
-msgstr "Adding contact to LDAP server…"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1875
-msgid "Removing contact from LDAP server..."
-msgstr "Removing contact from LDAP server…"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2019
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1775
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
#, c-format
msgid "%s: NULL returned from ldap_first_entry"
msgstr "%s: NULL returned from ldap_first_entry"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2272
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2474
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
#, c-format
msgid "%s: Unhandled result type %d returned"
msgstr "%s: Unhandled result type %d returned"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2341
-msgid "Modifying contact from LDAP server..."
-msgstr "Modifying contact from LDAP server…"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2703
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2935
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2289
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
#, c-format
msgid "%s: Unhandled search result type %d returned"
msgstr "%s: Unhandled search result type %d returned"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4806
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4195
msgid "Receiving LDAP search results..."
msgstr "Receiving LDAP search results…"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4985
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4379
msgid "Error performing search"
msgstr "Error performing search"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5108
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4512
#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "Downloading contacts (%d)… "
+msgid "Downloading contacts (%d)..."
+msgstr "Downloading contacts (%d)…"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5571
-#, c-format
-msgid "Failed to get the DN for user '%s'"
-msgstr "Failed to get the DN for user '%s'"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5082
+msgid "Adding contact to LDAP server..."
+msgstr "Adding contact to LDAP server…"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:420
-#, c-format
-msgid "Create resource '%s' failed with HTTP status %d (%s)"
-msgstr "Create resource '%s' failed with HTTP status %d (%s)"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5157
+msgid "Modifying contact from LDAP server..."
+msgstr "Modifying contact from LDAP server…"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5223
+msgid "Removing contact from LDAP server..."
+msgstr "Removing contact from LDAP server…"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:522
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
#, c-format
-msgid "DELETE failed with HTTP status %d"
-msgstr "DELETE failed with HTTP status %d"
+msgid "Failed to get the DN for user '%s'"
+msgstr "Failed to get the DN for user '%s'"
#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
-msgid "Contact on server changed -> not modifying"
-msgstr "Contact on server changed -> not modifying"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:597
+#: ../calendar/backends/http/e-cal-backend-http.c:513
#, c-format
-msgid "Modify contact failed with HTTP status %d (%s)"
-msgstr "Modify contact failed with HTTP status %d (%s)"
+msgid "Malformed URI: %s"
+msgstr "Malformed URI: %s"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1007
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
msgid "Loading Addressbook summary..."
msgstr "Loading Addressbook summary…"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
#, c-format
msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
msgstr "PROPFIND on webdav failed with HTTP status %d (%s)"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1051
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:883
msgid "No response body in webdav PROPFIND result"
msgstr "No response body in webdav PROPFIND result"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1083
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:944
#, c-format
msgid "Loading Contacts (%d%%)"
msgstr "Loading Contacts (%d%%)"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1416
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1358
msgid "Cannot transform SoupURI to string"
msgstr "Cannot transform SoupURI to string"
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1555
+#, c-format
+msgid "Create resource '%s' failed with HTTP status %d (%s)"
+msgstr "Create resource '%s' failed with HTTP status %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1657
+msgid "Contact on server changed -> not modifying"
+msgstr "Contact on server changed -> not modifying"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1665
+#, c-format
+msgid "Modify contact failed with HTTP status %d (%s)"
+msgstr "Modify contact failed with HTTP status %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1758
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1774
+#, c-format
+msgid "DELETE failed with HTTP status %d"
+msgstr "DELETE failed with HTTP status %d"
+
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
msgid "No such book"
msgstr "No such book"
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:797
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../addressbook/libedata-book/e-data-book.c:384
msgid "Contact not found"
msgstr "Contact not found"
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:798
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
+#: ../addressbook/libedata-book/e-data-book.c:385
msgid "Contact ID already exists"
msgstr "Contact ID already exists"
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
msgid "No such source"
msgstr "No such source"
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:814
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:48
+#: ../addressbook/libedata-book/e-data-book.c:401
msgid "No space"
msgstr "No space"
#. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:120
+#: ../addressbook/libebook-contacts/e-contact.c:130
msgid "Unique ID"
msgstr "Unique ID"
@@ -313,12 +348,12 @@ msgstr "Unique ID"
#. * so we can generate its value if necessary in the getter
#. Translators: This is an EContact field description, in this case it's a
#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook-contacts/e-contact.c:125
+#: ../addressbook/libebook-contacts/e-contact.c:135
msgid "File Under"
msgstr "File Under"
#. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:127
+#: ../addressbook/libebook-contacts/e-contact.c:137
msgid "Book UID"
msgstr "Book UID"
@@ -326,434 +361,435 @@ msgstr "Book UID"
#. 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-contacts/e-contact.c:133
+#: ../addressbook/libebook-contacts/e-contact.c:143
msgid "Full Name"
msgstr "Full Name"
-#: ../addressbook/libebook-contacts/e-contact.c:134
+#: ../addressbook/libebook-contacts/e-contact.c:144
msgid "Given Name"
msgstr "Given Name"
-#: ../addressbook/libebook-contacts/e-contact.c:135
+#: ../addressbook/libebook-contacts/e-contact.c:145
msgid "Family Name"
msgstr "Family Name"
-#: ../addressbook/libebook-contacts/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:146
msgid "Nickname"
msgstr "Nickname"
#. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:139
+#: ../addressbook/libebook-contacts/e-contact.c:149
msgid "Email 1"
msgstr "E-mail 1"
-#: ../addressbook/libebook-contacts/e-contact.c:140
+#: ../addressbook/libebook-contacts/e-contact.c:150
msgid "Email 2"
msgstr "E-mail 2"
-#: ../addressbook/libebook-contacts/e-contact.c:141
+#: ../addressbook/libebook-contacts/e-contact.c:151
msgid "Email 3"
msgstr "E-mail 3"
-#: ../addressbook/libebook-contacts/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:152
msgid "Email 4"
msgstr "E-mail 4"
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:154
msgid "Mailer"
msgstr "Mailer"
#. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:157
msgid "Home Address Label"
msgstr "Home Address Label"
-#: ../addressbook/libebook-contacts/e-contact.c:148
+#: ../addressbook/libebook-contacts/e-contact.c:158
msgid "Work Address Label"
msgstr "Work Address Label"
-#: ../addressbook/libebook-contacts/e-contact.c:149
+#: ../addressbook/libebook-contacts/e-contact.c:159
msgid "Other Address Label"
msgstr "Other Address Label"
#. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:162
msgid "Assistant Phone"
msgstr "Assistant Phone"
-#: ../addressbook/libebook-contacts/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:163
msgid "Business Phone"
msgstr "Business Phone"
-#: ../addressbook/libebook-contacts/e-contact.c:154
+#: ../addressbook/libebook-contacts/e-contact.c:164
msgid "Business Phone 2"
msgstr "Business Phone 2"
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:165
msgid "Business Fax"
msgstr "Business Fax"
-#: ../addressbook/libebook-contacts/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:166
msgid "Callback Phone"
msgstr "Callback Phone"
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:167
msgid "Car Phone"
msgstr "Car Phone"
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:168
msgid "Company Phone"
msgstr "Company Phone"
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:169
msgid "Home Phone"
msgstr "Home Phone"
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:170
msgid "Home Phone 2"
msgstr "Home Phone 2"
-#: ../addressbook/libebook-contacts/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:171
msgid "Home Fax"
msgstr "Home Fax"
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:172
msgid "ISDN"
msgstr "ISDN"
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:173
msgid "Mobile Phone"
msgstr "Mobile Phone"
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:174
msgid "Other Phone"
msgstr "Other Phone"
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:175
msgid "Other Fax"
msgstr "Other Fax"
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:176
msgid "Pager"
msgstr "Pager"
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:177
msgid "Primary Phone"
msgstr "Primary Phone"
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:178
msgid "Radio"
msgstr "Radio"
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:179
msgid "Telex"
msgstr "Telex"
#. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:181
msgid "TTY"
msgstr "TTY"
#. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:184
msgid "Organization"
msgstr "Organisation"
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:185
msgid "Organizational Unit"
msgstr "Organisational Unit"
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../addressbook/libebook-contacts/e-contact.c:186
msgid "Office"
msgstr "Office"
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:187
msgid "Title"
msgstr "Title"
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:188
msgid "Role"
msgstr "Role"
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:189
msgid "Manager"
msgstr "Manager"
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:190
msgid "Assistant"
msgstr "Assistant"
#. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:183
+#: ../addressbook/libebook-contacts/e-contact.c:193
msgid "Homepage URL"
msgstr "Homepage URL"
-#: ../addressbook/libebook-contacts/e-contact.c:184
+#: ../addressbook/libebook-contacts/e-contact.c:194
msgid "Weblog URL"
msgstr "Weblog URL"
#. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:197
msgid "Categories"
msgstr "Categories"
#. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:200
msgid "Calendar URI"
msgstr "Calendar URI"
-#: ../addressbook/libebook-contacts/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:201
msgid "Free/Busy URL"
msgstr "Free/Busy URL"
-#: ../addressbook/libebook-contacts/e-contact.c:192
+#: ../addressbook/libebook-contacts/e-contact.c:202
msgid "ICS Calendar"
msgstr "ICS Calendar"
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:203
msgid "Video Conferencing URL"
msgstr "Video Conferencing URL"
#. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:196
+#: ../addressbook/libebook-contacts/e-contact.c:206
msgid "Spouse's Name"
msgstr "Spouse's Name"
-#: ../addressbook/libebook-contacts/e-contact.c:197
+#: ../addressbook/libebook-contacts/e-contact.c:207
msgid "Note"
msgstr "Note"
#. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../addressbook/libebook-contacts/e-contact.c:210
msgid "AIM Home Screen Name 1"
msgstr "AIM Home Screen Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:211
msgid "AIM Home Screen Name 2"
msgstr "AIM Home Screen Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:212
msgid "AIM Home Screen Name 3"
msgstr "AIM Home Screen Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:213
msgid "AIM Work Screen Name 1"
msgstr "AIM Work Screen Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:214
msgid "AIM Work Screen Name 2"
msgstr "AIM Work Screen Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:215
msgid "AIM Work Screen Name 3"
msgstr "AIM Work Screen Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:216
msgid "GroupWise Home Screen Name 1"
msgstr "GroupWise Home Screen Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:217
msgid "GroupWise Home Screen Name 2"
msgstr "GroupWise Home Screen Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:218
msgid "GroupWise Home Screen Name 3"
msgstr "GroupWise Home Screen Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:219
msgid "GroupWise Work Screen Name 1"
msgstr "GroupWise Work Screen Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:220
msgid "GroupWise Work Screen Name 2"
msgstr "GroupWise Work Screen Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:221
msgid "GroupWise Work Screen Name 3"
msgstr "GroupWise Work Screen Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:222
msgid "Jabber Home ID 1"
msgstr "Jabber Home ID 1"
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:223
msgid "Jabber Home ID 2"
msgstr "Jabber Home ID 2"
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:224
msgid "Jabber Home ID 3"
msgstr "Jabber Home ID 3"
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:225
msgid "Jabber Work ID 1"
msgstr "Jabber Work ID 1"
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:226
msgid "Jabber Work ID 2"
msgstr "Jabber Work ID 2"
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:227
msgid "Jabber Work ID 3"
msgstr "Jabber Work ID 3"
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:228
msgid "Yahoo! Home Screen Name 1"
msgstr "Yahoo! Home Screen Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:229
msgid "Yahoo! Home Screen Name 2"
msgstr "Yahoo! Home Screen Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:230
msgid "Yahoo! Home Screen Name 3"
msgstr "Yahoo! Home Screen Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:231
msgid "Yahoo! Work Screen Name 1"
msgstr "Yahoo! Work Screen Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:232
msgid "Yahoo! Work Screen Name 2"
msgstr "Yahoo! Work Screen Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:233
msgid "Yahoo! Work Screen Name 3"
msgstr "Yahoo! Work Screen Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:234
msgid "MSN Home Screen Name 1"
msgstr "MSN Home Screen Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:235
msgid "MSN Home Screen Name 2"
msgstr "MSN Home Screen Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:236
msgid "MSN Home Screen Name 3"
msgstr "MSN Home Screen Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:237
msgid "MSN Work Screen Name 1"
msgstr "MSN Work Screen Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:238
msgid "MSN Work Screen Name 2"
msgstr "MSN Work Screen Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:239
msgid "MSN Work Screen Name 3"
msgstr "MSN Work Screen Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:240
msgid "ICQ Home ID 1"
msgstr "ICQ Home ID 1"
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:241
msgid "ICQ Home ID 2"
msgstr "ICQ Home ID 2"
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:242
msgid "ICQ Home ID 3"
msgstr "ICQ Home ID 3"
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:243
msgid "ICQ Work ID 1"
msgstr "ICQ Work ID 1"
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:244
msgid "ICQ Work ID 2"
msgstr "ICQ Work ID 2"
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:245
msgid "ICQ Work ID 3"
msgstr "ICQ Work ID 3"
#. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:248
msgid "Last Revision"
msgstr "Last Revision"
#. Translators: This is an EContact field description, in this case it's a
#. * virtual field, which returns either name of the contact or the organization
#. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../addressbook/libebook-contacts/e-contact.c:252
msgid "Name or Org"
msgstr "Name or Org"
#. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../addressbook/libebook-contacts/e-contact.c:255
msgid "Address List"
msgstr "Address List"
-#: ../addressbook/libebook-contacts/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:256
msgid "Home Address"
msgstr "Home Address"
-#: ../addressbook/libebook-contacts/e-contact.c:247
+#: ../addressbook/libebook-contacts/e-contact.c:257
msgid "Work Address"
msgstr "Work Address"
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../addressbook/libebook-contacts/e-contact.c:258
msgid "Other Address"
msgstr "Other Address"
#. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:251
+#: ../addressbook/libebook-contacts/e-contact.c:261
msgid "Category List"
msgstr "Category List"
#. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:254
+#: ../addressbook/libebook-contacts/e-contact.c:264
msgid "Photo"
msgstr "Photo"
-#: ../addressbook/libebook-contacts/e-contact.c:255
+#: ../addressbook/libebook-contacts/e-contact.c:265
msgid "Logo"
msgstr "Logo"
#. Translators: This is an EContact field description, in this case it's a name
#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:259
+#: ../addressbook/libebook-contacts/e-contact.c:269
+#: ../libedataserverui/e-webdav-discover-widget.c:153
msgid "Name"
msgstr "Name"
-#: ../addressbook/libebook-contacts/e-contact.c:260
+#: ../addressbook/libebook-contacts/e-contact.c:270
msgid "Email List"
msgstr "E-mail List"
#. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:263
+#: ../addressbook/libebook-contacts/e-contact.c:273
msgid "AIM Screen Name List"
msgstr "AIM Screen Name List"
-#: ../addressbook/libebook-contacts/e-contact.c:264
+#: ../addressbook/libebook-contacts/e-contact.c:274
msgid "GroupWise ID List"
msgstr "GroupWise ID List"
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:275
msgid "Jabber ID List"
msgstr "Jabber ID List"
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:276
msgid "Yahoo! Screen Name List"
msgstr "Yahoo! Screen Name List"
-#: ../addressbook/libebook-contacts/e-contact.c:267
+#: ../addressbook/libebook-contacts/e-contact.c:277
msgid "MSN Screen Name List"
msgstr "MSN Screen Name List"
-#: ../addressbook/libebook-contacts/e-contact.c:268
+#: ../addressbook/libebook-contacts/e-contact.c:278
msgid "ICQ ID List"
msgstr "ICQ ID List"
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:280
msgid "Wants HTML Mail"
msgstr "Wants HTML Mail"
#. Translators: This is an EContact field description, in this case it's a
#. * field describing whether it's a Contact list (list of email addresses) or a
#. * regular contact for one person/organization/...
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../addressbook/libebook-contacts/e-contact.c:285
msgid "List"
msgstr "List"
@@ -761,197 +797,213 @@ msgstr "List"
#. * used to determine whether when sending to Contact lists the addresses should be
#. * shown or not to other recipients - basically whether to use BCC field or CC
#. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook-contacts/e-contact.c:280
+#: ../addressbook/libebook-contacts/e-contact.c:290
msgid "List Shows Addresses"
msgstr "List Shows Addresses"
-#: ../addressbook/libebook-contacts/e-contact.c:282
+#: ../addressbook/libebook-contacts/e-contact.c:292
msgid "Birth Date"
msgstr "Birth Date"
-#: ../addressbook/libebook-contacts/e-contact.c:283
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:875
+#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:948
msgid "Anniversary"
msgstr "Anniversary"
#. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:286
+#: ../addressbook/libebook-contacts/e-contact.c:296
msgid "X.509 Certificate"
msgstr "X.509 Certificate"
-#: ../addressbook/libebook-contacts/e-contact.c:288
+#: ../addressbook/libebook-contacts/e-contact.c:297
+msgid "PGP Certificate"
+msgstr "PGP Certificate"
+
+#: ../addressbook/libebook-contacts/e-contact.c:299
msgid "Gadu-Gadu Home ID 1"
msgstr "Gadu-Gadu Home ID 1"
-#: ../addressbook/libebook-contacts/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:300
msgid "Gadu-Gadu Home ID 2"
msgstr "Gadu-Gadu Home ID 2"
-#: ../addressbook/libebook-contacts/e-contact.c:290
+#: ../addressbook/libebook-contacts/e-contact.c:301
msgid "Gadu-Gadu Home ID 3"
msgstr "Gadu-Gadu Home ID 3"
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:302
msgid "Gadu-Gadu Work ID 1"
msgstr "Gadu-Gadu Work ID 1"
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:303
msgid "Gadu-Gadu Work ID 2"
msgstr "Gadu-Gadu Work ID 2"
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:304
msgid "Gadu-Gadu Work ID 3"
msgstr "Gadu-Gadu Work ID 3"
-#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:305
msgid "Gadu-Gadu ID List"
msgstr "Gadu-Gadu ID List"
#. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:308
msgid "Geographic Information"
msgstr "Geographic Information"
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../addressbook/libebook-contacts/e-contact.c:310
msgid "Telephone"
msgstr "Telephone"
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../addressbook/libebook-contacts/e-contact.c:312
msgid "Skype Home Name 1"
msgstr "Skype Home Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:313
msgid "Skype Home Name 2"
msgstr "Skype Home Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../addressbook/libebook-contacts/e-contact.c:314
msgid "Skype Home Name 3"
msgstr "Skype Home Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:315
msgid "Skype Work Name 1"
msgstr "Skype Work Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:316
msgid "Skype Work Name 2"
msgstr "Skype Work Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:306
+#: ../addressbook/libebook-contacts/e-contact.c:317
msgid "Skype Work Name 3"
msgstr "Skype Work Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:318
msgid "Skype Name List"
msgstr "Skype Name List"
-#: ../addressbook/libebook-contacts/e-contact.c:309
+#: ../addressbook/libebook-contacts/e-contact.c:320
msgid "SIP address"
msgstr "SIP address"
-#: ../addressbook/libebook-contacts/e-contact.c:311
+#: ../addressbook/libebook-contacts/e-contact.c:322
msgid "Google Talk Home Name 1"
msgstr "Google Talk Home Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:323
msgid "Google Talk Home Name 2"
msgstr "Google Talk Home Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../addressbook/libebook-contacts/e-contact.c:324
msgid "Google Talk Home Name 3"
msgstr "Google Talk Home Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:325
msgid "Google Talk Work Name 1"
msgstr "Google Talk Work Name 1"
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:326
msgid "Google Talk Work Name 2"
msgstr "Google Talk Work Name 2"
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:327
msgid "Google Talk Work Name 3"
msgstr "Google Talk Work Name 3"
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:328
msgid "Google Talk Name List"
msgstr "Google Talk Name List"
-#: ../addressbook/libebook-contacts/e-contact.c:319
+#: ../addressbook/libebook-contacts/e-contact.c:330
msgid "Twitter Name List"
msgstr "Twitter Name List"
-#: ../addressbook/libebook-contacts/e-contact.c:1624
-#: ../addressbook/libebook/e-destination.c:884
+#: ../addressbook/libebook-contacts/e-contact.c:1660
+#: ../addressbook/libebook/e-destination.c:918
msgid "Unnamed List"
msgstr "Unnamed List"
-#: ../addressbook/libebook-contacts/e-phone-number.c:43
+#: ../addressbook/libebook-contacts/e-phone-number.c:41
msgid "The library was built without phone number support."
msgstr "The library was built without phone number support."
-#: ../addressbook/libebook-contacts/e-phone-number.c:45
-msgid "The phone number parser reported an yet unkown error code."
-msgstr "The phone number parser reported an yet unkown error code."
+#: ../addressbook/libebook-contacts/e-phone-number.c:43
+msgid "The phone number parser reported a yet unknown error code."
+msgstr "The phone number parser reported a yet unkown error code."
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../addressbook/libebook-contacts/e-phone-number.c:45
msgid "Not a phone number"
msgstr "Not a phone number"
-#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#: ../addressbook/libebook-contacts/e-phone-number.c:47
msgid "Invalid country calling code"
msgstr "Invalid country calling code"
-#: ../addressbook/libebook-contacts/e-phone-number.c:51
+#: ../addressbook/libebook-contacts/e-phone-number.c:49
msgid ""
"Remaining text after the country calling code is too short for a phone number"
msgstr ""
-"Remaining text after the country calling code is too short for a phone "
-"number"
+"Remaining text after the country calling code is too short for a phone number"
-#: ../addressbook/libebook-contacts/e-phone-number.c:53
+#: ../addressbook/libebook-contacts/e-phone-number.c:51
msgid "Text is too short for a phone number"
msgstr "Text is too short for a phone number"
-#: ../addressbook/libebook-contacts/e-phone-number.c:55
+#: ../addressbook/libebook-contacts/e-phone-number.c:53
msgid "Text is too long for a phone number"
msgstr "Text is too long for a phone number"
-#: ../addressbook/libebook/e-book-client.c:659
-#: ../addressbook/libedata-book/e-book-backend.c:120
+#: ../addressbook/libebook/e-book-client.c:931
#, c-format
msgid "Unknown book property '%s'"
msgstr "Unknown book property '%s'"
-#: ../addressbook/libebook/e-book-client.c:674
+#: ../addressbook/libebook/e-book-client.c:946
#, c-format
msgid "Cannot change value of book property '%s'"
msgstr "Cannot change value of book property '%s'"
-#: ../addressbook/libebook/e-book-client.c:985
-#: ../addressbook/libebook/e-book-client.c:1158
-#: ../calendar/libecal/e-cal-client.c:1502
-#: ../calendar/libecal/e-cal-client.c:1682
+#: ../addressbook/libebook/e-book-client.c:1390
+#: ../addressbook/libebook/e-book-client.c:1621
+#: ../addressbook/libebook/e-book-client.c:1898
+#: ../calendar/libecal/e-cal-client.c:1717
+#: ../calendar/libecal/e-cal-client.c:1955
#, c-format
msgid "Unable to connect to '%s': "
msgstr "Unable to connect to '%s': "
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:752
+#: ../addressbook/libebook/e-book-client-view.c:870
+#: ../calendar/libecal/e-cal-client-view.c:681
+#, c-format
+msgid "Client disappeared"
+msgstr "Client disappeared"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
+#: ../addressbook/libedata-book/e-book-sqlite.c:2254
#, c-format
msgid "Error introspecting unknown summary field '%s'"
msgstr "Error introspecting unknown summary field '%s'"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1241
-#: ../camel/camel-db.c:544
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../addressbook/libedata-book/e-book-sqlite.c:1393
+msgid "Error parsing regular expression"
+msgstr "Error parsing regular expression"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
+#: ../addressbook/libedata-book/e-book-sqlite.c:1877 ../camel/camel-db.c:751
#, c-format
msgid "Insufficient memory"
msgstr "Insufficient memory"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1374
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
#, c-format
msgid "Invalid contact field '%d' specified in summary"
msgstr "Invalid contact field '%d' specified in summary"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1408
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
+#: ../addressbook/libedata-book/e-book-sqlite.c:604
#, c-format
msgid ""
"Contact field '%s' of type '%s' specified in summary, but only boolean, "
@@ -960,26 +1012,27 @@ msgstr ""
"Contact field '%s' of type '%s' specified in summary, but only boolean, "
"string and string list field types are supported"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2603
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3644
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
#, c-format
msgid ""
"Full search_contacts are not stored in cache. vcards cannot be returned."
msgstr ""
"Full search_contacts are not stored in cache. vcards cannot be returned."
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3770
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3851
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
+#: ../addressbook/libedata-book/e-book-sqlite.c:5817
#, c-format
msgid "Query contained unsupported elements"
msgstr "Query contained unsupported elements"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3774
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
#, c-format
msgid "Invalid Query"
msgstr "Invalid Query"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3798
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
#, c-format
msgid ""
"Full search_contacts are not stored in cache. Hence only summary query is "
@@ -988,240 +1041,320 @@ msgstr ""
"Full search_contacts are not stored in cache. Hence only summary query is "
"supported."
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3855
-#: ../addressbook/libedata-book/e-data-book.c:669
-#: ../addressbook/libedata-book/e-data-book.c:809
-#: ../calendar/libedata-cal/e-data-cal.c:612
-#: ../calendar/libedata-cal/e-data-cal.c:771 ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
+#: ../addressbook/libedata-book/e-data-book.c:396
+#: ../addressbook/libedata-book/e-data-book.c:1146
+#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../calendar/libedata-cal/e-data-cal.c:1427 ../libedataserver/e-client.c:177
#, c-format
msgid "Invalid query"
msgstr "Invalid query"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
#, c-format
msgid ""
"Full vcards are not stored in cache. Hence only summary query is supported."
msgstr ""
"Full vcards are not stored in cache. Hence only summary query is supported."
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4598
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
#, c-format
msgid "Unable to remove the db file: errno %d"
msgstr "Unable to remove the db file: errno %d"
-#: ../addressbook/libedata-book/e-book-backend-sync.c:179
-#: ../calendar/libedata-cal/e-cal-backend-sync.c:182
-msgid "Clients cannot set backend properties"
-msgstr "Clients cannot set backend properties"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
+#, c-format
+msgid "Only summary queries are supported by EbSdbCursor"
+msgstr "Only summary queries are supported by EbSdbCursor"
-#. Translators: This is prefix to a detailed error message
-#. Translators: This is a prefix to a detailed error message *
-#.
-#: ../addressbook/libedata-book/e-data-book.c:691
-#: ../calendar/libedata-cal/e-data-cal.c:635
-msgid "Invalid query: "
-msgstr "Invalid query: "
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
+#, c-format
+msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgstr "At least one sort field must be specified to use an EbSdbCursor"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
+#, c-format
+msgid "Cannot sort by a field that is not in the summary"
+msgstr "Cannot sort by a field that is not in the summary"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
+#, c-format
+msgid "Cannot sort by a field which may have multiple values"
+msgstr "Cannot sort by a field which may have multiple values"
-#: ../addressbook/libedata-book/e-data-book.c:793
-#: ../calendar/libedata-cal/e-data-cal.c:752
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
+#: ../addressbook/libedata-book/e-book-sqlite.c:8116
+#, c-format
+msgid ""
+"Tried to step a cursor in reverse, but cursor is already at the beginning of "
+"the contact list"
+msgstr ""
+"Tried to step a cursor in reverse, but cursor is already at the beginning of "
+"the contact list"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
+#: ../addressbook/libedata-book/e-book-sqlite.c:8124
+#, c-format
+msgid ""
+"Tried to step a cursor forwards, but cursor is already at the end of the "
+"contact list"
+msgstr ""
+"Tried to step a cursor forwards, but cursor is already at the end of the "
+"contact list"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:570
+#, c-format
+msgid "Unsupported contact field '%d' specified in summary"
+msgstr "Unsupported contact field '%d' specified in summary"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:1950
+msgid ""
+"Cannot upgrade contacts database from a legacy database with more than one "
+"addressbook. Delete one of the entries in the 'folders' table first."
+msgstr ""
+"Cannot upgrade contacts database from a legacy database with more than one "
+"addressbook. Delete one of the entries in the 'folders' table first."
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5810
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Invalid query: %s"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5985
+msgid "Invalid query for EbSqlCursor"
+msgstr "Invalid query for EbSqlCursor"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7938
+msgid "At least one sort field must be specified to use an EbSqlCursor"
+msgstr "At least one sort field must be specified to use an EbSqlCursor"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7956
+msgid "Cannot sort by a field that is not a string type"
+msgstr "Cannot sort by a field that is not a string type"
+
+#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../calendar/libedata-cal/e-data-cal.c:409
msgid "Success"
msgstr "Success"
-#: ../addressbook/libedata-book/e-data-book.c:794
-#: ../calendar/libecal/e-cal.c:2307 ../calendar/libedata-cal/e-data-cal.c:753
-#: ../libedataserver/e-client.c:133
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libecal/e-cal.c:2304 ../calendar/libedata-cal/e-data-cal.c:410
+#: ../libedataserver/e-client.c:144
msgid "Backend is busy"
msgstr "Backend is busy"
-#: ../addressbook/libedata-book/e-data-book.c:795
-#: ../calendar/libedata-cal/e-data-cal.c:754 ../libedataserver/e-client.c:143
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:154
msgid "Repository offline"
msgstr "Repository offline"
-#: ../addressbook/libedata-book/e-data-book.c:796
-#: ../calendar/libecal/e-cal.c:2321 ../calendar/libedata-cal/e-data-cal.c:755
-#: ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/libecal/e-cal.c:2318 ../calendar/libedata-cal/e-data-cal.c:412
+#: ../libedataserver/e-client.c:161
msgid "Permission denied"
msgstr "Permission denied"
-#: ../addressbook/libedata-book/e-data-book.c:799
-#: ../calendar/libedata-cal/e-data-cal.c:760
+#: ../addressbook/libedata-book/e-data-book.c:386
+#: ../calendar/libedata-cal/e-data-cal.c:417
msgid "Authentication Failed"
msgstr "Authentication Failed"
-#: ../addressbook/libedata-book/e-data-book.c:800
-#: ../calendar/libedata-cal/e-data-cal.c:761
+#: ../addressbook/libedata-book/e-data-book.c:387
+#: ../calendar/libedata-cal/e-data-cal.c:418
msgid "Authentication Required"
msgstr "Authentication Required"
-#: ../addressbook/libedata-book/e-data-book.c:801
-#: ../calendar/libedata-cal/e-data-cal.c:762
+#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../calendar/libedata-cal/e-data-cal.c:419
msgid "Unsupported field"
msgstr "Unsupported field"
-#: ../addressbook/libedata-book/e-data-book.c:802
-#: ../calendar/libedata-cal/e-data-cal.c:764 ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:169
msgid "Unsupported authentication method"
msgstr "Unsupported authentication method"
-#: ../addressbook/libedata-book/e-data-book.c:803
-#: ../calendar/libedata-cal/e-data-cal.c:765 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:390
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:171
msgid "TLS not available"
msgstr "TLS not available"
-#: ../addressbook/libedata-book/e-data-book.c:804
+#: ../addressbook/libedata-book/e-data-book.c:391
msgid "Address book does not exist"
msgstr "Address book does not exist"
-#: ../addressbook/libedata-book/e-data-book.c:805
+#: ../addressbook/libedata-book/e-data-book.c:392
msgid "Book removed"
msgstr "Book removed"
-#: ../addressbook/libedata-book/e-data-book.c:806
-#: ../calendar/libedata-cal/e-data-cal.c:768
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../calendar/libedata-cal/e-data-cal.c:425
msgid "Not available in offline mode"
msgstr "Not available in offline mode"
-#: ../addressbook/libedata-book/e-data-book.c:807
-#: ../calendar/libedata-cal/e-data-cal.c:769 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:394
+#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:173
msgid "Search size limit exceeded"
msgstr "Search size limit exceeded"
-#: ../addressbook/libedata-book/e-data-book.c:808
-#: ../calendar/libedata-cal/e-data-cal.c:770 ../libedataserver/e-client.c:164
+#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:175
msgid "Search time limit exceeded"
msgstr "Search time limit exceeded"
-#: ../addressbook/libedata-book/e-data-book.c:810
-#: ../calendar/libedata-cal/e-data-cal.c:772 ../libedataserver/e-client.c:168
+#: ../addressbook/libedata-book/e-data-book.c:397
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:179
msgid "Query refused"
msgstr "Query refused"
-#: ../addressbook/libedata-book/e-data-book.c:811
-#: ../calendar/libedata-cal/e-data-cal.c:773 ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-data-book.c:398
+#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:165
msgid "Could not cancel"
msgstr "Could not cancel"
#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
#. { OtherError, N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:813
-#: ../calendar/libedata-cal/e-data-cal.c:775
+#: ../addressbook/libedata-book/e-data-book.c:400
+#: ../calendar/libedata-cal/e-data-cal.c:432
msgid "Invalid server version"
msgstr "Invalid server version"
-#: ../addressbook/libedata-book/e-data-book.c:815
-#: ../calendar/libecal/e-cal.c:2305 ../calendar/libedata-cal/e-data-cal.c:776
-#: ../libedataserver/e-client.c:131
+#: ../addressbook/libedata-book/e-data-book.c:402
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:433
+#: ../libedataserver/e-client.c:142
msgid "Invalid argument"
msgstr "Invalid argument"
#. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:817
-#: ../calendar/libecal/e-cal.c:1064 ../calendar/libecal/e-cal.c:1432
-#: ../calendar/libecal/e-cal.c:1912 ../calendar/libecal/e-cal.c:2344
-#: ../calendar/libedata-cal/e-data-cal.c:778 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:404
+#: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
+#: ../calendar/libecal/e-cal.c:1909 ../calendar/libecal/e-cal.c:2341
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:167
#, c-format
msgid "Not supported"
msgstr "Not supported"
-#: ../addressbook/libedata-book/e-data-book.c:818
-#: ../calendar/libedata-cal/e-data-cal.c:779 ../libedataserver/e-client.c:174
+#: ../addressbook/libedata-book/e-data-book.c:405
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
msgid "Backend is not opened yet"
msgstr "Backend is not opened yet"
-#: ../addressbook/libedata-book/e-data-book.c:819
-#: ../libedataserver/e-client.c:176
+#: ../addressbook/libedata-book/e-data-book.c:406
+#: ../libedataserver/e-client.c:187
msgid "Object is out of sync"
msgstr "Object is out of sync"
-#: ../addressbook/libedata-book/e-data-book.c:827
-#: ../calendar/libedata-cal/e-data-cal.c:787 ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:183
msgid "Other error"
msgstr "Other error"
+#: ../addressbook/libedata-book/e-data-book.c:1171
+#: ../calendar/libedata-cal/e-data-cal.c:1452
+msgid "Invalid query: "
+msgstr "Invalid query: "
+
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1133
+#: ../addressbook/libedata-book/e-data-book.c:1420
msgid "Cannot open book: "
msgstr "Cannot open book: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1217
+#: ../addressbook/libedata-book/e-data-book.c:1458
msgid "Cannot refresh address book: "
msgstr "Cannot refresh address book: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1298
+#: ../addressbook/libedata-book/e-data-book.c:1497
msgid "Cannot get contact: "
msgstr "Cannot get contact: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1364
+#: ../addressbook/libedata-book/e-data-book.c:1546
msgid "Cannot get contact list: "
msgstr "Cannot get contact list: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1456
+#: ../addressbook/libedata-book/e-data-book.c:1602
msgid "Cannot get contact list uids: "
msgstr "Cannot get contact list uids: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1536
+#: ../addressbook/libedata-book/e-data-book.c:1653
msgid "Cannot add contact: "
msgstr "Cannot add contact: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1599
+#: ../addressbook/libedata-book/e-data-book.c:1706
msgid "Cannot modify contacts: "
msgstr "Cannot modify contacts: "
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1640
+#: ../addressbook/libedata-book/e-data-book.c:1759
msgid "Cannot remove contacts: "
msgstr "Cannot remove contacts: "
-#: ../addressbook/libedata-book/e-data-book-factory.c:94
-#: ../calendar/libedata-cal/e-data-cal-factory.c:97
-#, c-format
-msgid "No backend name in source '%s'"
-msgstr "No backend name in source '%s'"
+#: ../addressbook/libedata-book/e-data-book-cursor.c:776
+msgid "Cursor does not support setting the search expression"
+msgstr "Cursor does not support setting the search expression"
-#: ../addressbook/libedata-book/e-data-book-factory.c:185
-#: ../calendar/libedata-cal/e-data-cal-factory.c:191
-#, c-format
-msgid "Missing source UID"
-msgstr "Missing source UID"
+#: ../addressbook/libedata-book/e-data-book-cursor.c:859
+msgid "Cursor does not support step"
+msgstr "Cursor does not support step"
-#: ../addressbook/libedata-book/e-data-book-factory.c:196
-#: ../calendar/libedata-cal/e-data-cal-factory.c:201
-#, c-format
-msgid "No such source for UID '%s'"
-msgstr "No such source for UID '%s'"
+#: ../addressbook/libedata-book/e-data-book-cursor.c:942
+msgid "Cursor does not support alphabetic indexes"
+msgstr "Cursor does not support alphabetic indexes"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+msgid "Unrecognized cursor origin"
+msgstr "Unrecognised cursor origin"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:560
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:336
+msgid "Out of sync revision while moving cursor"
+msgstr "Out of sync revision while moving cursor"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:430
+msgid "Alphabetic index was set for incorrect locale"
+msgstr "Alphabetic index was set for incorrect locale"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:678
#, c-format
msgid "Server is unreachable (%s)"
msgstr "Server is unreachable (%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:590
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
#, c-format
-msgid "Failed to connect to a server using SSL: %s"
-msgstr "Failed to connect to a server using SSL: %s"
+#| msgid "Failed to connect to a server using SSL: %s"
+msgid "Failed to login to the server: %s"
+msgstr "Failed to login to the server: %s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:601
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:726
#, c-format
-msgid "Unexpected HTTP status code %d returned (%s)"
-msgstr "Unexpected HTTP status code %d returned (%s)"
+msgid "Failed to connect to a server using SSL/TLS: %s"
+msgstr "Failed to connect to a server using SSL/TLS: %s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:620
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:742
+#, c-format
+msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
+msgstr "Unexpected HTTP status code %d returned (%s) for URI: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:763
msgid "CalDAV backend is not loaded yet"
msgstr "CalDAV backend is not loaded yet"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1009
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1200
+#: ../libedataserver/e-webdav-discover.c:147
msgid "Invalid Redirect URL"
msgstr "Invalid Redirect URL"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2491
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2849
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2899
+#, c-format
+msgid "Cannot create local cache folder '%s'"
+msgstr "Cannot create local cache folder '%s'"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2985
#, c-format
msgid ""
"Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1230,439 +1363,452 @@ msgstr ""
"Server is unreachable, calendar is opened in read-only mode.\n"
"Error message: %s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2801
-#, c-format
-msgid "Cannot create local cache folder '%s'"
-msgstr "Cannot create local cache folder '%s'"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3893
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4090
msgid "CalDAV does not support bulk additions"
msgstr "CalDAV does not support bulk additions"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3996
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4193
msgid "CalDAV does not support bulk modifications"
msgstr "CalDAV does not support bulk modifications"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4165
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4474
msgid "CalDAV does not support bulk removals"
msgstr "CalDAV does not support bulk removals"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4837
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5221
msgid "Calendar doesn't support Free/Busy"
msgstr "Calendar doesn't support Free/Busy"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4846
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5230
msgid "Schedule outbox url not found"
msgstr "Schedule outbox url not found"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4945
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5327
msgid "Unexpected result in schedule-response"
msgstr "Unexpected result in schedule-response"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:877
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:950
msgid "Birthday"
msgstr "Birthday"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:913
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:986
#, c-format
msgid "Birthday: %s"
msgstr "Birthday: %s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:944
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1017
#, c-format
msgid "Anniversary: %s"
msgstr "Anniversary: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:245
msgid "Cannot save calendar data: Malformed URI."
msgstr "Cannot save calendar data: Malformed URI."
-#: ../calendar/backends/file/e-cal-backend-file.c:250
-#: ../calendar/backends/file/e-cal-backend-file.c:256
+#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
msgid "Cannot save calendar data"
msgstr "Cannot save calendar data"
-#: ../calendar/backends/http/e-cal-backend-http.c:477
-#, c-format
-msgid "Malformed URI: %s"
-msgstr "Malformed URI: %s"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:568
+#: ../calendar/backends/http/e-cal-backend-http.c:582
#, c-format
msgid "Redirected to Invalid URI"
msgstr "Redirected to Invalid URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:605
+#: ../calendar/backends/http/e-cal-backend-http.c:641
#, c-format
msgid "Bad file format."
msgstr "Bad file format."
-#: ../calendar/backends/http/e-cal-backend-http.c:615
+#: ../calendar/backends/http/e-cal-backend-http.c:651
#, c-format
msgid "Not a calendar."
msgstr "Not a calendar."
-#: ../calendar/backends/http/e-cal-backend-http.c:926
-#: ../calendar/backends/weather/e-cal-backend-weather.c:514
+#: ../calendar/backends/http/e-cal-backend-http.c:955
+#: ../calendar/backends/weather/e-cal-backend-weather.c:709
msgid "Could not create cache file"
msgstr "Could not create cache file"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:173
+#: ../calendar/backends/weather/e-cal-backend-weather.c:195
msgid "Could not retrieve weather data"
msgstr "Could not retrieve weather data"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:378
msgid "Weather: Fog"
msgstr "Weather: Fog"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:379
msgid "Weather: Cloudy Night"
msgstr "Weather: Cloudy Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:380
msgid "Weather: Cloudy"
msgstr "Weather: Cloudy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:381
msgid "Weather: Overcast"
msgstr "Weather: Overcast"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:382
msgid "Weather: Showers"
msgstr "Weather: Showers"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:383
msgid "Weather: Snow"
msgstr "Weather: Snow"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:384
msgid "Weather: Clear Night"
msgstr "Weather: Clear Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:385
msgid "Weather: Sunny"
msgstr "Weather: Sunny"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:386
msgid "Weather: Thunderstorms"
msgstr "Weather: Thunderstorms"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:410
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:412
+#, c-format
+msgid "%.1f °F"
+msgstr "%.1f °F"
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:415
+#, c-format
+msgid "%.1f °C"
+msgstr "%.1f °C"
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../calendar/backends/weather/e-cal-backend-weather.c:418
+#, c-format
+msgid "%.1f K"
+msgstr "%.1f K"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:424
+#, c-format
+msgid "%.1f"
+msgstr "%.1f"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:589
+#: ../calendar/backends/weather/e-cal-backend-weather.c:617
msgid "Forecast"
msgstr "Forecast"
-#: ../calendar/libecal/e-cal.c:2309
+#: ../calendar/libecal/e-cal.c:2306
msgid "Repository is offline"
msgstr "Repository is offline"
-#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:262
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:266
msgid "No such calendar"
msgstr "No such calendar"
-#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:264
-#: ../calendar/libedata-cal/e-data-cal.c:757
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268
+#: ../calendar/libedata-cal/e-data-cal.c:414
msgid "Object not found"
msgstr "Object not found"
-#: ../calendar/libecal/e-cal.c:2315 ../calendar/libecal/e-cal-client.c:266
-#: ../calendar/libedata-cal/e-data-cal.c:758
+#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270
+#: ../calendar/libedata-cal/e-data-cal.c:415
msgid "Invalid object"
msgstr "Invalid object"
-#: ../calendar/libecal/e-cal.c:2317
+#: ../calendar/libecal/e-cal.c:2314
msgid "URI not loaded"
msgstr "URI not loaded"
-#: ../calendar/libecal/e-cal.c:2319
+#: ../calendar/libecal/e-cal.c:2316
msgid "URI already loaded"
msgstr "URI already loaded"
-#: ../calendar/libecal/e-cal.c:2323
+#: ../calendar/libecal/e-cal.c:2320
msgid "Unknown User"
msgstr "Unknown User"
-#: ../calendar/libecal/e-cal.c:2325 ../calendar/libecal/e-cal-client.c:270
-#: ../calendar/libedata-cal/e-data-cal.c:759
+#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:274
+#: ../calendar/libedata-cal/e-data-cal.c:416
msgid "Object ID already exists"
msgstr "Object ID already exists"
-#: ../calendar/libecal/e-cal.c:2327
+#: ../calendar/libecal/e-cal.c:2324
msgid "Protocol not supported"
msgstr "Protocol not supported"
-#: ../calendar/libecal/e-cal.c:2329
-msgid "Operation has been canceled"
+#: ../calendar/libecal/e-cal.c:2326
+msgid "Operation has been cancelled"
msgstr "Operation has been cancelled"
-#: ../calendar/libecal/e-cal.c:2331
+#: ../calendar/libecal/e-cal.c:2328
msgid "Could not cancel operation"
msgstr "Could not cancel operation"
-#: ../calendar/libecal/e-cal.c:2333 ../libedataserver/e-client.c:139
+#: ../calendar/libecal/e-cal.c:2330 ../libedataserver/e-client.c:150
msgid "Authentication failed"
msgstr "Authentication failed"
-#: ../calendar/libecal/e-cal.c:2335
-#: ../camel/providers/smtp/camel-smtp-transport.c:923
-#: ../libedataserver/e-client.c:141
+#: ../calendar/libecal/e-cal.c:2332
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../libedataserver/e-client.c:152
msgid "Authentication required"
msgstr "Authentication required"
-#: ../calendar/libecal/e-cal.c:2337
+#: ../calendar/libecal/e-cal.c:2334
msgid "A D-Bus exception has occurred"
msgstr "A D-Bus exception has occurred"
-#: ../calendar/libecal/e-cal.c:2341
+#: ../calendar/libecal/e-cal.c:2338
msgid "No error"
msgstr "No error"
-#: ../calendar/libecal/e-cal-client.c:268
-#: ../calendar/libedata-cal/e-data-cal.c:767
+#: ../calendar/libecal/e-cal-client.c:272
+#: ../calendar/libedata-cal/e-data-cal.c:424
msgid "Unknown user"
msgstr "Unknown user"
-#: ../calendar/libecal/e-cal-client.c:272
-#: ../calendar/libedata-cal/e-data-cal.c:756
+#: ../calendar/libecal/e-cal-client.c:276
+#: ../calendar/libedata-cal/e-data-cal.c:413
msgid "Invalid range"
msgstr "Invalid range"
-#: ../calendar/libecal/e-cal-client.c:936
-#: ../calendar/libedata-cal/e-cal-backend.c:204
+#: ../calendar/libecal/e-cal-client.c:1065
#, c-format
msgid "Unknown calendar property '%s'"
msgstr "Unknown calendar property '%s'"
-#: ../calendar/libecal/e-cal-client.c:951
+#: ../calendar/libecal/e-cal-client.c:1080
#, c-format
msgid "Cannot change value of calendar property '%s'"
msgstr "Cannot change value of calendar property '%s'"
-#: ../calendar/libecal/e-cal-component.c:1340
+#: ../calendar/libecal/e-cal-component.c:1357
msgid "Untitled appointment"
msgstr "Untitled appointment"
-#: ../calendar/libecal/e-cal-recur.c:4036
+#: ../calendar/libecal/e-cal-recur.c:4744
msgid "1st"
msgstr "1st"
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4745
msgid "2nd"
msgstr "2nd"
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4746
msgid "3rd"
msgstr "3rd"
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4747
msgid "4th"
msgstr "4th"
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4748
msgid "5th"
msgstr "5th"
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4749
msgid "6th"
msgstr "6th"
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4750
msgid "7th"
msgstr "7th"
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4751
msgid "8th"
msgstr "8th"
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4752
msgid "9th"
msgstr "9th"
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4753
msgid "10th"
msgstr "10th"
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4754
msgid "11th"
msgstr "11th"
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4755
msgid "12th"
msgstr "12th"
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4756
msgid "13th"
msgstr "13th"
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4757
msgid "14th"
msgstr "14th"
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4758
msgid "15th"
msgstr "15th"
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4759
msgid "16th"
msgstr "16th"
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4760
msgid "17th"
msgstr "17th"
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4761
msgid "18th"
msgstr "18th"
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4762
msgid "19th"
msgstr "19th"
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4763
msgid "20th"
msgstr "20th"
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4764
msgid "21st"
msgstr "21st"
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4765
msgid "22nd"
msgstr "22nd"
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4766
msgid "23rd"
msgstr "23rd"
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4767
msgid "24th"
msgstr "24th"
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4768
msgid "25th"
msgstr "25th"
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4769
msgid "26th"
msgstr "26th"
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4770
msgid "27th"
msgstr "27th"
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4771
msgid "28th"
msgstr "28th"
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4772
msgid "29th"
msgstr "29th"
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4773
msgid "30th"
msgstr "30th"
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4774
msgid "31st"
msgstr "31st"
-#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734
+#: ../calendar/libecal/e-cal-util.c:706 ../calendar/libecal/e-cal-util.c:733
msgctxt "Priority"
msgid "High"
msgstr "High"
-#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736
+#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
msgctxt "Priority"
msgid "Normal"
msgstr "Normal"
-#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738
+#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
msgctxt "Priority"
msgid "Low"
msgstr "Low"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:732
+#: ../calendar/libecal/e-cal-util.c:731
msgctxt "Priority"
msgid "Undefined"
msgstr "Undefined"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1379
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1506
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1555
#, c-format
msgid "\"%s\" expects one argument"
msgstr "\"%s\" expects one argument"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
#, 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:160
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
#, c-format
msgid "\"%s\" expects two or three arguments"
msgstr "\"%s\" expects two or three arguments"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:263
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:824
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
#, 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:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:335
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
#, 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:186
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
#, c-format
msgid "\"%s\" expects the third argument to be a string"
msgstr "\"%s\" expects the third argument to be a string"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:255
#, c-format
msgid "\"%s\" expects none or two arguments"
msgstr "\"%s\" expects none or two arguments"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
#, c-format
msgid "\"%s\" expects two arguments"
msgstr "\"%s\" expects two arguments"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:603
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:626
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:749
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:988
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1340
#, c-format
msgid "\"%s\" expects no arguments"
msgstr "\"%s\" expects no arguments"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:683
#, 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:707
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
#, c-format
msgid ""
"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1673,12 +1819,12 @@ msgstr ""
"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
"\"classification\""
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
#, c-format
msgid "\"%s\" expects at least one argument"
msgstr "\"%s\" expects at least one argument"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:900
#, c-format
msgid ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1687,401 +1833,352 @@ msgstr ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
"be a boolean false (#f)"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1403
#, 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:1450
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1464
#, 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-data-cal.c:763
+#: ../calendar/libedata-cal/e-data-cal.c:420
msgid "Unsupported method"
msgstr "Unsupported method"
-#: ../calendar/libedata-cal/e-data-cal.c:766
+#: ../calendar/libedata-cal/e-data-cal.c:423
msgid "Calendar does not exist"
msgstr "Calendar does not exist"
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1237
+#: ../calendar/libedata-cal/e-data-cal.c:1645
msgid "Cannot open calendar: "
msgstr "Cannot open calendar: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1298
+#: ../calendar/libedata-cal/e-data-cal.c:1682
msgid "Cannot refresh calendar: "
msgstr "Cannot refresh calendar: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1337
-msgid "Cannot retrieve backend property: "
-msgstr "Cannot retrieve backend property: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1395
+#: ../calendar/libedata-cal/e-data-cal.c:1723
msgid "Cannot retrieve calendar object path: "
msgstr "Cannot retrieve calendar object path: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1441
+#: ../calendar/libedata-cal/e-data-cal.c:1775
msgid "Cannot retrieve calendar object list: "
msgstr "Cannot retrieve calendar object list: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1494
+#: ../calendar/libedata-cal/e-data-cal.c:1832
msgid "Cannot retrieve calendar free/busy list: "
msgstr "Cannot retrieve calendar free/busy list: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1535
+#: ../calendar/libedata-cal/e-data-cal.c:1882
msgid "Cannot create calendar object: "
msgstr "Cannot create calendar object: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1604
+#: ../calendar/libedata-cal/e-data-cal.c:1950
msgid "Cannot modify calendar object: "
msgstr "Cannot modify calendar object: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1666
+#: ../calendar/libedata-cal/e-data-cal.c:2028
msgid "Cannot remove calendar object: "
msgstr "Cannot remove calendar object: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1727
+#: ../calendar/libedata-cal/e-data-cal.c:2114
msgid "Cannot receive calendar objects: "
msgstr "Cannot receive calendar objects: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1768
+#: ../calendar/libedata-cal/e-data-cal.c:2157
msgid "Cannot send calendar objects: "
msgstr "Cannot send calendar objects: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1828
+#: ../calendar/libedata-cal/e-data-cal.c:2209
msgid "Could not retrieve attachment uris: "
msgstr "Could not retrieve attachment uris: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1878
+#: ../calendar/libedata-cal/e-data-cal.c:2254
msgid "Could not discard reminder: "
msgstr "Could not discard reminder: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1917
-msgid "Could not get calendar view path: "
-msgstr "Could not get calendar view path: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1963
+#: ../calendar/libedata-cal/e-data-cal.c:2295
msgid "Could not retrieve calendar time zone: "
msgstr "Could not retrieve calendar time zone: "
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2007
+#: ../calendar/libedata-cal/e-data-cal.c:2335
msgid "Could not add calendar time zone: "
msgstr "Could not add calendar time zone: "
-#: ../camel/camel-cipher-context.c:208
+#: ../camel/camel-cipher-context.c:204
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "Signing is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:221
+#: ../camel/camel-cipher-context.c:217
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "Verifying is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:237
+#: ../camel/camel-cipher-context.c:233
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "Encryption is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:251
+#: ../camel/camel-cipher-context.c:247
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "Decryption is not supported by this cypher"
-#: ../camel/camel-cipher-context.c:264
-#, c-format
-msgid "You may not import keys with this cipher"
-msgstr "You may not import keys with this cypher"
-
-#: ../camel/camel-cipher-context.c:278
-#, c-format
-msgid "You may not export keys with this cipher"
-msgstr "You may not export keys with this cypher"
-
-#: ../camel/camel-cipher-context.c:819
+#: ../camel/camel-cipher-context.c:363
msgid "Signing message"
msgstr "Signing message"
-#: ../camel/camel-cipher-context.c:1060
+#: ../camel/camel-cipher-context.c:653
msgid "Encrypting message"
msgstr "Encrypting message"
-#: ../camel/camel-cipher-context.c:1187
+#: ../camel/camel-cipher-context.c:825
msgid "Decrypting message"
msgstr "Decrypting message"
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:179
#, c-format
msgid "Unable to create cache path"
msgstr "Unable to create cache path"
-#: ../camel/camel-data-cache.c:440
+#: ../camel/camel-data-cache.c:457
msgid "Empty cache file"
msgstr "Empty cache file"
-#: ../camel/camel-data-cache.c:509
+#: ../camel/camel-data-cache.c:534
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not remove cache entry: %s: %s"
-#: ../camel/camel-disco-diary.c:207
+#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
#, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-
-#: ../camel/camel-disco-diary.c:279
-#, c-format
-msgid ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronised."
-
-#: ../camel/camel-disco-diary.c:326
-msgid "Resynchronizing with server"
-msgstr "Resynchronising with server"
-
-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
-msgid "Downloading new messages for offline mode"
-msgstr "Downloading new messages for offline mode"
-
-#: ../camel/camel-disco-folder.c:422
-#, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr "Preparing folder '%s' for offline"
-
-#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336
-msgid "Copy folder content locally for _offline operation"
-msgstr "Copy folder content locally for _offline operation"
-
-#: ../camel/camel-disco-store.c:475 ../camel/camel-imapx-folder.c:478
-#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553
-#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748
-#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993
-#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:368
-#: ../camel/camel-imapx-store.c:1573 ../camel/camel-imapx-store.c:1662
-#: ../camel/camel-imapx-store.c:1711
-#: ../camel/providers/pop3/camel-pop3-folder.c:534
-#: ../camel/providers/pop3/camel-pop3-folder.c:677
-#: ../camel/providers/pop3/camel-pop3-folder.c:906
-#: ../camel/providers/pop3/camel-pop3-folder.c:1106
-#: ../camel/providers/pop3/camel-pop3-store.c:472
-#: ../camel/providers/pop3/camel-pop3-store.c:896
-#, c-format
-msgid "You must be working online to complete this operation"
-msgstr "You must be working online to complete this operation"
-
-#: ../camel/camel-file-utils.c:732
-#, c-format
-msgid "Canceled"
-msgstr "Cancelled"
+msgid "Could not rename '%s' to %s: %s"
+msgstr "Could not rename '%s' to %s: %s"
-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
+#: ../camel/camel-filter-driver.c:935 ../camel/camel-filter-search.c:773
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "Failed to create child process '%s': %s"
-#: ../camel/camel-filter-driver.c:964
+#: ../camel/camel-filter-driver.c:983
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Invalid message stream received from %s: %s"
-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1179
+#: ../camel/camel-filter-driver.c:1190 ../camel/camel-filter-driver.c:1199
msgid "Syncing folders"
msgstr "Syncing folders"
-#: ../camel/camel-filter-driver.c:1277
+#: ../camel/camel-filter-driver.c:1297
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Error parsing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1288
+#: ../camel/camel-filter-driver.c:1308
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Error executing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1384
+#: ../camel/camel-filter-driver.c:1404
#, c-format
msgid "Unable to open spool folder"
msgstr "Unable to open spool folder"
-#: ../camel/camel-filter-driver.c:1396
+#: ../camel/camel-filter-driver.c:1416
#, c-format
msgid "Unable to process spool folder"
msgstr "Unable to process spool folder"
-#: ../camel/camel-filter-driver.c:1419
+#: ../camel/camel-filter-driver.c:1439
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Getting message %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1450
+#: ../camel/camel-filter-driver.c:1448 ../camel/camel-filter-driver.c:1470
#, c-format
msgid "Failed on message %d"
msgstr "Failed on message %d"
-#: ../camel/camel-filter-driver.c:1469 ../camel/camel-filter-driver.c:1583
+#: ../camel/camel-filter-driver.c:1489 ../camel/camel-filter-driver.c:1603
msgid "Syncing folder"
msgstr "Syncing folder"
-#: ../camel/camel-filter-driver.c:1474 ../camel/camel-filter-driver.c:1591
+#: ../camel/camel-filter-driver.c:1494 ../camel/camel-filter-driver.c:1611
msgid "Complete"
msgstr "Complete"
-#: ../camel/camel-filter-driver.c:1537
+#: ../camel/camel-filter-driver.c:1557
#, c-format
msgid "Getting message %d of %d"
msgstr "Getting message %d of %d"
-#: ../camel/camel-filter-driver.c:1555
+#: ../camel/camel-filter-driver.c:1575
#, c-format
msgid "Failed at message %d of %d"
msgstr "Failed at message %d of %d"
-#: ../camel/camel-filter-driver.c:1751 ../camel/camel-filter-driver.c:1785
+#: ../camel/camel-filter-driver.c:1770 ../camel/camel-filter-driver.c:1797
#, c-format
msgid "Execution of filter '%s' failed: "
msgstr "Execution of filter '%s' failed: "
-#: ../camel/camel-filter-driver.c:1775
+#: ../camel/camel-filter-driver.c:1787
#, c-format
msgid "Error parsing filter '%s': %s: %s"
msgstr "Error parsing filter '%s': %s: %s"
-#: ../camel/camel-filter-driver.c:1794
+#: ../camel/camel-filter-driver.c:1806
#, c-format
msgid "Error executing filter '%s': %s: %s"
msgstr "Error executing filter '%s': %s: %s"
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:139
msgid "Failed to retrieve message"
msgstr "Failed to retrieve message"
-#: ../camel/camel-filter-search.c:537
+#: ../camel/camel-filter-search.c:513
msgid "Invalid arguments to (system-flag)"
msgstr "Invalid arguments to (system-flag)"
-#: ../camel/camel-filter-search.c:555
+#: ../camel/camel-filter-search.c:531
msgid "Invalid arguments to (user-tag)"
msgstr "Invalid arguments to (user-tag)"
-#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
+#: ../camel/camel-filter-search.c:1043
+msgid "Invalid arguments to (message-location)"
+msgstr "Invalid arguments to (message-location)"
+
+#: ../camel/camel-filter-search.c:1124 ../camel/camel-filter-search.c:1135
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Error executing filter search: %s: %s"
-#: ../camel/camel-folder.c:291
+#: ../camel/camel-folder.c:327
#, c-format
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "Learning new spam message in '%s'"
-msgstr[1] "Learning new spam messages in '%s'"
+msgid "Learning new spam message in '%s : %s'"
+msgid_plural "Learning new spam messages in '%s : %s'"
+msgstr[0] "Learning new spam message in '%s : %s'"
+msgstr[1] "Learning new spam messages in '%s : %s'"
-#: ../camel/camel-folder.c:331
+#: ../camel/camel-folder.c:370
#, c-format
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "Learning new ham message in '%s'"
-msgstr[1] "Learning new ham messages in '%s'"
+msgid "Learning new ham message in '%s : %s'"
+msgid_plural "Learning new ham messages in '%s : %s'"
+msgstr[0] "Learning new ham message in '%s : %s'"
+msgstr[1] "Learning new ham messages in '%s : %s'"
-#: ../camel/camel-folder.c:379
+#: ../camel/camel-folder.c:421
#, c-format
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "Filtering new message in '%s'"
-msgstr[1] "Filtering new messages in '%s'"
+msgid "Filtering new message in '%s : %s'"
+msgid_plural "Filtering new messages in '%s : %s'"
+msgstr[0] "Filtering new message in '%s : %s'"
+msgstr[1] "Filtering new messages in '%s : %s'"
-#: ../camel/camel-folder.c:953
-#: ../camel/providers/local/camel-maildir-folder.c:321
+#: ../camel/camel-folder.c:1029
+#: ../camel/providers/local/camel-maildir-folder.c:330
msgid "Moving messages"
msgstr "Moving messages"
-#: ../camel/camel-folder.c:956
+#: ../camel/camel-folder.c:1032
msgid "Copying messages"
msgstr "Copying messages"
-#: ../camel/camel-folder.c:1276
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:1077
#, c-format
-msgid "Quota information not supported for folder '%s'"
-msgstr "Quota information not supported for folder '%s'"
+msgid "Quota information not supported for folder '%s : %s'"
+msgstr "Quota information not supported for folder '%s : %s'"
-#: ../camel/camel-folder.c:3509
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:1176
#, c-format
-msgid "Expunging folder '%s'"
-msgstr "Expunging folder '%s'"
+msgid "Filtering folder '%s : %s'"
+msgstr "Filtering folder '%s : %s'"
-#: ../camel/camel-folder.c:3741
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:2916
#, c-format
-msgid "Retrieving message '%s' in %s"
-msgstr "Retrieving message '%s' in %s"
+msgid "Expunging folder '%s : %s'"
+msgstr "Expunging folder '%s : %s'"
-#: ../camel/camel-folder.c:3892
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:3050
#, c-format
-msgid "Retrieving quota information for '%s'"
-msgstr "Retrieving quota information for '%s'"
+msgid "Retrieving message '%s' in '%s : %s'"
+msgstr "Retrieving message '%s' in '%s : %s'"
-#: ../camel/camel-folder.c:4124
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:3243
#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Refreshing folder '%s'"
+msgid "Retrieving quota information for '%s : %s'"
+msgstr "Retrieving quota information for '%s : %s'"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:3541
+#, c-format
+msgid "Refreshing folder '%s : %s'"
+msgstr "Refreshing folder '%s : %s'"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:838 ../camel/camel-folder-search.c:881
+#: ../camel/camel-folder-search.c:845 ../camel/camel-folder-search.c:887
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) requires a single bool result"
#. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:916
+#: ../camel/camel-folder-search.c:922
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) not allowed inside %s"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:923 ../camel/camel-folder-search.c:931
+#: ../camel/camel-folder-search.c:929 ../camel/camel-folder-search.c:937
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) requires a match type string"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:959
+#: ../camel/camel-folder-search.c:965
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) expects an array result"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:969
+#: ../camel/camel-folder-search.c:975
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) requires the folder set"
-#: ../camel/camel-folder-search.c:1862 ../camel/camel-folder-search.c:2029
+#: ../camel/camel-folder-search.c:1887 ../camel/camel-folder-search.c:2056
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -2090,7 +2187,7 @@ msgstr ""
"Cannot parse search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:1874 ../camel/camel-folder-search.c:2041
+#: ../camel/camel-folder-search.c:1899 ../camel/camel-folder-search.c:2068
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -2099,18 +2196,34 @@ msgstr ""
"Error executing search expression: %s:\n"
"%s"
-#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696
-#: ../camel/camel-gpg-context.c:1359
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder-summary.c:2171
+#, c-format
+msgid "Release unused memory for folder '%s : %s'"
+msgstr "Release unused memory for folder '%s : %s'"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder-summary.c:2390
+#, c-format
+msgid "Update preview data for folder '%s : %s'"
+msgstr "Update preview data for folder '%s : %s'"
+
+#: ../camel/camel-gpg-context.c:819 ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:1514
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Failed to execute gpg: %s"
-#: ../camel/camel-gpg-context.c:696
-#: ../camel/providers/smtp/camel-smtp-transport.c:926
+#: ../camel/camel-gpg-context.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:1131
msgid "Unknown"
msgstr "Unknown"
-#: ../camel/camel-gpg-context.c:761
+#: ../camel/camel-gpg-context.c:936
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -2121,17 +2234,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:972
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "Failed to parse gpg userid hint."
-#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:997 ../camel/camel-gpg-context.c:1012
#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "Failed to parse gpg passphrase request."
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:1033
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -2140,7 +2253,7 @@ msgstr ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:1037
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -2149,12 +2262,12 @@ msgstr ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
-#: ../camel/camel-gpg-context.c:868
+#: ../camel/camel-gpg-context.c:1043
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Unexpected request from GnuPG for '%s'"
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:1055
msgid ""
"Note the encrypted content doesn't contain information about a recipient, "
"thus there will be a password prompt for each of stored private key."
@@ -2162,551 +2275,288 @@ msgstr ""
"Note the encrypted content doesn't contain information about a recipient, "
"thus there will be a password prompt for each of stored private key."
-#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523
-#: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:388
-#: ../libedataserver/e-client.c:152
+#: ../camel/camel-gpg-context.c:1086 ../camel/camel-net-utils.c:524
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../libedataserver/e-client.c:163
#, c-format
msgid "Cancelled"
msgstr "Cancelled"
-#: ../camel/camel-gpg-context.c:932
+#: ../camel/camel-gpg-context.c:1107
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "Failed to unlock secret key: 3 bad passphrases given."
-#: ../camel/camel-gpg-context.c:945
+#: ../camel/camel-gpg-context.c:1120
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Unexpected response from GnuPG: %s"
-#: ../camel/camel-gpg-context.c:1076
+#: ../camel/camel-gpg-context.c:1234
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "Failed to encrypt: No valid recipients specified."
-#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846
+#: ../camel/camel-gpg-context.c:1943 ../camel/camel-smime-context.c:843
msgid "Could not generate signing data: "
msgstr "Could not generate signing data: "
-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879
-#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136
-#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284
+#: ../camel/camel-gpg-context.c:1994 ../camel/camel-gpg-context.c:2230
+#: ../camel/camel-gpg-context.c:2346 ../camel/camel-gpg-context.c:2522
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
-#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762
-#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790
-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
-#: ../camel/camel-smime-context.c:996
+#: ../camel/camel-gpg-context.c:2100 ../camel/camel-gpg-context.c:2108
+#: ../camel/camel-gpg-context.c:2116 ../camel/camel-gpg-context.c:2136
+#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
+#: ../camel/camel-smime-context.c:995
#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1832
+#: ../camel/camel-gpg-context.c:2182
msgid "Cannot verify message signature: "
msgstr "Cannot verify message signature: "
-#: ../camel/camel-gpg-context.c:1955
+#: ../camel/camel-gpg-context.c:2311
msgid "Could not generate encrypting data: "
msgstr "Could not generate encrypting data: "
-#: ../camel/camel-gpg-context.c:2008
+#: ../camel/camel-gpg-context.c:2386
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075
-#: ../camel/camel-gpg-context.c:2098
+#: ../camel/camel-gpg-context.c:2445 ../camel/camel-gpg-context.c:2454
+#: ../camel/camel-gpg-context.c:2477
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Cannot decrypt message: Incorrect message format"
-#: ../camel/camel-gpg-context.c:2086
+#: ../camel/camel-gpg-context.c:2465
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Failed to decrypt MIME part: protocol error"
-#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1287
-msgid "Encrypted content"
-msgstr "Encrypted content"
-
-#: ../camel/camel-imapx-folder.c:710
-#, c-format
-msgid "No quota information available for folder '%s'"
-msgstr "No quota information available for folder '%s'"
-
-#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882
-#, c-format
-msgid "No destination folder specified"
-msgstr "No destination folder specified"
-
-#: ../camel/camel-imapx-folder.c:828
-msgid "Unable to move junk messages"
-msgstr "Unable to move junk messages"
-
-#: ../camel/camel-imapx-folder.c:901
-msgid "Unable to move deleted messages"
-msgstr "Unable to move deleted messages"
-
-#: ../camel/camel-imapx-folder.c:1119
-#: ../camel/providers/nntp/camel-nntp-folder.c:738
-msgid "Apply message _filters to this folder"
-msgstr "Apply message _filters to this folder"
-
-#: ../camel/camel-imapx-folder.c:1228
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Could not create folder summary for %s"
-
-#: ../camel/camel-imapx-folder.c:1236
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "Could not create cache for %s: "
-
-#: ../camel/camel-imapx-server.c:1279
-msgid "Server disconnected"
-msgstr "Server disconnected"
-
-#: ../camel/camel-imapx-server.c:1787
-msgid "Error writing to cache stream"
-msgstr "Error writing to cache stream"
-
-#: ../camel/camel-imapx-server.c:2994
-#, c-format
-msgid "Not authenticated"
-msgstr "Not authenticated"
-
-#: ../camel/camel-imapx-server.c:3072
-msgid "Error performing IDLE"
-msgstr "Error performing IDLE"
-
-#: ../camel/camel-imapx-server.c:4029
-#, 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/camel-imapx-server.c:4030
-#: ../camel/providers/smtp/camel-smtp-transport.c:208
-msgid "STARTTLS not supported"
-msgstr "STARTTLS not supported"
-
-#: ../camel/camel-imapx-server.c:4069
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "Failed to connect to IMAP server %s in secure mode: "
-
-#: ../camel/camel-imapx-server.c:4149
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP server %s does not support %s authentication"
-
-#: ../camel/camel-imapx-server.c:4160 ../camel/camel-session.c:495
-#: ../camel/providers/pop3/camel-pop3-store.c:272
-#: ../camel/providers/pop3/camel-pop3-store.c:654
-#: ../camel/providers/smtp/camel-smtp-transport.c:517
-#, c-format
-msgid "No support for %s authentication"
-msgstr "No support for %s authentication"
-
-#: ../camel/camel-imapx-server.c:4179
-#: ../camel/providers/nntp/camel-nntp-store.c:362
-#: ../camel/providers/nntp/camel-nntp-store.c:562
-msgid "Cannot authenticate without a username"
-msgstr "Cannot authenticate without a username"
-
-#: ../camel/camel-imapx-server.c:4188
-#: ../camel/providers/nntp/camel-nntp-store.c:571
-#: ../camel/providers/pop3/camel-pop3-store.c:579
-#: ../camel/providers/pop3/camel-pop3-store.c:599
-msgid "Authentication password not available"
-msgstr "Authentication password not available"
-
-#: ../camel/camel-imapx-server.c:4396
-msgid "Error fetching message"
-msgstr "Error fetching message"
-
-#: ../camel/camel-imapx-server.c:4478
-msgid "Failed to copy the tmp file"
-msgstr "Failed to copy the tmp file"
-
-#: ../camel/camel-imapx-server.c:4492
-msgid "Failed to close the tmp stream"
-msgstr "Failed to close the tmp stream"
-
-#: ../camel/camel-imapx-server.c:4613
-msgid "Error copying messages"
-msgstr "Error copying messages"
-
-#: ../camel/camel-imapx-server.c:4779
-msgid "Error appending message"
-msgstr "Error appending message"
-
-#: ../camel/camel-imapx-server.c:4978
-msgid "Error fetching message headers"
-msgstr "Error fetching message headers"
-
-#: ../camel/camel-imapx-server.c:5129
-msgid "Error retrieving message"
-msgstr "Error retrieving message"
-
-#: ../camel/camel-imapx-server.c:5260 ../camel/camel-imapx-server.c:5488
-#, c-format
-msgid "Fetching summary information for new messages in '%s'"
-msgstr "Fetching summary information for new messages in '%s'"
-
-#: ../camel/camel-imapx-server.c:5324
-#, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "Scanning for changed messages in '%s'"
-
-#: ../camel/camel-imapx-server.c:5377
-msgid "Error fetching new messages"
-msgstr "Error fetching new messages"
-
-#: ../camel/camel-imapx-server.c:5590
-msgid "Error while fetching messages"
-msgstr "Error while fetching messages"
-
-#: ../camel/camel-imapx-server.c:5598 ../camel/camel-imapx-server.c:5631
-#, c-format
-msgid "Fetching summary information for %d message in '%s'"
-msgid_plural "Fetching summary information for %d messages in '%s'"
-msgstr[0] "Fetching summary information for %d message in '%s'"
-msgstr[1] "Fetching summary information for %d messages in '%s'"
-
-#: ../camel/camel-imapx-server.c:5767 ../camel/camel-imapx-server.c:5797
-msgid "Error refreshing folder"
-msgstr "Error refreshing folder"
-
-#: ../camel/camel-imapx-server.c:5921
-msgid "Error expunging message"
-msgstr "Error expunging message"
-
-#: ../camel/camel-imapx-server.c:6032
-msgid "Error fetching folders"
-msgstr "Error fetching folders"
-
-#: ../camel/camel-imapx-server.c:6114
-msgid "Error subscribing to folder"
-msgstr "Error subscribing to folder"
-
-#: ../camel/camel-imapx-server.c:6179
-msgid "Error creating folder"
-msgstr "Error creating folder"
-
-#: ../camel/camel-imapx-server.c:6233
-msgid "Error deleting folder"
-msgstr "Error deleting folder"
-
-#: ../camel/camel-imapx-server.c:6307
-msgid "Error renaming folder"
-msgstr "Error renaming folder"
-
-#: ../camel/camel-imapx-server.c:6382
-msgid "Error retrieving quota information"
-msgstr "Error retrieving quota information"
-
-#: ../camel/camel-imapx-server.c:6447
-msgid "Search failed"
-msgstr "Search failed"
-
-#: ../camel/camel-imapx-server.c:6510
-msgid "Error performing NOOP"
-msgstr "Error performing NOOP"
-
-#: ../camel/camel-imapx-server.c:6619
-msgid "Error syncing changes"
-msgstr "Error syncing changes"
-
-#: ../camel/camel-imapx-server.c:7431
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "Cannot get message with message ID %s: %s"
-
-#: ../camel/camel-imapx-server.c:7432
-msgid "No such message available."
-msgstr "No such message available."
-
-#: ../camel/camel-imapx-server.c:7590 ../camel/camel-imapx-server.c:7605
-msgid "Cannot create spool file: "
-msgstr "Cannot create spool file: "
-
-#: ../camel/camel-imapx-server.c:8347
-msgid "IMAP server does not support quotas"
-msgstr "IMAP server does not support quotas"
-
-#: ../camel/camel-imapx-store.c:249
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: ../camel/camel-imapx-store.c:252
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP service for %s on %s"
-
-#: ../camel/camel-imapx-store.c:343
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
-msgid "Password"
-msgstr "Password"
-
-#: ../camel/camel-imapx-store.c:345
-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/camel-imapx-store.c:453
-#, c-format
-msgid "No such folder %s"
-msgstr "No such folder %s"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:478 ../camel/camel-imapx-store.c:968
-#: ../camel/providers/local/camel-maildir-folder.c:473
-#: ../camel/providers/local/camel-maildir-store.c:316
-#: ../camel/providers/local/camel-maildir-store.c:750
-#: ../camel/providers/local/camel-maildir-store.c:756
-#: ../camel/providers/local/camel-maildir-store.c:840
-#: ../camel/providers/local/camel-spool-store.c:393
-msgid "Inbox"
-msgstr "Inbox"
-
-#: ../camel/camel-imapx-store.c:1212
-#, c-format
-msgid "Retrieving folder list for %s"
-msgstr "Retrieving folder list for %s"
-
-#: ../camel/camel-imapx-store.c:1595
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#: ../camel/camel-imapx-store.c:1606
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Unknown parent folder: %s"
-
-#: ../camel/camel-imapx-store.c:1616
+#: ../camel/camel-gpg-context.c:2532
#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "The parent folder is not allowed to contain subfolders"
+msgid "Failed to decrypt MIME part: Secret key not found"
+msgstr "Failed to decrypt MIME part: Secret key not found"
-#: ../camel/camel-imapx-stream.c:98
-#, c-format
-msgid "Source stream returned no data"
-msgstr "Source stream returned no data"
+#: ../camel/camel-gpg-context.c:2568 ../camel/camel-smime-context.c:1288
+msgid "Encrypted content"
+msgstr "Encrypted content"
-#: ../camel/camel-imapx-stream.c:107
-#, c-format
-msgid "Source stream unavailable"
-msgstr "Source stream unavailable"
+#: ../camel/camel-junk-filter.c:167
+msgid "Synchronizing junk database"
+msgstr "Synchronising junk database"
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-lock.c:110
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "Could not create lock file for %s: %s"
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-lock.c:153
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr "Timed out trying to get lock file on %s. Try again later."
-#: ../camel/camel-lock.c:205
+#: ../camel/camel-lock.c:215
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "Failed to get lock using fcntl(2): %s"
-#: ../camel/camel-lock.c:272
+#: ../camel/camel-lock.c:282
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "Failed to get lock using flock(2): %s"
-#: ../camel/camel-lock-client.c:106
+#: ../camel/camel-lock-client.c:107
#, c-format
msgid "Cannot build locking helper pipe: %s"
msgstr "Cannot build locking helper pipe: %s"
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-lock-client.c:131
#, c-format
msgid "Cannot fork locking helper: %s"
msgstr "Cannot fork locking helper: %s"
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
msgstr "Could not lock '%s': protocol error with lock-helper"
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:234
#, c-format
msgid "Could not lock '%s'"
msgstr "Could not lock '%s'"
-#: ../camel/camel-movemail.c:105
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Could not check mail file %s: %s"
-
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:101
#, c-format
msgid "Could not open mail file %s: %s"
msgstr "Could not open mail file %s: %s"
-#: ../camel/camel-movemail.c:129
+#: ../camel/camel-movemail.c:121
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Could not check mail file %s: %s"
+
+#: ../camel/camel-movemail.c:136
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "Could not open temporary mail file %s: %s"
-#: ../camel/camel-movemail.c:159
+#: ../camel/camel-movemail.c:166
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "Failed to store mail in temp file %s: %s"
-#: ../camel/camel-movemail.c:193
+#: ../camel/camel-movemail.c:200
#, c-format
msgid "Could not create pipe: %s"
msgstr "Could not create pipe: %s"
-#: ../camel/camel-movemail.c:207
+#: ../camel/camel-movemail.c:214
#, c-format
msgid "Could not fork: %s"
msgstr "Could not fork: %s"
-#: ../camel/camel-movemail.c:245
+#: ../camel/camel-movemail.c:252
#, c-format
msgid "Movemail program failed: %s"
msgstr "Movemail program failed: %s"
-#: ../camel/camel-movemail.c:246
+#: ../camel/camel-movemail.c:253
msgid "(Unknown error)"
msgstr "(Unknown error)"
-#: ../camel/camel-movemail.c:273
+#: ../camel/camel-movemail.c:280
#, c-format
msgid "Error reading mail file: %s"
msgstr "Error reading mail file: %s"
-#: ../camel/camel-movemail.c:286
+#: ../camel/camel-movemail.c:293
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "Error writing mail temp file: %s"
-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
+#: ../camel/camel-movemail.c:500 ../camel/camel-movemail.c:569
#, c-format
msgid "Error copying mail temp file: %s"
msgstr "Error copying mail temp file: %s"
-#: ../camel/camel-multipart-signed.c:297
+#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432
#, c-format
msgid "No content available"
msgstr "No content available"
-#: ../camel/camel-multipart-signed.c:305
+#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440
#, c-format
msgid "No signature available"
msgstr "No signature available"
-#: ../camel/camel-multipart-signed.c:689
+#: ../camel/camel-multipart-signed.c:806
#, c-format
msgid "parse error"
msgstr "parse error"
-#: ../camel/camel-net-utils.c:703
+#: ../camel/camel-net-utils.c:708
#, c-format
msgid "Resolving: %s"
msgstr "Resolving: %s"
-#: ../camel/camel-net-utils.c:726
+#: ../camel/camel-net-utils.c:733
msgid "Host lookup failed"
msgstr "Host lookup failed"
-#: ../camel/camel-net-utils.c:732
+#: ../camel/camel-net-utils.c:739
#, c-format
msgid "Host lookup '%s' failed. Check your host name for spelling errors."
msgstr "Host lookup '%s' failed. Check your host name for spelling errors."
-#: ../camel/camel-net-utils.c:736
+#: ../camel/camel-net-utils.c:743
#, c-format
msgid "Host lookup '%s' failed: %s"
msgstr "Host lookup '%s' failed: %s"
-#: ../camel/camel-net-utils.c:857
-msgid "Resolving address"
-msgstr "Resolving address"
-
-#: ../camel/camel-net-utils.c:878
-msgid "Name lookup failed"
-msgstr "Name lookup failed"
-
-#: ../camel/camel-net-utils.c:885
-msgid "Name lookup failed. Check your host name for spelling errors."
-msgstr "Name lookup failed. Check your host name for spelling errors."
-
-#: ../camel/camel-net-utils.c:889
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-offline-folder.c:96
#, c-format
-msgid "Name lookup failed: %s"
-msgstr "Name lookup failed: %s"
+msgid "Downloading new messages for offline mode in '%s : %s'"
+msgstr "Downloading new messages for offline mode in '%s : %s'"
-#: ../camel/camel-network-service.c:350
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-offline-folder.c:167
#, c-format
-msgid "Could not connect to '%s:%s': "
-msgstr "Could not connect to '%s:%s': "
+msgid "Storing changes in folder '%s : %s'"
+msgstr "Storing changes in folder '%s : %s'"
-#: ../camel/camel-offline-folder.c:212
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-offline-folder.c:257
#, c-format
-msgid "Syncing messages in folder '%s' to disk"
-msgstr "Syncing messages in folder '%s' to disk"
+msgid "Checking download of new messages for offline in '%s : %s'"
+msgstr "Checking download of new messages for offline in '%s : %s'"
-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-offline-folder.c:373
#, c-format
-msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "Cannot write offline journal for folder '%s': %s"
+msgid "Syncing messages in folder '%s : %s' to disk"
+msgstr "Syncing messages in folder '%s : %s' to disk"
+
+#: ../camel/camel-offline-folder.c:436
+msgid "Copy folder content locally for _offline operation"
+msgstr "Copy folder content locally for _offline operation"
-#: ../camel/camel-provider.c:58
+#: ../camel/camel-provider.c:55
msgid "Virtual folder email provider"
msgstr "Virtual folder e-mail provider"
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:57
msgid "For reading mail as a query of another set of folders"
msgstr "For reading mail as a query of another set of folders"
-#: ../camel/camel-provider.c:263
+#: ../camel/camel-provider.c:260
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "Could not load %s: Module loading not supported on this system."
-#: ../camel/camel-provider.c:272
+#: ../camel/camel-provider.c:269
#, c-format
msgid "Could not load %s: %s"
msgstr "Could not load %s: %s"
-#: ../camel/camel-provider.c:281
+#: ../camel/camel-provider.c:278
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "Could not load %s: No initialisation code in module."
-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:407
+#: ../camel/camel-provider.c:424 ../camel/camel-session.c:436
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "No provider available for protocol '%s'"
-#: ../camel/camel-sasl-anonymous.c:35
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-sasl-anonymous.c:32
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
msgid "Anonymous"
msgstr "Anonymous"
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:34
msgid "This option will connect to the server using an anonymous login."
msgstr "This option will connect to the server using an anonymous login."
-#: ../camel/camel-sasl-anonymous.c:70
+#: ../camel/camel-sasl-anonymous.c:67
#, c-format
msgid "Authentication failed."
msgstr "Authentication failed."
-#: ../camel/camel-sasl-anonymous.c:81
+#: ../camel/camel-sasl-anonymous.c:78
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -2715,7 +2565,7 @@ msgstr ""
"Invalid e-mail address trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:95
+#: ../camel/camel-sasl-anonymous.c:92
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -2724,7 +2574,7 @@ msgstr ""
"Invalid opaque trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:109
+#: ../camel/camel-sasl-anonymous.c:106
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -2733,11 +2583,11 @@ msgstr ""
"Invalid trace information:\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:46
+#: ../camel/camel-sasl-cram-md5.c:43
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:48
+#: ../camel/camel-sasl-cram-md5.c:45
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
@@ -2745,11 +2595,11 @@ msgstr ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
-#: ../camel/camel-sasl-digest-md5.c:59
+#: ../camel/camel-sasl-digest-md5.c:56
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:61
+#: ../camel/camel-sasl-digest-md5.c:58
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -2757,46 +2607,51 @@ msgstr ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
-#: ../camel/camel-sasl-digest-md5.c:855
+#: ../camel/camel-sasl-digest-md5.c:854
#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "Server challenge too long (>2048 octets)"
-#: ../camel/camel-sasl-digest-md5.c:866
+#: ../camel/camel-sasl-digest-md5.c:865
#, c-format
msgid "Server challenge invalid\n"
msgstr "Server challenge invalid\n"
-#: ../camel/camel-sasl-digest-md5.c:874
+#: ../camel/camel-sasl-digest-md5.c:873
#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "Server challenge contained invalid \"Quality of Protection\" token"
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:906
#, c-format
msgid "Server response did not contain authorization data"
msgstr "Server response did not contain authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:928
+#: ../camel/camel-sasl-digest-md5.c:927
#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "Server response contained incomplete authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:941
+#: ../camel/camel-sasl-digest-md5.c:940
#, c-format
msgid "Server response does not match"
msgstr "Server response does not match"
-#: ../camel/camel-sasl-gssapi.c:91
+#: ../camel/camel-sasl-gssapi.c:94
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:93
+#: ../camel/camel-sasl-gssapi.c:96
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:134
+#: ../camel/camel-sasl-gssapi.c:148
+#, c-format
+msgid "(Unknown GSSAPI mechanism code: %x)"
+msgstr "(Unknown GSSAPI mechanism code: %x)"
+
+#: ../camel/camel-sasl-gssapi.c:181
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
@@ -2804,11 +2659,11 @@ msgstr ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognised by the implementation."
-#: ../camel/camel-sasl-gssapi.c:139
+#: ../camel/camel-sasl-gssapi.c:186
msgid "The provided target_name parameter was ill-formed."
msgstr "The provided target_name parameter was ill-formed."
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:189
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
@@ -2816,7 +2671,7 @@ msgstr ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:193
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
@@ -2824,7 +2679,7 @@ msgstr ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:198
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
@@ -2832,7 +2687,7 @@ msgstr ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:202
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
@@ -2840,52 +2695,52 @@ msgstr ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:207
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:163
+#: ../camel/camel-sasl-gssapi.c:210
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:166
+#: ../camel/camel-sasl-gssapi.c:213
msgid "The consistency checks performed on the credential failed."
msgstr "The consistency checks performed on the credential failed."
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:216
msgid "The referenced credentials have expired."
msgstr "The referenced credentials have expired."
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
-#: ../camel/providers/smtp/camel-smtp-transport.c:624
+#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
+#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
#, c-format
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
-#: ../camel/camel-sasl-gssapi.c:417
+#: ../camel/camel-sasl-gssapi.c:482
#, c-format
msgid "Unsupported security layer."
msgstr "Unsupported security layer."
-#: ../camel/camel-sasl-login.c:40
+#: ../camel/camel-sasl-login.c:37
msgid "Login"
msgstr "Login"
-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
+#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
msgid "This option will connect to the server using a simple password."
msgstr "This option will connect to the server using a simple password."
-#: ../camel/camel-sasl-login.c:110
+#: ../camel/camel-sasl-login.c:107
#, c-format
msgid "Unknown authentication state."
msgstr "Unknown authentication state."
-#: ../camel/camel-sasl-ntlm.c:47
+#: ../camel/camel-sasl-ntlm.c:46
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:49
+#: ../camel/camel-sasl-ntlm.c:48
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
@@ -2893,464 +2748,474 @@ msgstr ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
-#: ../camel/camel-sasl-plain.c:44
+#: ../camel/camel-sasl-plain.c:41
msgid "PLAIN"
msgstr "PLAIN"
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:43
msgid "POP before SMTP"
msgstr "POP before SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:45
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "This option will authorise a POP connection before attempting SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:84
+#: ../camel/camel-sasl-popb4smtp.c:83
msgid "POP Source UID"
msgstr "POP Source UID"
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:97
#, c-format
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "POP Before SMTP authentication using an unknown transport"
-#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119
+#: ../camel/camel-sasl-popb4smtp.c:109 ../camel/camel-sasl-popb4smtp.c:118
#, c-format
msgid "POP Before SMTP authentication attempted with a %s service"
msgstr "POP Before SMTP authentication attempted with a %s service"
-#: ../camel/camel-search-private.c:116
+#: ../camel/camel-search-private.c:113
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "Regular expression compilation failed: %s: %s"
-#: ../camel/camel-session.c:416
+#: ../camel/camel-session.c:445
#, c-format
msgid "Invalid GType registered for protocol '%s'"
msgstr "Invalid GType registered for protocol '%s'"
-#: ../camel/camel-session.c:510
+#: ../camel/camel-session.c:514
+#: ../camel/providers/imapx/camel-imapx-server.c:2990
+#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:790
+#: ../camel/providers/smtp/camel-smtp-transport.c:672
+#, c-format
+msgid "No support for %s authentication"
+msgstr "No support for %s authentication"
+
+#: ../camel/camel-session.c:529
#, c-format
msgid "%s authentication failed"
msgstr "%s authentication failed"
-#: ../camel/camel-session.c:646
+#: ../camel/camel-session.c:598
msgid "Forwarding messages is not supported"
msgstr "Forwarding messages is not supported"
-#. Translators: The first argument is the account type
-#. * (e.g. "IMAP"), the second is the user name, and the
-#. * third is the host name.
-#: ../camel/camel-session.c:1423
-#, c-format
-msgid "Please enter the %s password for %s on host %s."
-msgstr "Please enter the %s password for %s on host %s."
-
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Cannot find certificate for '%s'"
-#: ../camel/camel-smime-context.c:379
+#: ../camel/camel-smime-context.c:376
msgid "Cannot create CMS message"
msgstr "Cannot create CMS message"
-#: ../camel/camel-smime-context.c:384
+#: ../camel/camel-smime-context.c:381
msgid "Cannot create CMS signed data"
msgstr "Cannot create CMS signed data"
-#: ../camel/camel-smime-context.c:390
+#: ../camel/camel-smime-context.c:387
msgid "Cannot attach CMS signed data"
msgstr "Cannot attach CMS signed data"
-#: ../camel/camel-smime-context.c:397
+#: ../camel/camel-smime-context.c:394
msgid "Cannot attach CMS data"
msgstr "Cannot attach CMS data"
-#: ../camel/camel-smime-context.c:403
+#: ../camel/camel-smime-context.c:400
msgid "Cannot create CMS Signer information"
msgstr "Cannot create CMS Signer information"
-#: ../camel/camel-smime-context.c:409
+#: ../camel/camel-smime-context.c:406
msgid "Cannot find certificate chain"
msgstr "Cannot find certificate chain"
-#: ../camel/camel-smime-context.c:415
+#: ../camel/camel-smime-context.c:412
msgid "Cannot add CMS Signing time"
msgstr "Cannot add CMS Signing time"
-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "Encryption certificate for '%s' does not exist"
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:458
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "Cannot add SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:466
+#: ../camel/camel-smime-context.c:463
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:468
msgid "Cannot add encryption certificate"
msgstr "Cannot add encryption certificate"
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:474
msgid "Cannot add CMS Signer information"
msgstr "Cannot add CMS Signer information"
#. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:507
msgid "Unverified"
msgstr "Unverified"
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:509
msgid "Good signature"
msgstr "Good signature"
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:511
msgid "Bad signature"
msgstr "Bad signature"
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:513
msgid "Content tampered with or altered in transit"
msgstr "Content tampered with or altered in transit"
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:515
msgid "Signing certificate not found"
msgstr "Signing certificate not found"
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:517
msgid "Signing certificate not trusted"
msgstr "Signing certificate not trusted"
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:519
msgid "Signature algorithm unknown"
msgstr "Signature algorithm unknown"
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:521
msgid "Signature algorithm unsupported"
msgstr "Signature algorithm unsupported"
-#: ../camel/camel-smime-context.c:526
+#: ../camel/camel-smime-context.c:523
msgid "Malformed signature"
msgstr "Malformed signature"
-#: ../camel/camel-smime-context.c:528
+#: ../camel/camel-smime-context.c:525
msgid "Processing error"
msgstr "Processing error"
-#: ../camel/camel-smime-context.c:573
+#: ../camel/camel-smime-context.c:570
msgid "No signed data in signature"
msgstr "No signed data in signature"
-#: ../camel/camel-smime-context.c:578
+#: ../camel/camel-smime-context.c:575
msgid "Digests missing from enveloped data"
msgstr "Digests missing from enveloped data"
-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
msgid "Cannot calculate digests"
msgstr "Cannot calculate digests"
-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
+#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
msgid "Cannot set message digests"
msgstr "Cannot set message digests"
-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
+#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
msgid "Certificate import failed"
msgstr "Certificate import failed"
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:635
#, 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:641
+#: ../camel/camel-smime-context.c:638
#, 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:645
+#: ../camel/camel-smime-context.c:642
msgid "Cannot find signature digests"
msgstr "Cannot find signature digests"
-#: ../camel/camel-smime-context.c:662
+#: ../camel/camel-smime-context.c:659
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "Signer: %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1149
msgid "Cannot create encoder context"
msgstr "Cannot create encoder context"
-#: ../camel/camel-smime-context.c:864
+#: ../camel/camel-smime-context.c:861
msgid "Failed to add data to CMS encoder"
msgstr "Failed to add data to CMS encoder"
-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:866 ../camel/camel-smime-context.c:1166
msgid "Failed to encode data"
msgstr "Failed to encode data"
-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262
+#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
msgid "Decoder failed"
msgstr "Decoder failed"
-#: ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:1083
msgid "Cannot find common bulk encryption algorithm"
msgstr "Cannot find common bulk encryption algorithm"
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1091
msgid "Cannot allocate slot for encryption bulk key"
msgstr "Cannot allocate slot for encryption bulk key"
-#: ../camel/camel-smime-context.c:1101
+#: ../camel/camel-smime-context.c:1102
msgid "Cannot create CMS Message"
msgstr "Cannot create CMS Message"
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1108
msgid "Cannot create CMS Enveloped data"
msgstr "Cannot create CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1113
+#: ../camel/camel-smime-context.c:1114
msgid "Cannot attach CMS Enveloped data"
msgstr "Cannot attach CMS Enveloped data"
-#: ../camel/camel-smime-context.c:1119
+#: ../camel/camel-smime-context.c:1120
msgid "Cannot attach CMS data object"
msgstr "Cannot attach CMS data object"
-#: ../camel/camel-smime-context.c:1128
+#: ../camel/camel-smime-context.c:1129
msgid "Cannot create CMS Recipient information"
msgstr "Cannot create CMS Recipient information"
-#: ../camel/camel-smime-context.c:1133
+#: ../camel/camel-smime-context.c:1134
msgid "Cannot add CMS Recipient information"
msgstr "Cannot add CMS Recipient information"
-#: ../camel/camel-smime-context.c:1159
+#: ../camel/camel-smime-context.c:1160
msgid "Failed to add data to encoder"
msgstr "Failed to add data to encoder"
-#: ../camel/camel-smime-context.c:1269
+#: ../camel/camel-smime-context.c:1270
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: No encrypted content found"
-#: ../camel/camel-store.c:1871
-#, c-format
-msgid "Cannot create folder '%s': folder exists"
-msgstr "Cannot create folder '%s': folder exists"
-
-#: ../camel/camel-store.c:1914
+#: ../camel/camel-store.c:1284
#, c-format
msgid "Opening folder '%s'"
msgstr "Opening folder '%s'"
-#: ../camel/camel-store.c:2099
+#: ../camel/camel-store.c:1578
#, c-format
msgid "Scanning folders in '%s'"
msgstr "Scanning folders in '%s'"
-#: ../camel/camel-store.c:2115 ../camel/camel-store.c:2146
-#: ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1606 ../camel/camel-store.c:1651
+#: ../camel/camel-vtrash-folder.c:45
msgid "Trash"
msgstr "Wastebasket"
-#: ../camel/camel-store.c:2127 ../camel/camel-store.c:2162
-#: ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:1620 ../camel/camel-store.c:1668
+#: ../camel/camel-vtrash-folder.c:47
msgid "Junk"
msgstr "Junk"
-#: ../camel/camel-store.c:2615
+#: ../camel/camel-store.c:2269
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Cannot create folder: %s: folder exists"
-#: ../camel/camel-store.c:2629
+#: ../camel/camel-store.c:2276
#, c-format
msgid "Creating folder '%s'"
msgstr "Creating folder '%s'"
-#: ../camel/camel-store.c:2747 ../camel/camel-vee-store.c:416
-#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/camel-store.c:2453 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:346
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Cannot delete folder: %s: Invalid operation"
-#: ../camel/camel-store.c:2890 ../camel/camel-vee-store.c:466
-#: ../camel/providers/local/camel-maildir-store.c:839
+#: ../camel/camel-store.c:2643 ../camel/camel-vee-store.c:461
+#: ../camel/providers/local/camel-maildir-store.c:914
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Cannot rename folder: %s: Invalid operation"
-#: ../camel/camel-stream-filter.c:334
+#: ../camel/camel-stream.c:168
+msgid "Cannot write with no base stream"
+msgstr "Cannot write with no base stream"
+
+#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
+#, c-format
+msgid "Stream type '%s' is not seekable"
+msgstr "Stream type '%s' is not seekable"
+
+#: ../camel/camel-stream-filter.c:344
msgid "Only reset to beginning is supported with CamelStreamFilter"
msgstr "Only reset to beginning is supported with CamelStreamFilter"
-#: ../camel/camel-stream-null.c:78
+#: ../camel/camel-stream-null.c:74
msgid "Only reset to beginning is supported with CamelHttpStream"
msgstr "Only reset to beginning is supported with CamelHttpStream"
-#: ../camel/camel-stream-process.c:275
+#: ../camel/camel-stream-process.c:278
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
#, c-format
msgid "Connection cancelled"
msgstr "Connection cancelled"
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:283
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not connect with command \"%s\": %s"
-#: ../camel/camel-subscribable.c:397
+#: ../camel/camel-subscribable.c:273
#, c-format
msgid "Subscribing to folder '%s'"
msgstr "Subscribing to folder '%s'"
-#: ../camel/camel-subscribable.c:529
+#: ../camel/camel-subscribable.c:442
#, c-format
msgid "Unsubscribing from folder '%s'"
msgstr "Unsubscribing from folder '%s'"
-#: ../camel/camel-tcp-stream-raw.c:310
-#, c-format
-msgid "NSPR error code %d"
-msgstr "NSPR error code %d"
-
-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
-#, c-format
-msgid "The proxy host does not support SOCKS4"
-msgstr "The proxy host does not support SOCKS4"
-
-#: ../camel/camel-tcp-stream-raw.c:675
-#, c-format
-msgid "The proxy host denied our request: code %d"
-msgstr "The proxy host denied our request: code %d"
-
-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
-#, c-format
-msgid "The proxy host does not support SOCKS5"
-msgstr "The proxy host does not support SOCKS5"
-
-#: ../camel/camel-tcp-stream-raw.c:789
-#, c-format
-msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "Could not find a suitable authentication type: code 0x%x"
-
-#: ../camel/camel-tcp-stream-raw.c:801
-msgid "General SOCKS server failure"
-msgstr "General SOCKS server failure"
-
-#: ../camel/camel-tcp-stream-raw.c:802
-msgid "SOCKS server's rules do not allow connection"
-msgstr "SOCKS server's rules do not allow connection"
-
-#: ../camel/camel-tcp-stream-raw.c:803
-msgid "Network is unreachable from SOCKS server"
-msgstr "Network is unreachable from SOCKS server"
-
-#: ../camel/camel-tcp-stream-raw.c:804
-msgid "Host is unreachable from SOCKS server"
-msgstr "Host is unreachable from SOCKS server"
-
-#: ../camel/camel-tcp-stream-raw.c:805
-msgid "Connection refused"
-msgstr "Connection refused"
-
-#: ../camel/camel-tcp-stream-raw.c:806
-msgid "Time-to-live expired"
-msgstr "Time-to-live expired"
-
-#: ../camel/camel-tcp-stream-raw.c:807
-msgid "Command not supported by SOCKS server"
-msgstr "Command not supported by SOCKS server"
-
-#: ../camel/camel-tcp-stream-raw.c:808
-msgid "Address type not supported by SOCKS server"
-msgstr "Address type not supported by SOCKS server"
-
-#: ../camel/camel-tcp-stream-raw.c:809
-msgid "Unknown error from SOCKS server"
-msgstr "Unknown error from SOCKS server"
-
-#: ../camel/camel-tcp-stream-raw.c:842
-#, c-format
-msgid "Got unknown address type from SOCKS server"
-msgstr "Got unknown address type from SOCKS server"
-
-#: ../camel/camel-tcp-stream-raw.c:860
-#, c-format
-msgid "Incomplete reply from SOCKS server"
-msgstr "Incomplete reply from SOCKS server"
-
-#: ../camel/camel-tcp-stream-raw.c:880
-#, c-format
-msgid "Hostname is too long (maximum is 255 characters)"
-msgstr "Hostname is too long (maximum is 255 characters)"
-
-#. SOCKS5
-#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
-#, c-format
-msgid "Invalid reply from proxy server"
-msgstr "Invalid reply from proxy server"
-
-#: ../camel/camel-url.c:331
+#: ../camel/camel-url.c:327
#, c-format
msgid "Could not parse URL '%s'"
msgstr "Could not parse URL '%s'"
-#: ../camel/camel-vee-folder.c:494
+#: ../camel/camel-vee-folder.c:491
#, c-format
msgid "Updating folder '%s'"
msgstr "Updating folder '%s'"
-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
+#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:984
#, c-format
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "Cannot copy or move messages into a Virtual Folder"
-#: ../camel/camel-vee-folder.c:888
+#. Translators: The first '%s' is replaced with a message UID, the second '%s'
+#. is replaced with an account name and the third '%s' is replaced with a full
+#. path name. The spaces around ':' are intentional, as the whole '%s : %s' is
+#. meant as an absolute identification of the folder.
+#: ../camel/camel-vee-folder.c:906
#, c-format
-msgid "No such message %s in %s"
-msgstr "No such message %s in %s"
+msgid "No such message %s in '%s : %s'"
+msgstr "No such message %s in '%s : %s'"
-#: ../camel/camel-vee-folder.c:941
+#: ../camel/camel-vee-folder.c:960
#, c-format
msgid "Error storing '%s': "
msgstr "Error storing '%s': "
-#: ../camel/camel-vee-folder.c:1171
+#: ../camel/camel-vee-folder.c:1198
msgid "Automatically _update on change in source folders"
msgstr "Automatically _update on change in source folders"
#. Translators: 'Unmatched' is a folder name under Search folders where are shown
#. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:42
+#: ../camel/camel-vee-store.c:40
msgid "Unmatched"
msgstr "Unmatched"
-#: ../camel/camel-vee-store.c:442
+#: ../camel/camel-vee-store.c:436
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Cannot delete folder: %s: No such folder"
-#: ../camel/camel-vee-store.c:476
+#: ../camel/camel-vee-store.c:471
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Cannot rename folder: %s: No such folder"
-#: ../camel/camel-vee-store.c:538
+#: ../camel/camel-vee-store.c:533
msgid "Enable _Unmatched folder"
msgstr "Enable _Unmatched folder"
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vee-store.c:1030
+msgid "Updating Unmatched search folder"
+msgstr "Updating Unmatched search folder"
+
+#: ../camel/camel-vtrash-folder.c:46
msgid "Cannot copy messages to the Trash folder"
msgstr "Cannot copy messages to the Wastebasket folder"
-#: ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-vtrash-folder.c:48
msgid "Cannot copy messages to the Junk folder"
msgstr "Cannot copy messages to the Junk folder"
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:973
+#, c-format
+msgid "You must be working online to complete this operation (%s)"
+msgstr "You must be working online to complete this operation (%s)"
+
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:981
+#: ../camel/providers/imapx/camel-imapx-server.c:3123
+#: ../camel/providers/nntp/camel-nntp-store.c:353
+#: ../camel/providers/nntp/camel-nntp-store.c:1350
+#: ../camel/providers/nntp/camel-nntp-store.c:2158
+#: ../camel/providers/nntp/camel-nntp-store.c:2302
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:632
+#: ../camel/providers/pop3/camel-pop3-folder.c:834
+#: ../camel/providers/pop3/camel-pop3-folder.c:1044
+#: ../camel/providers/pop3/camel-pop3-store.c:296
+#: ../camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:672
+#: ../camel/providers/pop3/camel-pop3-store.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:543
+#, c-format
+msgid "You must be working online to complete this operation"
+msgstr "You must be working online to complete this operation"
+
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1561
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1649
+#, c-format
+msgid "No destination folder specified"
+msgstr "No destination folder specified"
+
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1588
+msgid "Unable to move junk messages"
+msgstr "Unable to move junk messages"
+
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1683
+msgid "Unable to move deleted messages"
+msgstr "Unable to move deleted messages"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/providers/imapx/camel-imapx-folder.c:705
+#, c-format
+msgid "No quota information available for folder '%s : %s'"
+msgstr "No quota information available for folder '%s : %s'"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:968
+#: ../camel/providers/nntp/camel-nntp-folder.c:765
+msgid "Apply message _filters to this folder"
+msgstr "Apply message _filters to this folder"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:979
+msgid "Always check for _new mail in this folder"
+msgstr "Always check for _new mail in this folder"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1090
+#, 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:1099
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "Could not create cache for %s: "
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/providers/imapx/camel-imapx-folder.c:1300
+#, c-format
+msgid "No IMAP mailbox available for folder '%s : %s'"
+msgstr "No IMAP mailbox available for folder '%s : %s'"
+
+#: ../camel/providers/imapx/camel-imapx-input-stream.c:101
+#, c-format
+msgid "Source stream returned no data"
+msgstr "Source stream returned no data"
+
#: ../camel/providers/imapx/camel-imapx-provider.c:38
msgid "Checking for New Mail"
msgstr "Checking for New Mail"
@@ -3372,88 +3237,448 @@ msgid "_Listen for server change notifications"
msgstr "_Listen for server change notifications"
#: ../camel/providers/imapx/camel-imapx-provider.c:49
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+msgid "Connection to Server"
+msgstr "Connection to Server"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Numbe_r of concurrent connections to use"
+msgstr "Numbe_r of concurrent connections to use"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
msgid "Folders"
msgstr "Folders"
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
msgid "_Show only subscribed folders"
msgstr "_Show only subscribed folders"
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
msgid "O_verride server-supplied folder namespace"
msgstr "O_verride server-supplied folder namespace"
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
msgid "Namespace:"
msgstr "Namespace:"
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
-#: ../camel/providers/local/camel-local-provider.c:41
-#: ../camel/providers/local/camel-local-provider.c:81
-#: ../camel/providers/local/camel-local-provider.c:101
-#: ../camel/providers/nntp/camel-nntp-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/local/camel-local-provider.c:39
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:99
+#: ../camel/providers/nntp/camel-nntp-provider.c:38
msgid "Options"
msgstr "Options"
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
-#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:40
msgid "Apply _filters to new messages in all folders"
msgstr "Apply _filters to new messages in all folders"
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "_Apply filters to new messages in Inbox on this server"
-#: ../camel/providers/imapx/camel-imapx-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
msgid "Check new messages for _Junk contents"
msgstr "Check new messages for _Junk contents"
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Only check for Junk messages in the IN_BOX folder"
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+msgid "Only check for Junk messages in the In_box folder"
+msgstr "Only check for Junk messages in the In_box folder"
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
-msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Automatically synchroni_se remote mail locally"
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "Synchroni_ze remote mail locally in all folders"
+msgstr "Synchronise remote mail locally in all folders"
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
msgid "Default IMAP port"
msgstr "Default IMAP port"
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "IMAP over SSL"
-msgstr "IMAP over SSL"
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
+msgid "IMAP over TLS"
+msgstr "IMAP over TLS"
-#: ../camel/providers/imapx/camel-imapx-provider.c:83
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapx/camel-imapx-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/local/camel-local-folder.c:194
+#: ../camel/providers/imapx/camel-imapx-server.c:1167
+msgid "Error writing to cache stream"
+msgstr "Error writing to cache stream"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2806
+#: ../camel/providers/imapx/camel-imapx-server.c:2894
+#: ../camel/providers/imapx/camel-imapx-server.c:3156
+msgid "Failed to get capabilities"
+msgstr "Failed to get capabilities"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2825
+#, 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/imapx/camel-imapx-server.c:2826
+#: ../camel/providers/smtp/camel-smtp-transport.c:281
+msgid "STARTTLS not supported"
+msgstr "STARTTLS not supported"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2835
+msgid "Failed to issue STARTTLS"
+msgstr "Failed to issue STARTTLS"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2883
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "Failed to connect to IMAP server %s in secure mode: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2977
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP server %s does not support %s authentication"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3008
+#: ../camel/providers/nntp/camel-nntp-store.c:459
+#: ../camel/providers/nntp/camel-nntp-store.c:601
+msgid "Cannot authenticate without a username"
+msgstr "Cannot authenticate without a username"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3017
+#: ../camel/providers/nntp/camel-nntp-store.c:610
+#: ../camel/providers/pop3/camel-pop3-store.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:728
+msgid "Authentication password not available"
+msgstr "Authentication password not available"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3025
+msgid "Failed to authenticate"
+msgstr "Failed to authenticate"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3178
+msgid "Failed to issue NAMESPACE"
+msgstr "Failed to issue NAMESPACE"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3196
+msgid "Failed to enable QResync"
+msgstr "Failed to enable QResync"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3228
+msgid "Failed to issue NOTIFY"
+msgstr "Failed to issue NOTIFY"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3706
+msgid "Failed to select mailbox"
+msgstr "Failed to select mailbox"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3809
+msgid "Cannot issue command, no stream available"
+msgstr "Cannot issue command, no stream available"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4073
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "Cannot get message with message ID %s: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4074
+msgid "No such message available."
+msgstr "No such message available."
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4111
+#: ../camel/providers/imapx/camel-imapx-server.c:4136
+#: ../camel/providers/imapx/camel-imapx-server.c:4175
+msgid "Error fetching message"
+msgstr "Error fetching message"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4153
+#: ../camel/providers/imapx/camel-imapx-server.c:4760
+msgid "Error performing NOOP"
+msgstr "Error performing NOOP"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4168
+msgid "Failed to close the tmp stream"
+msgstr "Failed to close the tmp stream"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4199
+msgid "Failed to copy the tmp file"
+msgstr "Failed to copy the tmp file"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4362
+msgid "Error moving messages"
+msgstr "Error moving messages"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4362
+msgid "Error copying messages"
+msgstr "Error copying messages"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4546
+#: ../camel/providers/imapx/camel-imapx-server.c:4567
+msgid "Cannot create spool file: "
+msgstr "Cannot create spool file: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4668
+msgid "Error appending message"
+msgstr "Error appending message"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/providers/imapx/camel-imapx-server.c:4913
+#, c-format
+msgid "Scanning for changed messages in '%s : %s'"
+msgstr "Scanning for changed messages in '%s : %s'"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4917
+msgid "Error scanning changes"
+msgstr "Error scanning changes"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/providers/imapx/camel-imapx-server.c:4938
+#, c-format
+msgid "Fetching summary information for new messages in '%s : %s'"
+msgstr "Fetching summary information for new messages in '%s : %s'"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4956
+msgid "Error fetching message info"
+msgstr "Error fetching message info"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5018
+msgid "Error running STATUS"
+msgstr "Error running STATUS"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5510
+#: ../camel/providers/imapx/camel-imapx-server.c:5562
+msgid "Error syncing changes"
+msgstr "Error syncing changes"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5673
+msgid "Error expunging message"
+msgstr "Error expunging message"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5743
+msgid "Error fetching folders"
+msgstr "Error fetching folders"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5754
+msgid "Error fetching subscribed folders"
+msgstr "Error fetching subscribed folders"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5776
+msgid "Error creating folder"
+msgstr "Error creating folder"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5832
+msgid "Error deleting folder"
+msgstr "Error deleting folder"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5878
+msgid "Error renaming folder"
+msgstr "Error renaming folder"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5910
+msgid "Error subscribing to folder"
+msgstr "Error subscribing to folder"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5946
+msgid "Error unsubscribing from folder"
+msgstr "Error unsubscribing from folder"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5986
+msgid "IMAP server does not support quotas"
+msgstr "IMAP server does not support quotas"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5998
+msgid "Error retrieving quota information"
+msgstr "Error retrieving quota information"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6045
+msgid "Search failed"
+msgstr "Search failed"
+
+#. Blocks, until the DONE is issued or on inactivity timeout, error, ...
+#: ../camel/providers/imapx/camel-imapx-server.c:6163
+msgid "Error running IDLE"
+msgstr "Error running IDLE"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imapx/camel-imapx-store.c:224
+#: ../camel/providers/local/camel-maildir-folder.c:482
+#: ../camel/providers/local/camel-maildir-store.c:347
+#: ../camel/providers/local/camel-maildir-store.c:826
+#: ../camel/providers/local/camel-maildir-store.c:832
+#: ../camel/providers/local/camel-maildir-store.c:915
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:765
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:768
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP service for %s on %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:836
+msgid "No IMAPx connection object provided"
+msgstr "No IMAPx connection object provided"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:853
+#: ../camel/providers/nntp/camel-nntp-provider.c:92
+#: ../camel/providers/pop3/camel-pop3-provider.c:80
+msgid "Password"
+msgstr "Password"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:855
+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/imapx/camel-imapx-store.c:938
+#, c-format
+msgid "No such folder %s"
+msgstr "No such folder %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1381
+#, c-format
+msgid "No IMAP namespace for folder path '%s'"
+msgstr "No IMAP namespace for folder path '%s'"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1642
+#: ../camel/providers/imapx/camel-imapx-store.c:1876
+#, c-format
+msgid "Retrieving folder list for '%s'"
+msgstr "Retrieving folder list for '%s'"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2093
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2470
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Drafts"
+msgstr "[Gmail]/Drafts"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2471
+msgctxt "IMAPDefaults"
+msgid "Drafts"
+msgstr "Drafts"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2472
+msgctxt "IMAPDefaults"
+msgid "Draft"
+msgstr "Draft"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2475
+msgctxt "IMAPDefaults"
+msgid "Templates"
+msgstr "Templates"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2478
+msgctxt "IMAPDefaults"
+msgid "Archive"
+msgstr "Archive"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2481
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Sent Mail"
+msgstr "[Gmail]/Sent Mail"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2482
+msgctxt "IMAPDefaults"
+msgid "Sent"
+msgstr "Sent"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2483
+msgctxt "IMAPDefaults"
+msgid "Sent Items"
+msgstr "Sent Items"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2484
+msgctxt "IMAPDefaults"
+msgid "Sent Messages"
+msgstr "Sent Message"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2487
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Spam"
+msgstr "[Gmail]/Spam"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2488
+msgctxt "IMAPDefaults"
+msgid "Junk"
+msgstr "Junk"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2489
+msgctxt "IMAPDefaults"
+msgid "Junk E-mail"
+msgstr "Junk E-mail"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2490
+msgctxt "IMAPDefaults"
+msgid "Junk Email"
+msgstr "Junk Email"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2491
+msgctxt "IMAPDefaults"
+msgid "Spam"
+msgstr "Spam"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2492
+msgctxt "IMAPDefaults"
+msgid "Bulk Mail"
+msgstr "Bulk Mail"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2495
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Trash"
+msgstr "[Gmail]/Wastebasket"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2496
+msgctxt "IMAPDefaults"
+msgid "Trash"
+msgstr "Trash"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2497
+msgctxt "IMAPDefaults"
+msgid "Deleted Items"
+msgstr "Deleted Items"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2498
+msgctxt "IMAPDefaults"
+msgid "Deleted Messages"
+msgstr "Deleted Messages"
+
+#: ../camel/providers/local/camel-local-folder.c:190
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:204
-#: ../camel/providers/local/camel-local-folder.c:213
+#: ../camel/providers/local/camel-local-folder.c:200
+#: ../camel/providers/local/camel-local-folder.c:209
#, c-format
msgid "mailbox: %s (%s)"
msgstr "mailbox: %s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:222
+#: ../camel/providers/local/camel-local-folder.c:218
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:499
+#: ../camel/providers/local/camel-local-folder.c:495
msgid "_Index message body data"
msgstr "_Index message body data"
-#: ../camel/providers/local/camel-local-folder.c:727
+#: ../camel/providers/local/camel-local-folder.c:723
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -3462,23 +3687,23 @@ msgstr ""
"Cannot get message %s from folder %s\n"
"%s"
-#: ../camel/providers/local/camel-local-provider.c:43
+#: ../camel/providers/local/camel-local-provider.c:41
msgid "_Use the '.folders' folder summary file (exmh)"
msgstr "_Use the '.folders' folder summary file (exmh)"
-#: ../camel/providers/local/camel-local-provider.c:50
+#: ../camel/providers/local/camel-local-provider.c:48
msgid "MH-format mail directories"
msgstr "MH-format mail directories"
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:49
msgid "For storing local mail in MH-like mail directories."
msgstr "For storing local mail in MH-like mail directories."
-#: ../camel/providers/local/camel-local-provider.c:68
+#: ../camel/providers/local/camel-local-provider.c:66
msgid "Local delivery"
msgstr "Local delivery"
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:67
msgid ""
"For retrieving (moving) local mail from standard mbox-formatted spools into "
"folders managed by Evolution."
@@ -3486,29 +3711,29 @@ msgstr ""
"For retrieving (moving) local mail from standard mbox-formatted spools into "
"folders managed by Evolution."
-#: ../camel/providers/local/camel-local-provider.c:83
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:101
msgid "_Apply filters to new messages in Inbox"
msgstr "_Apply filters to new messages in Inbox"
-#: ../camel/providers/local/camel-local-provider.c:90
+#: ../camel/providers/local/camel-local-provider.c:86
msgid "Maildir-format mail directories"
msgstr "Maildir-format mail directories"
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:87
msgid "For storing local mail in maildir directories."
msgstr "For storing local mail in maildir directories."
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:102
msgid "_Store status headers in Elm/Pine/Mutt format"
msgstr "_Store status headers in Elm/Pine/Mutt format"
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:109
msgid "Standard Unix mbox spool file"
msgstr "Standard Unix mbox spool file"
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:110
+#: ../camel/providers/local/camel-local-provider.c:124
msgid ""
"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3516,225 +3741,220 @@ msgstr ""
"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
-#: ../camel/providers/local/camel-local-provider.c:125
+#: ../camel/providers/local/camel-local-provider.c:123
msgid "Standard Unix mbox spool directory"
msgstr "Standard Unix mbox spool directory"
-#: ../camel/providers/local/camel-local-store.c:98
+#: ../camel/providers/local/camel-local-store.c:88
#, 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:180
+#: ../camel/providers/local/camel-local-store.c:170
#, c-format
msgid "Local mail file %s"
msgstr "Local mail file %s"
-#: ../camel/providers/local/camel-local-store.c:223
-#: ../camel/providers/local/camel-local-store.c:383
-#: ../camel/providers/local/camel-maildir-store.c:117
-#: ../camel/providers/local/camel-mbox-store.c:581
-#: ../camel/providers/local/camel-spool-store.c:89
+#: ../camel/providers/local/camel-local-store.c:213
+#: ../camel/providers/local/camel-local-store.c:373
+#: ../camel/providers/local/camel-maildir-store.c:123
+#: ../camel/providers/local/camel-mbox-store.c:572
+#: ../camel/providers/local/camel-spool-store.c:87
#, 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:232
+#: ../camel/providers/local/camel-local-store.c:222
#, 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:234
#: ../camel/providers/local/camel-local-store.c:244
-#: ../camel/providers/local/camel-local-store.c:254
-#: ../camel/providers/local/camel-local-store.c:396
-#: ../camel/providers/local/camel-maildir-store.c:145
+#: ../camel/providers/local/camel-local-store.c:386
+#: ../camel/providers/local/camel-maildir-store.c:165
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Cannot get folder: %s: %s"
-#: ../camel/providers/local/camel-local-store.c:291
+#: ../camel/providers/local/camel-local-store.c:281
#, c-format
msgid "Local stores do not have an inbox"
msgstr "Local stores do not have an inbox"
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:748
+#: ../camel/providers/local/camel-local-store.c:446
+#: ../camel/providers/local/camel-mbox-store.c:739
#, 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:484
-#: ../camel/providers/local/camel-mbox-store.c:778
+#: ../camel/providers/local/camel-local-store.c:474
+#: ../camel/providers/local/camel-mbox-store.c:769
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "Could not delete folder meta file '%s': %s"
-#: ../camel/providers/local/camel-local-store.c:596
+#: ../camel/providers/local/camel-local-store.c:587
#, c-format
msgid "Could not rename '%s': %s"
msgstr "Could not rename '%s': %s"
-#: ../camel/providers/local/camel-local-summary.c:567
-#, c-format
-msgid "Unable to add message to summary: unknown reason"
-msgstr "Unable to add message to summary: unknown reason"
-
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:335
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:159
+#: ../camel/providers/local/camel-maildir-folder.c:109
+#: ../camel/providers/local/camel-maildir-folder.c:344
+#: ../camel/providers/local/camel-mbox-folder.c:126
+#: ../camel/providers/local/camel-mbox-folder.c:339
+#: ../camel/providers/local/camel-mh-folder.c:157
msgid "No such message"
msgstr "No such message"
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:234
#, c-format
msgid "Cannot append message to maildir folder: %s: "
msgstr "Cannot append message to maildir folder: %s: "
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:171
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-maildir-folder.c:282
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-mbox-folder.c:400
+#: ../camel/providers/local/camel-mh-folder.c:169
+#: ../camel/providers/local/camel-mh-folder.c:179
#, c-format
msgid "Cannot get message %s from folder %s: "
msgstr "Cannot get message %s from folder %s: "
-#: ../camel/providers/local/camel-maildir-folder.c:353
+#: ../camel/providers/local/camel-maildir-folder.c:362
#, c-format
msgid "Cannot transfer message to destination folder: %s"
msgstr "Cannot transfer message to destination folder: %s"
-#: ../camel/providers/local/camel-maildir-store.c:125
-#: ../camel/providers/local/camel-maildir-store.c:848
+#: ../camel/providers/local/camel-maildir-store.c:131
+#: ../camel/providers/local/camel-maildir-store.c:931
+#, c-format
+msgid "Cannot create folder containing '%s'"
+msgstr "Cannot create folder containing '%s'"
+
+#: ../camel/providers/local/camel-maildir-store.c:139
+#: ../camel/providers/local/camel-maildir-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:923
#, c-format
msgid "Folder %s already exists"
msgstr "Folder %s already exists"
-#: ../camel/providers/local/camel-maildir-store.c:230
-#: ../camel/providers/local/camel-maildir-store.c:261
-#: ../camel/providers/local/camel-mbox-store.c:403
-#: ../camel/providers/local/camel-mbox-store.c:424
+#: ../camel/providers/local/camel-maildir-store.c:266
+#: ../camel/providers/local/camel-maildir-store.c:297
+#: ../camel/providers/local/camel-mbox-store.c:401
+#: ../camel/providers/local/camel-mbox-store.c:422
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "Cannot create folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:245
-#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:522
+#: ../camel/providers/local/camel-maildir-store.c:281
+#: ../camel/providers/local/camel-mbox-store.c:367
+#: ../camel/providers/local/camel-mh-store.c:523
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "Cannot get folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:251
-#: ../camel/providers/local/camel-mbox-store.c:379
-#: ../camel/providers/local/camel-mh-store.c:531
+#: ../camel/providers/local/camel-maildir-store.c:287
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mh-store.c:532
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "Cannot get folder '%s': folder does not exist."
-#: ../camel/providers/local/camel-maildir-store.c:278
+#: ../camel/providers/local/camel-maildir-store.c:314
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "Cannot get folder '%s': not a maildir directory."
-#: ../camel/providers/local/camel-maildir-store.c:283
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:564
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Cannot create folder '%s': folder exists."
-
-#: ../camel/providers/local/camel-maildir-store.c:347
-#: ../camel/providers/local/camel-maildir-store.c:387
-#: ../camel/providers/local/camel-mh-store.c:682
+#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../camel/providers/local/camel-maildir-store.c:418
+#: ../camel/providers/local/camel-mh-store.c:676
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "Could not delete folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:349
+#: ../camel/providers/local/camel-maildir-store.c:380
msgid "not a maildir directory"
msgstr "not a maildir directory"
-#: ../camel/providers/local/camel-maildir-store.c:628
-#: ../camel/providers/local/camel-maildir-store.c:1063
+#: ../camel/providers/local/camel-maildir-store.c:666
+#: ../camel/providers/local/camel-maildir-store.c:1146
#: ../camel/providers/local/camel-spool-store.c:212
#: ../camel/providers/local/camel-spool-store.c:231
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "Could not scan folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-summary.c:458
-#: ../camel/providers/local/camel-maildir-summary.c:591
+#: ../camel/providers/local/camel-maildir-summary.c:476
+#: ../camel/providers/local/camel-maildir-summary.c:616
#, 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:582
+#: ../camel/providers/local/camel-maildir-summary.c:607
msgid "Checking folder consistency"
msgstr "Checking folder consistency"
-#: ../camel/providers/local/camel-maildir-summary.c:675
+#: ../camel/providers/local/camel-maildir-summary.c:707
msgid "Checking for new messages"
msgstr "Checking for new messages"
-#: ../camel/providers/local/camel-maildir-summary.c:770
-#: ../camel/providers/local/camel-mbox-summary.c:450
-#: ../camel/providers/local/camel-mbox-summary.c:682
-#: ../camel/providers/local/camel-mbox-summary.c:830
-#: ../camel/providers/local/camel-spool-summary.c:141
+#: ../camel/providers/local/camel-maildir-summary.c:810
+#: ../camel/providers/local/camel-mbox-summary.c:466
+#: ../camel/providers/local/camel-mbox-summary.c:687
+#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-spool-summary.c:139
msgid "Storing folder"
msgstr "Storing folder"
-#: ../camel/providers/local/camel-mbox-folder.c:187
+#: ../camel/providers/local/camel-mbox-folder.c:196
#, c-format
msgid "Cannot open mailbox: %s: "
msgstr "Cannot open mailbox: %s: "
-#: ../camel/providers/local/camel-mbox-folder.c:253
+#: ../camel/providers/local/camel-mbox-folder.c:262
#, c-format
msgid "Cannot append message to mbox file: %s: "
msgstr "Cannot append message to mbox file: %s: "
-#: ../camel/providers/local/camel-mbox-folder.c:382
+#: ../camel/providers/local/camel-mbox-folder.c:392
msgid "The folder appears to be irrecoverably corrupted."
msgstr "The folder appears to be irrecoverably corrupted."
-#: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:69
+#: ../camel/providers/local/camel-mbox-folder.c:449
+#: ../camel/providers/local/camel-spool-folder.c:67
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "Cannot create folder lock on %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:391
-#: ../camel/providers/local/camel-mbox-store.c:589
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:580
#, c-format
msgid "Cannot create a folder by this name."
msgstr "Cannot create a folder by this name."
-#: ../camel/providers/local/camel-mbox-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:433
#, 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:605
+#: ../camel/providers/local/camel-mbox-store.c:596
#, c-format
msgid "Cannot create directory '%s': %s."
msgstr "Cannot create directory '%s': %s."
-#: ../camel/providers/local/camel-mbox-store.c:617
+#: ../camel/providers/local/camel-mbox-store.c:608
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Cannot create folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:610
msgid "Folder already exists"
msgstr "Folder already exists"
-#: ../camel/providers/local/camel-mbox-store.c:659
-#: ../camel/providers/local/camel-mbox-store.c:672
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:663
+#: ../camel/providers/local/camel-mbox-store.c:692
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3743,89 +3963,79 @@ msgstr ""
"Could not delete folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:682
+#: ../camel/providers/local/camel-mbox-store.c:673
#, c-format
msgid "'%s' is not a regular file."
msgstr "'%s' is not a regular file."
-#: ../camel/providers/local/camel-mbox-store.c:691
+#: ../camel/providers/local/camel-mbox-store.c:682
#, 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:718
-#: ../camel/providers/local/camel-mbox-store.c:733
+#: ../camel/providers/local/camel-mbox-store.c:709
+#: ../camel/providers/local/camel-mbox-store.c:724
#, 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:815
+#: ../camel/providers/local/camel-mbox-store.c:806
#, c-format
msgid "The new folder name is illegal."
msgstr "The new folder name is illegal."
-#: ../camel/providers/local/camel-mbox-store.c:831
+#: ../camel/providers/local/camel-mbox-store.c:822
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "Could not rename '%s': '%s': %s"
-#: ../camel/providers/local/camel-mbox-store.c:915
-#, c-format
-msgid "Could not rename '%s' to %s: %s"
-msgstr "Could not rename '%s' to %s: %s"
-
-#: ../camel/providers/local/camel-mbox-summary.c:460
+#: ../camel/providers/local/camel-mbox-summary.c:476
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "Could not open folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:522
-#, c-format
-msgid "Fatal mail parser error near position %s in folder %s"
-msgstr "Fatal mail parser error near position %s in folder %s"
-
-#: ../camel/providers/local/camel-mbox-summary.c:607
+#: ../camel/providers/local/camel-mbox-summary.c:611
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "Cannot check folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:695
-#: ../camel/providers/local/camel-mbox-summary.c:839
-#: ../camel/providers/local/camel-spool-summary.c:148
+#: ../camel/providers/local/camel-mbox-summary.c:696
+#: ../camel/providers/local/camel-mbox-summary.c:845
+#: ../camel/providers/local/camel-spool-summary.c:146
#, c-format
msgid "Could not open file: %s: %s"
msgstr "Could not open file: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:709
-#: ../camel/providers/local/camel-spool-summary.c:163
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-spool-summary.c:161
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "Cannot open temporary mailbox: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:726
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:967
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Could not close source folder %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:745
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "Could not close temporary folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:758
+#: ../camel/providers/local/camel-mbox-summary.c:764
#, c-format
msgid "Could not rename folder: %s"
msgstr "Could not rename folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:859
+#: ../camel/providers/local/camel-mbox-summary.c:1132
#, c-format
msgid "Could not store folder: %s"
msgstr "Could not store folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:892
-#: ../camel/providers/local/camel-mbox-summary.c:1162
+#: ../camel/providers/local/camel-mbox-summary.c:898
+#: ../camel/providers/local/camel-mbox-summary.c:1172
#, c-format
msgid ""
"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3834,55 +4044,55 @@ msgstr ""
"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
"it.)"
-#: ../camel/providers/local/camel-mbox-summary.c:902
-#: ../camel/providers/local/camel-mbox-summary.c:1174
+#: ../camel/providers/local/camel-mbox-summary.c:908
+#: ../camel/providers/local/camel-mbox-summary.c:1184
#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "Summary and folder mismatch, even after a sync"
-#: ../camel/providers/local/camel-mbox-summary.c:1067
+#: ../camel/providers/local/camel-mbox-summary.c:1077
#: ../camel/providers/local/camel-spool-summary.c:356
#, c-format
msgid "Unknown error: %s"
msgstr "Unknown error: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1232
-#: ../camel/providers/local/camel-mbox-summary.c:1262
+#: ../camel/providers/local/camel-mbox-summary.c:1242
+#: ../camel/providers/local/camel-mbox-summary.c:1272
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "Writing to temporary mailbox failed: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1251
+#: ../camel/providers/local/camel-mbox-summary.c:1261
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "Writing to temporary mailbox failed: %s: %s"
-#: ../camel/providers/local/camel-mh-folder.c:118
+#: ../camel/providers/local/camel-mh-folder.c:116
#, c-format
msgid "Cannot append message to mh folder: %s: "
msgstr "Cannot append message to mh folder: %s: "
-#: ../camel/providers/local/camel-mh-store.c:541
+#: ../camel/providers/local/camel-mh-store.c:542
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "Could not create folder '%s': %s"
-#: ../camel/providers/local/camel-mh-store.c:557
+#: ../camel/providers/local/camel-mh-store.c:558
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "Cannot get folder '%s': not a directory."
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:236
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "Cannot open MH directory path: %s: %s"
-#: ../camel/providers/local/camel-spool-store.c:97
+#: ../camel/providers/local/camel-spool-store.c:95
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "Spool '%s' cannot be opened: %s"
-#: ../camel/providers/local/camel-spool-store.c:111
+#: ../camel/providers/local/camel-spool-store.c:109
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "Spool '%s' is not a regular file or directory"
@@ -3901,12 +4111,12 @@ msgstr "Spool folder tree %s"
msgid "Invalid spool"
msgstr "Invalid spool"
-#: ../camel/providers/local/camel-spool-store.c:492
+#: ../camel/providers/local/camel-spool-store.c:481
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "Folder '%s/%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:505
+#: ../camel/providers/local/camel-spool-store.c:494
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3915,12 +4125,12 @@ msgstr ""
"Could not open folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:511
+#: ../camel/providers/local/camel-spool-store.c:500
#, c-format
msgid "Folder '%s' does not exist."
msgstr "Folder '%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:519
+#: ../camel/providers/local/camel-spool-store.c:508
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -3929,34 +4139,34 @@ msgstr ""
"Could not create folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:532
+#: ../camel/providers/local/camel-spool-store.c:521
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "'%s' is not a mailbox file."
-#: ../camel/providers/local/camel-spool-store.c:596
+#: ../camel/providers/local/camel-spool-store.c:585
#, c-format
msgid "Store does not support an INBOX"
msgstr "Store does not support an INBOX"
-#: ../camel/providers/local/camel-spool-store.c:615
+#: ../camel/providers/local/camel-spool-store.c:604
#, c-format
msgid "Spool folders cannot be deleted"
msgstr "Spool folders cannot be deleted"
-#: ../camel/providers/local/camel-spool-store.c:630
+#: ../camel/providers/local/camel-spool-store.c:619
#, c-format
msgid "Spool folders cannot be renamed"
msgstr "Spool folders cannot be renamed"
-#: ../camel/providers/local/camel-spool-summary.c:179
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:203
+#: ../camel/providers/local/camel-spool-summary.c:177
+#: ../camel/providers/local/camel-spool-summary.c:189
+#: ../camel/providers/local/camel-spool-summary.c:201
#, c-format
msgid "Could not synchronize temporary folder %s: %s"
msgstr "Could not synchronise temporary folder %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:221
+#: ../camel/providers/local/camel-spool-summary.c:219
#, c-format
msgid "Could not synchronize spool folder %s: %s"
msgstr "Could not synchronise spool folder %s: %s"
@@ -3972,83 +4182,78 @@ msgstr ""
"Could not synchronise spool folder %s: %s\n"
"Folder may be corrupt; copy saved in '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:278
-#: ../camel/providers/nntp/camel-nntp-folder.c:360
-#: ../camel/providers/nntp/camel-nntp-folder.c:481
+#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:595
#, 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:328
-#: ../camel/providers/nntp/camel-nntp-folder.c:332
-#: ../camel/providers/pop3/camel-pop3-folder.c:633
-#: ../camel/providers/pop3/camel-pop3-folder.c:1065
+#: ../camel/providers/nntp/camel-nntp-folder.c:297
+#: ../camel/providers/nntp/camel-nntp-folder.c:302
+#: ../camel/providers/pop3/camel-pop3-folder.c:574
+#: ../camel/providers/pop3/camel-pop3-folder.c:1002
#, c-format
msgid "Cannot get message %s: %s"
msgstr "Cannot get message %s: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:339
-#: ../camel/providers/nntp/camel-nntp-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-folder.c:558
-#: ../camel/providers/pop3/camel-pop3-folder.c:623
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
+#: ../camel/providers/nntp/camel-nntp-folder.c:309
+#: ../camel/providers/nntp/camel-nntp-folder.c:629
+#: ../camel/providers/pop3/camel-pop3-folder.c:478
+#: ../camel/providers/pop3/camel-pop3-folder.c:510
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:564
+#: ../camel/providers/pop3/camel-pop3-folder.c:583
#, c-format
msgid "Cannot get message %s: "
msgstr "Cannot get message %s: "
-#: ../camel/providers/nntp/camel-nntp-folder.c:493
-#, c-format
-msgid "This message is not currently available"
-msgstr "This message is not currently available"
-
-#: ../camel/providers/nntp/camel-nntp-folder.c:559
-#: ../camel/providers/nntp/camel-nntp-folder.c:565
-#: ../camel/providers/nntp/camel-nntp-folder.c:611
+#: ../camel/providers/nntp/camel-nntp-folder.c:435
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
#, c-format
msgid "Posting failed: %s"
msgstr "Posting failed: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:606
+#: ../camel/providers/nntp/camel-nntp-folder.c:508
msgid "Posting failed: "
msgstr "Posting failed: "
-#: ../camel/providers/nntp/camel-nntp-folder.c:633
+#: ../camel/providers/nntp/camel-nntp-folder.c:618
#, c-format
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "You cannot post NNTP messages while working offline!"
+msgid "This message is not currently available"
+msgstr "This message is not currently available"
-#: ../camel/providers/nntp/camel-nntp-folder.c:653
+#: ../camel/providers/nntp/camel-nntp-folder.c:727
#, c-format
-msgid "You cannot copy messages from a NNTP folder!"
-msgstr "You cannot copy messages from a NNTP folder!"
+msgid "You cannot copy messages from a NNTP folder"
+msgstr "You cannot copy messages from a NNTP folder"
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:45
msgid ""
"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
msgstr ""
"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:51
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
msgid "In the subscription _dialog, show relative folder names"
msgstr "In the subscription _dialogue, show relative folder names"
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:54
msgid "Default NNTP port"
msgstr "Default NNTP port"
-#: ../camel/providers/nntp/camel-nntp-provider.c:58
-msgid "NNTP over SSL"
-msgstr "NNTP over SSL"
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
+msgid "NNTP over TLS"
+msgstr "NNTP over TLS"
-#: ../camel/providers/nntp/camel-nntp-provider.c:64
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
msgid "USENET news"
msgstr "USENET news"
-#: ../camel/providers/nntp/camel-nntp-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
msgid "This is a provider for reading from and posting to USENET newsgroups."
msgstr "This is a provider for reading from and posting to USENET newsgroups."
-#: ../camel/providers/nntp/camel-nntp-provider.c:87
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
msgid ""
"This option will connect to the NNTP server anonymously, without "
"authentication."
@@ -4056,7 +4261,7 @@ msgstr ""
"This option will connect to the NNTP server anonymously, without "
"authentication."
-#: ../camel/providers/nntp/camel-nntp-provider.c:97
+#: ../camel/providers/nntp/camel-nntp-provider.c:94
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
@@ -4064,22 +4269,37 @@ msgstr ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
-#: ../camel/providers/nntp/camel-nntp-store.c:333
+#: ../camel/providers/nntp/camel-nntp-store.c:381
#, c-format
msgid "Could not read greeting from %s: "
msgstr "Could not read greeting from %s: "
-#: ../camel/providers/nntp/camel-nntp-store.c:345
+#: ../camel/providers/nntp/camel-nntp-store.c:393
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP server %s returned error code %d: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:522
+#: ../camel/providers/nntp/camel-nntp-store.c:412
+#, c-format
+msgid "Failed to issue STARTTLS for NNTP server %s: "
+msgstr "Failed to issue STARTTLS for NNTP server %s: "
+
+#: ../camel/providers/nntp/camel-nntp-store.c:423
+#, c-format
+msgid "NNTP server %s doesn't support STARTTLS: %s"
+msgstr "NNTP server %s doesn't support STARTTLS: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:443
+#, c-format
+msgid "Failed to connect to NNTP server %s in secure mode: "
+msgstr "Failed to connect to SMTP server %s in secure mode: "
+
+#: ../camel/providers/nntp/camel-nntp-store.c:514
#, c-format
msgid "USENET News via %s"
msgstr "USENET News via %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1123
+#: ../camel/providers/nntp/camel-nntp-store.c:1251
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4090,22 +4310,22 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1217
+#: ../camel/providers/nntp/camel-nntp-store.c:1367
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "You cannot create a folder in a News store: subscribe instead."
-#: ../camel/providers/nntp/camel-nntp-store.c:1233
+#: ../camel/providers/nntp/camel-nntp-store.c:1383
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "You cannot rename a folder in a News store."
-#: ../camel/providers/nntp/camel-nntp-store.c:1256
+#: ../camel/providers/nntp/camel-nntp-store.c:1406
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "You cannot remove a folder in a News store: unsubscribe instead."
-#: ../camel/providers/nntp/camel-nntp-store.c:1455
+#: ../camel/providers/nntp/camel-nntp-store.c:1616
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4116,7 +4336,7 @@ msgstr ""
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
-#: ../camel/providers/nntp/camel-nntp-store.c:1503
+#: ../camel/providers/nntp/camel-nntp-store.c:1683
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4127,116 +4347,116 @@ msgstr ""
"\n"
"newsgroup does not exist!"
-#: ../camel/providers/nntp/camel-nntp-store.c:1707
+#: ../camel/providers/nntp/camel-nntp-store.c:2109
msgid "NNTP Command failed: "
msgstr "NNTP Command failed: "
-#: ../camel/providers/nntp/camel-nntp-store.c:1794
+#: ../camel/providers/nntp/camel-nntp-store.c:2214
#, c-format
msgid "Not connected."
msgstr "Not connected."
-#: ../camel/providers/nntp/camel-nntp-store.c:1856
+#: ../camel/providers/nntp/camel-nntp-store.c:2316
#, c-format
msgid "No such folder: %s"
msgstr "No such folder: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:198
-#: ../camel/providers/nntp/camel-nntp-summary.c:328
+#: ../camel/providers/nntp/camel-nntp-summary.c:197
+#: ../camel/providers/nntp/camel-nntp-summary.c:337
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Scanning new messages"
-#: ../camel/providers/nntp/camel-nntp-summary.c:216
+#: ../camel/providers/nntp/camel-nntp-summary.c:219
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "Unexpected server response from xover: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:346
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "Unexpected server response from head: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:393
+#: ../camel/providers/nntp/camel-nntp-summary.c:406
#, c-format
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:453
-#: ../camel/providers/pop3/camel-pop3-folder.c:526
+#: ../camel/providers/pop3/camel-pop3-folder.c:357
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
#, c-format
msgid "No message with UID %s"
msgstr "No message with UID %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
#, c-format
msgid "Retrieving POP message %d"
msgstr "Retrieving POP message %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:634
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
msgid "Unknown reason"
msgstr "Unknown reason"
-#: ../camel/providers/pop3/camel-pop3-folder.c:682
+#: ../camel/providers/pop3/camel-pop3-folder.c:644
msgid "Retrieving POP summary"
msgstr "Retrieving POP summary"
-#: ../camel/providers/pop3/camel-pop3-folder.c:741
-#: ../camel/providers/pop3/camel-pop3-folder.c:744
-#: ../camel/providers/pop3/camel-pop3-folder.c:757
-#: ../camel/providers/pop3/camel-pop3-folder.c:770
-#: ../camel/providers/pop3/camel-pop3-folder.c:784
+#: ../camel/providers/pop3/camel-pop3-folder.c:703
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#: ../camel/providers/pop3/camel-pop3-folder.c:719
+#: ../camel/providers/pop3/camel-pop3-folder.c:732
+#: ../camel/providers/pop3/camel-pop3-folder.c:746
msgid "Cannot get POP summary: "
msgstr "Cannot get POP summary: "
-#: ../camel/providers/pop3/camel-pop3-folder.c:891
+#: ../camel/providers/pop3/camel-pop3-folder.c:811
msgid "Expunging old messages"
msgstr "Expunging old messages"
-#: ../camel/providers/pop3/camel-pop3-folder.c:911
+#: ../camel/providers/pop3/camel-pop3-folder.c:839
msgid "Expunging deleted messages"
msgstr "Expunging deleted messages"
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/pop3/camel-pop3-provider.c:36
msgid "Message Storage"
msgstr "Message Storage"
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:38
msgid "_Leave messages on server"
msgstr "_Leave messages on server"
#. Translators: '%s' is replaced with a widget, where user can
#. * select how many days can be message left on the server.
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:42
#, c-format
msgid "_Delete after %s day(s)"
msgstr "_Delete after %s day(s)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
msgid "Delete _expunged from local Inbox"
msgstr "Delete _expunged from local Inbox"
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
msgid "Disable _support for all POP3 extensions"
msgstr "Disable _support for all POP3 extensions"
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:52
msgid "Default POP3 port"
msgstr "Default POP3 port"
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
-msgid "POP3 over SSL"
-msgstr "POP3 over SSL"
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
+msgid "POP3 over TLS"
+msgstr "POP3 over TLS"
-#: ../camel/providers/pop3/camel-pop3-provider.c:63
+#: ../camel/providers/pop3/camel-pop3-provider.c:60
msgid "POP"
msgstr "POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:65
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
msgid "For connecting to and downloading mail from POP servers."
msgstr "For connecting to and downloading mail from POP servers."
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4244,7 +4464,7 @@ msgstr ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
-#: ../camel/providers/pop3/camel-pop3-provider.c:95
+#: ../camel/providers/pop3/camel-pop3-provider.c:92
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -4255,66 +4475,59 @@ msgstr ""
"claim to support it."
#. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:89
+#: ../camel/providers/pop3/camel-pop3-store.c:95
msgid ": "
msgstr ": "
-#: ../camel/providers/pop3/camel-pop3-store.c:150
+#: ../camel/providers/pop3/camel-pop3-store.c:162
#, 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:165
+#: ../camel/providers/pop3/camel-pop3-store.c:177
#, 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:166
+#: ../camel/providers/pop3/camel-pop3-store.c:178
msgid "STLS not supported by server"
msgstr "STLS not supported by server"
#. Translators: Last %s is an optional
#. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:187
+#: ../camel/providers/pop3/camel-pop3-store.c:199
#, 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:200
+#: ../camel/providers/pop3/camel-pop3-store.c:217
#, c-format
msgid "Failed to connect to POP server %s in secure mode: "
msgstr "Failed to connect to POP server %s in secure mode: "
-#: ../camel/providers/pop3/camel-pop3-store.c:311
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "Cannot login to POP server %s: SASL Protocol error"
-#: ../camel/providers/pop3/camel-pop3-store.c:333
+#: ../camel/providers/pop3/camel-pop3-store.c:379
#, c-format
msgid "Failed to authenticate on POP server %s: "
msgstr "Failed to authenticate on POP server %s: "
-#: ../camel/providers/pop3/camel-pop3-store.c:435
+#: ../camel/providers/pop3/camel-pop3-store.c:487
#, c-format
msgid "POP3 server %s"
msgstr "POP3 server %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:438
+#: ../camel/providers/pop3/camel-pop3-store.c:490
#, c-format
msgid "POP3 server for %s on %s"
msgstr "POP3 server for %s on %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:613
-#, c-format
-msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
-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:665
+#: ../camel/providers/pop3/camel-pop3-store.c:702
+#: ../camel/providers/pop3/camel-pop3-store.c:715
+#: ../camel/providers/pop3/camel-pop3-store.c:801
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4323,9 +4536,18 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password: "
+#: ../camel/providers/pop3/camel-pop3-store.c:742
+#, c-format
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+
#. Translators: Last %s is an optional explanation
#. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:680
+#: ../camel/providers/pop3/camel-pop3-store.c:816
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4334,22 +4556,22 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending username%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:751
+#: ../camel/providers/pop3/camel-pop3-store.c:900
#, c-format
msgid "No such folder '%s'."
msgstr "No such folder '%s'."
-#: ../camel/providers/pop3/camel-pop3-store.c:768
+#: ../camel/providers/pop3/camel-pop3-store.c:917
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 stores have no folder hierarchy"
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
msgid "Sendmail"
msgstr "Sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
msgid ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
@@ -4357,285 +4579,299 @@ msgstr ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
msgid "sendmail"
msgstr "sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
msgid "Mail delivery via the sendmail program"
msgstr "Mail delivery via the sendmail program"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:137
+#, c-format
+msgid "Failed to read From address"
+msgstr "Failed to read From address"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:154
+#, c-format
+msgid "Message send in offline mode is disabled"
+msgstr "Message send in offline mode is disabled"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
#, c-format
msgid "Could not parse recipient list"
msgstr "Could not parse recipient list"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:199
#, c-format
msgid "Could not parse arguments"
msgstr "Could not parse arguments"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:213
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:230
#, c-format
msgid "Could not create pipe to '%s': %s: mail not sent"
msgstr "Could not create pipe to '%s': %s: mail not sent"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:238
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
#, c-format
msgid "Could not fork '%s': %s: mail not sent"
msgstr "Could not fork '%s': %s: mail not sent"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:287
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:304
msgid "Could not send message: "
msgstr "Could not send message: "
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:317
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:334
#, c-format
msgid "'%s' exited with signal %s: mail not sent."
msgstr "'%s' exited with signal %s: mail not sent."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:327
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:344
#, c-format
msgid "Could not execute '%s': mail not sent."
msgstr "Could not execute '%s': mail not sent."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:332
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:349
#, c-format
msgid "'%s' exited with status %d: mail not sent."
msgstr "'%s' exited with status %d: mail not sent."
-#: ../camel/providers/smtp/camel-smtp-provider.c:42
+#: ../camel/providers/smtp/camel-smtp-provider.c:39
msgid "Default SMTP port"
msgstr "Default SMTP port"
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
-msgid "SMTP over SSL"
-msgstr "SMTP over SSL"
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
+msgid "SMTP over TLS"
+msgstr "SMTP over TLS"
-#: ../camel/providers/smtp/camel-smtp-provider.c:44
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
msgid "Message submission port"
msgstr "Message submission port"
-#: ../camel/providers/smtp/camel-smtp-provider.c:50
+#: ../camel/providers/smtp/camel-smtp-provider.c:47
msgid "SMTP"
msgstr "SMTP"
-#: ../camel/providers/smtp/camel-smtp-provider.c:52
+#: ../camel/providers/smtp/camel-smtp-provider.c:49
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "For delivering mail by connecting to a remote mailhub using SMTP."
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
msgid "Welcome response error: "
msgstr "Welcome response error: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:207
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr "Failed to connect to SMTP server %s in secure mode: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
-#: ../camel/providers/smtp/camel-smtp-transport.c:229
-#: ../camel/providers/smtp/camel-smtp-transport.c:236
+#: ../camel/providers/smtp/camel-smtp-transport.c:289
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:309
msgid "STARTTLS command failed: "
msgstr "STARTTLS command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:247
+#: ../camel/providers/smtp/camel-smtp-transport.c:328
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: "
msgstr "Failed to connect to SMTP server %s in secure mode: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:349
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
#, c-format
msgid "SMTP server %s"
msgstr "SMTP server %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:352
+#: ../camel/providers/smtp/camel-smtp-transport.c:442
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "SMTP mail delivery via %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:426
+#: ../camel/providers/smtp/camel-smtp-transport.c:582
#, c-format
msgid "SMTP server %s does not support %s authentication"
msgstr "SMTP server %s does not support %s authentication"
-#: ../camel/providers/smtp/camel-smtp-transport.c:508
+#: ../camel/providers/smtp/camel-smtp-transport.c:663
#, c-format
msgid "No SASL mechanism was specified"
msgstr "No SASL mechanism was specified"
-#: ../camel/providers/smtp/camel-smtp-transport.c:538
-#: ../camel/providers/smtp/camel-smtp-transport.c:549
-#: ../camel/providers/smtp/camel-smtp-transport.c:562
+#: ../camel/providers/smtp/camel-smtp-transport.c:699
+msgid "AUTH command failed: Not connected."
+msgstr "AUTH command failed: Not connected."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
msgid "AUTH command failed: "
msgstr "AUTH command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
#, c-format
msgid "Cannot send message: service not connected."
msgstr "Cannot send message: service not connected."
-#: ../camel/providers/smtp/camel-smtp-transport.c:710
+#: ../camel/providers/smtp/camel-smtp-transport.c:898
#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "Cannot send message: sender address not valid."
-#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#: ../camel/providers/smtp/camel-smtp-transport.c:902
msgid "Sending message"
msgstr "Sending message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:931
#, c-format
msgid "Cannot send message: no recipients defined."
msgstr "Cannot send message: no recipients defined."
-#: ../camel/providers/smtp/camel-smtp-transport.c:752
+#: ../camel/providers/smtp/camel-smtp-transport.c:946
#, c-format
msgid "Cannot send message: one or more invalid recipients"
msgstr "Cannot send message: one or more invalid recipients"
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:1078
msgid "Syntax error, command unrecognized"
msgstr "Syntax error, command unrecognised"
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:1080
msgid "Syntax error in parameters or arguments"
msgstr "Syntax error in parameters or arguments"
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
msgid "Command not implemented"
msgstr "Command not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:1084
msgid "Command parameter not implemented"
msgstr "Command parameter not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:1086
msgid "System status, or system help reply"
msgstr "System status, or system help reply"
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:1088
msgid "Help message"
msgstr "Help message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:1090
msgid "Service ready"
msgstr "Service ready"
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:1092
msgid "Service closing transmission channel"
msgstr "Service closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
msgid "Service not available, closing transmission channel"
msgstr "Service not available, closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:1096
msgid "Requested mail action okay, completed"
msgstr "Requested mail action okay, completed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:1098
msgid "User not local; will forward to <forward-path>"
msgstr "User not local; will forward to <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:1100
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Requested mail action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
msgid "Requested action not taken: mailbox unavailable"
msgstr "Requested action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:1104
msgid "Requested action aborted: error in processing"
msgstr "Requested action aborted: error in processing"
-#: ../camel/providers/smtp/camel-smtp-transport.c:901
+#: ../camel/providers/smtp/camel-smtp-transport.c:1106
msgid "User not local; please try <forward-path>"
msgstr "User not local; please try <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:1108
msgid "Requested action not taken: insufficient system storage"
msgstr "Requested action not taken: insufficient system storage"
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:1110
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Requested mail action aborted: exceeded storage allocation"
-#: ../camel/providers/smtp/camel-smtp-transport.c:907
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
msgid "Requested action not taken: mailbox name not allowed"
msgstr "Requested action not taken: mailbox name not allowed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:1114
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Start mail input; end with <CRLF>.<CRLF>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:911
+#: ../camel/providers/smtp/camel-smtp-transport.c:1116
msgid "Transaction failed"
msgstr "Transaction failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:915
+#: ../camel/providers/smtp/camel-smtp-transport.c:1120
msgid "A password transition is needed"
msgstr "A password transition is needed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:917
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
msgid "Authentication mechanism is too weak"
msgstr "Authentication mechanism is too weak"
-#: ../camel/providers/smtp/camel-smtp-transport.c:919
+#: ../camel/providers/smtp/camel-smtp-transport.c:1124
msgid "Encryption required for requested authentication mechanism"
msgstr "Encryption required for requested authentication mechanism"
-#: ../camel/providers/smtp/camel-smtp-transport.c:921
+#: ../camel/providers/smtp/camel-smtp-transport.c:1126
msgid "Temporary authentication failure"
msgstr "Temporary authentication failure"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1178
+#: ../camel/providers/smtp/camel-smtp-transport.c:1416
msgid "SMTP Greeting"
msgstr "SMTP Greeting"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1205
-#: ../camel/providers/smtp/camel-smtp-transport.c:1223
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1425
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1445
msgid "HELO command failed: "
msgstr "HELO command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1306
-#: ../camel/providers/smtp/camel-smtp-transport.c:1321
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1535
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1358
+#: ../camel/providers/smtp/camel-smtp-transport.c:1572
msgid "RCPT TO command failed: "
msgstr "RCPT TO command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1375
-#: ../camel/providers/smtp/camel-smtp-transport.c:1385
+#: ../camel/providers/smtp/camel-smtp-transport.c:1588
+#: ../camel/providers/smtp/camel-smtp-transport.c:1597
#, c-format
msgid "RCPT TO <%s> failed: "
msgstr "RCPT TO <%s> failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1428
-#: ../camel/providers/smtp/camel-smtp-transport.c:1439
-#: ../camel/providers/smtp/camel-smtp-transport.c:1450
-#: ../camel/providers/smtp/camel-smtp-transport.c:1509
-#: ../camel/providers/smtp/camel-smtp-transport.c:1529
-#: ../camel/providers/smtp/camel-smtp-transport.c:1543
-#: ../camel/providers/smtp/camel-smtp-transport.c:1552
+#: ../camel/providers/smtp/camel-smtp-transport.c:1669
+#: ../camel/providers/smtp/camel-smtp-transport.c:1680
+#: ../camel/providers/smtp/camel-smtp-transport.c:1691
+#: ../camel/providers/smtp/camel-smtp-transport.c:1753
+#: ../camel/providers/smtp/camel-smtp-transport.c:1771
+#: ../camel/providers/smtp/camel-smtp-transport.c:1784
+#: ../camel/providers/smtp/camel-smtp-transport.c:1792
msgid "DATA command failed: "
msgstr "DATA command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1577
-#: ../camel/providers/smtp/camel-smtp-transport.c:1592
-#: ../camel/providers/smtp/camel-smtp-transport.c:1601
+#: ../camel/providers/smtp/camel-smtp-transport.c:1818
+#: ../camel/providers/smtp/camel-smtp-transport.c:1832
+#: ../camel/providers/smtp/camel-smtp-transport.c:1840
msgid "RSET command failed: "
msgstr "RSET command failed: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1626
-#: ../camel/providers/smtp/camel-smtp-transport.c:1640
-#: ../camel/providers/smtp/camel-smtp-transport.c:1647
+#: ../camel/providers/smtp/camel-smtp-transport.c:1866
+#: ../camel/providers/smtp/camel-smtp-transport.c:1878
+#: ../camel/providers/smtp/camel-smtp-transport.c:1884
msgid "QUIT command failed: "
msgstr "QUIT command failed: "
@@ -4671,362 +4907,397 @@ msgstr ""
"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
"\"days\""
-#: ../libebackend/e-authentication-mediator.c:205
-#: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:852
-#: ../libebackend/e-authentication-mediator.c:1185
-msgid "Bus name vanished (client terminated?)"
-msgstr "Bus name vanished (client terminated?)"
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
+msgid "Whether the migration of old setting was already done"
+msgstr "Whether the migration of old setting was already done"
-#: ../libebackend/e-authentication-mediator.c:264
-msgid "No response from client"
-msgstr "No response from client"
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:2
+msgid "An absolute path where the gpg (or gpg2) binary is"
+msgstr "An absolute path where the gpg (or gpg2) binary is"
-#: ../libebackend/e-authentication-mediator.c:334
-#: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:846
-#: ../libebackend/e-authentication-mediator.c:1179
-msgid "Client cancelled the operation"
-msgstr "Client cancelled the operation"
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
+msgid ""
+"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it "
+"is searched for it. Change requires restart of the application."
+msgstr ""
+"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it "
+"is searched for it. Change requires restart of the application."
-#: ../libebackend/e-authentication-mediator.c:416
-msgid "Client reports password was rejected"
-msgstr "Client reports password was rejected"
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:4
+msgid "Whether to load photos of signers/encrypters"
+msgstr "Whether to load photos of signers/encrypters"
-#: ../libebackend/e-authentication-session.c:532
-msgid "Add this password to your keyring"
-msgstr "Add this password to your keyring"
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:5
+msgid ""
+"When set to 'true', tries to load also photo of the signers/encrypters, if "
+"available in the key/certificate."
+msgstr ""
+"When set to 'true', tries to load also photo of the signers/encrypters, if "
+"available in the key/certificate."
-#: ../libebackend/e-authentication-session.c:622
-msgid "Password was incorrect"
-msgstr "Password was incorrect"
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:6
+msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
+msgstr "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
-#: ../libebackend/e-backend.c:428
-#, c-format
-msgid "%s does not support authentication"
-msgstr "%s does not support authentication"
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:7
+msgid ""
+"When set to an unknown value, then the default GNetworkMonitor is used in "
+"the background. A special value 'always-online' is used for no network "
+"monitoring."
+msgstr ""
+"When set to an unknown value, then the default GNetworkMonitor is used in "
+"the background. A special value 'always-online' is used for no network "
+"monitoring."
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "(Deprecated) Proxy type to use"
+msgstr "(Deprecated) Proxy type to use"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"This key was deprecated in version 3.12 and should no longer be used. Proxy "
+"settings are now integrated into Evolution-Data-Server's account system. See "
+"the ESourceProxy API documentation for details."
+msgstr ""
+"This key was deprecated in version 3.12 and should no longer be used. Proxy "
+"settings are now integrated into Evolution-Data-Server's account system. See "
+"the ESourceProxy API documentation for details."
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "(Deprecated) Whether to use http-proxy"
+msgstr "(Deprecated) Whether to use http-proxy"
-#: ../libebackend/e-collection-backend.c:800
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "(Deprecated) Whether proxy server requires authentication"
+msgstr "(Deprecated) Whether proxy server requires authentication"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "(Deprecated) Host name for HTTP requests"
+msgstr "(Deprecated) Host name for HTTP requests"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "(Deprecated) Port number for HTTP requests"
+msgstr "(Deprecated) Port number for HTTP requests"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "(Deprecated) Proxy authentication user name"
+msgstr "(Deprecated) Proxy authentication user name"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "(Deprecated) Proxy authentication password"
+msgstr "(Deprecated) Proxy authentication password"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "(Deprecated) List of hosts to connect to without proxy"
+msgstr "(Deprecated) List of hosts to connect to without proxy"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "(Deprecated) Host name for HTTPS requests"
+msgstr "(Deprecated) Host name for HTTPS requests"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "(Deprecated) Port number for HTTPS requests"
+msgstr "(Deprecated) Port number for HTTPS requests"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "(Deprecated) Host name for SOCKS requests"
+msgstr "(Deprecated) Host name for SOCKS requests"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "(Deprecated) Port number for SOCKS requests"
+msgstr "(Deprecated) Port number for SOCKS requests"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "(Deprecated) Automatic proxy configuration URL"
+msgstr "(Deprecated) Automatic proxy configuration URL"
+
+#: ../libebackend/e-collection-backend.c:976
#, c-format
msgid "%s does not support creating remote resources"
msgstr "%s does not support creating remote resources"
-#: ../libebackend/e-collection-backend.c:859
+#: ../libebackend/e-collection-backend.c:1035
#, c-format
msgid "%s does not support deleting remote resources"
msgstr "%s does not support deleting remote resources"
-#: ../libebackend/e-data-factory.c:320
+#: ../libebackend/e-data-factory.c:1294
#, c-format
-msgid "No backend factory for hash key '%s'"
-msgstr "No backend factory for hash key '%s'"
+msgid "Backend factory for source '%s' and extension '%s' cannot be found."
+msgstr "Backend factory for source '%s' and extension '%s' cannot be found."
-#: ../libebackend/e-server-side-source.c:134
+#: ../libebackend/e-server-side-source.c:141
#, c-format
msgid "Data source is missing a [%s] group"
msgstr "Data source is missing a [%s] group"
-#: ../libebackend/e-server-side-source.c:1008
-#: ../libedataserver/e-source.c:1120
+#: ../libebackend/e-server-side-source.c:466
+msgid "Failed to lookup credentials: "
+msgstr "Failed to lookup credentials: "
+
+#: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
#, c-format
msgid "Data source '%s' does not support creating remote resources"
msgstr "Data source '%s' does not support creating remote resources"
-#: ../libebackend/e-server-side-source.c:1022
+#: ../libebackend/e-server-side-source.c:1405
#, c-format
msgid ""
"Data source '%s' has no collection backend to create the remote resource"
msgstr ""
"Data source '%s' has no collection backend to create the remote resource"
-#: ../libebackend/e-server-side-source.c:1050
-#: ../libedataserver/e-source.c:1227
+#: ../libebackend/e-server-side-source.c:1433 ../libedataserver/e-source.c:1708
#, c-format
msgid "Data source '%s' does not support deleting remote resources"
msgstr "Data source '%s' does not support deleting remote resources"
-#: ../libebackend/e-server-side-source.c:1064
+#: ../libebackend/e-server-side-source.c:1447
#, c-format
msgid ""
"Data source '%s' has no collection backend to delete the remote resource"
msgstr ""
"Data source '%s' has no collection backend to delete the remote resource"
-#: ../libebackend/e-server-side-source.c:1095
-#: ../libedataserver/e-source.c:1317
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990
+#: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
#, c-format
msgid "Data source '%s' does not support OAuth 2.0 authentication"
msgstr "Data source '%s' does not support OAuth 2.0 authentication"
-#: ../libebackend/e-server-side-source.c:1438
+#: ../libebackend/e-server-side-source.c:1856
#, c-format
msgid "File must have a '.source' extension"
msgstr "File must have a '.source' extension"
-#: ../libebackend/e-source-registry-server.c:523
-#: ../libedataserver/e-source-registry.c:1625
-msgid "The user declined to authenticate"
-msgstr "The user declined to authenticate"
-
-#: ../libebackend/e-source-registry-server.c:792
+#: ../libebackend/e-source-registry-server.c:319
#, c-format
msgid "UID '%s' is already in use"
msgstr "UID '%s' is already in use"
-#: ../libebackend/e-user-prompter-server.c:303
+#: ../libebackend/e-subprocess-factory.c:279
+#, c-format
+msgid "Module '%s' for source UID '%s' cannot be loaded"
+msgstr "Module '%s' for source UID '%s' cannot be loaded"
+
+#: ../libebackend/e-subprocess-factory.c:291
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr "No such source for UID '%s'"
+
+#: ../libebackend/e-subprocess-factory.c:302
+#, c-format
+msgid "Failed to create backend of type '%s' for source UID '%s'"
+msgstr "Failed to create backend of type '%s' for source UID '%s'"
+
+#: ../libebackend/e-user-prompter-server.c:305
#, c-format
msgid "Extension dialog '%s' not found."
msgstr "Extension dialogue '%s' not found."
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:49
msgctxt "CategoryName"
msgid "Anniversary"
msgstr "Anniversary"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
msgctxt "CategoryName"
msgid "Birthday"
msgstr "Birthday"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
msgctxt "CategoryName"
msgid "Business"
msgstr "Business"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
msgctxt "CategoryName"
msgid "Competition"
msgstr "Competition"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
msgctxt "CategoryName"
msgid "Favorites"
msgstr "Favourites"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
msgctxt "CategoryName"
msgid "Gifts"
msgstr "Gifts"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:55
msgctxt "CategoryName"
msgid "Goals/Objectives"
msgstr "Goals/Objectives"
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:56
msgctxt "CategoryName"
msgid "Holiday"
msgstr "Holiday"
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
msgctxt "CategoryName"
msgid "Holiday Cards"
msgstr "Holiday Cards"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
msgctxt "CategoryName"
msgid "Hot Contacts"
msgstr "Hot Contacts"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
msgctxt "CategoryName"
msgid "Ideas"
msgstr "Ideas"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
msgctxt "CategoryName"
msgid "International"
msgstr "International"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
msgctxt "CategoryName"
msgid "Key Customer"
msgstr "Key Customer"
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:63
msgctxt "CategoryName"
msgid "Miscellaneous"
msgstr "Miscellaneous"
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:64
msgctxt "CategoryName"
msgid "Personal"
msgstr "Personal"
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
msgctxt "CategoryName"
msgid "Phone Calls"
msgstr "Phone Calls"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
msgctxt "CategoryName"
msgid "Status"
msgstr "Status"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
msgctxt "CategoryName"
msgid "Strategies"
msgstr "Strategies"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
msgctxt "CategoryName"
msgid "Suppliers"
msgstr "Suppliers"
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:70
msgctxt "CategoryName"
msgid "Time & Expenses"
msgstr "Time & Expenses"
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:71
msgctxt "CategoryName"
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:72
msgctxt "CategoryName"
msgid "Waiting"
msgstr "Waiting"
-#: ../libedataserver/e-client.c:135
+#: ../libedataserver/e-client.c:146
msgid "Source not loaded"
msgstr "Source not loaded"
-#: ../libedataserver/e-client.c:137
+#: ../libedataserver/e-client.c:148
msgid "Source already loaded"
msgstr "Source already loaded"
#. Translators: This means that the EClient does not
#. * support offline mode, or it's not set to by a user,
#. * thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:148
+#: ../libedataserver/e-client.c:159
msgid "Offline unavailable"
msgstr "Offline unavailable"
-#: ../libedataserver/e-client.c:170
+#: ../libedataserver/e-client.c:181
msgid "D-Bus error"
msgstr "D-Bus error"
-#: ../libedataserver/e-source-authenticator.c:166
-msgid "Address book authentication request"
-msgstr "Address book authentication request"
+#: ../libedataserver/e-client.c:2023
+msgid "Timeout was reached"
+msgstr "Timeout was reached"
-#: ../libedataserver/e-source-authenticator.c:171
-msgid "Calendar authentication request"
-msgstr "Calendar authentication request"
-
-#: ../libedataserver/e-source-authenticator.c:175
-msgid "Mail authentication request"
-msgstr "Mail authentication request"
-
-#. generic account prompt
-#: ../libedataserver/e-source-authenticator.c:178
-msgid "Authentication request"
-msgstr "Authentication request"
-
-#: ../libedataserver/e-source-authenticator.c:188
-#, c-format
-msgid "Please enter the password for address book \"%s\"."
-msgstr "Please enter the password for address book \"%s\"."
-
-#: ../libedataserver/e-source-authenticator.c:194
-#, c-format
-msgid "Please enter the password for calendar \"%s\"."
-msgstr "Please enter the password for calendar \"%s\"."
-
-#: ../libedataserver/e-source-authenticator.c:200
-#, c-format
-msgid "Please enter the password for mail account \"%s\"."
-msgstr "Please enter the password for mail account \"%s\"."
-
-#: ../libedataserver/e-source-authenticator.c:206
-#, c-format
-msgid "Please enter the password for mail transport \"%s\"."
-msgstr "Please enter the password for mail transport \"%s\"."
-
-#: ../libedataserver/e-source-authenticator.c:212
-#, c-format
-msgid "Please enter the password for memo list \"%s\"."
-msgstr "Please enter the password for memo list \"%s\"."
-
-#: ../libedataserver/e-source-authenticator.c:218
-#, c-format
-msgid "Please enter the password for task list \"%s\"."
-msgstr "Please enter the password for task list \"%s\"."
-
-#: ../libedataserver/e-source-authenticator.c:224
-#, c-format
-msgid "Please enter the password for account \"%s\"."
-msgstr "Please enter the password for account \"%s\"."
-
-#: ../libedataserver/e-source.c:622
+#: ../libedataserver/e-source.c:771
#, c-format
msgid "Source file is missing a [%s] group"
msgstr "Source file is missing a [%s] group"
-#: ../libedataserver/e-source.c:943
+#: ../libedataserver/e-source.c:1375
#, c-format
msgid "Data source '%s' is not removable"
msgstr "Data source '%s' is not removable"
-#: ../libedataserver/e-source.c:1029
+#: ../libedataserver/e-source.c:1498
#, c-format
msgid "Data source '%s' is not writable"
msgstr "Data source '%s' is not writable"
-#: ../libedataserver/e-source.c:1523
+#: ../libedataserver/e-source.c:2194
msgid "Unnamed"
msgstr "Unnamed"
-#: ../libedataserver/e-source-mail-signature.c:487
-#, c-format
-msgid "Signature script must be a local file"
-msgstr "Signature script must be a local file"
+#: ../libedataserver/e-source-credentials-provider-impl.c:41
+msgid "Credentials lookup is not supported"
+msgstr "Credentials lookup is not supported"
-#: ../libedataserver/e-source-webdav.c:1529
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr ""
-"SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
-"you wish to accept it?"
+#: ../libedataserver/e-source-credentials-provider-impl.c:54
+msgid "Credentials store is not supported"
+msgstr "Credentials store is not supported"
+
+#: ../libedataserver/e-source-credentials-provider-impl.c:65
+msgid "Credentials delete is not supported"
+msgstr "Credentials delete is not supported"
-#: ../libedataserver/e-source-webdav.c:1538
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
+msgid "Google authentication is not supported"
+msgstr "Google authentication is not supported"
+
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
#, c-format
-msgid ""
-"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
-"wish to accept it?"
-msgstr ""
-"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
-"wish to accept it?"
+msgid "Source '%s' (%s) is not a valid Google source"
+msgstr "Source '%s' (%s) is not a valid Google source"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+msgid "Google secret not found"
+msgstr "Google secret not found"
+
+#: ../libedataserver/e-source-credentials-provider-impl-password.c:81
+msgid "Password not found"
+msgstr "Password not found"
-#: ../libedataserver/e-source-webdav.c:1547
+#: ../libedataserver/e-source-mail-signature.c:481
#, c-format
-msgid ""
-"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr ""
-"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
-"you wish to accept it?"
+msgid "Signature script must be a local file"
+msgstr "Signature script must be a local file"
-#: ../libedataserver/e-source-webdav.c:1556
+#: ../libedataserver/e-source-proxy.c:1641
#, c-format
-msgid ""
-"SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr ""
-"SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
-"you wish to accept it?"
+msgid "Source '%s' does not support proxy lookups"
+msgstr "Source '%s' does not support proxy lookups"
#. strptime format of a weekday, a date and a time,
#. * in 12-hour format.
#. strftime format of a weekday, a date and a
#. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962
+#: ../libedataserver/e-time-utils.c:1692 ../libedataserver/e-time-utils.c:1991
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -5034,7 +5305,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:1668 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1982
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -5042,7 +5313,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:1673 ../libedataserver/e-time-utils.c:1958
+#: ../libedataserver/e-time-utils.c:1702 ../libedataserver/e-time-utils.c:1987
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
@@ -5050,78 +5321,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:1678 ../libedataserver/e-time-utils.c:1949
+#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1978
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:1683
+#: ../libedataserver/e-time-utils.c:1712
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:1688
+#: ../libedataserver/e-time-utils.c:1717
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:1691 ../libedataserver/e-time-utils.c:1811
-#: ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1720 ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1973
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:1698
+#: ../libedataserver/e-time-utils.c:1727
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:1702
+#: ../libedataserver/e-time-utils.c:1731
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:1707
+#: ../libedataserver/e-time-utils.c:1736
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:1712
+#: ../libedataserver/e-time-utils.c:1741
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:1717
+#: ../libedataserver/e-time-utils.c:1746
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:1722
+#: ../libedataserver/e-time-utils.c:1751
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:1725 ../libedataserver/e-time-utils.c:1814
+#: ../libedataserver/e-time-utils.c:1754 ../libedataserver/e-time-utils.c:1843
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:1885 ../libedataserver/e-time-utils.c:2006
+#: ../libedataserver/e-time-utils.c:1914 ../libedataserver/e-time-utils.c:2035
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:1889 ../libedataserver/e-time-utils.c:1998
+#: ../libedataserver/e-time-utils.c:1918 ../libedataserver/e-time-utils.c:2027
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -5129,507 +5400,273 @@ msgstr "%H:%M:%S"
#. * in 12-hour format.
#. strftime format of a time in 12-hour format,
#. * without seconds.
-#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003
+#: ../libedataserver/e-time-utils.c:1923 ../libedataserver/e-time-utils.c:2032
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:1898 ../libedataserver/e-time-utils.c:1995
+#: ../libedataserver/e-time-utils.c:1927 ../libedataserver/e-time-utils.c:2024
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:1902
+#: ../libedataserver/e-time-utils.c:1931
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1906
+#: ../libedataserver/e-time-utils.c:1935
msgid "%I %p"
msgstr "%I %p"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
-msgid "Proxy type to use"
-msgstr "Proxy type to use"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-msgid ""
-"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
-"means manual proxy."
-msgstr ""
-"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
-"means manual proxy."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
-msgid "Whether to use http-proxy"
-msgstr "Whether to use http-proxy"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
-msgid "Whether to use proxy for HTTP requests."
-msgstr "Whether to use proxy for HTTP requests."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
-msgid "Whether proxy server requires authentication"
-msgstr "Whether proxy server requires authentication"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-msgid "Whether authentication is required to access proxy server."
-msgstr "Whether authentication is required to access proxy server."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
-msgid "Host name for HTTP requests"
-msgstr "Host name for HTTP requests"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
-msgid "Host name to use for HTTP requests."
-msgstr "Host name to use for HTTP requests."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
-msgid "Port number for HTTP requests"
-msgstr "Port number for HTTP requests"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
-msgid "Port number to use for HTTP requests."
-msgstr "Port number to use for HTTP requests."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-msgid "Proxy authentication user name"
-msgstr "Proxy authentication user name"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-msgid "User name to use to authenticate against proxy server."
-msgstr "User name to use to authenticate against proxy server."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-msgid "Proxy authentication password"
-msgstr "Proxy authentication password"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-msgid "Password to use to authenticate against proxy server."
-msgstr "Password to use to authenticate against proxy server."
+#: ../libedataserver/e-webdav-discover.c:484
+#: ../libedataserver/e-webdav-discover.c:493
+#, c-format
+msgid "HTTP Error: %s"
+msgstr "HTTP Error: %s"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
-msgid "List of hosts to connect to without proxy"
-msgstr "List of hosts to connect to without proxy"
+#: ../libedataserver/e-webdav-discover.c:523
+msgid "Could not parse response"
+msgstr "Could not parse response"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
-msgid "List of hosts for which do not use proxy."
-msgstr "List of hosts for which do not use proxy."
+#: ../libedataserver/e-webdav-discover.c:532
+msgid "Empty response"
+msgstr "Empty response"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
-msgid "Host name for HTTPS requests"
-msgstr "Host name for HTTPS requests"
+#: ../libedataserver/e-webdav-discover.c:540
+msgid "Unexpected reply from server"
+msgstr "Unexpected reply from server"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
-msgid "Host name to use for HTTPS requests."
-msgstr "Host name to use for HTTPS requests."
+#: ../libedataserverui/e-credentials-prompter.c:260
+#: ../libedataserverui/e-credentials-prompter.c:1563
+#: ../libedataserverui/e-credentials-prompter.c:1607
+msgid "Credentials prompt was cancelled"
+msgstr "Credentials prompt was cancelled"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
-msgid "Port number for HTTPS requests"
-msgstr "Port number for HTTPS requests"
+#: ../libedataserverui/e-credentials-prompter.c:664
+#, c-format
+msgid "Source '%s' doesn't support prompt for credentials"
+msgstr "Source '%s' doesn't support prompt for credentials"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
-msgid "Port number to use for HTTPS requests."
-msgstr "Port number to use for HTTPS requests."
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:441
+#, c-format
+msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgstr "Failed to obtain access token from address '%s'. Error code %d (%s)"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
-msgid "Host name for SOCKS requests"
-msgstr "Host name for SOCKS requests"
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:487
+msgid "Requesting access token, please wait..."
+msgstr "Requesting access token, please wait…"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
-msgid "Host name to use for SOCKS requests."
-msgstr "Host name to use for SOCKS requests."
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:589
+msgid "Google Address book authentication request"
+msgstr "Google Address book authentication request"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
-msgid "Port number for SOCKS requests"
-msgstr "Port number for SOCKS requests"
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:592
+msgid "Google Calendar authentication request"
+msgstr "Google Calendar authentication request"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
-msgid "Port number to use for SOCKS requests."
-msgstr "Port number to use for SOCKS requests."
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:595
+msgid "Google Memo List authentication request"
+msgstr "Google Memo List authentication request"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
-msgid "Automatic proxy configuration URL"
-msgstr "Automatic proxy configuration URL"
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:598
+msgid "Google Task List authentication request"
+msgstr "Google Task List authentication request"
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
-msgid "Where to read automatic proxy configuration from."
-msgstr "Where to read automatic proxy configuration from."
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
+msgid "Google Mail authentication request"
+msgstr "Google Mail authentication request"
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:132
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365
-#, c-format
-msgid "No such data source for UID '%s'"
-msgstr "No such data source for UID '%s'"
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
+msgid "Google account authentication request"
+msgstr "Google account authentication request"
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:144
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:616
#, c-format
msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain a password for '%s'"
+"Login to your Google account and accept conditions in order to access your "
+"address book \"%s\"."
msgstr ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain a password for '%s'"
-
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:216
-#, c-format
-msgid "Invalid password for '%s'"
-msgstr "Invalid password for '%s'"
+"Login to your Google account and accept conditions in order to access your "
+"address book \"%s\"."
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:223
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:620
#, c-format
-msgid "Code: %u - Unexpected response from server"
-msgstr "Code: %u - Unexpected response from server"
-
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:244
-#, c-format
-msgid "Failed to parse autodiscover response XML"
-msgstr "Failed to parse autodiscover response XML"
-
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:253
-#, c-format
-msgid "Failed to find Autodiscover element"
-msgstr "Failed to find Autodiscover element"
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"calendar \"%s\"."
+msgstr ""
+"Login to your Google account and accept conditions in order to access your "
+"calendar \"%s\"."
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:265
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:624
#, c-format
-msgid "Failed to find Response element"
-msgstr "Failed to find Response element"
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail account \"%s\"."
+msgstr ""
+"Login to your Google account and accept conditions in order to access your "
+"mail account \"%s\"."
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:277
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:628
#, c-format
-msgid "Failed to find Account element"
-msgstr "Failed to find Account element"
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail transport \"%s\"."
+msgstr ""
+"Login to your Google account and accept conditions in order to access your "
+"mail transport \"%s\"."
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:291
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:632
#, c-format
-msgid "Failed to find ASUrl and OABUrl in autodiscover response"
-msgstr "Failed to find ASUrl and OABUrl in autodiscover response"
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"memo list \"%s\"."
+msgstr ""
+"Login to your Google account and accept conditions in order to access your "
+"memo list \"%s\"."
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1237
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:636
#, c-format
msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an access token for '%s'"
+"Login to your Google account and accept conditions in order to access your "
+"task list \"%s\"."
msgstr ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an access token for '%s'"
+"Login to your Google account and accept conditions in order to access your "
+"task list \"%s\"."
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1264
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:640
#, c-format
-msgid "Failed to obtain an access token for '%s': "
-msgstr "Failed to obtain an access token for '%s': "
-
-#: ../modules/google-backend/module-google-backend.c:140
-#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../modules/google-backend/module-google-backend.c:217
-#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
-#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../modules/trust-prompt/certificate-viewer.c:292
-msgid "Not part of certificate"
-msgstr "Not part of certificate"
-
-#: ../modules/trust-prompt/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr "This certificate has been verified for the following uses:"
-
-#: ../modules/trust-prompt/certificate-viewer.c:604
-#: ../modules/trust-prompt/e-asn1-object.c:387
-msgid "SSL Client Certificate"
-msgstr "SSL Client Certificate"
-
-#: ../modules/trust-prompt/certificate-viewer.c:609
-#: ../modules/trust-prompt/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "SSL Server Certificate"
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"account \"%s\"."
+msgstr ""
+"Login to your Google account and accept conditions in order to access your "
+"account \"%s\"."
-#: ../modules/trust-prompt/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "E-mail Signer Certificate"
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:684
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:232
+#: ../libedataserverui/e-trust-prompt.c:114
+#: ../libedataserverui/e-webdav-discover-widget.c:1063
+msgid "_Cancel"
+msgstr "_Cancel"
-#: ../modules/trust-prompt/certificate-viewer.c:619
-msgid "Email Recipient Certificate"
-msgstr "E-mail Recipient Certificate"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
+msgid "Address book authentication request"
+msgstr "Address book authentication request"
-#: ../modules/trust-prompt/certificate-viewer.c:634
-msgid "Issued To"
-msgstr "Issued To"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
+msgid "Calendar authentication request"
+msgstr "Calendar authentication request"
-#: ../modules/trust-prompt/certificate-viewer.c:635
-#: ../modules/trust-prompt/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr "Common Name (CN)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:636
-#: ../modules/trust-prompt/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "Organisation (O)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:637
-#: ../modules/trust-prompt/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "Organisational Unit (OU)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:638
-#: ../modules/trust-prompt/e-asn1-object.c:134
-msgid "Serial Number"
-msgstr "Serial Number"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
+msgid "Mail authentication request"
+msgstr "Mail authentication request"
-#: ../modules/trust-prompt/certificate-viewer.c:640
-msgid "Issued By"
-msgstr "Issued By"
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
+msgid "Authentication request"
+msgstr "Authentication request"
-#: ../modules/trust-prompt/certificate-viewer.c:645
-msgid "Validity"
-msgstr "Validity"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "Please enter the password for address book \"%s\"."
-#: ../modules/trust-prompt/certificate-viewer.c:646
-msgid "Issued On"
-msgstr "Issued On"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "Please enter the password for calendar \"%s\"."
-#: ../modules/trust-prompt/certificate-viewer.c:647
-msgid "Expires On"
-msgstr "Expires On"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "Please enter the password for mail account \"%s\"."
-#: ../modules/trust-prompt/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr "Fingerprints"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "Please enter the password for mail transport \"%s\"."
-#: ../modules/trust-prompt/certificate-viewer.c:650
-msgid "SHA1 Fingerprint"
-msgstr "SHA1 Fingerprint"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "Please enter the password for memo list \"%s\"."
-#: ../modules/trust-prompt/certificate-viewer.c:651
-msgid "MD5 Fingerprint"
-msgstr "MD5 Fingerprint"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "Please enter the password for task list \"%s\"."
-#: ../modules/trust-prompt/certificate-viewer.c:653
-msgid "General"
-msgstr "General"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "Please enter the password for account \"%s\"."
-#: ../modules/trust-prompt/certificate-viewer.c:672
-msgid "Certificate Hierarchy"
-msgstr "Certificate Hierarchy"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
+#: ../libedataserverui/e-webdav-discover-widget.c:1064
+msgid "_OK"
+msgstr "_OK"
-#: ../modules/trust-prompt/certificate-viewer.c:676
-msgid "Certificate Fields"
-msgstr "Certificate Fields"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
+msgid "_User Name:"
+msgstr "_User Name:"
-#: ../modules/trust-prompt/certificate-viewer.c:680
-msgid "Field Value"
-msgstr "Field Value"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
+msgid "_Password:"
+msgstr "_Password:"
-#: ../modules/trust-prompt/certificate-viewer.c:682
-msgid "Details"
-msgstr "Details"
+#. Remember password check
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
+msgid "_Add this password to your keyring"
+msgstr "_Add this password to your keyring"
-#: ../modules/trust-prompt/e-asn1-object.c:95
-msgid "Version"
-msgstr "Version"
-
-#: ../modules/trust-prompt/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "Version 1"
-
-#: ../modules/trust-prompt/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "Version 2"
-
-#: ../modules/trust-prompt/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "Version 3"
-
-#: ../modules/trust-prompt/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 With RSA Encryption"
+#: ../libedataserverui/e-trust-prompt.c:113
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
+msgid "Certificate trust..."
+msgstr "Certificate trust…"
-#: ../modules/trust-prompt/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 With RSA Encryption"
+#: ../libedataserverui/e-trust-prompt.c:115
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
+msgid "_Reject"
+msgstr "_Reject"
-#: ../modules/trust-prompt/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 With RSA Encryption"
+#: ../libedataserverui/e-trust-prompt.c:116
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
+msgid "Accept _Temporarily"
+msgstr "Accept _Temporarily"
-#: ../modules/trust-prompt/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 With RSA Encryption"
+#: ../libedataserverui/e-trust-prompt.c:117
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
+msgid "_Accept Permanently"
+msgstr "_Accept Permanently"
-#: ../modules/trust-prompt/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 With RSA Encryption"
+#: ../libedataserverui/e-trust-prompt.c:188
+#: ../modules/trust-prompt/trust-prompt-gtk.c:159
+#, c-format
+msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
-#: ../modules/trust-prompt/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 With RSA Encryption"
+#: ../libedataserverui/e-trust-prompt.c:210
+#: ../modules/trust-prompt/trust-prompt-gtk.c:174
+msgid "Reason:"
+msgstr "Reason:"
-#: ../modules/trust-prompt/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA Encryption"
+#: ../libedataserverui/e-trust-prompt.c:213
+msgid "Detailed error:"
+msgstr "Detailed error:"
-#: ../modules/trust-prompt/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "Certificate Key Usage"
-
-#: ../modules/trust-prompt/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Netscape Certificate Type"
-
-#: ../modules/trust-prompt/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "Certificate Authority Key Identifier"
-
-#: ../modules/trust-prompt/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "Object Identifier (%s)"
-
-#: ../modules/trust-prompt/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "Algorithm Identifier"
-
-#: ../modules/trust-prompt/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "Algorithm Parameters"
-
-#: ../modules/trust-prompt/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "Subject Public Key Info"
-
-#: ../modules/trust-prompt/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "Subject Public Key Algorithm"
-
-#: ../modules/trust-prompt/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "Subject's Public Key"
-
-#: ../modules/trust-prompt/e-asn1-object.c:378
-#: ../modules/trust-prompt/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "Error: Unable to process extension"
-
-#: ../modules/trust-prompt/e-asn1-object.c:395
-msgid "Email"
-msgstr "E-mail"
-
-#: ../modules/trust-prompt/e-asn1-object.c:399
-#: ../modules/trust-prompt/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "Object Signer"
-
-#: ../modules/trust-prompt/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "SSL Certificate Authority"
-
-#: ../modules/trust-prompt/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "E-mail Certificate Authority"
-
-#: ../modules/trust-prompt/e-asn1-object.c:436
-msgid "Signing"
-msgstr "Signing"
-
-#: ../modules/trust-prompt/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "Non-repudiation"
-
-#: ../modules/trust-prompt/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "Key Encypherment"
-
-#: ../modules/trust-prompt/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "Data Encypherment"
-
-#: ../modules/trust-prompt/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "Key Agreement"
-
-#: ../modules/trust-prompt/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "Certificate Signer"
-
-#: ../modules/trust-prompt/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL Signer"
-
-#: ../modules/trust-prompt/e-asn1-object.c:509
-msgid "Critical"
-msgstr "Critical"
-
-#: ../modules/trust-prompt/e-asn1-object.c:511
-#: ../modules/trust-prompt/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "Not Critical"
-
-#: ../modules/trust-prompt/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "Extensions"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself. You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value. As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../modules/trust-prompt/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../modules/trust-prompt/e-asn1-object.c:658
-msgid "Certificate"
-msgstr "Certificate"
-
-#: ../modules/trust-prompt/e-asn1-object.c:674
-#: ../modules/trust-prompt/e-asn1-object.c:812
-msgid "Certificate Signature Algorithm"
-msgstr "Certificate Signature Algorithm"
-
-#: ../modules/trust-prompt/e-asn1-object.c:683
-msgid "Issuer"
-msgstr "Issuer"
-
-#: ../modules/trust-prompt/e-asn1-object.c:714
-msgid "Subject"
-msgstr "Subject"
-
-#: ../modules/trust-prompt/e-asn1-object.c:738
-msgid "Issuer Unique ID"
-msgstr "Issuer Unique ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:757
-msgid "Subject Unique ID"
-msgstr "Subject Unique ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:818
-msgid "Certificate Signature Value"
-msgstr "Certificate Signature Value"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:201
+#: ../libedataserverui/e-trust-prompt.c:275
+#: ../modules/trust-prompt/module-trust-prompt.c:82
msgid "The signing certificate authority is not known."
msgstr "The signing certificate authority is not known."
-#: ../modules/trust-prompt/module-trust-prompt.c:203
+#: ../libedataserverui/e-trust-prompt.c:277
+#: ../modules/trust-prompt/module-trust-prompt.c:84
msgid ""
"The certificate does not match the expected identity of the site that it was "
"retrieved from."
@@ -5637,15 +5674,18 @@ msgstr ""
"The certificate does not match the expected identity of the site that it was "
"retrieved from."
-#: ../modules/trust-prompt/module-trust-prompt.c:205
+#: ../libedataserverui/e-trust-prompt.c:279
+#: ../modules/trust-prompt/module-trust-prompt.c:86
msgid "The certificate's activation time is still in the future."
msgstr "The certificate's activation time is still in the future."
-#: ../modules/trust-prompt/module-trust-prompt.c:207
+#: ../libedataserverui/e-trust-prompt.c:281
+#: ../modules/trust-prompt/module-trust-prompt.c:88
msgid "The certificate has expired."
msgstr "The certificate has expired."
-#: ../modules/trust-prompt/module-trust-prompt.c:209
+#: ../libedataserverui/e-trust-prompt.c:283
+#: ../modules/trust-prompt/module-trust-prompt.c:90
msgid ""
"The certificate has been revoked according to the connection's certificate "
"revocation list."
@@ -5653,54 +5693,133 @@ msgstr ""
"The certificate has been revoked according to the connection's certificate "
"revocation list."
-#: ../modules/trust-prompt/module-trust-prompt.c:211
+#: ../libedataserverui/e-trust-prompt.c:285
+#: ../modules/trust-prompt/module-trust-prompt.c:92
msgid "The certificate's algorithm is considered insecure."
msgstr "The certificate's algorithm is considered insecure."
-#: ../modules/trust-prompt/trust-prompt-gtk.c:162
-msgid "Certificate trust..."
-msgstr "Certificate trust..."
+#: ../libedataserverui/e-webdav-discover-widget.c:166
+msgid "Supports"
+msgstr "Supports"
-#: ../modules/trust-prompt/trust-prompt-gtk.c:163
-msgid "_View Certificate"
-msgstr "_View Certificate"
+#: ../libedataserverui/e-webdav-discover-widget.c:177
+msgid "_User mail:"
+msgstr "_User mail:"
-#: ../modules/trust-prompt/trust-prompt-gtk.c:164
-msgid "_Reject"
-msgstr "_Reject"
+#: ../libedataserverui/e-webdav-discover-widget.c:523
+msgctxt "WebDAVDiscover"
+msgid "Contacts"
+msgstr "Contacts"
-#: ../modules/trust-prompt/trust-prompt-gtk.c:165
-msgid "Accept _Temporarily"
-msgstr "Accept _Temporarily"
+#: ../libedataserverui/e-webdav-discover-widget.c:524
+msgctxt "WebDAVDiscover"
+msgid "Events"
+msgstr "Events"
-#: ../modules/trust-prompt/trust-prompt-gtk.c:166
-msgid "_Accept Permanently"
-msgstr "_Accept Permanently"
+#: ../libedataserverui/e-webdav-discover-widget.c:525
+msgctxt "WebDAVDiscover"
+msgid "Memos"
+msgstr "Memos"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:526
+msgctxt "WebDAVDiscover"
+msgid "Tasks"
+msgstr "Tasks"
-#: ../modules/trust-prompt/trust-prompt-gtk.c:203
+#: ../libedataserverui/e-webdav-discover-widget.c:825
+msgid "Invalid URL"
+msgstr "Invalid URI"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:839
+msgid "User name not filled"
+msgstr "User name not filled"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:880
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:883
+msgid "Searching server sources..."
+msgstr "Searching server sources…"
+
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:210
#, c-format
-msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain a password for '%s'"
+msgstr ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain a password for '%s'"
-#: ../modules/trust-prompt/trust-prompt-gtk.c:209
-msgid "Detailed information about the certificate:"
-msgstr "Detailed information about the certificate:"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:273
+msgid "Failed to get password from GOA: "
+msgstr "Failed to get password from GOA: "
-#: ../modules/trust-prompt/trust-prompt-gtk.c:223
-msgid "Issuer:"
-msgstr "Issuer:"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:219
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "Code: %u - Unexpected response from server"
-#: ../modules/trust-prompt/trust-prompt-gtk.c:224
-msgid "Subject:"
-msgstr "Subject:"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:240
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "Failed to parse autodiscover response XML"
-#: ../modules/trust-prompt/trust-prompt-gtk.c:225
-msgid "Fingerprint:"
-msgstr "Fingerprint:"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:249
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "Failed to find Autodiscover element"
-#: ../modules/trust-prompt/trust-prompt-gtk.c:226
-msgid "Reason:"
-msgstr "Reason:"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:261
+#, c-format
+msgid "Failed to find Response element"
+msgstr "Failed to find Response element"
+
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:273
+#, c-format
+msgid "Failed to find Account element"
+msgstr "Failed to find Account element"
+
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:287
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "Failed to find ASUrl and OABUrl in autodiscover response"
+
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1235
+#, c-format
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an access token for '%s'"
+msgstr ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an access token for '%s'"
+
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#, c-format
+msgid "Failed to obtain an access token for '%s': "
+msgstr "Failed to obtain an access token for '%s': "
+
+#: ../modules/google-backend/module-google-backend.c:602
+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
+msgid "Tasks"
+msgstr "Tasks"
+
+#: ../modules/google-backend/module-google-backend.c:659
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+msgid "Contacts"
+msgstr "Contacts"
+
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../modules/yahoo-backend/module-yahoo-backend.c:199
+msgid "Calendar"
+msgstr "Calendar"
#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
msgid "Integrate your calendars"
@@ -5710,10 +5829,18 @@ msgstr "Integrate your calendars"
msgid "Integrate your contacts"
msgstr "Integrate your contacts"
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:272
msgid "Signon service did not return a secret"
msgstr "Signon service did not return a secret"
+#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
+msgid "Evolution Data Server"
+msgstr "Evolution Data Server"
+
+#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
+msgid "Required to have EDS appear in UOA"
+msgstr "Required to have EDS appear in UOA"
+
#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
msgid "Google Calendar"
msgstr "Google Calendar"
@@ -5734,7 +5861,7 @@ msgstr "Mail"
msgid "Integrate your mailboxes"
msgstr "Integrate your mailboxes"
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
#, c-format
msgid ""
"Cannot find a corresponding account service in the accounts database from "
@@ -5743,18 +5870,34 @@ msgstr ""
"Cannot find a corresponding account service in the accounts database from "
"which to obtain an access token for '%s'"
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:79
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
#, c-format
-msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
-msgstr "Expected status 200 when requesting guid, instead got status %d (%s)"
+msgid ""
+"Expected status 200 when requesting your identity, instead got status %d (%s)"
+msgstr ""
+"Expected status 200 when requesting your identity, instead got status %d (%s)"
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:96
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
msgid "Error parsing response as JSON: "
msgstr "Error parsing response as JSON: "
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:112
-msgid "Didn't find email member in JSON data"
-msgstr "Didn't find e-mail member in JSON data"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
+msgid "Didn't find 'email' in JSON data"
+msgstr "Didn't find 'email' in JSON data"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:316
+msgid "Didn't find 'id' in JSON data"
+msgstr "Didn't find 'id' in JSON data"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:321
+msgid "Didn't find 'emails.account' in JSON data"
+msgstr "Didn't find 'emails.account' in JSON data"
+
+#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
+msgid "Windows Live Mail"
+msgstr "Windows Live Mail"
#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
msgid "Yahoo! Calendar"
@@ -5764,18 +5907,14 @@ msgstr "Yahoo! Calendar"
msgid "Yahoo! Mail"
msgstr "Yahoo! Mail"
-#: ../modules/yahoo-backend/module-yahoo-backend.c:227
-msgid "Tasks"
-msgstr "Tasks"
-
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:31
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:38
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:32
msgid "Keep running after the last client is closed"
msgstr "Keep running after the last client is closed"
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
msgid "Wait running until at least one client is connected"
msgstr "Wait running until at least one client is connected"
@@ -5816,10 +5955,533 @@ msgstr "On The Web"
msgid "WebDAV"
msgstr "WebDAV"
-#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+#: ../services/evolution-source-registry/evolution-source-registry.c:39
+msgid "Don't migrate user data from previous versions of Evolution"
+msgstr "Don't migrate user data from previous versions of Evolution"
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
msgid "_Dismiss"
msgstr "_Dismiss"
+#: ../tools/addressbook-export/addressbook-export.c:70
+#: ../tools/addressbook-export/addressbook-export.c:767
+msgid "Can not open file"
+msgstr "Cannot open file"
+
+#: ../tools/addressbook-export/addressbook-export.c:100
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "Failed to open client '%s': %s"
+
+#: ../tools/addressbook-export/addressbook-export.c:877
+msgid "Unhandled error"
+msgstr "Unhandled error"
+
+#: ../tools/addressbook-export/addressbook-export.c:910
+msgid "Specify the output file instead of standard output"
+msgstr "Specify the output file instead of standard output"
+
+#: ../tools/addressbook-export/addressbook-export.c:911
+msgid "OUTPUTFILE"
+msgstr "OUTPUTFILE"
+
+#: ../tools/addressbook-export/addressbook-export.c:914
+msgid "List local address book folders"
+msgstr "List local address book folders"
+
+#: ../tools/addressbook-export/addressbook-export.c:917
+msgid "Show cards as vcard or csv file"
+msgstr "Show cards as vcard or csv file"
+
+#: ../tools/addressbook-export/addressbook-export.c:918
+msgid "[vcard|csv]"
+msgstr "csv]"
+
+#: ../tools/addressbook-export/addressbook-export.c:966
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Command line arguments error, please use --help option to see the usage."
+
+#: ../tools/addressbook-export/addressbook-export.c:980
+msgid "Only support csv or vcard format."
+msgstr "Only support csv or vcard format."
+
+#~ msgid "Creating new contact…"
+#~ msgstr "Creating new contact…"
+
+#~ msgid "Deleting contact…"
+#~ msgstr "Deleting contact…"
+
+#~ msgid "Modifying contact…"
+#~ msgstr "Modifying contact…"
+
+#~ msgid "Clients cannot set backend properties"
+#~ msgstr "Clients cannot set backend properties"
+
+#~ msgid "No backend name in source '%s'"
+#~ msgstr "No backend name in source '%s'"
+
+#~ msgid "Missing source UID"
+#~ msgstr "Missing source UID"
+
+#~ msgid "Cannot retrieve backend property: "
+#~ msgstr "Cannot retrieve backend property: "
+
+#~ msgid "Could not get calendar view path: "
+#~ msgstr "Could not get calendar view path: "
+
+#~ msgid "You may not import keys with this cipher"
+#~ 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"
+
+#~ msgid ""
+#~ "Could not write log entry: %s\n"
+#~ "Further operations on this server will not be replayed when you\n"
+#~ "reconnect to the network."
+#~ msgstr ""
+#~ "Could not write log entry: %s\n"
+#~ "Further operations on this server will not be replayed when you\n"
+#~ "reconnect to the network."
+
+#~ msgid ""
+#~ "Could not open '%s':\n"
+#~ "%s\n"
+#~ "Changes made to this folder will not be resynchronized."
+#~ msgstr ""
+#~ "Could not open '%s':\n"
+#~ "%s\n"
+#~ "Changes made to this folder will not be resynchronised."
+
+#~ msgid "Resynchronizing with server"
+#~ msgstr "Resynchronising with server"
+
+#~ msgid "Preparing folder '%s' for offline"
+#~ msgstr "Preparing folder '%s' for offline"
+
+#~ msgid "Server disconnected"
+#~ msgstr "Server disconnected"
+
+#~ msgid "Error fetching message headers"
+#~ msgstr "Error fetching message headers"
+
+#~ msgid "Error retrieving message"
+#~ msgstr "Error retrieving message"
+
+#~ msgid "Error fetching new messages"
+#~ msgstr "Error fetching new messages"
+
+#~ msgid "Error while fetching messages"
+#~ msgstr "Error while fetching messages"
+
+#~ msgid "Fetching summary information for %d message in '%s'"
+#~ msgid_plural "Fetching summary information for %d messages in '%s'"
+#~ msgstr[0] "Fetching summary information for %d message in '%s'"
+#~ msgstr[1] "Fetching summary information for %d messages in '%s'"
+
+#~ msgid "Error refreshing folder"
+#~ msgstr "Error refreshing folder"
+
+#~ msgid "Unknown parent folder: %s"
+#~ msgstr "Unknown parent folder: %s"
+
+#~ msgid "The parent folder is not allowed to contain subfolders"
+#~ msgstr "The parent folder is not allowed to contain subfolders"
+
+#~ msgid "Resolving address"
+#~ msgstr "Resolving address"
+
+#~ msgid "Name lookup failed"
+#~ msgstr "Name lookup failed"
+
+#~ msgid "Name lookup failed. Check your host name for spelling errors."
+#~ msgstr "Name lookup failed. Check your host name for spelling errors."
+
+#~ msgid "Name lookup failed: %s"
+#~ msgstr "Name lookup failed: %s"
+
+#~ msgid "Could not connect to '%s:%s': "
+#~ msgstr "Could not connect to '%s:%s': "
+
+#~ msgid "Please enter the %s password for %s on host %s."
+#~ msgstr "Please enter the %s password for %s on host %s."
+
+#~ msgid "Cannot create folder '%s': folder exists"
+#~ msgstr "Cannot create folder '%s': folder exists"
+
+#~ msgid "NSPR error code %d"
+#~ msgstr "NSPR error code %d"
+
+#~ msgid "The proxy host does not support SOCKS4"
+#~ msgstr "The proxy host does not support SOCKS4"
+
+#~ msgid "The proxy host denied our request: code %d"
+#~ msgstr "The proxy host denied our request: code %d"
+
+#~ msgid "The proxy host does not support SOCKS5"
+#~ msgstr "The proxy host does not support SOCKS5"
+
+#~ msgid "Could not find a suitable authentication type: code 0x%x"
+#~ msgstr "Could not find a suitable authentication type: code 0x%x"
+
+#~ msgid "General SOCKS server failure"
+#~ msgstr "General SOCKS server failure"
+
+#~ msgid "SOCKS server's rules do not allow connection"
+#~ msgstr "SOCKS server's rules do not allow connection"
+
+#~ msgid "Network is unreachable from SOCKS server"
+#~ msgstr "Network is unreachable from SOCKS server"
+
+#~ msgid "Host is unreachable from SOCKS server"
+#~ msgstr "Host is unreachable from SOCKS server"
+
+#~ msgid "Connection refused"
+#~ msgstr "Connection refused"
+
+#~ msgid "Time-to-live expired"
+#~ msgstr "Time-to-live expired"
+
+#~ msgid "Command not supported by SOCKS server"
+#~ msgstr "Command not supported by SOCKS server"
+
+#~ msgid "Address type not supported by SOCKS server"
+#~ msgstr "Address type not supported by SOCKS server"
+
+#~ msgid "Unknown error from SOCKS server"
+#~ msgstr "Unknown error from SOCKS server"
+
+#~ msgid "Got unknown address type from SOCKS server"
+#~ msgstr "Got unknown address type from SOCKS server"
+
+#~ msgid "Incomplete reply from SOCKS server"
+#~ msgstr "Incomplete reply from SOCKS server"
+
+#~ msgid "Hostname is too long (maximum is 255 characters)"
+#~ msgstr "Hostname is too long (maximum is 255 characters)"
+
+#~ msgid "Invalid reply from proxy server"
+#~ msgstr "Invalid reply from proxy server"
+
+#~ msgid "Unable to add message to summary: unknown reason"
+#~ msgstr "Unable to add message to summary: unknown reason"
+
+#~ msgid "Cannot create folder '%s': folder exists."
+#~ msgstr "Cannot create folder '%s': folder exists."
+
+#~ msgid "Fatal mail parser error near position %s in folder %s"
+#~ msgstr "Fatal mail parser error near position %s in folder %s"
+
+#~ msgid "You cannot post NNTP messages while working offline!"
+#~ msgstr "You cannot post NNTP messages while working offline!"
+
+#~ msgid "Bus name vanished (client terminated?)"
+#~ msgstr "Bus name vanished (client terminated?)"
+
+#~ msgid "No response from client"
+#~ msgstr "No response from client"
+
+#~ msgid "Client cancelled the operation"
+#~ msgstr "Client cancelled the operation"
+
+#~ msgid "Client reports password was rejected"
+#~ msgstr "Client reports password was rejected"
+
+#~ msgid "Password was incorrect"
+#~ msgstr "Password was incorrect"
+
+#~ msgid "No backend factory for hash key '%s'"
+#~ msgstr "No backend factory for hash key '%s'"
+
+#~ msgid "The user declined to authenticate"
+#~ msgstr "The user declined to authenticate"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by address book '%s', is not trusted. "
+#~ "Do you wish to accept it?"
+#~ msgstr ""
+#~ "SSL certificate for host '%s', used by address book '%s', is not trusted. "
+#~ "Do you wish to accept it?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+
+#~ msgid ""
+#~ "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+#~ "means manual proxy."
+#~ msgstr ""
+#~ "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+#~ "means manual proxy."
+
+#~ msgid "Whether to use proxy for HTTP requests."
+#~ msgstr "Whether to use proxy for HTTP requests."
+
+#~ msgid "Whether authentication is required to access proxy server."
+#~ msgstr "Whether authentication is required to access proxy server."
+
+#~ msgid "Host name to use for HTTP requests."
+#~ msgstr "Host name to use for HTTP requests."
+
+#~ msgid "Port number to use for HTTP requests."
+#~ msgstr "Port number to use for HTTP requests."
+
+#~ msgid "User name to use to authenticate against proxy server."
+#~ msgstr "User name to use to authenticate against proxy server."
+
+#~ msgid "Password to use to authenticate against proxy server."
+#~ msgstr "Password to use to authenticate against proxy server."
+
+#~ msgid "List of hosts for which do not use proxy."
+#~ msgstr "List of hosts for which do not use proxy."
+
+#~ msgid "Host name to use for HTTPS requests."
+#~ msgstr "Host name to use for HTTPS requests."
+
+#~ msgid "Port number to use for HTTPS requests."
+#~ msgstr "Port number to use for HTTPS requests."
+
+#~ msgid "Host name to use for SOCKS requests."
+#~ msgstr "Host name to use for SOCKS requests."
+
+#~ msgid "Port number to use for SOCKS requests."
+#~ msgstr "Port number to use for SOCKS requests."
+
+#~ msgid "Where to read automatic proxy configuration from."
+#~ msgstr "Where to read automatic proxy configuration from."
+
+#~ msgid "No such data source for UID '%s'"
+#~ msgstr "No such data source for UID '%s'"
+
+#~ msgid "Invalid password for '%s'"
+#~ msgstr "Invalid password for '%s'"
+
+#~ msgid "Not part of certificate"
+#~ msgstr "Not part of certificate"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "This certificate has been verified for the following uses:"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL Client Certificate"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL Server Certificate"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "E-mail Signer Certificate"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "E-mail Recipient Certificate"
+
+#~ msgid "Issued To"
+#~ msgstr "Issued To"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "Common Name (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "Organisation (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "Organisational Unit (OU)"
+
+#~ msgid "Serial Number"
+#~ msgstr "Serial Number"
+
+#~ msgid "Issued By"
+#~ msgstr "Issued By"
+
+#~ msgid "Validity"
+#~ msgstr "Validity"
+
+#~ msgid "Issued On"
+#~ msgstr "Issued On"
+
+#~ msgid "Expires On"
+#~ msgstr "Expires On"
+
+#~ msgid "Fingerprints"
+#~ msgstr "Fingerprints"
+
+#~ msgid "SHA1 Fingerprint"
+#~ msgstr "SHA1 Fingerprint"
+
+#~ msgid "MD5 Fingerprint"
+#~ msgstr "MD5 Fingerprint"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "Certificate Hierarchy"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "Certificate Fields"
+
+#~ msgid "Field Value"
+#~ msgstr "Field Value"
+
+#~ msgid "Details"
+#~ msgstr "Details"
+
+#~ msgid "Version"
+#~ msgstr "Version"
+
+#~ msgid "Version 1"
+#~ msgstr "Version 1"
+
+#~ msgid "Version 2"
+#~ msgstr "Version 2"
+
+#~ msgid "Version 3"
+#~ msgstr "Version 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "PKCS #1 MD2 With RSA Encryption"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "PKCS #1 MD5 With RSA Encryption"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-1 With RSA Encryption"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-256 With RSA Encryption"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-384 With RSA Encryption"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-512 With RSA Encryption"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA Encryption"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "Certificate Key Usage"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Netscape Certificate Type"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "Certificate Authority Key Identifier"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "Object Identifier (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "Algorithm Identifier"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "Algorithm Parameters"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "Subject Public Key Info"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "Subject Public Key Algorithm"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "Subject's Public Key"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "Error: Unable to process extension"
+
+#~ msgid "Object Signer"
+#~ msgstr "Object Signer"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "SSL Certificate Authority"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "E-mail Certificate Authority"
+
+#~ msgid "Signing"
+#~ msgstr "Signing"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "Non-repudiation"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "Key Encypherment"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "Data Encypherment"
+
+#~ msgid "Key Agreement"
+#~ msgstr "Key Agreement"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "Certificate Signer"
+
+#~ msgid "CRL Signer"
+#~ msgstr "CRL Signer"
+
+#~ msgid "Critical"
+#~ msgstr "Critical"
+
+#~ msgid "Not Critical"
+#~ msgstr "Not Critical"
+
+#~ msgid "Extensions"
+#~ msgstr "Extensions"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "Certificate Signature Algorithm"
+
+#~ msgid "Issuer"
+#~ msgstr "Issuer"
+
+#~ msgid "Subject"
+#~ msgstr "Subject"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "Issuer Unique ID"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "Subject Unique ID"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "Certificate Signature Value"
+
+#~ msgid "_View Certificate"
+#~ msgstr "_View Certificate"
+
+#~ msgid "Detailed information about the certificate:"
+#~ msgstr "Detailed information about the certificate:"
+
+#~ msgid "Issuer:"
+#~ msgstr "Issuer:"
+
+#~ msgid "Subject:"
+#~ msgstr "Subject:"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Fingerprint:"
+
#~ msgid "Failed to build summary for an address book %s"
#~ msgstr "Failed to build summary for an address book %s"
@@ -5943,9 +6605,6 @@ msgstr "_Dismiss"
#~ "Alert from IMAP server %s@%s:\n"
#~ "%s"
-#~ msgid "Unexpected response from IMAP server: %s"
-#~ msgstr "Unexpected response from IMAP server: %s"
-
#~ msgid "IMAP command failed: %s"
#~ msgstr "IMAP command failed: %s"
@@ -5958,9 +6617,6 @@ msgstr "_Dismiss"
#~ msgid "Unexpected OK response from IMAP server: %s"
#~ msgstr "Unexpected OK response from IMAP server: %s"
-#~ msgid "Always check for _new mail in this folder"
-#~ msgstr "Always check for _new mail in this folder"
-
#~ msgid "Could not create directory %s: %s"
#~ msgstr "Could not create directory %s: %s"
@@ -5991,9 +6647,6 @@ msgstr "_Dismiss"
#~ msgid "Failed to cache message %s: "
#~ msgstr "Failed to cache message %s: "
-#~ msgid "Failed to cache %s: "
-#~ msgstr "Failed to cache %s: "
-
#~ msgid "Names_pace:"
#~ msgstr "Names_pace:"
@@ -6091,9 +6744,6 @@ msgstr "_Dismiss"
#~ msgid "_Remove"
#~ msgstr "_Remove"
-#~ msgid "Error loading address book: %s"
-#~ msgstr "Error loading address book: %s"
-
#~ msgid "E_xpand %s Inline"
#~ msgstr "E_xpand %s Inline"
@@ -6151,9 +6801,6 @@ msgstr "_Dismiss"
#~ msgid "Cannot remove calendar: "
#~ msgstr "Cannot remove calendar: "
-#~ msgid "Keyring operation was cancelled"
-#~ msgstr "Keyring operation was cancelled"
-
#~ msgid "Authenticating with the server…"
#~ msgstr "Authenticating with the server…"
@@ -6166,9 +6813,6 @@ msgstr "_Dismiss"
#~ msgid "Incorrect uri '%s'"
#~ msgstr "Incorrect uri '%s'"
-#~ msgid "Failed to find system book"
-#~ msgstr "Failed to find system book"
-
#~ msgid "There was no source for UID '%s' stored in a source list."
#~ msgstr "There was no source for UID '%s' stored in a source list."
@@ -6197,12 +6841,6 @@ msgstr "_Dismiss"
#~ msgid "Invalid source type"
#~ msgstr "Invalid source type"
-#~ msgid "Updating %s folder"
-#~ msgstr "Updating %s folder"
-
-#~ msgid "Connection to Server"
-#~ msgstr "Connection to Server"
-
#~ msgid "_Use custom command to connect to server"
#~ msgstr "_Use custom command to connect to server"
@@ -6212,9 +6850,6 @@ msgstr "_Dismiss"
#~ msgid "Command:"
#~ msgstr "Command:"
-#~ msgid "Numbe_r of cached connections to use"
-#~ msgstr "Numbe_r of cached connections to use"
-
#~ msgid "Closing tmp stream failed: "
#~ msgstr "Closing tmp stream failed: "
@@ -6260,9 +6895,6 @@ msgstr "_Dismiss"
#~ msgid "Enter Password"
#~ msgstr "Enter Password"
-#~ msgid "Invalid URI"
-#~ msgstr "Invalid URI"
-
#~ msgid "Could not instantiate backend"
#~ msgstr "Could not instantiate backend"
@@ -6442,12 +7074,6 @@ msgstr "_Dismiss"
#~ msgid "This message is not available in offline mode."
#~ msgstr "This message is not available in offline mode."
-#~ msgid "Cannot get folder container %s"
-#~ msgstr "Cannot get folder container %s"
-
-#~ msgid "Cannot append message in offline mode: cache unavailable"
-#~ msgstr "Cannot append message in offline mode: cache unavailable"
-
#~ msgid "Cannot append message in offline mode: "
#~ msgstr "Cannot append message in offline mode: "
@@ -6505,9 +7131,6 @@ msgstr "_Dismiss"
#~ msgid "GroupWise mail delivery via %s"
#~ msgstr "GroupWise mail delivery via %s"
-#~ msgid "Sending Message"
-#~ msgstr "Sending Message"
-
#~ msgid "Cannot get folder: Invalid operation on this store"
#~ msgstr "Cannot get folder: Invalid operation on this store"
@@ -6571,9 +7194,6 @@ msgstr "_Dismiss"
#~ msgid "Could not create thread for getting deltas"
#~ msgstr "Could not create thread for getting deltas"
-#~ msgid "Cannot open message"
-#~ msgstr "Cannot open message"
-
#~ msgid "Unsupported operation: append message: for %s"
#~ msgstr "Unsupported operation: append message: for %s"
@@ -6601,9 +7221,6 @@ msgstr "_Dismiss"
#~ msgid "Cannot create folder: Invalid operation on this store"
#~ msgstr "Cannot create folder: Invalid operation on this store"
-#~ msgid "User canceled"
-#~ msgstr "User cancelled"
-
#~ msgid "Trash Folder Full. Please Empty."
#~ msgstr "Wastebasket Folder Full. Please Empty."
@@ -6699,9 +7316,6 @@ msgstr "_Dismiss"
#~ msgid "Cannot select folder '%s': Bad command"
#~ msgstr "Cannot select folder '%s': Bad command"
-#~ msgid "Failed to send command to IMAP server %s: %s"
-#~ msgstr "Failed to send command to IMAP server %s: %s"
-
#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
#~ msgstr "IMAP4 server %s unexpectedly disconnected: %s"
@@ -7078,12 +7692,6 @@ msgstr "_Dismiss"
#~ msgid "Global Address List"
#~ msgstr "Global Address List"
-#~ msgid "Deleted Items"
-#~ msgstr "Deleted Items"
-
-#~ msgid "Drafts"
-#~ msgstr "Drafts"
-
#~ msgid "Journal"
#~ msgstr "Journal"
@@ -7093,9 +7701,6 @@ msgstr "_Dismiss"
#~ msgid "Outbox"
#~ msgstr "Outbox"
-#~ msgid "Sent Items"
-#~ msgstr "Sent Items"
-
#~ msgid "Evolution Addressbook file backend"
#~ msgstr "Evolution Addressbook file backend"
@@ -7105,9 +7710,6 @@ msgstr "_Dismiss"
#~ 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\""
@@ -7132,9 +7734,6 @@ msgstr "_Dismiss"
#~ msgid "%s: Could not create EBookListener"
#~ msgstr "%s: Could not create EBookListener"
-#~ msgid "Decoder failed, error %d"
-#~ msgstr "Decoder failed, error %d"
-
#~ msgid "CRL not yet valid"
#~ msgstr "CRL not yet valid"
@@ -7144,12 +7743,6 @@ msgstr "_Dismiss"
#~ msgid "Error in CRL"
#~ msgstr "Error in CRL"
-#~ msgid "Sent"
-#~ msgstr "Sent"
-
-#~ msgid "Templates"
-#~ msgstr "Templates"
-
# dialog display isn't working out
#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
#~ msgstr ""
@@ -7233,12 +7826,6 @@ msgstr "_Dismiss"
#~ msgid "Weather: Partly Cloudy"
#~ msgstr "Weather: Partly Cloudy"
-#~ msgid "%.1f°C - %s"
-#~ msgstr "%.1f°C - %s"
-
-#~ msgid "%.1f°F - %s"
-#~ msgstr "%.1f°F - %s"
-
#~ msgid "%.1f/%.1f°C - %s"
#~ msgstr "%.1f/%.1f°C - %s"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
