[evolution-data-server] Update British English translation



commit a32babbd5c742e44dbf8f083f09ee3037f8eb0b5
Author: Bruce Cowan <bruce bcowan eu>
Date:   Fri Mar 2 12:38:45 2018 +0000

    Update British English translation

 po/en_GB.po | 5374 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 3232 insertions(+), 2142 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 39892fd..9980d07 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,344 +3,311 @@
 # Robert Brady <rwb197 zepler org>, 2000.
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Philip Withnall <philip tecnocode co uk>, 2009, 2010.
-# Bruce Cowan <bruce bcowan me uk>, 2010, 2011, 2012, 2013.
 # Chris Leonard <cjl laptop org>, 2012.
+# Bruce Cowan <bruce bcowan eu>, 2010, 2011, 2012, 2013, 2018.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"Report-Msgid-Bugs-To: https://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"
+"POT-Creation-Date: 2018-02-23 13:33+0000\n"
+"PO-Revision-Date: 2018-03-02 12:36+0000\n"
+"Last-Translator: Bruce Cowan <bruce bcowan eu>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:120
+#: ../src/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"
+#| msgid "Failed to remove file '%s': %s"
+msgid "Failed to remove file “%s”: %s"
+msgstr "Failed to remove file “%s”: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:148
+#: ../src/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:419
+#: ../src/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"
+#| msgid "Failed to create hardlink for resource '%s': %s"
+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:524
-#: ../addressbook/backends/file/e-book-backend-file.c:1256
+#: ../src/addressbook/backends/file/e-book-backend-file.c:524
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1257
 msgid "No UID in the contact"
 msgstr "No UID in the contact"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:851
+#: ../src/addressbook/backends/file/e-book-backend-file.c:852
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr "Conflicting UIDs found in added contacts"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:990
+#: ../src/addressbook/backends/file/e-book-backend-file.c:991
 msgid "Loading..."
-msgstr "Loading…"
+msgstr "Loading..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:992
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4357
+#: ../src/addressbook/backends/file/e-book-backend-file.c:993
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4444
 msgid "Searching..."
 msgstr "Searching…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1284
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1285
 #, c-format
-msgid "Tried to modify contact '%s' with out of sync revision"
-msgstr "Tried to modify contact '%s' with out of sync revision"
+#| msgid "Tried to modify contact '%s' with out of sync revision"
+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: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
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1476
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1561
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7342
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7411
 #, c-format
-msgid "Contact '%s' not found"
-msgstr "Contact '%s' not found"
+#| msgid "Contact '%s' not found"
+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
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1621
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1702
 #, c-format
-msgid "Query '%s' not supported"
-msgstr "Query '%s' not supported"
+#| msgid "Query '%s' not supported"
+msgid "Query “%s” not supported"
+msgstr "Query “%s” not supported"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1629
-#: ../addressbook/backends/file/e-book-backend-file.c:1710
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1630
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1711
 #, c-format
-msgid "Invalid Query '%s'"
-msgstr "Invalid Query '%s'"
+#| msgid "Invalid Query '%s'"
+msgid "Invalid Query “%s”"
+msgstr "Invalid Query “%s”"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1975
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1976
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2015
 msgid "Requested to delete an unrelated cursor"
 msgstr "Requested to delete an unrelated cursor"
 
-#: ../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: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
+#: ../src/addressbook/backends/file/e-book-backend-file.c:2047
+#, c-format
+#| msgid "Failed to rename old database from '%s' to '%s': %s"
+msgid "Failed to rename old database from “%s” to “%s”: %s"
+msgstr "Failed to rename old database from “%s” to “%s”: %s"
+
+#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1159
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4334
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:239
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:49
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:54
+#: ../src/addressbook/libebook/e-book.c:1079
+#: ../src/addressbook/libebook/e-book-client.c:2129
+#: ../src/addressbook/libebook/e-book-client.c:2301
+#: ../src/addressbook/libebook/e-book-client.c:2514
+#: ../src/addressbook/libebook/e-book-client.c:2645
+#: ../src/addressbook/libebook/e-book-client.c:2804
+#: ../src/addressbook/libebook/e-book-client.c:2938
+#: ../src/addressbook/libebook/e-book-client.c:3069
+#: ../src/addressbook/libebook/e-book-client.c:3227
+#: ../src/addressbook/libebook/e-book-client.c:3422
+#: ../src/addressbook/libebook/e-book-client.c:3640
+#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:200
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:274
+#: ../src/calendar/backends/http/e-cal-backend-http.c:204
+#: ../src/calendar/libecal/e-cal.c:2334
+#: ../src/calendar/libecal/e-cal-client.c:277
+#: ../src/calendar/libecal/e-cal-client.c:3544
+#: ../src/calendar/libecal/e-cal-client.c:3717
+#: ../src/calendar/libecal/e-cal-client.c:3981
+#: ../src/calendar/libecal/e-cal-client.c:4222
+#: ../src/calendar/libecal/e-cal-client.c:4412
+#: ../src/calendar/libecal/e-cal-client.c:4605
+#: ../src/calendar/libecal/e-cal-client.c:4814
+#: ../src/calendar/libecal/e-cal-client.c:4983
+#: ../src/calendar/libecal/e-cal-client.c:5186
+#: ../src/calendar/libecal/e-cal-client.c:5336
+#: ../src/calendar/libecal/e-cal-client.c:5530
+#: ../src/calendar/libecal/e-cal-client.c:5683
+#: ../src/calendar/libecal/e-cal-client.c:5900
+#: ../src/calendar/libecal/e-cal-client.c:6054
+#: ../src/calendar/libecal/e-cal-client.c:6280
+#: ../src/calendar/libecal/e-cal-client.c:6476
+#: ../src/calendar/libecal/e-cal-client.c:6839
+#: ../src/calendar/libecal/e-cal-client.c:7061
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1742
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3029
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3039
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3051
+#: ../src/camel/providers/nntp/camel-nntp-store.c:422
+#: ../src/libebackend/e-server-side-source.c:501
+#: ../src/libedataserver/e-client.c:188
+#: ../src/libedataserver/e-soup-session.c:1119
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:204
+#: ../src/tools/list-sources/list-sources.c:429
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:781
-msgid "Querying for updated contacts…"
-msgstr "Querying for updated contacts…"
+#: ../src/addressbook/backends/google/e-book-backend-google.c:924
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1005
+msgid "Object to save is not a valid vCard"
+msgstr "Object to save is not a valid vCard"
 
-#. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:965
-msgid "Querying for updated groups…"
-msgstr "Querying for updated groups…"
+#: ../src/addressbook/backends/google/e-book-backend-google.c:976
+#| msgid "Failed to create hardlink for resource '%s': %s"
+msgid "Failed to create contact from returned server data"
+msgstr "Failed to create contact from returned server data"
 
-#: ../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"
-
-#: ../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"
-
-#: ../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:2236
-msgid "Loading…"
-msgstr "Loading…"
+#: ../src/addressbook/backends/google/e-book-backend-google.c:992
+msgid "Server returned contact without UID"
+msgstr "Server returned contact without UID"
 
 #. System Group: My Contacts
-#: ../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
-#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1658
+#: ../src/services/evolution-source-registry/builtin/system-address-book.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-calendar.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-task-list.source.in.h:1
 msgid "Personal"
 msgstr "Personal"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1655
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1660
 msgid "Friends"
 msgstr "Friends"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1657
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1662
 msgid "Family"
 msgstr "Family"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1659
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1664
 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:114
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:112
 msgid "Not connected"
 msgstr "Not connected"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:892
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:881
 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:1016
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1005
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconnecting to LDAP server…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1140
 msgid "Invalid DN syntax"
 msgstr "Invalid DN syntax"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1156
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4333
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP error 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1775
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1772
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2114
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2127
 #, 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:2028
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2041
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2187
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: Unhandled result type %d returned"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2289
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2331
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2469
 #, 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:4195
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4270
 msgid "Receiving LDAP search results..."
 msgstr "Receiving LDAP search results…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4379
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4470
 msgid "Error performing search"
 msgstr "Error performing search"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4512
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4610
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Downloading contacts (%d)…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5082
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5101
+msgid "The backend does not support bulk additions"
+msgstr "The backend does not support bulk additions"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5184
 msgid "Adding contact to LDAP server..."
 msgstr "Adding contact to LDAP server…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5157
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5241
+msgid "The backend does not support bulk modifications"
+msgstr "The backend does not support bulk modifications"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5263
 msgid "Modifying contact from LDAP server..."
 msgstr "Modifying contact from LDAP server…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5223
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5333
 msgid "Removing contact from LDAP server..."
 msgstr "Removing contact from LDAP server…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
-#, c-format
-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
-#: ../calendar/backends/http/e-cal-backend-http.c:513
-#, c-format
-msgid "Malformed URI: %s"
-msgstr "Malformed URI: %s"
-
-#: ../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: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: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:944
-#, c-format
-msgid "Loading Contacts (%d%%)"
-msgstr "Loading Contacts (%d%%)"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1358
-msgid "Cannot transform SoupURI to string"
-msgstr "Cannot transform SoupURI to string"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1555
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5751
 #, c-format
-msgid "Create resource '%s' failed with HTTP status %d (%s)"
-msgstr "Create resource '%s' failed with HTTP status %d (%s)"
+#| msgid "Failed to get the DN for user '%s'"
+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:1657
-msgid "Contact on server changed -> not modifying"
-msgstr "Contact on server changed -> not modifying"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1665
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:180
 #, c-format
-msgid "Modify contact failed with HTTP status %d (%s)"
-msgstr "Modify contact failed with HTTP status %d (%s)"
+msgid "Given URL “%s” doesn’t reference WebDAV address book"
+msgstr "Given URL “%s” doesn’t reference WebDAV address book"
 
-#: ../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"
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:929
+msgid "Received object is not a valid vCard"
+msgstr "Received object is not a valid vCard"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:38
 msgid "No such book"
 msgstr "No such book"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
-#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:40
+#: ../src/addressbook/libedata-book/e-data-book.c:382
 msgid "Contact not found"
 msgstr "Contact not found"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
-#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../src/addressbook/libedata-book/e-data-book.c:383
 msgid "Contact ID already exists"
 msgstr "Contact ID already exists"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:44
 msgid "No such source"
 msgstr "No such source"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:48
-#: ../addressbook/libedata-book/e-data-book.c:401
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../src/addressbook/libedata-book/e-data-book.c:399
 msgid "No space"
 msgstr "No space"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:130
+#: ../src/addressbook/libebook-contacts/e-contact.c:128
 msgid "Unique ID"
 msgstr "Unique ID"
 
@@ -348,12 +315,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:135
+#: ../src/addressbook/libebook-contacts/e-contact.c:133
 msgid "File Under"
 msgstr "File Under"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:137
+#: ../src/addressbook/libebook-contacts/e-contact.c:135
 msgid "Book UID"
 msgstr "Book UID"
 
@@ -361,435 +328,436 @@ 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:143
+#: ../src/addressbook/libebook-contacts/e-contact.c:141
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../src/addressbook/libebook-contacts/e-contact.c:142
 msgid "Given Name"
 msgstr "Given Name"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../src/addressbook/libebook-contacts/e-contact.c:143
 msgid "Family Name"
 msgstr "Family Name"
 
-#: ../addressbook/libebook-contacts/e-contact.c:146
+#: ../src/addressbook/libebook-contacts/e-contact.c:144
 msgid "Nickname"
 msgstr "Nickname"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:149
+#: ../src/addressbook/libebook-contacts/e-contact.c:147
 msgid "Email 1"
 msgstr "E-mail 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../src/addressbook/libebook-contacts/e-contact.c:148
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../src/addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../src/addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 4"
 msgstr "E-mail 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:154
+#: ../src/addressbook/libebook-contacts/e-contact.c:152
 msgid "Mailer"
 msgstr "Mailer"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../src/addressbook/libebook-contacts/e-contact.c:155
 msgid "Home Address Label"
 msgstr "Home Address Label"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../src/addressbook/libebook-contacts/e-contact.c:156
 msgid "Work Address Label"
 msgstr "Work Address Label"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../src/addressbook/libebook-contacts/e-contact.c:157
 msgid "Other Address Label"
 msgstr "Other Address Label"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../src/addressbook/libebook-contacts/e-contact.c:160
 msgid "Assistant Phone"
 msgstr "Assistant Phone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../src/addressbook/libebook-contacts/e-contact.c:161
 msgid "Business Phone"
 msgstr "Business Phone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../src/addressbook/libebook-contacts/e-contact.c:162
 msgid "Business Phone 2"
 msgstr "Business Phone 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../src/addressbook/libebook-contacts/e-contact.c:163
 msgid "Business Fax"
 msgstr "Business Fax"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../src/addressbook/libebook-contacts/e-contact.c:164
 msgid "Callback Phone"
 msgstr "Callback Phone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../src/addressbook/libebook-contacts/e-contact.c:165
 msgid "Car Phone"
 msgstr "Car Phone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../src/addressbook/libebook-contacts/e-contact.c:166
 msgid "Company Phone"
 msgstr "Company Phone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../src/addressbook/libebook-contacts/e-contact.c:167
 msgid "Home Phone"
 msgstr "Home Phone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../src/addressbook/libebook-contacts/e-contact.c:168
 msgid "Home Phone 2"
 msgstr "Home Phone 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../src/addressbook/libebook-contacts/e-contact.c:169
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../src/addressbook/libebook-contacts/e-contact.c:170
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:173
+#: ../src/addressbook/libebook-contacts/e-contact.c:171
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../src/addressbook/libebook-contacts/e-contact.c:172
 msgid "Other Phone"
 msgstr "Other Phone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../src/addressbook/libebook-contacts/e-contact.c:173
 msgid "Other Fax"
 msgstr "Other Fax"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../src/addressbook/libebook-contacts/e-contact.c:174
 msgid "Pager"
 msgstr "Pager"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../src/addressbook/libebook-contacts/e-contact.c:175
 msgid "Primary Phone"
 msgstr "Primary Phone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../src/addressbook/libebook-contacts/e-contact.c:176
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../src/addressbook/libebook-contacts/e-contact.c:177
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:181
+#: ../src/addressbook/libebook-contacts/e-contact.c:179
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:184
+#: ../src/addressbook/libebook-contacts/e-contact.c:182
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../addressbook/libebook-contacts/e-contact.c:185
+#: ../src/addressbook/libebook-contacts/e-contact.c:183
 msgid "Organizational Unit"
 msgstr "Organisational Unit"
 
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../src/addressbook/libebook-contacts/e-contact.c:184
 msgid "Office"
 msgstr "Office"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../src/addressbook/libebook-contacts/e-contact.c:185
 msgid "Title"
 msgstr "Title"
 
-#: ../addressbook/libebook-contacts/e-contact.c:188
+#: ../src/addressbook/libebook-contacts/e-contact.c:186
 msgid "Role"
 msgstr "Role"
 
-#: ../addressbook/libebook-contacts/e-contact.c:189
+#: ../src/addressbook/libebook-contacts/e-contact.c:187
 msgid "Manager"
 msgstr "Manager"
 
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../src/addressbook/libebook-contacts/e-contact.c:188
 msgid "Assistant"
 msgstr "Assistant"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../src/addressbook/libebook-contacts/e-contact.c:191
 msgid "Homepage URL"
 msgstr "Homepage URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../src/addressbook/libebook-contacts/e-contact.c:192
 msgid "Weblog URL"
 msgstr "Weblog URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:197
+#: ../src/addressbook/libebook-contacts/e-contact.c:195
 msgid "Categories"
 msgstr "Categories"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../src/addressbook/libebook-contacts/e-contact.c:198
 msgid "Calendar URI"
 msgstr "Calendar URI"
 
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../src/addressbook/libebook-contacts/e-contact.c:199
 msgid "Free/Busy URL"
 msgstr "Free/Busy URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../src/addressbook/libebook-contacts/e-contact.c:200
 msgid "ICS Calendar"
 msgstr "ICS Calendar"
 
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../src/addressbook/libebook-contacts/e-contact.c:201
 msgid "Video Conferencing URL"
 msgstr "Video Conferencing URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:206
-msgid "Spouse's Name"
-msgstr "Spouse's Name"
+#: ../src/addressbook/libebook-contacts/e-contact.c:204
+#| msgid "Spouse's Name"
+msgid "Spouse’s Name"
+msgstr "Spouse’s Name"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../src/addressbook/libebook-contacts/e-contact.c:205
 msgid "Note"
 msgstr "Note"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:210
+#: ../src/addressbook/libebook-contacts/e-contact.c:208
 msgid "AIM Home Screen Name 1"
 msgstr "AIM Home Screen Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../src/addressbook/libebook-contacts/e-contact.c:209
 msgid "AIM Home Screen Name 2"
 msgstr "AIM Home Screen Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../src/addressbook/libebook-contacts/e-contact.c:210
 msgid "AIM Home Screen Name 3"
 msgstr "AIM Home Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../src/addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Work Screen Name 1"
 msgstr "AIM Work Screen Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../src/addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Work Screen Name 2"
 msgstr "AIM Work Screen Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../src/addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Work Screen Name 3"
 msgstr "AIM Work Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../src/addressbook/libebook-contacts/e-contact.c:214
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise Home Screen Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../src/addressbook/libebook-contacts/e-contact.c:215
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise Home Screen Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../src/addressbook/libebook-contacts/e-contact.c:216
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise Home Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../src/addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise Work Screen Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../src/addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise Work Screen Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../src/addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise Work Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../src/addressbook/libebook-contacts/e-contact.c:220
 msgid "Jabber Home ID 1"
 msgstr "Jabber Home ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../src/addressbook/libebook-contacts/e-contact.c:221
 msgid "Jabber Home ID 2"
 msgstr "Jabber Home ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../src/addressbook/libebook-contacts/e-contact.c:222
 msgid "Jabber Home ID 3"
 msgstr "Jabber Home ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../src/addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Work ID 1"
 msgstr "Jabber Work ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../src/addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Work ID 2"
 msgstr "Jabber Work ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../src/addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Work ID 3"
 msgstr "Jabber Work ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../src/addressbook/libebook-contacts/e-contact.c:226
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! Home Screen Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../src/addressbook/libebook-contacts/e-contact.c:227
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! Home Screen Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../src/addressbook/libebook-contacts/e-contact.c:228
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! Home Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../src/addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! Work Screen Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../src/addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! Work Screen Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../src/addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! Work Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../src/addressbook/libebook-contacts/e-contact.c:232
 msgid "MSN Home Screen Name 1"
 msgstr "MSN Home Screen Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../src/addressbook/libebook-contacts/e-contact.c:233
 msgid "MSN Home Screen Name 2"
 msgstr "MSN Home Screen Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../src/addressbook/libebook-contacts/e-contact.c:234
 msgid "MSN Home Screen Name 3"
 msgstr "MSN Home Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../src/addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Work Screen Name 1"
 msgstr "MSN Work Screen Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../src/addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Work Screen Name 2"
 msgstr "MSN Work Screen Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:239
+#: ../src/addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:240
+#: ../src/addressbook/libebook-contacts/e-contact.c:238
 msgid "ICQ Home ID 1"
 msgstr "ICQ Home ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../src/addressbook/libebook-contacts/e-contact.c:239
 msgid "ICQ Home ID 2"
 msgstr "ICQ Home ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../src/addressbook/libebook-contacts/e-contact.c:240
 msgid "ICQ Home ID 3"
 msgstr "ICQ Home ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:243
+#: ../src/addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Work ID 1"
 msgstr "ICQ Work ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:244
+#: ../src/addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Work ID 2"
 msgstr "ICQ Work ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../src/addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Work ID 3"
 msgstr "ICQ Work ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../src/addressbook/libebook-contacts/e-contact.c:246
 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:252
+#: ../src/addressbook/libebook-contacts/e-contact.c:250
 msgid "Name or Org"
 msgstr "Name or Org"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:255
+#: ../src/addressbook/libebook-contacts/e-contact.c:253
 msgid "Address List"
 msgstr "Address List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:256
+#: ../src/addressbook/libebook-contacts/e-contact.c:254
 msgid "Home Address"
 msgstr "Home Address"
 
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../src/addressbook/libebook-contacts/e-contact.c:255
 msgid "Work Address"
 msgstr "Work Address"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../src/addressbook/libebook-contacts/e-contact.c:256
 msgid "Other Address"
 msgstr "Other Address"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:261
+#: ../src/addressbook/libebook-contacts/e-contact.c:259
 msgid "Category List"
 msgstr "Category List"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:264
+#: ../src/addressbook/libebook-contacts/e-contact.c:262
 msgid "Photo"
 msgstr "Photo"
 
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../src/addressbook/libebook-contacts/e-contact.c:263
 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:269
-#: ../libedataserverui/e-webdav-discover-widget.c:153
+#: ../src/addressbook/libebook-contacts/e-contact.c:267
+#: ../src/libedataserverui/e-webdav-discover-widget.c:151
 msgid "Name"
 msgstr "Name"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../src/addressbook/libebook-contacts/e-contact.c:268
 msgid "Email List"
 msgstr "E-mail List"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:273
+#: ../src/addressbook/libebook-contacts/e-contact.c:271
 msgid "AIM Screen Name List"
 msgstr "AIM Screen Name List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:274
+#: ../src/addressbook/libebook-contacts/e-contact.c:272
 msgid "GroupWise ID List"
 msgstr "GroupWise ID List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../src/addressbook/libebook-contacts/e-contact.c:273
 msgid "Jabber ID List"
 msgstr "Jabber ID List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:276
+#: ../src/addressbook/libebook-contacts/e-contact.c:274
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! Screen Name List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:277
+#: ../src/addressbook/libebook-contacts/e-contact.c:275
 msgid "MSN Screen Name List"
 msgstr "MSN Screen Name List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../src/addressbook/libebook-contacts/e-contact.c:276
 msgid "ICQ ID List"
 msgstr "ICQ ID List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:280
+#: ../src/addressbook/libebook-contacts/e-contact.c:278
 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:285
+#: ../src/addressbook/libebook-contacts/e-contact.c:283
 msgid "List"
 msgstr "List"
 
@@ -797,242 +765,255 @@ 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:290
+#: ../src/addressbook/libebook-contacts/e-contact.c:288
 msgid "List Shows Addresses"
 msgstr "List Shows Addresses"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../src/addressbook/libebook-contacts/e-contact.c:290
 msgid "Birth Date"
 msgstr "Birth Date"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:948
+#: ../src/addressbook/libebook-contacts/e-contact.c:291
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:936
 msgid "Anniversary"
 msgstr "Anniversary"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:296
+#: ../src/addressbook/libebook-contacts/e-contact.c:294
 msgid "X.509 Certificate"
 msgstr "X.509 Certificate"
 
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../src/addressbook/libebook-contacts/e-contact.c:295
 msgid "PGP Certificate"
 msgstr "PGP Certificate"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../src/addressbook/libebook-contacts/e-contact.c:297
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu Home ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../src/addressbook/libebook-contacts/e-contact.c:298
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu Home ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../src/addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu Home ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../src/addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu Work ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../src/addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu Work ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../src/addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu Work ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../src/addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID List"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../src/addressbook/libebook-contacts/e-contact.c:306
 msgid "Geographic Information"
 msgstr "Geographic Information"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../src/addressbook/libebook-contacts/e-contact.c:308
 msgid "Telephone"
 msgstr "Telephone"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../src/addressbook/libebook-contacts/e-contact.c:310
 msgid "Skype Home Name 1"
 msgstr "Skype Home Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../src/addressbook/libebook-contacts/e-contact.c:311
 msgid "Skype Home Name 2"
 msgstr "Skype Home Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../src/addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 3"
 msgstr "Skype Home Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../src/addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Work Name 1"
 msgstr "Skype Work Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../src/addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Work Name 2"
 msgstr "Skype Work Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../src/addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 3"
 msgstr "Skype Work Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../src/addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Name List"
 msgstr "Skype Name List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../src/addressbook/libebook-contacts/e-contact.c:318
 msgid "SIP address"
 msgstr "SIP address"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../src/addressbook/libebook-contacts/e-contact.c:320
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk Home Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:323
+#: ../src/addressbook/libebook-contacts/e-contact.c:321
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk Home Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:324
+#: ../src/addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk Home Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:325
+#: ../src/addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk Work Name 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:326
+#: ../src/addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk Work Name 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:327
+#: ../src/addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk Work Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:328
+#: ../src/addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Name List"
 msgstr "Google Talk Name List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:330
+#: ../src/addressbook/libebook-contacts/e-contact.c:328
 msgid "Twitter Name List"
 msgstr "Twitter Name List"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1660
-#: ../addressbook/libebook/e-destination.c:918
+#: ../src/addressbook/libebook-contacts/e-contact.c:1658
+#: ../src/addressbook/libebook/e-destination.c:919
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:41
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:39
 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:43
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:41
 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:45
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:43
 msgid "Not a phone number"
 msgstr "Not a phone number"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Invalid country calling code"
 msgstr "Invalid country calling code"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:47
 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"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:51
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:49
 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:53
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:51
 msgid "Text is too long for a phone number"
 msgstr "Text is too long for a phone number"
 
-#: ../addressbook/libebook/e-book-client.c:931
+#: ../src/addressbook/libebook/e-book-client.c:929
 #, c-format
-msgid "Unknown book property '%s'"
-msgstr "Unknown book property '%s'"
+#| msgid "Unknown book property '%s'"
+msgid "Unknown book property “%s”"
+msgstr "Unknown book property “%s”"
 
-#: ../addressbook/libebook/e-book-client.c:946
+#: ../src/addressbook/libebook/e-book-client.c:944
 #, c-format
-msgid "Cannot change value of book property '%s'"
-msgstr "Cannot change value of book property '%s'"
+#| msgid "Cannot change value of book property '%s'"
+msgid "Cannot change value of book property “%s”"
+msgstr "Cannot change value of book property “%s”"
 
-#: ../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
+#: ../src/addressbook/libebook/e-book-client.c:1388
+#: ../src/addressbook/libebook/e-book-client.c:1619
+#: ../src/addressbook/libebook/e-book-client.c:1896
+#: ../src/calendar/libecal/e-cal-client.c:1715
+#: ../src/calendar/libecal/e-cal-client.c:1953
 #, c-format
-msgid "Unable to connect to '%s': "
-msgstr "Unable to connect to '%s': "
+#| msgid "Unable to connect to '%s': "
+msgid "Unable to connect to “%s”: "
+msgstr "Unable to connect to “%s”: "
 
-#: ../addressbook/libebook/e-book-client-view.c:870
-#: ../calendar/libecal/e-cal-client-view.c:681
+#: ../src/addressbook/libebook/e-book-client-view.c:868
+#: ../src/calendar/libecal/e-cal-client-view.c:679
 #, 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
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:905
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:2254
 #, c-format
-msgid "Error introspecting unknown summary field '%s'"
-msgstr "Error introspecting unknown summary field '%s'"
+#| msgid "Error introspecting unknown summary field '%s'"
+msgid "Error introspecting unknown summary field “%s”"
+msgstr "Error introspecting unknown summary field “%s”"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../addressbook/libedata-book/e-book-sqlite.c:1393
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../src/addressbook/libedata-book/e-book-cache.c:542
+#: ../src/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
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
+#: ../src/addressbook/libedata-book/e-book-cache.c:4475
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1877
+#: ../src/camel/camel-db.c:802
 #, c-format
 msgid "Insufficient memory"
 msgstr "Insufficient memory"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
+#: ../src/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"
+#| msgid "Invalid contact field '%d' specified in summary"
+msgid "Invalid contact field “%d” specified in summary"
+msgstr "Invalid contact field “%d” specified in summary"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
-#: ../addressbook/libedata-book/e-book-sqlite.c:604
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
+#: ../src/addressbook/libedata-book/e-book-cache.c:365
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:604
 #, c-format
+#| msgid ""
+#| "Contact field '%s' of type '%s' specified in summary, but only boolean, "
+#| "string and string list field types are supported"
 msgid ""
-"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"Contact field “%s” of type “%s” specified in summary, but only boolean, "
 "string and string list field types are supported"
 msgstr ""
-"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"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:3073
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4177
 #, 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:4307
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
-#: ../addressbook/libedata-book/e-book-sqlite.c:5817
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4308
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4401
+#: ../src/addressbook/libedata-book/e-book-cache.c:3433
+#: ../src/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:4311
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4312
 #, c-format
 msgid "Invalid Query"
 msgstr "Invalid Query"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4336
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
@@ -1041,50 +1022,52 @@ msgstr ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 
-#: ../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
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4405
+#: ../src/addressbook/libedata-book/e-data-book.c:394
+#: ../src/addressbook/libedata-book/e-data-book.c:1144
+#: ../src/calendar/libedata-cal/e-data-cal.c:429
+#: ../src/calendar/libedata-cal/e-data-cal.c:1436
+#: ../src/libedataserver/e-client.c:175
 #, c-format
 msgid "Invalid query"
 msgstr "Invalid query"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4448
 #, 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:5270
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5271
 #, 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-sqlitedb.c:6057
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6058
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6458
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "Only summary queries are supported by EbSdbCursor"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6065
 #, 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
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6079
 #, 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
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6086
 #, 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-book-backend-sqlitedb.c:6218
-#: ../addressbook/libedata-book/e-book-sqlite.c:8116
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
+#: ../src/addressbook/libedata-book/e-book-cache.c:5561
+#: ../src/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 "
@@ -1093,8 +1076,9 @@ 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
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6227
+#: ../src/addressbook/libedata-book/e-book-cache.c:5568
+#: ../src/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 "
@@ -1103,1082 +1087,1214 @@ 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
+#: ../src/addressbook/libedata-book/e-book-cache.c:330
+#: ../src/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"
+#| msgid "Unsupported contact field '%d' specified in summary"
+msgid "Unsupported contact field “%d” specified in summary"
+msgstr "Unsupported contact field “%d” specified in summary"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1950
+#: ../src/addressbook/libedata-book/e-book-cache.c:3428
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5810
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1607
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2917
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Invalid query: %s"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:3598
+#| msgid "Invalid query for EbSqlCursor"
+msgid "Invalid query for a book cursor"
+msgstr "Invalid query for a book cursor"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:4479
+#: ../src/libebackend/e-cache.c:756
+#, c-format
+#| msgid "Cannot open mailbox: %s: "
+msgid "Can’t open database %s: %s"
+msgstr "Can’t open database %s: %s"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5082
+#: ../src/addressbook/libedata-book/e-book-cache.c:5134
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2333
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2396
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2567
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1331
+#: ../src/libebackend/e-cache.c:1385 ../src/libebackend/e-cache.c:2238
+#: ../src/libebackend/e-cache.c:2278
+#, c-format
+#| msgid "Object not found"
+msgid "Object “%s” not found"
+msgstr "Object “%s” not found"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5194
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2458
+#, c-format
+#| msgid "Object not found"
+msgid "Object with extra “%s” not found"
+msgstr "Object with extra “%s” not found"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5348
+#| msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgid "At least one sort field must be specified to use a cursor"
+msgstr "At least one sort field must be specified to use a cursor"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5357
+#: ../src/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"
+
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1050
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1052
+#, c-format
+msgid "Preloaded object for UID “%s” is invalid"
+msgstr "Preloaded object for UID “%s” is invalid"
+
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1058
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1060
+#, c-format
+msgid "Received object for UID “%s” is invalid"
+msgstr "Received object for UID “%s” is invalid"
+
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1885
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2333
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3100
+#, c-format
+#| msgid "Unable to create cache path"
+msgid "Failed to create cache “%s”:"
+msgstr "Failed to create cache “%s”:"
+
+#: ../src/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."
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
-"addressbook. Delete one of the entries in the 'folders' table first."
+"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. Delete one of the entries in the “folders” table first."
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5985
+#: ../src/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
+#: ../src/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
+#: ../src/addressbook/libedata-book/e-data-book.c:378
+#: ../src/calendar/libedata-cal/e-data-cal.c:410
 msgid "Success"
 msgstr "Success"
 
-#: ../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
+#: ../src/addressbook/libedata-book/e-data-book.c:379
+#: ../src/calendar/libecal/e-cal.c:2302
+#: ../src/calendar/libedata-cal/e-data-cal.c:411
+#: ../src/libedataserver/e-client.c:142
 msgid "Backend is busy"
 msgstr "Backend is busy"
 
-#: ../addressbook/libedata-book/e-data-book.c:382
-#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:154
+#: ../src/addressbook/libedata-book/e-data-book.c:380
+#: ../src/calendar/libedata-cal/e-data-cal.c:412
+#: ../src/libedataserver/e-client.c:152
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: ../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
+#: ../src/addressbook/libedata-book/e-data-book.c:381
+#: ../src/calendar/libecal/e-cal.c:2316
+#: ../src/calendar/libedata-cal/e-data-cal.c:413
+#: ../src/libedataserver/e-client.c:159
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: ../addressbook/libedata-book/e-data-book.c:386
-#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../src/addressbook/libedata-book/e-data-book.c:384
+#: ../src/calendar/libedata-cal/e-data-cal.c:418
 msgid "Authentication Failed"
 msgstr "Authentication Failed"
 
-#: ../addressbook/libedata-book/e-data-book.c:387
-#: ../calendar/libedata-cal/e-data-cal.c:418
+#: ../src/addressbook/libedata-book/e-data-book.c:385
+#: ../src/calendar/libedata-cal/e-data-cal.c:419
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
-#: ../addressbook/libedata-book/e-data-book.c:388
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../src/addressbook/libedata-book/e-data-book.c:386
+#: ../src/calendar/libedata-cal/e-data-cal.c:420
 msgid "Unsupported field"
 msgstr "Unsupported field"
 
-#: ../addressbook/libedata-book/e-data-book.c:389
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:169
+#: ../src/addressbook/libedata-book/e-data-book.c:387
+#: ../src/calendar/libedata-cal/e-data-cal.c:422
+#: ../src/libedataserver/e-client.c:167
 msgid "Unsupported authentication method"
 msgstr "Unsupported authentication method"
 
-#: ../addressbook/libedata-book/e-data-book.c:390
-#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:171
+#: ../src/addressbook/libedata-book/e-data-book.c:388
+#: ../src/calendar/libedata-cal/e-data-cal.c:423
+#: ../src/libedataserver/e-client.c:169
 msgid "TLS not available"
 msgstr "TLS not available"
 
-#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../src/addressbook/libedata-book/e-data-book.c:389
 msgid "Address book does not exist"
 msgstr "Address book does not exist"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../src/addressbook/libedata-book/e-data-book.c:390
 msgid "Book removed"
 msgstr "Book removed"
 
-#: ../addressbook/libedata-book/e-data-book.c:393
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../src/addressbook/libedata-book/e-data-book.c:391
+#: ../src/calendar/libedata-cal/e-data-cal.c:426
 msgid "Not available in offline mode"
 msgstr "Not available in offline mode"
 
-#: ../addressbook/libedata-book/e-data-book.c:394
-#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:173
+#: ../src/addressbook/libedata-book/e-data-book.c:392
+#: ../src/calendar/libedata-cal/e-data-cal.c:427
+#: ../src/libedataserver/e-client.c:171
 msgid "Search size limit exceeded"
 msgstr "Search size limit exceeded"
 
-#: ../addressbook/libedata-book/e-data-book.c:395
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:175
+#: ../src/addressbook/libedata-book/e-data-book.c:393
+#: ../src/calendar/libedata-cal/e-data-cal.c:428
+#: ../src/libedataserver/e-client.c:173
 msgid "Search time limit exceeded"
 msgstr "Search time limit exceeded"
 
-#: ../addressbook/libedata-book/e-data-book.c:397
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:179
+#: ../src/addressbook/libedata-book/e-data-book.c:395
+#: ../src/calendar/libedata-cal/e-data-cal.c:430
+#: ../src/libedataserver/e-client.c:177
 msgid "Query refused"
 msgstr "Query refused"
 
-#: ../addressbook/libedata-book/e-data-book.c:398
-#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:165
+#: ../src/addressbook/libedata-book/e-data-book.c:396
+#: ../src/calendar/libedata-cal/e-data-cal.c:431
+#: ../src/libedataserver/e-client.c:163
 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:400
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../src/addressbook/libedata-book/e-data-book.c:398
+#: ../src/calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid server version"
 msgstr "Invalid server version"
 
-#: ../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
+#: ../src/addressbook/libedata-book/e-data-book.c:400
+#: ../src/calendar/libecal/e-cal.c:2300
+#: ../src/calendar/libedata-cal/e-data-cal.c:434
+#: ../src/libedataserver/e-client.c:140
 msgid "Invalid argument"
 msgstr "Invalid argument"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../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
+#: ../src/addressbook/libedata-book/e-data-book.c:402
+#: ../src/calendar/libecal/e-cal.c:1057 ../src/calendar/libecal/e-cal.c:1425
+#: ../src/calendar/libecal/e-cal.c:1907 ../src/calendar/libecal/e-cal.c:2339
+#: ../src/calendar/libedata-cal/e-data-cal.c:436
+#: ../src/libedataserver/e-client.c:165
 #, c-format
 msgid "Not supported"
 msgstr "Not supported"
 
-#: ../addressbook/libedata-book/e-data-book.c:405
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
+#: ../src/addressbook/libedata-book/e-data-book.c:403
+#: ../src/calendar/libedata-cal/e-data-cal.c:437
+#: ../src/libedataserver/e-client.c:183
 msgid "Backend is not opened yet"
 msgstr "Backend is not opened yet"
 
-#: ../addressbook/libedata-book/e-data-book.c:406
-#: ../libedataserver/e-client.c:187
+#: ../src/addressbook/libedata-book/e-data-book.c:404
+#: ../src/libedataserver/e-client.c:185
 msgid "Object is out of sync"
 msgstr "Object is out of sync"
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:183
+#: ../src/addressbook/libedata-book/e-data-book.c:412
+#: ../src/calendar/libedata-cal/e-data-cal.c:445
+#: ../src/libedataserver/e-client.c:181
 msgid "Other error"
 msgstr "Other error"
 
-#: ../addressbook/libedata-book/e-data-book.c:1171
-#: ../calendar/libedata-cal/e-data-cal.c:1452
+#: ../src/addressbook/libedata-book/e-data-book.c:1169
+#: ../src/calendar/libedata-cal/e-data-cal.c:1461
 msgid "Invalid query: "
 msgstr "Invalid query: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1420
+#: ../src/addressbook/libedata-book/e-data-book.c:1418
 msgid "Cannot open book: "
 msgstr "Cannot open book: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1458
+#: ../src/addressbook/libedata-book/e-data-book.c:1456
 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:1497
+#: ../src/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:1546
+#: ../src/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:1602
+#: ../src/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:1653
+#: ../src/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:1706
+#: ../src/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:1759
+#: ../src/addressbook/libedata-book/e-data-book.c:1759
 msgid "Cannot remove contacts: "
 msgstr "Cannot remove contacts: "
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:776
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:774
 msgid "Cursor does not support setting the search expression"
 msgstr "Cursor does not support setting the search expression"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:859
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:857
 msgid "Cursor does not support step"
 msgstr "Cursor does not support step"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:942
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:940
 msgid "Cursor does not support alphabetic indexes"
 msgstr "Cursor does not support alphabetic indexes"
 
-#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:92
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:266
 msgid "Unrecognized cursor origin"
 msgstr "Unrecognised cursor origin"
 
-#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:336
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:151
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:334
 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
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:222
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:428
 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
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:143
 #, c-format
-msgid "Server is unreachable (%s)"
-msgstr "Server is unreachable (%s)"
+msgid "Given URL “%s” doesn’t reference CalDAV calendar"
+msgstr "Given URL “%s” doesn’t reference CalDAV calendar"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
-#, c-format
-#| 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"
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1579
+#| msgid "Failed to encode data"
+msgid "Failed to parse response data"
+msgstr "Failed to parse response data"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:726
-#, c-format
-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: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:1200
-#: ../libedataserver/e-webdav-discover.c:147
-msgid "Invalid Redirect URL"
-msgstr "Invalid Redirect URL"
-
-#: ../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"
-"Error message: %s"
-msgstr ""
-"Server is unreachable, calendar is opened in read-only mode.\n"
-"Error message: %s"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4090
-msgid "CalDAV does not support bulk additions"
-msgstr "CalDAV does not support bulk additions"
-
-#: ../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:4474
-msgid "CalDAV does not support bulk removals"
-msgstr "CalDAV does not support bulk removals"
-
-#: ../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:5230
-msgid "Schedule outbox url not found"
-msgstr "Schedule outbox url not found"
-
-#: ../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:950
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:938
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:986
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:974
 #, c-format
 msgid "Birthday: %s"
 msgstr "Birthday: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1017
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1005
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Anniversary: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:245
+#: ../src/calendar/backends/file/e-cal-backend-file.c:243
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Cannot save calendar data: Malformed URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:252
-#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../src/calendar/backends/file/e-cal-backend-file.c:250
+#: ../src/calendar/backends/file/e-cal-backend-file.c:256
 msgid "Cannot save calendar data"
 msgstr "Cannot save calendar data"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:582
+#: ../src/calendar/backends/http/e-cal-backend-http.c:135
+#| msgid "URI not loaded"
+msgid "URI not set"
+msgstr "URI not set"
+
+#: ../src/calendar/backends/http/e-cal-backend-http.c:203
 #, c-format
-msgid "Redirected to Invalid URI"
-msgstr "Redirected to Invalid URI"
+#| msgid "Malformed URI: %s"
+msgid "Malformed URI “%s”: %s"
+msgstr "Malformed URI “%s”: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:641
+#: ../src/calendar/backends/http/e-cal-backend-http.c:349
 #, c-format
 msgid "Bad file format."
 msgstr "Bad file format."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:651
+#: ../src/calendar/backends/http/e-cal-backend-http.c:358
 #, c-format
 msgid "Not a calendar."
 msgstr "Not a calendar."
 
-#: ../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:195
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:196
 msgid "Could not retrieve weather data"
 msgstr "Could not retrieve weather data"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:378
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:379
 msgid "Weather: Fog"
 msgstr "Weather: Fog"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:379
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:380
 msgid "Weather: Cloudy Night"
 msgstr "Weather: Cloudy Night"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:380
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:381
 msgid "Weather: Cloudy"
 msgstr "Weather: Cloudy"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:381
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:382
 msgid "Weather: Overcast"
 msgstr "Weather: Overcast"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:382
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:383
 msgid "Weather: Showers"
 msgstr "Weather: Showers"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:383
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:384
 msgid "Weather: Snow"
 msgstr "Weather: Snow"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:384
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:385
 msgid "Weather: Clear Night"
 msgstr "Weather: Clear Night"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:385
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:386
 msgid "Weather: Sunny"
 msgstr "Weather: Sunny"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:386
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:387
 msgid "Weather: Thunderstorms"
 msgstr "Weather: Thunderstorms"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:412
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:413
 #, 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
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:416
 #, c-format
 msgid "%.1f °C"
 msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../calendar/backends/weather/e-cal-backend-weather.c:418
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:419
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:424
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:425
 #, c-format
 msgid "%.1f"
 msgstr "%.1f"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:589
-#: ../calendar/backends/weather/e-cal-backend-weather.c:617
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:590
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:618
 msgid "Forecast"
 msgstr "Forecast"
 
-#: ../calendar/libecal/e-cal.c:2306
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:710
+msgid "Could not create cache file"
+msgstr "Could not create cache file"
+
+#: ../src/calendar/libecal/e-cal.c:2304
 msgid "Repository is offline"
 msgstr "Repository is offline"
 
-#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:266
+#: ../src/calendar/libecal/e-cal.c:2306
+#: ../src/calendar/libecal/e-cal-client.c:264
 msgid "No such calendar"
 msgstr "No such calendar"
 
-#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268
-#: ../calendar/libedata-cal/e-data-cal.c:414
+#: ../src/calendar/libecal/e-cal.c:2308
+#: ../src/calendar/libecal/e-cal-client.c:266
+#: ../src/calendar/libedata-cal/e-data-cal.c:415
 msgid "Object not found"
 msgstr "Object not found"
 
-#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../src/calendar/libecal/e-cal.c:2310
+#: ../src/calendar/libecal/e-cal-client.c:268
+#: ../src/calendar/libedata-cal/e-data-cal.c:416
 msgid "Invalid object"
 msgstr "Invalid object"
 
-#: ../calendar/libecal/e-cal.c:2314
+#: ../src/calendar/libecal/e-cal.c:2312
 msgid "URI not loaded"
 msgstr "URI not loaded"
 
-#: ../calendar/libecal/e-cal.c:2316
+#: ../src/calendar/libecal/e-cal.c:2314
 msgid "URI already loaded"
 msgstr "URI already loaded"
 
-#: ../calendar/libecal/e-cal.c:2320
+#: ../src/calendar/libecal/e-cal.c:2318
 msgid "Unknown User"
 msgstr "Unknown User"
 
-#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:274
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../src/calendar/libecal/e-cal.c:2320
+#: ../src/calendar/libecal/e-cal-client.c:272
+#: ../src/calendar/libedata-cal/e-data-cal.c:417
 msgid "Object ID already exists"
 msgstr "Object ID already exists"
 
-#: ../calendar/libecal/e-cal.c:2324
+#: ../src/calendar/libecal/e-cal.c:2322
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
-#: ../calendar/libecal/e-cal.c:2326
+#: ../src/calendar/libecal/e-cal.c:2324
 msgid "Operation has been cancelled"
 msgstr "Operation has been cancelled"
 
-#: ../calendar/libecal/e-cal.c:2328
+#: ../src/calendar/libecal/e-cal.c:2326
 msgid "Could not cancel operation"
 msgstr "Could not cancel operation"
 
-#: ../calendar/libecal/e-cal.c:2330 ../libedataserver/e-client.c:150
+#: ../src/calendar/libecal/e-cal.c:2328 ../src/libedataserver/e-client.c:148
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../calendar/libecal/e-cal.c:2332
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#: ../libedataserver/e-client.c:152
+#: ../src/calendar/libecal/e-cal.c:2330
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../src/libedataserver/e-client.c:150
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: ../calendar/libecal/e-cal.c:2334
+#: ../src/calendar/libecal/e-cal.c:2332
 msgid "A D-Bus exception has occurred"
 msgstr "A D-Bus exception has occurred"
 
-#: ../calendar/libecal/e-cal.c:2338
+#: ../src/calendar/libecal/e-cal.c:2336
 msgid "No error"
 msgstr "No error"
 
-#: ../calendar/libecal/e-cal-client.c:272
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../src/calendar/libecal/e-cal-client.c:270
+#: ../src/calendar/libedata-cal/e-data-cal.c:425
 msgid "Unknown user"
 msgstr "Unknown user"
 
-#: ../calendar/libecal/e-cal-client.c:276
-#: ../calendar/libedata-cal/e-data-cal.c:413
+#: ../src/calendar/libecal/e-cal-client.c:274
+#: ../src/calendar/libedata-cal/e-data-cal.c:414
 msgid "Invalid range"
 msgstr "Invalid range"
 
-#: ../calendar/libecal/e-cal-client.c:1065
+#: ../src/calendar/libecal/e-cal-client.c:1063
 #, c-format
-msgid "Unknown calendar property '%s'"
-msgstr "Unknown calendar property '%s'"
+#| msgid "Unknown calendar property '%s'"
+msgid "Unknown calendar property “%s”"
+msgstr "Unknown calendar property “%s”"
 
-#: ../calendar/libecal/e-cal-client.c:1080
+#: ../src/calendar/libecal/e-cal-client.c:1078
 #, c-format
-msgid "Cannot change value of calendar property '%s'"
-msgstr "Cannot change value of calendar property '%s'"
+#| msgid "Cannot change value of calendar property '%s'"
+msgid "Cannot change value of calendar property “%s”"
+msgstr "Cannot change value of calendar property “%s”"
 
-#: ../calendar/libecal/e-cal-component.c:1357
+#: ../src/calendar/libecal/e-cal-component.c:1330
 msgid "Untitled appointment"
 msgstr "Untitled appointment"
 
-#: ../calendar/libecal/e-cal-recur.c:4744
+#: ../src/calendar/libecal/e-cal-recur.c:4744
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/libecal/e-cal-recur.c:4745
+#: ../src/calendar/libecal/e-cal-recur.c:4745
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/libecal/e-cal-recur.c:4746
+#: ../src/calendar/libecal/e-cal-recur.c:4746
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/libecal/e-cal-recur.c:4747
+#: ../src/calendar/libecal/e-cal-recur.c:4747
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/libecal/e-cal-recur.c:4748
+#: ../src/calendar/libecal/e-cal-recur.c:4748
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/libecal/e-cal-recur.c:4749
+#: ../src/calendar/libecal/e-cal-recur.c:4749
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/libecal/e-cal-recur.c:4750
+#: ../src/calendar/libecal/e-cal-recur.c:4750
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/libecal/e-cal-recur.c:4751
+#: ../src/calendar/libecal/e-cal-recur.c:4751
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/libecal/e-cal-recur.c:4752
+#: ../src/calendar/libecal/e-cal-recur.c:4752
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/libecal/e-cal-recur.c:4753
+#: ../src/calendar/libecal/e-cal-recur.c:4753
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/libecal/e-cal-recur.c:4754
+#: ../src/calendar/libecal/e-cal-recur.c:4754
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/libecal/e-cal-recur.c:4755
+#: ../src/calendar/libecal/e-cal-recur.c:4755
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/libecal/e-cal-recur.c:4756
+#: ../src/calendar/libecal/e-cal-recur.c:4756
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/libecal/e-cal-recur.c:4757
+#: ../src/calendar/libecal/e-cal-recur.c:4757
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/libecal/e-cal-recur.c:4758
+#: ../src/calendar/libecal/e-cal-recur.c:4758
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/libecal/e-cal-recur.c:4759
+#: ../src/calendar/libecal/e-cal-recur.c:4759
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/libecal/e-cal-recur.c:4760
+#: ../src/calendar/libecal/e-cal-recur.c:4760
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/libecal/e-cal-recur.c:4761
+#: ../src/calendar/libecal/e-cal-recur.c:4761
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/libecal/e-cal-recur.c:4762
+#: ../src/calendar/libecal/e-cal-recur.c:4762
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/libecal/e-cal-recur.c:4763
+#: ../src/calendar/libecal/e-cal-recur.c:4763
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/libecal/e-cal-recur.c:4764
+#: ../src/calendar/libecal/e-cal-recur.c:4764
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/libecal/e-cal-recur.c:4765
+#: ../src/calendar/libecal/e-cal-recur.c:4765
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/libecal/e-cal-recur.c:4766
+#: ../src/calendar/libecal/e-cal-recur.c:4766
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/libecal/e-cal-recur.c:4767
+#: ../src/calendar/libecal/e-cal-recur.c:4767
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/libecal/e-cal-recur.c:4768
+#: ../src/calendar/libecal/e-cal-recur.c:4768
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/libecal/e-cal-recur.c:4769
+#: ../src/calendar/libecal/e-cal-recur.c:4769
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/libecal/e-cal-recur.c:4770
+#: ../src/calendar/libecal/e-cal-recur.c:4770
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/libecal/e-cal-recur.c:4771
+#: ../src/calendar/libecal/e-cal-recur.c:4771
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/libecal/e-cal-recur.c:4772
+#: ../src/calendar/libecal/e-cal-recur.c:4772
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/libecal/e-cal-recur.c:4773
+#: ../src/calendar/libecal/e-cal-recur.c:4773
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/libecal/e-cal-recur.c:4774
+#: ../src/calendar/libecal/e-cal-recur.c:4774
 msgid "31st"
 msgstr "31st"
 
-#: ../calendar/libecal/e-cal-util.c:706 ../calendar/libecal/e-cal-util.c:733
+#: ../src/calendar/libecal/e-cal-util.c:707
+#: ../src/calendar/libecal/e-cal-util.c:734
 msgctxt "Priority"
 msgid "High"
 msgstr "High"
 
-#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
+#: ../src/calendar/libecal/e-cal-util.c:709
+#: ../src/calendar/libecal/e-cal-util.c:736
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
+#: ../src/calendar/libecal/e-cal-util.c:711
+#: ../src/calendar/libecal/e-cal-util.c:738
 msgctxt "Priority"
 msgid "Low"
 msgstr "Low"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:731
+#: ../src/calendar/libecal/e-cal-util.c:732
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../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: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"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:83
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1083
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1396
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1523
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1572
+#, c-format
+#| msgid "\"%s\" expects one argument"
+msgid "“%s” expects one argument"
+msgstr "“%s” expects one argument"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:90
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:686
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1403
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1411
+#, c-format
+#| msgid "\"%s\" expects the first argument to be a string"
+msgid "“%s” expects the first argument to be a string"
+msgstr "“%s” expects the first argument to be a string"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:165
+#, c-format
+#| msgid "\"%s\" expects two or three arguments"
+msgid "“%s” expects two or three arguments"
+msgstr "“%s” expects two or three arguments"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:172
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:261
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:323
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:836
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1090
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1472
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1530
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1579
+#, c-format
+#| msgid "\"%s\" expects the first argument to be a time_t"
+msgid "“%s” expects the first argument to be a time_t"
+msgstr "“%s” expects the first argument to be a time_t"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:181
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:269
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:845
+#, c-format
+#| msgid "\"%s\" expects the second argument to be a time_t"
+msgid "“%s” expects the second argument to be a time_t"
+msgstr "“%s” expects the second argument to be a time_t"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:191
+#, c-format
+#| msgid "\"%s\" expects the third argument to be a string"
+msgid "“%s” expects the third argument to be a string"
+msgstr "“%s” expects the third argument to be a string"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:253
+#, c-format
+#| msgid "\"%s\" expects none or two arguments"
+msgid "“%s” expects none or two arguments"
+msgstr "“%s” expects none or two arguments"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:316
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:679
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:829
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1465
+#, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "“%s” expects two arguments"
+msgstr "“%s” expects two arguments"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:612
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:635
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:761
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:793
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1002
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1035
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1357
+#, c-format
+#| msgid "\"%s\" expects no arguments"
+msgid "“%s” expects no arguments"
+msgstr "“%s” expects no arguments"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:695
+#, c-format
+#| msgid "\"%s\" expects the second argument to be a string"
+msgid "“%s” expects the second argument to be a string"
+msgstr "“%s” expects the second argument to be a string"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:726
+#, c-format
+#| msgid ""
+#| "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+#| "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+#| "\"classification\""
+msgid ""
+"“%s” expects the first argument to be either “any”, “summary”, or "
+"“description”, or “location”, or “attendee”, or “organizer”, or "
+"“classification”"
+msgstr ""
+"“%s” expects the first argument to be either “any”, “summary”, or "
+"“description”, or “location”, or “attendee”, or “organizer”, or "
+"“classification”"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:897
 #, c-format
-msgid "\"%s\" expects two or three arguments"
-msgstr "\"%s\" expects two or three arguments"
+#| msgid "\"%s\" expects at least one argument"
+msgid "“%s” expects at least one argument"
+msgstr "“%s” expects at least one argument"
 
-#: ../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
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:912
 #, c-format
-msgid "\"%s\" expects the first argument to be a time_t"
-msgstr "\"%s\" expects the first argument to be a time_t"
+#| msgid ""
+#| "\"%s\" expects all arguments to be strings or one and only one argument "
+#| "to be a boolean false (#f)"
+msgid ""
+"“%s” expects all arguments to be strings or one and only one argument to be "
+"a boolean false (#f)"
+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: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
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1420
 #, c-format
-msgid "\"%s\" expects the second argument to be a time_t"
-msgstr "\"%s\" expects the second argument to be a time_t"
+#| msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
+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:193
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1481
 #, c-format
-msgid "\"%s\" expects the third argument to be a string"
-msgstr "\"%s\" expects the third argument to be a string"
+#| msgid "\"%s\" expects the second argument to be an integer"
+msgid "“%s” expects the second argument to be an integer"
+msgstr "“%s” expects the second argument to be an integer"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:255
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1741
 #, c-format
-msgid "\"%s\" expects none or two arguments"
-msgstr "\"%s\" expects none or two arguments"
+#| msgid "Failed to create create child process '%s': %s"
+msgid "Failed to create SQLite function, error code “%d”: %s"
+msgstr "Failed to create SQLite function, error code “%d”: %s"
 
-#: ../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
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2331
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2394
 #, c-format
-msgid "\"%s\" expects two arguments"
-msgstr "\"%s\" expects two arguments"
+#| msgid "Object not found"
+msgid "Object “%s”, “%s” not found"
+msgstr "Object “%s”, “%s” not found"
 
-#: ../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"
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3089
+#| msgid "Cannot add contact: "
+msgid "Cannot add timezone without tzid"
+msgstr "Cannot add timezone without tzid"
 
-#: ../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"
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3095
+#| msgid "Cannot authenticate without a username"
+msgid "Cannot add timezone without component"
+msgstr "Cannot add timezone without component"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
-#, c-format
-msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-"\"classification\""
-msgstr ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-"\"classification\""
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3101
+#| msgid "Cannot send message: one or more invalid recipients"
+msgid "Cannot add timezone with invalid component"
+msgstr "Cannot add timezone with invalid component"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1107
 #, c-format
-msgid "\"%s\" expects at least one argument"
-msgstr "\"%s\" expects at least one argument"
+msgid "Received object for UID “%s” doesn’t contain any expected component"
+msgstr "Received object for UID “%s” doesn’t contain any expected component"
 
-#: ../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 "
-"be a boolean false (#f)"
-msgstr ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3896
+msgid "attachment.dat"
+msgstr "attachment.dat"
 
-#: ../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: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:420
+#: ../src/calendar/libedata-cal/e-data-cal.c:421
 msgid "Unsupported method"
 msgstr "Unsupported method"
 
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../src/calendar/libedata-cal/e-data-cal.c:424
 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:1645
+#: ../src/calendar/libedata-cal/e-data-cal.c:1655
 msgid "Cannot open calendar: "
 msgstr "Cannot open calendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1682
+#: ../src/calendar/libedata-cal/e-data-cal.c:1693
 msgid "Cannot refresh calendar: "
 msgstr "Cannot refresh calendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1723
+#: ../src/calendar/libedata-cal/e-data-cal.c:1735
 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:1775
+#: ../src/calendar/libedata-cal/e-data-cal.c:1788
 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:1832
+#: ../src/calendar/libedata-cal/e-data-cal.c:1846
 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:1882
+#: ../src/calendar/libedata-cal/e-data-cal.c:1897
 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:1950
+#: ../src/calendar/libedata-cal/e-data-cal.c:1966
 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:2028
+#: ../src/calendar/libedata-cal/e-data-cal.c:2045
 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:2114
+#: ../src/calendar/libedata-cal/e-data-cal.c:2132
 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:2157
+#: ../src/calendar/libedata-cal/e-data-cal.c:2176
 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:2209
+#: ../src/calendar/libedata-cal/e-data-cal.c:2229
 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:2254
+#: ../src/calendar/libedata-cal/e-data-cal.c:2275
 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:2295
+#: ../src/calendar/libedata-cal/e-data-cal.c:2317
 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:2335
+#: ../src/calendar/libedata-cal/e-data-cal.c:2358
 msgid "Could not add calendar time zone: "
 msgstr "Could not add calendar time zone: "
 
-#: ../camel/camel-cipher-context.c:204
+#: ../src/camel/camel-cipher-context.c:202
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Signing is not supported by this cypher"
 
-#: ../camel/camel-cipher-context.c:217
+#: ../src/camel/camel-cipher-context.c:215
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifying is not supported by this cypher"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../src/camel/camel-cipher-context.c:231
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Encryption is not supported by this cypher"
 
-#: ../camel/camel-cipher-context.c:247
+#: ../src/camel/camel-cipher-context.c:245
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Decryption is not supported by this cypher"
 
-#: ../camel/camel-cipher-context.c:363
+#: ../src/camel/camel-cipher-context.c:361
 msgid "Signing message"
 msgstr "Signing message"
 
-#: ../camel/camel-cipher-context.c:653
+#: ../src/camel/camel-cipher-context.c:651
 msgid "Encrypting message"
 msgstr "Encrypting message"
 
-#: ../camel/camel-cipher-context.c:825
+#: ../src/camel/camel-cipher-context.c:823
 msgid "Decrypting message"
 msgstr "Decrypting message"
 
-#: ../camel/camel-data-cache.c:179
+#: ../src/camel/camel-data-cache.c:203
 #, c-format
 msgid "Unable to create cache path"
 msgstr "Unable to create cache path"
 
-#: ../camel/camel-data-cache.c:457
+#: ../src/camel/camel-data-cache.c:532
 msgid "Empty cache file"
 msgstr "Empty cache file"
 
-#: ../camel/camel-data-cache.c:534
+#: ../src/camel/camel-data-cache.c:609
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Could not remove cache entry: %s: %s"
 
-#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
+#: ../src/camel/camel-db.c:855
+#: ../src/camel/providers/local/camel-mbox-store.c:904
 #, c-format
-msgid "Could not rename '%s' to %s: %s"
-msgstr "Could not rename '%s' to %s: %s"
+#| msgid "Could not rename '%s' to %s: %s"
+msgid "Could not rename “%s” to %s: %s"
+msgstr "Could not rename “%s” to %s: %s"
 
-#: ../camel/camel-filter-driver.c:935 ../camel/camel-filter-search.c:773
+#: ../src/camel/camel-filter-driver.c:991
+#: ../src/camel/camel-filter-search.c:930
 #, c-format
-msgid "Failed to create child process '%s': %s"
-msgstr "Failed to create child process '%s': %s"
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to create child process “%s”: %s"
+msgstr "Failed to create child process “%s”: %s"
 
-#: ../camel/camel-filter-driver.c:983
+#: ../src/camel/camel-filter-driver.c:1039
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Invalid message stream received from %s: %s"
 
-#: ../camel/camel-filter-driver.c:1190 ../camel/camel-filter-driver.c:1199
+#: ../src/camel/camel-filter-driver.c:1259
+#: ../src/camel/camel-filter-driver.c:1271
 msgid "Syncing folders"
 msgstr "Syncing folders"
 
-#: ../camel/camel-filter-driver.c:1297
+#: ../src/camel/camel-filter-driver.c:1378
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parsing filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1308
+#: ../src/camel/camel-filter-driver.c:1389
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error executing filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1404
+#: ../src/camel/camel-filter-driver.c:1486
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Unable to open spool folder"
 
-#: ../camel/camel-filter-driver.c:1416
+#: ../src/camel/camel-filter-driver.c:1498
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Unable to process spool folder"
 
-#: ../camel/camel-filter-driver.c:1439
+#: ../src/camel/camel-filter-driver.c:1522
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Getting message %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1448 ../camel/camel-filter-driver.c:1470
+#: ../src/camel/camel-filter-driver.c:1531
+#: ../src/camel/camel-filter-driver.c:1554
 #, c-format
 msgid "Failed on message %d"
 msgstr "Failed on message %d"
 
-#: ../camel/camel-filter-driver.c:1489 ../camel/camel-filter-driver.c:1603
+#: ../src/camel/camel-filter-driver.c:1573
+#: ../src/camel/camel-filter-driver.c:1687
 msgid "Syncing folder"
 msgstr "Syncing folder"
 
-#: ../camel/camel-filter-driver.c:1494 ../camel/camel-filter-driver.c:1611
+#: ../src/camel/camel-filter-driver.c:1578
+#: ../src/camel/camel-filter-driver.c:1695
 msgid "Complete"
 msgstr "Complete"
 
-#: ../camel/camel-filter-driver.c:1557
+#: ../src/camel/camel-filter-driver.c:1641
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Getting message %d of %d"
 
-#: ../camel/camel-filter-driver.c:1575
+#: ../src/camel/camel-filter-driver.c:1659
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Failed at message %d of %d"
 
-#: ../camel/camel-filter-driver.c:1770 ../camel/camel-filter-driver.c:1797
+#: ../src/camel/camel-filter-driver.c:1866
+#: ../src/camel/camel-filter-driver.c:1890
 #, c-format
-msgid "Execution of filter '%s' failed: "
-msgstr "Execution of filter '%s' failed: "
+#| msgid "Execution of filter '%s' failed: "
+msgid "Execution of filter “%s” failed: "
+msgstr "Execution of filter “%s” failed: "
 
-#: ../camel/camel-filter-driver.c:1787
+#: ../src/camel/camel-filter-driver.c:1880
 #, c-format
-msgid "Error parsing filter '%s': %s: %s"
-msgstr "Error parsing filter '%s': %s: %s"
+#| msgid "Error parsing filter '%s': %s: %s"
+msgid "Error parsing filter “%s”: %s: %s"
+msgstr "Error parsing filter “%s”: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1806
+#: ../src/camel/camel-filter-driver.c:1899
 #, c-format
-msgid "Error executing filter '%s': %s: %s"
-msgstr "Error executing filter '%s': %s: %s"
+#| msgid "Error executing filter '%s': %s: %s"
+msgid "Error executing filter “%s”: %s: %s"
+msgstr "Error executing filter “%s”: %s: %s"
 
-#: ../camel/camel-filter-search.c:139
+#: ../src/camel/camel-filter-search.c:167
 msgid "Failed to retrieve message"
 msgstr "Failed to retrieve message"
 
-#: ../camel/camel-filter-search.c:513
+#: ../src/camel/camel-filter-search.c:631
 msgid "Invalid arguments to (system-flag)"
 msgstr "Invalid arguments to (system-flag)"
 
-#: ../camel/camel-filter-search.c:531
+#: ../src/camel/camel-filter-search.c:650
 msgid "Invalid arguments to (user-tag)"
 msgstr "Invalid arguments to (user-tag)"
 
-#: ../camel/camel-filter-search.c:1043
+#: ../src/camel/camel-filter-search.c:1232
 msgid "Invalid arguments to (message-location)"
 msgstr "Invalid arguments to (message-location)"
 
-#: ../camel/camel-filter-search.c:1124 ../camel/camel-filter-search.c:1135
+#: ../src/camel/camel-filter-search.c:1331
+#: ../src/camel/camel-filter-search.c:1342
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: ../camel/camel-folder.c:327
-#, c-format
-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:370
-#, c-format
-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:421
-#, c-format
-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:1029
-#: ../camel/providers/local/camel-maildir-folder.c:330
+#. 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.
+#: ../src/camel/camel-folder.c:311
+#, c-format
+#| msgid "Learning new spam message in '%s : %s'"
+#| msgid_plural "Learning new spam messages in '%s : %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”"
+
+#. 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.
+#: ../src/camel/camel-folder.c:354
+#, c-format
+#| msgid "Learning new ham message in '%s : %s'"
+#| msgid_plural "Learning new ham messages in '%s : %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”"
+
+#. 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.
+#: ../src/camel/camel-folder.c:405
+#, c-format
+#| msgid "Filtering new message in '%s : %s'"
+#| msgid_plural "Filtering new messages in '%s : %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”"
+
+#: ../src/camel/camel-folder.c:1030
+#: ../src/camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Moving messages"
 
-#: ../camel/camel-folder.c:1032
+#: ../src/camel/camel-folder.c:1033
 msgid "Copying messages"
 msgstr "Copying 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/camel-folder.c:1077
+#. 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.
+#: ../src/camel/camel-folder.c:1078
 #, c-format
-msgid "Quota information not supported for folder '%s : %s'"
-msgstr "Quota information not supported for folder '%s : %s'"
+#| msgid "Quota information not supported for folder '%s : %s'"
+msgid "Quota information not supported for folder “%s : %s”"
+msgstr "Quota information not supported 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.c:1176
+#. 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.
+#: ../src/camel/camel-folder.c:1180
 #, c-format
-msgid "Filtering folder '%s : %s'"
-msgstr "Filtering folder '%s : %s'"
+#| msgid "Filtering folder '%s : %s'"
+msgid "Filtering folder “%s : %s”"
+msgstr "Filtering 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.c:2916
+#. 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.
+#: ../src/camel/camel-folder.c:2985
 #, c-format
-msgid "Expunging folder '%s : %s'"
-msgstr "Expunging folder '%s : %s'"
+#| msgid "Expunging folder '%s : %s'"
+msgid "Expunging folder “%s : %s”"
+msgstr "Expunging 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.c:3050
+#. 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.
+#: ../src/camel/camel-folder.c:3119
 #, c-format
-msgid "Retrieving message '%s' in '%s : %s'"
-msgstr "Retrieving message '%s' in '%s : %s'"
+#| msgid "Retrieving message '%s' in '%s : %s'"
+msgid "Retrieving message “%s” in “%s : %s”"
+msgstr "Retrieving message “%s” in “%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:3243
+#. 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.
+#: ../src/camel/camel-folder.c:3341
 #, c-format
-msgid "Retrieving quota information for '%s : %s'"
-msgstr "Retrieving quota information for '%s : %s'"
+#| msgid "Retrieving quota information for '%s : %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
+#. 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.
+#: ../src/camel/camel-folder.c:3639
 #, c-format
-msgid "Refreshing folder '%s : %s'"
-msgstr "Refreshing folder '%s : %s'"
+#| msgid "Refreshing folder '%s : %s'"
+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:845 ../camel/camel-folder-search.c:887
+#: ../src/camel/camel-folder-search.c:905
+#: ../src/camel/camel-folder-search.c:948
 #, 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:922
+#: ../src/camel/camel-folder-search.c:986
 #, 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:929 ../camel/camel-folder-search.c:937
+#: ../src/camel/camel-folder-search.c:993
+#: ../src/camel/camel-folder-search.c:1001
 #, 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:965
+#: ../src/camel/camel-folder-search.c:1029
 #, 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:975
+#: ../src/camel/camel-folder-search.c:1039
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) requires the folder set"
 
-#: ../camel/camel-folder-search.c:1887 ../camel/camel-folder-search.c:2056
+#: ../src/camel/camel-folder-search.c:2125
+#: ../src/camel/camel-folder-search.c:2299
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2187,7 +2303,8 @@ msgstr ""
 "Cannot parse search expression: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1899 ../camel/camel-folder-search.c:2068
+#: ../src/camel/camel-folder-search.c:2137
+#: ../src/camel/camel-folder-search.c:2311
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2196,34 +2313,33 @@ msgstr ""
 "Error executing search expression: %s:\n"
 "%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:2171
+#. 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.
+#: ../src/camel/camel-folder-summary.c:1668
 #, c-format
-msgid "Release unused memory for folder '%s : %s'"
-msgstr "Release unused memory for folder '%s : %s'"
+#| msgid "Release unused memory for folder '%s : %s'"
+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
+#. Translators: The '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
+#: ../src/camel/camel-gpg-context.c:417
 #, c-format
-msgid "Update preview data for folder '%s : %s'"
-msgstr "Update preview data for folder '%s : %s'"
+msgid "Output from %s:"
+msgstr "Output from %s:"
 
-#: ../camel/camel-gpg-context.c:819 ../camel/camel-gpg-context.c:824
-#: ../camel/camel-gpg-context.c:1514
+#: ../src/camel/camel-gpg-context.c:834 ../src/camel/camel-gpg-context.c:839
+#: ../src/camel/camel-gpg-context.c:1543
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: ../camel/camel-gpg-context.c:824
-#: ../camel/providers/smtp/camel-smtp-transport.c:1131
+#: ../src/camel/camel-gpg-context.c:839
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1127
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../camel/camel-gpg-context.c:936
+#: ../src/camel/camel-gpg-context.c:951
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2234,329 +2350,385 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:972
+#: ../src/camel/camel-gpg-context.c:987
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: ../camel/camel-gpg-context.c:997 ../camel/camel-gpg-context.c:1012
+#: ../src/camel/camel-gpg-context.c:1012 ../src/camel/camel-gpg-context.c:1027
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: ../camel/camel-gpg-context.c:1033
+#: ../src/camel/camel-gpg-context.c:1048
 #, c-format
+#| msgid ""
+#| "You need a PIN to unlock the key for your\n"
+#| "SmartCard: \"%s\""
 msgid ""
 "You need a PIN to unlock the key for your\n"
-"SmartCard: \"%s\""
+"SmartCard: “%s”"
 msgstr ""
 "You need a PIN to unlock the key for your\n"
-"SmartCard: \"%s\""
+"SmartCard: “%s”"
 
-#: ../camel/camel-gpg-context.c:1037
+#: ../src/camel/camel-gpg-context.c:1052
 #, c-format
+#| msgid ""
+#| "You need a passphrase to unlock the key for\n"
+#| "user: \"%s\""
 msgid ""
 "You need a passphrase to unlock the key for\n"
-"user: \"%s\""
+"user: “%s”"
 msgstr ""
 "You need a passphrase to unlock the key for\n"
-"user: \"%s\""
+"user: “%s”"
 
-#: ../camel/camel-gpg-context.c:1043
+#: ../src/camel/camel-gpg-context.c:1058
 #, c-format
-msgid "Unexpected request from GnuPG for '%s'"
-msgstr "Unexpected request from GnuPG for '%s'"
+#| msgid "Unexpected request from GnuPG for '%s'"
+msgid "Unexpected request from GnuPG for “%s”"
+msgstr "Unexpected request from GnuPG for “%s”"
 
-#: ../camel/camel-gpg-context.c:1055
+#: ../src/camel/camel-gpg-context.c:1070
+#| 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."
 msgid ""
-"Note the encrypted content doesn't contain information about a recipient, "
+"Note the encrypted content doesn’t contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr ""
-"Note the encrypted content doesn't contain information about a recipient, "
+"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:1086 ../camel/camel-net-utils.c:524
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
-#: ../libedataserver/e-client.c:163
+#: ../src/camel/camel-gpg-context.c:1101 ../src/camel/camel-net-utils.c:522
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:405
+#: ../src/libedataserver/e-client.c:161
 #, c-format
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../camel/camel-gpg-context.c:1107
+#: ../src/camel/camel-gpg-context.c:1122
 #, 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:1120
+#: ../src/camel/camel-gpg-context.c:1135
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1234
+#: ../src/camel/camel-gpg-context.c:1249
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
-#: ../camel/camel-gpg-context.c:1943 ../camel/camel-smime-context.c:843
+#. Translators: The first '%s' is replaced with the e-mail address, like '<user example com>';
+#. the second '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
+#: ../src/camel/camel-gpg-context.c:1262
+#, c-format
+msgid ""
+"Failed to encrypt: Invalid recipient %s specified. A common issue is that "
+"the %s doesn’t have imported public key for this recipient."
+msgstr ""
+"Failed to encrypt: Invalid recipient %s specified. A common issue is that "
+"the %s doesn’t have imported public key for this recipient."
+
+#: ../src/camel/camel-gpg-context.c:2054 ../src/camel/camel-smime-context.c:841
 msgid "Could not generate signing data: "
 msgstr "Could not generate signing data: "
 
-#: ../camel/camel-gpg-context.c:1994 ../camel/camel-gpg-context.c:2230
-#: ../camel/camel-gpg-context.c:2346 ../camel/camel-gpg-context.c:2522
+#: ../src/camel/camel-gpg-context.c:2105 ../src/camel/camel-gpg-context.c:2341
+#: ../src/camel/camel-gpg-context.c:2457 ../src/camel/camel-gpg-context.c:2633
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
-#: ../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
+#: ../src/camel/camel-gpg-context.c:2211 ../src/camel/camel-gpg-context.c:2219
+#: ../src/camel/camel-gpg-context.c:2227 ../src/camel/camel-gpg-context.c:2247
+#: ../src/camel/camel-smime-context.c:970
+#: ../src/camel/camel-smime-context.c:984
+#: ../src/camel/camel-smime-context.c:993
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: ../camel/camel-gpg-context.c:2182
+#: ../src/camel/camel-gpg-context.c:2293
 msgid "Cannot verify message signature: "
 msgstr "Cannot verify message signature: "
 
-#: ../camel/camel-gpg-context.c:2311
+#: ../src/camel/camel-gpg-context.c:2422
 msgid "Could not generate encrypting data: "
 msgstr "Could not generate encrypting data: "
 
-#: ../camel/camel-gpg-context.c:2386
+#: ../src/camel/camel-gpg-context.c:2497
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: ../camel/camel-gpg-context.c:2445 ../camel/camel-gpg-context.c:2454
-#: ../camel/camel-gpg-context.c:2477
+#: ../src/camel/camel-gpg-context.c:2556 ../src/camel/camel-gpg-context.c:2565
+#: ../src/camel/camel-gpg-context.c:2588
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Cannot decrypt message: Incorrect message format"
 
-#: ../camel/camel-gpg-context.c:2465
+#: ../src/camel/camel-gpg-context.c:2576
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Failed to decrypt MIME part: protocol error"
 
-#: ../camel/camel-gpg-context.c:2532
+#: ../src/camel/camel-gpg-context.c:2643
 #, c-format
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "Failed to decrypt MIME part: Secret key not found"
 
-#: ../camel/camel-gpg-context.c:2568 ../camel/camel-smime-context.c:1288
+#: ../src/camel/camel-gpg-context.c:2679
+#: ../src/camel/camel-smime-context.c:1286
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: ../camel/camel-junk-filter.c:167
+#: ../src/camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr "Synchronising junk database"
 
-#: ../camel/camel-lock.c:110
+#: ../src/camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Could not create lock file for %s: %s"
 
-#: ../camel/camel-lock.c:153
+#: ../src/camel/camel-lock.c:154
 #, 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:215
+#: ../src/camel/camel-lock.c:221
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Failed to get lock using fcntl(2): %s"
 
-#: ../camel/camel-lock.c:282
+#: ../src/camel/camel-lock.c:293
 #, 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:107
+#: ../src/camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Cannot build locking helper pipe: %s"
 
-#: ../camel/camel-lock-client.c:131
+#: ../src/camel/camel-lock-client.c:129
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Cannot fork locking helper: %s"
 
-#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
+#: ../src/camel/camel-lock-client.c:216 ../src/camel/camel-lock-client.c:244
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Could not lock '%s': protocol error with lock-helper"
+#| msgid "Could not lock '%s': protocol error with lock-helper"
+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:234
+#: ../src/camel/camel-lock-client.c:232
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "Could not lock '%s'"
+#| msgid "Could not lock '%s'"
+msgid "Could not lock “%s”"
+msgstr "Could not lock “%s”"
 
-#: ../camel/camel-movemail.c:101
+#: ../src/camel/camel-movemail.c:99
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Could not open mail file %s: %s"
 
-#: ../camel/camel-movemail.c:121
+#: ../src/camel/camel-movemail.c:119
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Could not check mail file %s: %s"
 
-#: ../camel/camel-movemail.c:136
+#: ../src/camel/camel-movemail.c:134
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Could not open temporary mail file %s: %s"
 
-#: ../camel/camel-movemail.c:166
+#: ../src/camel/camel-movemail.c:164
 #, 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:200
+#: ../src/camel/camel-movemail.c:198
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Could not create pipe: %s"
 
-#: ../camel/camel-movemail.c:214
+#: ../src/camel/camel-movemail.c:212
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Could not fork: %s"
 
-#: ../camel/camel-movemail.c:252
+#: ../src/camel/camel-movemail.c:250
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail program failed: %s"
 
-#: ../camel/camel-movemail.c:253
+#: ../src/camel/camel-movemail.c:251
 msgid "(Unknown error)"
 msgstr "(Unknown error)"
 
-#: ../camel/camel-movemail.c:280
+#: ../src/camel/camel-movemail.c:278
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error reading mail file: %s"
 
-#: ../camel/camel-movemail.c:293
+#: ../src/camel/camel-movemail.c:291
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error writing mail temp file: %s"
 
-#: ../camel/camel-movemail.c:500 ../camel/camel-movemail.c:569
+#: ../src/camel/camel-movemail.c:499 ../src/camel/camel-movemail.c:573
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error copying mail temp file: %s"
 
-#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432
+#: ../src/camel/camel-multipart-signed.c:277
+#: ../src/camel/camel-multipart-signed.c:430
 #, c-format
 msgid "No content available"
 msgstr "No content available"
 
-#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440
+#: ../src/camel/camel-multipart-signed.c:285
+#: ../src/camel/camel-multipart-signed.c:438
 #, c-format
 msgid "No signature available"
 msgstr "No signature available"
 
-#: ../camel/camel-multipart-signed.c:806
+#: ../src/camel/camel-multipart-signed.c:804
 #, c-format
 msgid "parse error"
 msgstr "parse error"
 
-#: ../camel/camel-net-utils.c:708
+#: ../src/camel/camel-net-utils.c:714
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving: %s"
 
-#: ../camel/camel-net-utils.c:733
+#: ../src/camel/camel-net-utils.c:739
 msgid "Host lookup failed"
 msgstr "Host lookup failed"
 
-#: ../camel/camel-net-utils.c:739
+#: ../src/camel/camel-net-utils.c:745
+#, c-format
+#| msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgid "Host lookup “%s” failed. Check your host name for spelling errors."
+msgstr "Host lookup “%s” failed. Check your host name for spelling errors."
+
+#: ../src/camel/camel-net-utils.c:749
 #, 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."
+#| msgid "Host lookup '%s' failed: %s"
+msgid "Host lookup “%s” failed: %s"
+msgstr "Host lookup “%s” failed: %s"
 
-#: ../camel/camel-net-utils.c:743
+#: ../src/camel/camel-network-service.c:1127
 #, c-format
-msgid "Host lookup '%s' failed: %s"
-msgstr "Host lookup '%s' failed: %s"
+msgid "Checking reach-ability of account “%s”"
+msgstr "Checking reach-ability of account “%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-offline-folder.c:96
+#. 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.
+#: ../src/camel/camel-offline-folder.c:125
 #, c-format
-msgid "Downloading new messages for offline mode in '%s : %s'"
-msgstr "Downloading new messages for offline mode in '%s : %s'"
+#| msgid "Downloading new messages for offline mode in '%s : %s'"
+msgid "Downloading new messages for offline mode in “%s : %s”"
+msgstr "Downloading new messages for offline mode in “%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-offline-folder.c:167
+#. 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.
+#: ../src/camel/camel-offline-folder.c:221
 #, c-format
-msgid "Storing changes in folder '%s : %s'"
-msgstr "Storing changes in folder '%s : %s'"
+#| msgid "Storing changes in folder '%s : %s'"
+msgid "Storing changes in folder “%s : %s”"
+msgstr "Storing changes in 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-offline-folder.c:257
+#. 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.
+#: ../src/camel/camel-offline-folder.c:311
 #, c-format
-msgid "Checking download of new messages for offline in '%s : %s'"
-msgstr "Checking download of new messages for offline in '%s : %s'"
+#| msgid "Checking download of new messages for offline in '%s : %s'"
+msgid "Checking download of new messages for offline in “%s : %s”"
+msgstr "Checking download of new messages for offline in “%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-offline-folder.c:373
+#. 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.
+#: ../src/camel/camel-offline-folder.c:428
 #, c-format
-msgid "Syncing messages in folder '%s : %s' to disk"
-msgstr "Syncing messages in folder '%s : %s' to disk"
+#| msgid "Syncing messages in folder '%s : %s' to disk"
+msgid "Syncing messages in folder “%s : %s” to disk"
+msgstr "Syncing messages in folder “%s : %s” to disk"
 
-#: ../camel/camel-offline-folder.c:436
+#. Translators: The first “%d” is the sequence number of the message, the second “%d”
+#. is the total number of messages to synchronize.
+#. 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.
+#: ../src/camel/camel-offline-folder.c:476
+#, c-format
+#| msgid "Syncing messages in folder '%s : %s' to disk"
+msgid "Syncing message %d of %d in folder “%s : %s” to disk"
+msgstr "Syncing message %d of %d in folder “%s : %s” to disk"
+
+#: ../src/camel/camel-offline-folder.c:527
 msgid "Copy folder content locally for _offline operation"
 msgstr "Copy folder content locally for _offline operation"
 
-#: ../camel/camel-provider.c:55
+#: ../src/camel/camel-offline-store.c:268
+#, c-format
+#| msgid "Syncing messages in folder '%s : %s' to disk"
+msgid "Syncing messages in account “%s” to disk"
+msgstr "Syncing messages in account “%s” to disk"
+
+#: ../src/camel/camel-provider.c:89
 msgid "Virtual folder email provider"
 msgstr "Virtual folder e-mail provider"
 
-#: ../camel/camel-provider.c:57
+#: ../src/camel/camel-provider.c:91
 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:260
+#: ../src/camel/camel-provider.c:295
 #, 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:269
+#: ../src/camel/camel-provider.c:304
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Could not load %s: %s"
 
-#: ../camel/camel-provider.c:278
+#: ../src/camel/camel-provider.c:313
 #, 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:424 ../camel/camel-session.c:436
+#: ../src/camel/camel-provider.c:459 ../src/camel/camel-session.c:434
 #, c-format
-msgid "No provider available for protocol '%s'"
-msgstr "No provider available for protocol '%s'"
+#| msgid "No provider available for protocol '%s'"
+msgid "No provider available for protocol “%s”"
+msgstr "No provider available for protocol “%s”"
 
-#: ../camel/camel-sasl-anonymous.c:32
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../src/camel/camel-sasl-anonymous.c:35
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../camel/camel-sasl-anonymous.c:34
+#: ../src/camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "This option will connect to the server using an anonymous login."
 
-#: ../camel/camel-sasl-anonymous.c:67
+#: ../src/camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
-#: ../camel/camel-sasl-anonymous.c:78
+#: ../src/camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2565,7 +2737,7 @@ msgstr ""
 "Invalid e-mail address trace information:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:92
+#: ../src/camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2574,7 +2746,7 @@ msgstr ""
 "Invalid opaque trace information:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:106
+#: ../src/camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2583,11 +2755,11 @@ msgstr ""
 "Invalid trace information:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../src/camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../src/camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2595,11 +2767,11 @@ msgstr ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../src/camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../src/camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2607,51 +2779,52 @@ 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:854
+#: ../src/camel/camel-sasl-digest-md5.c:852
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Server challenge too long (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../src/camel/camel-sasl-digest-md5.c:863
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Server challenge invalid\n"
 
-#: ../camel/camel-sasl-digest-md5.c:873
+#: ../src/camel/camel-sasl-digest-md5.c:871
 #, c-format
-msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Server challenge contained invalid \"Quality of Protection\" token"
+#| msgid "Server challenge contained invalid \"Quality of Protection\" token"
+msgid "Server challenge contained invalid “Quality of Protection” token"
+msgstr "Server challenge contained invalid “Quality of Protection” token"
 
-#: ../camel/camel-sasl-digest-md5.c:906
+#: ../src/camel/camel-sasl-digest-md5.c:904
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Server response did not contain authorisation data"
 
-#: ../camel/camel-sasl-digest-md5.c:927
+#: ../src/camel/camel-sasl-digest-md5.c:925
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Server response contained incomplete authorisation data"
 
-#: ../camel/camel-sasl-digest-md5.c:940
+#: ../src/camel/camel-sasl-digest-md5.c:938
 #, c-format
 msgid "Server response does not match"
 msgstr "Server response does not match"
 
-#: ../camel/camel-sasl-gssapi.c:94
+#: ../src/camel/camel-sasl-gssapi.c:92
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:96
+#: ../src/camel/camel-sasl-gssapi.c:94
 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:148
+#: ../src/camel/camel-sasl-gssapi.c:146
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
 msgstr "(Unknown GSSAPI mechanism code: %x)"
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../src/camel/camel-sasl-gssapi.c:179
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2659,11 +2832,11 @@ msgstr ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognised by the implementation."
 
-#: ../camel/camel-sasl-gssapi.c:186
+#: ../src/camel/camel-sasl-gssapi.c:184
 msgid "The provided target_name parameter was ill-formed."
 msgstr "The provided target_name parameter was ill-formed."
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../src/camel/camel-sasl-gssapi.c:187
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2671,7 +2844,7 @@ msgstr ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../src/camel/camel-sasl-gssapi.c:191
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2679,7 +2852,7 @@ msgstr ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 
-#: ../camel/camel-sasl-gssapi.c:198
+#: ../src/camel/camel-sasl-gssapi.c:196
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2687,7 +2860,7 @@ msgstr ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 
-#: ../camel/camel-sasl-gssapi.c:202
+#: ../src/camel/camel-sasl-gssapi.c:200
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2695,52 +2868,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:207
+#: ../src/camel/camel-sasl-gssapi.c:205
 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:210
+#: ../src/camel/camel-sasl-gssapi.c:208
 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:213
+#: ../src/camel/camel-sasl-gssapi.c:211
 msgid "The consistency checks performed on the credential failed."
 msgstr "The consistency checks performed on the credential failed."
 
-#: ../camel/camel-sasl-gssapi.c:216
+#: ../src/camel/camel-sasl-gssapi.c:214
 msgid "The referenced credentials have expired."
 msgstr "The referenced credentials have expired."
 
-#: ../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
+#: ../src/camel/camel-sasl-gssapi.c:220 ../src/camel/camel-sasl-gssapi.c:402
+#: ../src/camel/camel-sasl-gssapi.c:451 ../src/camel/camel-sasl-gssapi.c:468
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
-#: ../camel/camel-sasl-gssapi.c:482
+#: ../src/camel/camel-sasl-gssapi.c:480
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Unsupported security layer."
 
-#: ../camel/camel-sasl-login.c:37
+#: ../src/camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Login"
 
-#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
+#: ../src/camel/camel-sasl-login.c:37 ../src/camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "This option will connect to the server using a simple password."
 
-#: ../camel/camel-sasl-login.c:107
+#: ../src/camel/camel-sasl-login.c:105
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Unknown authentication state."
 
-#: ../camel/camel-sasl-ntlm.c:46
+#: ../src/camel/camel-sasl-ntlm.c:44
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:48
+#: ../src/camel/camel-sasl-ntlm.c:46
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2748,937 +2921,1038 @@ msgstr ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 
-#: ../camel/camel-sasl-plain.c:41
+#: ../src/camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:43
+#: ../src/camel/camel-sasl-popb4smtp.c:41
 msgid "POP before SMTP"
 msgstr "POP before SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:45
+#: ../src/camel/camel-sasl-popb4smtp.c:43
 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:83
+#: ../src/camel/camel-sasl-popb4smtp.c:81
 msgid "POP Source UID"
 msgstr "POP Source UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../src/camel/camel-sasl-popb4smtp.c:95
 #, 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:109 ../camel/camel-sasl-popb4smtp.c:118
+#: ../src/camel/camel-sasl-popb4smtp.c:107
+#: ../src/camel/camel-sasl-popb4smtp.c:116
 #, 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:113
+#: ../src/camel/camel-sasl-xoauth2.c:26
+#| msgid "Author"
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: ../src/camel/camel-sasl-xoauth2.c:27
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr ""
+"This option will use an OAuth 2.0 access token to connect to the server"
+
+#: ../src/camel/camel-sasl-xoauth2-google.c:23
+msgid "OAuth2 (Google)"
+msgstr "OAuth2 (Google)"
+
+#: ../src/camel/camel-sasl-xoauth2-google.c:24
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+
+#: ../src/camel/camel-sasl-xoauth2-outlook.c:23
+msgid "OAuth2 (Outlook)"
+msgstr "OAuth2 (Outlook)"
+
+#: ../src/camel/camel-sasl-xoauth2-outlook.c:24
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Outlook.com "
+"server"
+msgstr ""
+"This option will use an OAuth 2.0 access token to connect to the Outlook.com "
+"server"
+
+#: ../src/camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regular expression compilation failed: %s: %s"
 
-#: ../camel/camel-session.c:445
+#: ../src/camel/camel-session.c:443
 #, c-format
-msgid "Invalid GType registered for protocol '%s'"
-msgstr "Invalid GType registered for protocol '%s'"
+#| msgid "Invalid GType registered for protocol '%s'"
+msgid "Invalid GType registered for protocol “%s”"
+msgstr "Invalid GType registered for protocol “%s”"
 
-#: ../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
+#: ../src/camel/camel-session.c:512
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2978
+#: ../src/camel/providers/pop3/camel-pop3-store.c:306
+#: ../src/camel/providers/pop3/camel-pop3-store.c:788
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:670
 #, c-format
 msgid "No support for %s authentication"
 msgstr "No support for %s authentication"
 
-#: ../camel/camel-session.c:529
+#: ../src/camel/camel-session.c:527
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s authentication failed"
 
-#: ../camel/camel-session.c:598
+#: ../src/camel/camel-session.c:596
 msgid "Forwarding messages is not supported"
 msgstr "Forwarding messages is not supported"
 
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
+#: ../src/camel/camel-smime-context.c:346
+#: ../src/camel/camel-smime-context.c:1073
 #, c-format
-msgid "Cannot find certificate for '%s'"
-msgstr "Cannot find certificate for '%s'"
+#| msgid "Cannot find certificate for '%s'"
+msgid "Cannot find certificate for “%s”"
+msgstr "Cannot find certificate for “%s”"
 
-#: ../camel/camel-smime-context.c:376
+#: ../src/camel/camel-smime-context.c:374
 msgid "Cannot create CMS message"
 msgstr "Cannot create CMS message"
 
-#: ../camel/camel-smime-context.c:381
+#: ../src/camel/camel-smime-context.c:379
 msgid "Cannot create CMS signed data"
 msgstr "Cannot create CMS signed data"
 
-#: ../camel/camel-smime-context.c:387
+#: ../src/camel/camel-smime-context.c:385
 msgid "Cannot attach CMS signed data"
 msgstr "Cannot attach CMS signed data"
 
-#: ../camel/camel-smime-context.c:394
+#: ../src/camel/camel-smime-context.c:392
 msgid "Cannot attach CMS data"
 msgstr "Cannot attach CMS data"
 
-#: ../camel/camel-smime-context.c:400
+#: ../src/camel/camel-smime-context.c:398
 msgid "Cannot create CMS Signer information"
 msgstr "Cannot create CMS Signer information"
 
-#: ../camel/camel-smime-context.c:406
+#: ../src/camel/camel-smime-context.c:404
 msgid "Cannot find certificate chain"
 msgstr "Cannot find certificate chain"
 
-#: ../camel/camel-smime-context.c:412
+#: ../src/camel/camel-smime-context.c:410
 msgid "Cannot add CMS Signing time"
 msgstr "Cannot add CMS Signing time"
 
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../src/camel/camel-smime-context.c:434
+#: ../src/camel/camel-smime-context.c:449
 #, c-format
-msgid "Encryption certificate for '%s' does not exist"
-msgstr "Encryption certificate for '%s' does not exist"
+#| msgid "Encryption certificate for '%s' does not exist"
+msgid "Encryption certificate for “%s” does not exist"
+msgstr "Encryption certificate for “%s” does not exist"
 
-#: ../camel/camel-smime-context.c:458
+#: ../src/camel/camel-smime-context.c:456
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add SMIMEEncKeyPrefs attribute"
 
-#: ../camel/camel-smime-context.c:463
+#: ../src/camel/camel-smime-context.c:461
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
 
-#: ../camel/camel-smime-context.c:468
+#: ../src/camel/camel-smime-context.c:466
 msgid "Cannot add encryption certificate"
 msgstr "Cannot add encryption certificate"
 
-#: ../camel/camel-smime-context.c:474
+#: ../src/camel/camel-smime-context.c:472
 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:507
+#: ../src/camel/camel-smime-context.c:505
 msgid "Unverified"
 msgstr "Unverified"
 
-#: ../camel/camel-smime-context.c:509
+#: ../src/camel/camel-smime-context.c:507
 msgid "Good signature"
 msgstr "Good signature"
 
-#: ../camel/camel-smime-context.c:511
+#: ../src/camel/camel-smime-context.c:509
 msgid "Bad signature"
 msgstr "Bad signature"
 
-#: ../camel/camel-smime-context.c:513
+#: ../src/camel/camel-smime-context.c:511
 msgid "Content tampered with or altered in transit"
 msgstr "Content tampered with or altered in transit"
 
-#: ../camel/camel-smime-context.c:515
+#: ../src/camel/camel-smime-context.c:513
 msgid "Signing certificate not found"
 msgstr "Signing certificate not found"
 
-#: ../camel/camel-smime-context.c:517
+#: ../src/camel/camel-smime-context.c:515
 msgid "Signing certificate not trusted"
 msgstr "Signing certificate not trusted"
 
-#: ../camel/camel-smime-context.c:519
+#: ../src/camel/camel-smime-context.c:517
 msgid "Signature algorithm unknown"
 msgstr "Signature algorithm unknown"
 
-#: ../camel/camel-smime-context.c:521
+#: ../src/camel/camel-smime-context.c:519
 msgid "Signature algorithm unsupported"
 msgstr "Signature algorithm unsupported"
 
-#: ../camel/camel-smime-context.c:523
+#: ../src/camel/camel-smime-context.c:521
 msgid "Malformed signature"
 msgstr "Malformed signature"
 
-#: ../camel/camel-smime-context.c:525
+#: ../src/camel/camel-smime-context.c:523
 msgid "Processing error"
 msgstr "Processing error"
 
-#: ../camel/camel-smime-context.c:570
+#: ../src/camel/camel-smime-context.c:568
 msgid "No signed data in signature"
 msgstr "No signed data in signature"
 
-#: ../camel/camel-smime-context.c:575
+#: ../src/camel/camel-smime-context.c:573
 msgid "Digests missing from enveloped data"
 msgstr "Digests missing from enveloped data"
 
-#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
+#: ../src/camel/camel-smime-context.c:586
+#: ../src/camel/camel-smime-context.c:597
 msgid "Cannot calculate digests"
 msgstr "Cannot calculate digests"
 
-#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
+#: ../src/camel/camel-smime-context.c:604
+#: ../src/camel/camel-smime-context.c:608
 msgid "Cannot set message digests"
 msgstr "Cannot set message digests"
 
-#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
+#: ../src/camel/camel-smime-context.c:618
+#: ../src/camel/camel-smime-context.c:623
 msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
-#: ../camel/camel-smime-context.c:635
+#: ../src/camel/camel-smime-context.c:633
 #, 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:638
+#: ../src/camel/camel-smime-context.c:636
 #, 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:642
+#: ../src/camel/camel-smime-context.c:640
 msgid "Cannot find signature digests"
 msgstr "Cannot find signature digests"
 
-#: ../camel/camel-smime-context.c:659
+#: ../src/camel/camel-smime-context.c:657
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signer: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1149
+#: ../src/camel/camel-smime-context.c:853
+#: ../src/camel/camel-smime-context.c:1147
 msgid "Cannot create encoder context"
 msgstr "Cannot create encoder context"
 
-#: ../camel/camel-smime-context.c:861
+#: ../src/camel/camel-smime-context.c:859
 msgid "Failed to add data to CMS encoder"
 msgstr "Failed to add data to CMS encoder"
 
-#: ../camel/camel-smime-context.c:866 ../camel/camel-smime-context.c:1166
+#: ../src/camel/camel-smime-context.c:864
+#: ../src/camel/camel-smime-context.c:1164
 msgid "Failed to encode data"
 msgstr "Failed to encode data"
 
-#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
+#: ../src/camel/camel-smime-context.c:1012
+#: ../src/camel/camel-smime-context.c:1261
 msgid "Decoder failed"
 msgstr "Decoder failed"
 
-#: ../camel/camel-smime-context.c:1083
+#: ../src/camel/camel-smime-context.c:1081
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Cannot find common bulk encryption algorithm"
 
-#: ../camel/camel-smime-context.c:1091
+#: ../src/camel/camel-smime-context.c:1089
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Cannot allocate slot for encryption bulk key"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../src/camel/camel-smime-context.c:1100
 msgid "Cannot create CMS Message"
 msgstr "Cannot create CMS Message"
 
-#: ../camel/camel-smime-context.c:1108
+#: ../src/camel/camel-smime-context.c:1106
 msgid "Cannot create CMS Enveloped data"
 msgstr "Cannot create CMS Enveloped data"
 
-#: ../camel/camel-smime-context.c:1114
+#: ../src/camel/camel-smime-context.c:1112
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Cannot attach CMS Enveloped data"
 
-#: ../camel/camel-smime-context.c:1120
+#: ../src/camel/camel-smime-context.c:1118
 msgid "Cannot attach CMS data object"
 msgstr "Cannot attach CMS data object"
 
-#: ../camel/camel-smime-context.c:1129
+#: ../src/camel/camel-smime-context.c:1127
 msgid "Cannot create CMS Recipient information"
 msgstr "Cannot create CMS Recipient information"
 
-#: ../camel/camel-smime-context.c:1134
+#: ../src/camel/camel-smime-context.c:1132
 msgid "Cannot add CMS Recipient information"
 msgstr "Cannot add CMS Recipient information"
 
-#: ../camel/camel-smime-context.c:1160
+#: ../src/camel/camel-smime-context.c:1158
 msgid "Failed to add data to encoder"
 msgstr "Failed to add data to encoder"
 
-#: ../camel/camel-smime-context.c:1270
+#: ../src/camel/camel-smime-context.c:1268
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: No encrypted content found"
 
-#: ../camel/camel-store.c:1284
+#: ../src/camel/camel-store.c:1401
 #, c-format
-msgid "Opening folder '%s'"
-msgstr "Opening folder '%s'"
+#| msgid "Opening folder '%s'"
+msgid "Opening folder “%s”"
+msgstr "Opening folder “%s”"
 
-#: ../camel/camel-store.c:1578
+#: ../src/camel/camel-store.c:1696
 #, c-format
-msgid "Scanning folders in '%s'"
-msgstr "Scanning folders in '%s'"
+#| msgid "Scanning folders in '%s'"
+msgid "Scanning folders in “%s”"
+msgstr "Scanning folders in “%s”"
 
-#: ../camel/camel-store.c:1606 ../camel/camel-store.c:1651
-#: ../camel/camel-vtrash-folder.c:45
+#: ../src/camel/camel-store.c:1724 ../src/camel/camel-store.c:1769
+#: ../src/camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Wastebasket"
 
-#: ../camel/camel-store.c:1620 ../camel/camel-store.c:1668
-#: ../camel/camel-vtrash-folder.c:47
+#: ../src/camel/camel-store.c:1738 ../src/camel/camel-store.c:1786
+#: ../src/camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Junk"
 
-#: ../camel/camel-store.c:2269
+#: ../src/camel/camel-store.c:2387
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Cannot create folder: %s: folder exists"
 
-#: ../camel/camel-store.c:2276
+#: ../src/camel/camel-store.c:2394
 #, c-format
-msgid "Creating folder '%s'"
-msgstr "Creating folder '%s'"
+#| msgid "Creating folder '%s'"
+msgid "Creating folder “%s”"
+msgstr "Creating folder “%s”"
 
-#: ../camel/camel-store.c:2453 ../camel/camel-vee-store.c:410
-#: ../camel/providers/local/camel-maildir-store.c:346
+#: ../src/camel/camel-store.c:2571 ../src/camel/camel-vee-store.c:423
+#: ../src/camel/providers/local/camel-maildir-store.c:344
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: ../camel/camel-store.c:2643 ../camel/camel-vee-store.c:461
-#: ../camel/providers/local/camel-maildir-store.c:914
+#: ../src/camel/camel-store.c:2761 ../src/camel/camel-vee-store.c:474
+#: ../src/camel/providers/local/camel-maildir-store.c:912
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Cannot rename folder: %s: Invalid operation"
 
-#: ../camel/camel-stream.c:168
+#: ../src/camel/camel-stream.c:170
 msgid "Cannot write with no base stream"
 msgstr "Cannot write with no base stream"
 
-#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
+#: ../src/camel/camel-stream.c:290 ../src/camel/camel-stream.c:341
 #, c-format
-msgid "Stream type '%s' is not seekable"
-msgstr "Stream type '%s' is not seekable"
+#| msgid "Stream type '%s' is not seekable"
+msgid "Stream type “%s” is not seekable"
+msgstr "Stream type “%s” is not seekable"
 
-#: ../camel/camel-stream-filter.c:344
+#: ../src/camel/camel-stream-filter.c:342
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "Only reset to beginning is supported with CamelStreamFilter"
 
-#: ../camel/camel-stream-null.c:74
+#: ../src/camel/camel-stream-null.c:76
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Only reset to beginning is supported with CamelHttpStream"
 
-#: ../camel/camel-stream-process.c:278
-#: ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../src/camel/camel-stream-process.c:284
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:717
 #, c-format
 msgid "Connection cancelled"
 msgstr "Connection cancelled"
 
-#: ../camel/camel-stream-process.c:283
+#: ../src/camel/camel-stream-process.c:289
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Could not connect with command \"%s\": %s"
+#| msgid "Could not connect with command \"%s\": %s"
+msgid "Could not connect with command “%s”: %s"
+msgstr "Could not connect with command “%s”: %s"
 
-#: ../camel/camel-subscribable.c:273
+#: ../src/camel/camel-subscribable.c:234
 #, c-format
-msgid "Subscribing to folder '%s'"
-msgstr "Subscribing to folder '%s'"
+#| msgid "Subscribing to folder '%s'"
+msgid "Subscribing to folder “%s”"
+msgstr "Subscribing to folder “%s”"
 
-#: ../camel/camel-subscribable.c:442
+#: ../src/camel/camel-subscribable.c:403
 #, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "Unsubscribing from folder '%s'"
+#| msgid "Unsubscribing from folder '%s'"
+msgid "Unsubscribing from folder “%s”"
+msgstr "Unsubscribing from folder “%s”"
 
-#: ../camel/camel-url.c:327
+#: ../src/camel/camel-url.c:325
 #, c-format
-msgid "Could not parse URL '%s'"
-msgstr "Could not parse URL '%s'"
+#| msgid "Could not parse URL '%s'"
+msgid "Could not parse URL “%s”"
+msgstr "Could not parse URL “%s”"
 
-#: ../camel/camel-vee-folder.c:491
+#: ../src/camel/camel-vee-folder.c:558
 #, c-format
-msgid "Updating folder '%s'"
-msgstr "Updating folder '%s'"
+#| msgid "Updating folder '%s'"
+msgid "Updating folder “%s”"
+msgstr "Updating folder “%s”"
 
-#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:984
+#: ../src/camel/camel-vee-folder.c:958 ../src/camel/camel-vee-folder.c:1075
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
-#. 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
+#. 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
+#: ../src/camel/camel-vee-folder.c:995
 #, c-format
-msgid "No such message %s in '%s : %s'"
-msgstr "No such message %s in '%s : %s'"
+#| msgid "No such message %s in '%s : %s'"
+msgid "No such message %s in “%s : %s”"
+msgstr "No such message %s in “%s : %s”"
 
-#: ../camel/camel-vee-folder.c:960
+#: ../src/camel/camel-vee-folder.c:1051
 #, c-format
-msgid "Error storing '%s': "
-msgstr "Error storing '%s': "
+#| msgid "Error storing '%s': "
+msgid "Error storing “%s”: "
+msgstr "Error storing “%s”: "
 
-#: ../camel/camel-vee-folder.c:1198
+#: ../src/camel/camel-vee-folder.c:1301
 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:40
+#: ../src/camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: ../camel/camel-vee-store.c:436
+#: ../src/camel/camel-vee-store.c:449
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: ../camel/camel-vee-store.c:471
+#: ../src/camel/camel-vee-store.c:484
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
 
-#: ../camel/camel-vee-store.c:533
+#: ../src/camel/camel-vee-store.c:547
 msgid "Enable _Unmatched folder"
 msgstr "Enable _Unmatched folder"
 
-#: ../camel/camel-vee-store.c:1030
+#: ../src/camel/camel-vee-store.c:1101
 msgid "Updating Unmatched search folder"
 msgstr "Updating Unmatched search folder"
 
-#: ../camel/camel-vtrash-folder.c:46
+#: ../src/camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Cannot copy messages to the Wastebasket folder"
 
-#: ../camel/camel-vtrash-folder.c:48
+#: ../src/camel/camel-vtrash-folder.c:51
 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
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:985
 #, 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
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:993
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3111
+#: ../src/camel/providers/nntp/camel-nntp-store.c:351
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1346
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2158
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2306
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:450
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:633
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:920
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1134
+#: ../src/camel/providers/pop3/camel-pop3-store.c:294
+#: ../src/camel/providers/pop3/camel-pop3-store.c:527
+#: ../src/camel/providers/pop3/camel-pop3-store.c:575
+#: ../src/camel/providers/pop3/camel-pop3-store.c:670
+#: ../src/camel/providers/pop3/camel-pop3-store.c:1105
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:541
 #, 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
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1620
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1716
 #, c-format
 msgid "No destination folder specified"
 msgstr "No destination folder specified"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1588
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1647
 msgid "Unable to move junk messages"
 msgstr "Unable to move junk messages"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1683
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1750
 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
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1818
+#| msgid "Unable to move junk messages"
+msgid "Unable to move messages to Inbox"
+msgstr "Unable to move messages to Inbox"
+
+#. 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.
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:758
 #, c-format
-msgid "No quota information available for folder '%s : %s'"
-msgstr "No quota information available for folder '%s : %s'"
+#| msgid "No quota information available for folder '%s : %s'"
+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
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1038
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:841
 msgid "Apply message _filters to this folder"
 msgstr "Apply message _filters to this folder"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:979
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1049
 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
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1162
 #, 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
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1174
 #, 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
+#. 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.
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1379
 #, c-format
-msgid "No IMAP mailbox available for folder '%s : %s'"
-msgstr "No IMAP mailbox available for folder '%s : %s'"
+#| msgid "No IMAP mailbox available for folder '%s : %s'"
+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
+#: ../src/camel/providers/imapx/camel-imapx-input-stream.c:102
 #, c-format
 msgid "Source stream returned no data"
 msgstr "Source stream returned no data"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:38
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:36
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:38
 msgid "C_heck for new messages in all folders"
 msgstr "C_heck for new messages in all folders"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Ch_eck for new messages in subscribed folders"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Use _Quick Resync if the server supports it"
 msgstr "Use _Quick Resync if the server supports it"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:44
 msgid "_Listen for server change notifications"
 msgstr "_Listen for server change notifications"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:47
 msgid "Connection to Server"
 msgstr "Connection to Server"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:49
 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
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:52
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "Folders"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Show only subscribed folders"
 msgstr "_Show only subscribed folders"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:57
 msgid "O_verride server-supplied folder namespace"
 msgstr "O_verride server-supplied folder namespace"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
 msgid "Namespace:"
 msgstr "Namespace:"
 
-#: ../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
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:62
+#: ../src/camel/providers/local/camel-local-provider.c:37
+#: ../src/camel/providers/local/camel-local-provider.c:63
+#: ../src/camel/providers/local/camel-local-provider.c:84
+#: ../src/camel/providers/local/camel-local-provider.c:108
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:36
 msgid "Options"
 msgstr "Options"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:40
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:64
+#: ../src/camel/providers/local/camel-local-provider.c:39
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:38
 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:68
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:66
 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:70
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:68
+#: ../src/camel/providers/local/camel-local-provider.c:41
+#: ../src/camel/providers/local/camel-local-provider.c:67
+#: ../src/camel/providers/local/camel-local-provider.c:88
+#: ../src/camel/providers/local/camel-local-provider.c:112
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:40
 msgid "Check new messages for _Junk contents"
 msgstr "Check new messages for _Junk contents"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:70
 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:74
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:72
 msgid "Synchroni_ze remote mail locally in all folders"
 msgstr "Synchronise remote mail locally in all folders"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Default IMAP port"
 msgstr "Default IMAP port"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:81
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:80
 msgid "IMAP over TLS"
 msgstr "IMAP over TLS"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "IMAP+"
-msgstr "IMAP+"
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:87
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:89
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For reading and storing mail on IMAP servers."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1167
+#: ../src/camel/providers/imapx/camel-imapx-server.c:1116
 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
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2793
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2881
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3144
 msgid "Failed to get capabilities"
 msgstr "Failed to get capabilities"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2825
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2812
 #, 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
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2813
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:279
 msgid "STARTTLS not supported"
 msgstr "STARTTLS not supported"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2835
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2822
 msgid "Failed to issue STARTTLS"
 msgstr "Failed to issue STARTTLS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2883
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2870
 #, 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
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2965
 #, 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
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2996
+#: ../src/camel/providers/nntp/camel-nntp-store.c:457
+#: ../src/camel/providers/nntp/camel-nntp-store.c:599
 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
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3005
+#: ../src/camel/providers/nntp/camel-nntp-store.c:608
+#: ../src/camel/providers/pop3/camel-pop3-store.c:688
+#: ../src/camel/providers/pop3/camel-pop3-store.c:726
 msgid "Authentication password not available"
 msgstr "Authentication password not available"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3025
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3013
 msgid "Failed to authenticate"
 msgstr "Failed to authenticate"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3178
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3166
 msgid "Failed to issue NAMESPACE"
 msgstr "Failed to issue NAMESPACE"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3196
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3184
 msgid "Failed to enable QResync"
 msgstr "Failed to enable QResync"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3228
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3216
 msgid "Failed to issue NOTIFY"
 msgstr "Failed to issue NOTIFY"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3706
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3694
 msgid "Failed to select mailbox"
 msgstr "Failed to select mailbox"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3809
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3797
 msgid "Cannot issue command, no stream available"
 msgstr "Cannot issue command, no stream available"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4073
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4061
 #, 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
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4062
 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
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4110
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4135
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4174
 msgid "Error fetching message"
 msgstr "Error fetching message"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4153
-#: ../camel/providers/imapx/camel-imapx-server.c:4760
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4152
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4911
 msgid "Error performing NOOP"
 msgstr "Error performing NOOP"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4168
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4167
 msgid "Failed to close the tmp stream"
 msgstr "Failed to close the tmp stream"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4199
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4198
 msgid "Failed to copy the tmp file"
 msgstr "Failed to copy the tmp file"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4362
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4434
 msgid "Error moving messages"
 msgstr "Error moving messages"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4362
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4434
 msgid "Error copying messages"
 msgstr "Error copying messages"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4546
-#: ../camel/providers/imapx/camel-imapx-server.c:4567
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4704
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4725
 msgid "Cannot create spool file: "
 msgstr "Cannot create spool file: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4668
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4811
 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
+#. 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.
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5064
 #, c-format
-msgid "Scanning for changed messages in '%s : %s'"
-msgstr "Scanning for changed messages in '%s : %s'"
+#| msgid "Scanning for changed messages in '%s : %s'"
+msgid "Scanning for changed messages in “%s : %s”"
+msgstr "Scanning for changed messages in “%s : %s”"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4917
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5068
 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
+#. 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.
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5089
 #, c-format
-msgid "Fetching summary information for new messages in '%s : %s'"
-msgstr "Fetching summary information for new messages in '%s : %s'"
+#| msgid "Fetching summary information for new messages in '%s : %s'"
+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
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5107
 msgid "Error fetching message info"
 msgstr "Error fetching message info"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5018
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5213
 msgid "Error running STATUS"
 msgstr "Error running STATUS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5510
-#: ../camel/providers/imapx/camel-imapx-server.c:5562
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5759
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5789
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5824
 msgid "Error syncing changes"
 msgstr "Error syncing changes"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5673
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5962
 msgid "Error expunging message"
 msgstr "Error expunging message"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5743
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6034
 msgid "Error fetching folders"
 msgstr "Error fetching folders"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5754
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6045
 msgid "Error fetching subscribed folders"
 msgstr "Error fetching subscribed folders"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5776
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6067
 msgid "Error creating folder"
 msgstr "Error creating folder"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5832
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6123
 msgid "Error deleting folder"
 msgstr "Error deleting folder"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5878
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6169
 msgid "Error renaming folder"
 msgstr "Error renaming folder"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5910
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6201
 msgid "Error subscribing to folder"
 msgstr "Error subscribing to folder"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5946
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6237
 msgid "Error unsubscribing from folder"
 msgstr "Error unsubscribing from folder"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5986
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6277
 msgid "IMAP server does not support quotas"
 msgstr "IMAP server does not support quotas"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5998
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6289
 msgid "Error retrieving quota information"
 msgstr "Error retrieving quota information"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6045
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6352
 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
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6470
 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
+#: ../src/camel/providers/imapx/camel-imapx-store.c:354
+#: ../src/camel/providers/local/camel-maildir-folder.c:478
+#: ../src/camel/providers/local/camel-maildir-store.c:345
+#: ../src/camel/providers/local/camel-maildir-store.c:824
+#: ../src/camel/providers/local/camel-maildir-store.c:830
+#: ../src/camel/providers/local/camel-maildir-store.c:913
+#: ../src/camel/providers/local/camel-spool-store.c:390
 msgid "Inbox"
 msgstr "Inbox"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:765
+#: ../src/camel/providers/imapx/camel-imapx-store.c:957
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:768
+#: ../src/camel/providers/imapx/camel-imapx-store.c:960
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP service for %s on %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:836
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1051
 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
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1068
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:95
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:80
 msgid "Password"
 msgstr "Password"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:855
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1070
 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
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1157
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1381
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1622
 #, c-format
-msgid "No IMAP namespace for folder path '%s'"
-msgstr "No IMAP namespace for folder path '%s'"
+#| msgid "No IMAP namespace for folder path '%s'"
+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
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1890
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2124
 #, c-format
-msgid "Retrieving folder list for '%s'"
-msgstr "Retrieving folder list for '%s'"
+#| msgid "Retrieving folder list for '%s'"
+msgid "Retrieving folder list for “%s”"
+msgstr "Retrieving folder list for “%s”"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2093
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2341
 #, 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\""
+#| msgid ""
+#| "The folder name \"%s\" is invalid because it contains the character \"%c\""
+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
+#. Translators: The strings in "IMAPDefaults" context are folder names as can be presented
+#. by the server; There's checked for the localized version of it and for the non-localized
+#. version as well. It's always the folder name (eventually path) as provided by the server,
+#. when returned in given localization. it can be checked semi-easily in the case of
+#. the GMail variants, by changing the GMail interface language in the GMail Preferences.
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2718
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Drafts"
 msgstr "[Gmail]/Drafts"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2471
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2719
 msgctxt "IMAPDefaults"
 msgid "Drafts"
 msgstr "Drafts"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2472
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2720
 msgctxt "IMAPDefaults"
 msgid "Draft"
 msgstr "Draft"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2475
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2723
 msgctxt "IMAPDefaults"
 msgid "Templates"
 msgstr "Templates"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2478
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2726
 msgctxt "IMAPDefaults"
 msgid "Archive"
 msgstr "Archive"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2481
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2729
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Sent Mail"
 msgstr "[Gmail]/Sent Mail"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2482
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2730
 msgctxt "IMAPDefaults"
 msgid "Sent"
 msgstr "Sent"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2483
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2731
 msgctxt "IMAPDefaults"
 msgid "Sent Items"
 msgstr "Sent Items"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2484
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2732
 msgctxt "IMAPDefaults"
 msgid "Sent Messages"
 msgstr "Sent Message"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2487
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2735
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Spam"
 msgstr "[Gmail]/Spam"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2488
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2736
 msgctxt "IMAPDefaults"
 msgid "Junk"
 msgstr "Junk"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2489
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2737
 msgctxt "IMAPDefaults"
 msgid "Junk E-mail"
 msgstr "Junk E-mail"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2490
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2738
 msgctxt "IMAPDefaults"
 msgid "Junk Email"
 msgstr "Junk Email"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2491
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2739
 msgctxt "IMAPDefaults"
 msgid "Spam"
 msgstr "Spam"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2492
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2740
 msgctxt "IMAPDefaults"
 msgid "Bulk Mail"
 msgstr "Bulk Mail"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2495
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2743
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Trash"
 msgstr "[Gmail]/Wastebasket"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2496
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2744
 msgctxt "IMAPDefaults"
 msgid "Trash"
 msgstr "Trash"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2497
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2745
 msgctxt "IMAPDefaults"
 msgid "Deleted Items"
 msgstr "Deleted Items"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2498
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2746
 msgctxt "IMAPDefaults"
 msgid "Deleted Messages"
 msgstr "Deleted Messages"
 
-#: ../camel/providers/local/camel-local-folder.c:190
+#. Translators: This is used for a folder description,
+#. * for folders being under $HOME.  The first %s is replaced
+#. * with a relative path under $HOME, the second %s is
+#. * replaced with a protocol name, like mbox/maldir/...
+#: ../src/camel/providers/local/camel-local-folder.c:187
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:200
-#: ../camel/providers/local/camel-local-folder.c:209
+#. Translators: This is used for a folder description, for
+#. * folders being under /var/spool/mail.  The first %s is
+#. * replaced with a relative path under /var/spool/mail,
+#. * the second %s is replaced with a protocol name, like
+#. * mbox/maldir/...
+#. Translators: This is used for a folder description, for
+#. * folders being under /var/mail.  The first %s is replaced
+#. * with a relative path under /var/mail, the second %s is
+#. * replaced with a protocol name, like mbox/maldir/...
+#: ../src/camel/providers/local/camel-local-folder.c:197
+#: ../src/camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:218
+#. Translators: This is used for a folder description.
+#. * The first %s is replaced with a folder's full path,
+#. * the second %s is replaced with a protocol name, like
+#. * mbox/maldir/...
+#: ../src/camel/providers/local/camel-local-folder.c:215
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:495
+#: ../src/camel/providers/local/camel-local-folder.c:505
 msgid "_Index message body data"
 msgstr "_Index message body data"
 
-#: ../camel/providers/local/camel-local-folder.c:723
+#. Translators: The first %s is replaced with a message ID,
+#. * the second %s is replaced with the folder path,
+#. * the third %s is replaced with a detailed error string
+#: ../src/camel/providers/local/camel-local-folder.c:737
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3687,23 +3961,29 @@ msgstr ""
 "Cannot get message %s from folder %s\n"
 "%s"
 
-#: ../camel/providers/local/camel-local-provider.c:41
-msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "_Use the '.folders' folder summary file (exmh)"
+#: ../src/camel/providers/local/camel-local-provider.c:43
+#| msgid "_Use the '.folders' folder summary file (exmh)"
+msgid "_Use the “.folders” folder summary file (exmh)"
+msgstr "_Use the “.folders” folder summary file (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../src/camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-format mail directories"
 
-#: ../camel/providers/local/camel-local-provider.c:49
+#: ../src/camel/providers/local/camel-local-provider.c:51
 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:66
+#: ../src/camel/providers/local/camel-local-provider.c:65
+#| msgid "_Apply filters to new messages in Inbox"
+msgid "Apply _filters to new messages"
+msgstr "Apply _filters to new messages"
+
+#: ../src/camel/providers/local/camel-local-provider.c:73
 msgid "Local delivery"
 msgstr "Local delivery"
 
-#: ../camel/providers/local/camel-local-provider.c:67
+#: ../src/camel/providers/local/camel-local-provider.c:74
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3711,29 +3991,29 @@ msgstr ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:79
-#: ../camel/providers/local/camel-local-provider.c:101
+#: ../src/camel/providers/local/camel-local-provider.c:86
+#: ../src/camel/providers/local/camel-local-provider.c:110
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Apply filters to new messages in Inbox"
 
-#: ../camel/providers/local/camel-local-provider.c:86
+#: ../src/camel/providers/local/camel-local-provider.c:95
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format mail directories"
 
-#: ../camel/providers/local/camel-local-provider.c:87
+#: ../src/camel/providers/local/camel-local-provider.c:96
 msgid "For storing local mail in maildir directories."
 msgstr "For storing local mail in maildir directories."
 
-#: ../camel/providers/local/camel-local-provider.c:102
+#: ../src/camel/providers/local/camel-local-provider.c:113
 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:109
+#: ../src/camel/providers/local/camel-local-provider.c:120
 msgid "Standard Unix mbox spool file"
 msgstr "Standard Unix mbox spool file"
 
-#: ../camel/providers/local/camel-local-provider.c:110
-#: ../camel/providers/local/camel-local-provider.c:124
+#: ../src/camel/providers/local/camel-local-provider.c:121
+#: ../src/camel/providers/local/camel-local-provider.c:135
 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."
@@ -3741,519 +4021,563 @@ 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:123
+#: ../src/camel/providers/local/camel-local-provider.c:134
 msgid "Standard Unix mbox spool directory"
 msgstr "Standard Unix mbox spool directory"
 
-#: ../camel/providers/local/camel-local-store.c:88
+#: ../src/camel/providers/local/camel-local-store.c:86
 #, 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:170
+#: ../src/camel/providers/local/camel-local-store.c:168
 #, c-format
 msgid "Local mail file %s"
 msgstr "Local mail file %s"
 
-#: ../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
+#: ../src/camel/providers/local/camel-local-store.c:211
+#: ../src/camel/providers/local/camel-local-store.c:371
+#: ../src/camel/providers/local/camel-maildir-store.c:121
+#: ../src/camel/providers/local/camel-mbox-store.c:570
+#: ../src/camel/providers/local/camel-spool-store.c:85
 #, 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:222
+#: ../src/camel/providers/local/camel-local-store.c:220
 #, 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:386
-#: ../camel/providers/local/camel-maildir-store.c:165
+#: ../src/camel/providers/local/camel-local-store.c:232
+#: ../src/camel/providers/local/camel-local-store.c:242
+#: ../src/camel/providers/local/camel-local-store.c:384
+#: ../src/camel/providers/local/camel-maildir-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Cannot get folder: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:281
+#: ../src/camel/providers/local/camel-local-store.c:279
 #, 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:446
-#: ../camel/providers/local/camel-mbox-store.c:739
+#: ../src/camel/providers/local/camel-local-store.c:444
+#: ../src/camel/providers/local/camel-mbox-store.c:737
 #, c-format
-msgid "Could not delete folder index file '%s': %s"
-msgstr "Could not delete folder index file '%s': %s"
+#| msgid "Could not delete folder index file '%s': %s"
+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:474
-#: ../camel/providers/local/camel-mbox-store.c:769
+#: ../src/camel/providers/local/camel-local-store.c:472
+#: ../src/camel/providers/local/camel-mbox-store.c:767
 #, c-format
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "Could not delete folder meta file '%s': %s"
+#| msgid "Could not delete folder meta file '%s': %s"
+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:587
+#: ../src/camel/providers/local/camel-local-store.c:585
 #, c-format
-msgid "Could not rename '%s': %s"
-msgstr "Could not rename '%s': %s"
+#| msgid "Could not rename '%s': %s"
+msgid "Could not rename “%s”: %s"
+msgstr "Could not rename “%s”: %s"
 
-#: ../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
+#: ../src/camel/providers/local/camel-maildir-folder.c:107
+#: ../src/camel/providers/local/camel-maildir-folder.c:344
+#: ../src/camel/providers/local/camel-mbox-folder.c:128
+#: ../src/camel/providers/local/camel-mbox-folder.c:336
+#: ../src/camel/providers/local/camel-mh-folder.c:157
 msgid "No such message"
 msgstr "No such message"
 
-#: ../camel/providers/local/camel-maildir-folder.c:234
+#: ../src/camel/providers/local/camel-maildir-folder.c:232
 #, 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: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
+#: ../src/camel/providers/local/camel-maildir-folder.c:282
+#: ../src/camel/providers/local/camel-maildir-folder.c:292
+#: ../src/camel/providers/local/camel-mbox-folder.c:395
+#: ../src/camel/providers/local/camel-mh-folder.c:169
+#: ../src/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:362
+#: ../src/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:131
-#: ../camel/providers/local/camel-maildir-store.c:931
+#: ../src/camel/providers/local/camel-maildir-store.c:129
+#: ../src/camel/providers/local/camel-maildir-store.c:929
 #, c-format
-msgid "Cannot create folder containing '%s'"
-msgstr "Cannot create folder containing '%s'"
+#| msgid "Cannot create folder containing '%s'"
+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
+#: ../src/camel/providers/local/camel-maildir-store.c:137
+#: ../src/camel/providers/local/camel-maildir-store.c:156
+#: ../src/camel/providers/local/camel-maildir-store.c:921
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Folder %s already exists"
 
-#: ../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
+#: ../src/camel/providers/local/camel-maildir-store.c:264
+#: ../src/camel/providers/local/camel-maildir-store.c:295
+#: ../src/camel/providers/local/camel-mbox-store.c:399
+#: ../src/camel/providers/local/camel-mbox-store.c:420
 #, c-format
-msgid "Cannot create folder '%s': %s"
-msgstr "Cannot create folder '%s': %s"
+#| msgid "Cannot create folder: %s: %s"
+msgid "Cannot create folder “%s”: %s"
+msgstr "Cannot create folder “%s”: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:281
-#: ../camel/providers/local/camel-mbox-store.c:367
-#: ../camel/providers/local/camel-mh-store.c:523
+#: ../src/camel/providers/local/camel-maildir-store.c:279
+#: ../src/camel/providers/local/camel-mbox-store.c:365
+#: ../src/camel/providers/local/camel-mh-store.c:519
 #, c-format
-msgid "Cannot get folder '%s': %s"
-msgstr "Cannot get folder '%s': %s"
+#| msgid "Cannot get folder: %s: %s"
+msgid "Cannot get folder “%s”: %s"
+msgstr "Cannot get folder “%s”: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:287
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mh-store.c:532
+#: ../src/camel/providers/local/camel-maildir-store.c:285
+#: ../src/camel/providers/local/camel-mbox-store.c:375
+#: ../src/camel/providers/local/camel-mh-store.c:528
 #, c-format
-msgid "Cannot get folder '%s': folder does not exist."
-msgstr "Cannot get folder '%s': folder does not exist."
+#| msgid "Cannot get folder '%s': folder does not exist."
+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:314
+#: ../src/camel/providers/local/camel-maildir-store.c:312
 #, c-format
-msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "Cannot get folder '%s': not a maildir directory."
+#| msgid "Cannot get folder '%s': not a maildir directory."
+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:378
-#: ../camel/providers/local/camel-maildir-store.c:418
-#: ../camel/providers/local/camel-mh-store.c:676
+#: ../src/camel/providers/local/camel-maildir-store.c:376
+#: ../src/camel/providers/local/camel-maildir-store.c:416
+#: ../src/camel/providers/local/camel-mh-store.c:672
 #, c-format
-msgid "Could not delete folder '%s': %s"
-msgstr "Could not delete folder '%s': %s"
+#| msgid "Could not delete folder '%s': %s"
+msgid "Could not delete folder “%s”: %s"
+msgstr "Could not delete folder “%s”: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:380
+#: ../src/camel/providers/local/camel-maildir-store.c:378
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: ../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
+#: ../src/camel/providers/local/camel-maildir-store.c:664
+#: ../src/camel/providers/local/camel-maildir-store.c:1144
+#: ../src/camel/providers/local/camel-spool-store.c:210
+#: ../src/camel/providers/local/camel-spool-store.c:229
 #, c-format
-msgid "Could not scan folder '%s': %s"
-msgstr "Could not scan folder '%s': %s"
+#| msgid "Could not scan folder '%s': %s"
+msgid "Could not scan folder “%s”: %s"
+msgstr "Could not scan folder “%s”: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:476
-#: ../camel/providers/local/camel-maildir-summary.c:616
+#: ../src/camel/providers/local/camel-maildir-summary.c:457
+#: ../src/camel/providers/local/camel-maildir-summary.c:596
 #, 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:607
+#: ../src/camel/providers/local/camel-maildir-summary.c:587
 msgid "Checking folder consistency"
 msgstr "Checking folder consistency"
 
-#: ../camel/providers/local/camel-maildir-summary.c:707
+#: ../src/camel/providers/local/camel-maildir-summary.c:709
 msgid "Checking for new messages"
 msgstr "Checking for new messages"
 
-#: ../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
+#: ../src/camel/providers/local/camel-maildir-summary.c:813
+#: ../src/camel/providers/local/camel-mbox-summary.c:367
+#: ../src/camel/providers/local/camel-mbox-summary.c:585
+#: ../src/camel/providers/local/camel-mbox-summary.c:739
+#: ../src/camel/providers/local/camel-spool-summary.c:141
 msgid "Storing folder"
 msgstr "Storing folder"
 
-#: ../camel/providers/local/camel-mbox-folder.c:196
+#: ../src/camel/providers/local/camel-mbox-folder.c:194
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "Cannot open mailbox: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:262
+#: ../src/camel/providers/local/camel-mbox-folder.c:257
 #, 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:392
+#: ../src/camel/providers/local/camel-mbox-folder.c:387
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "The folder appears to be irrecoverably corrupted."
 
-#: ../camel/providers/local/camel-mbox-folder.c:449
-#: ../camel/providers/local/camel-spool-folder.c:67
+#: ../src/camel/providers/local/camel-mbox-folder.c:444
+#: ../src/camel/providers/local/camel-spool-folder.c:65
 #, 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:389
-#: ../camel/providers/local/camel-mbox-store.c:580
+#: ../src/camel/providers/local/camel-mbox-store.c:387
+#: ../src/camel/providers/local/camel-mbox-store.c:578
 #, 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:433
+#: ../src/camel/providers/local/camel-mbox-store.c:431
 #, c-format
-msgid "Cannot get folder '%s': not a regular file."
-msgstr "Cannot get folder '%s': not a regular file."
+#| msgid "Cannot get folder '%s': not a regular file."
+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:596
+#: ../src/camel/providers/local/camel-mbox-store.c:594
 #, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Cannot create directory '%s': %s."
+#| msgid "Cannot create directory '%s': %s."
+msgid "Cannot create directory “%s”: %s."
+msgstr "Cannot create directory “%s”: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:608
+#: ../src/camel/providers/local/camel-mbox-store.c:606
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Cannot create folder: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:610
+#: ../src/camel/providers/local/camel-mbox-store.c:608
 msgid "Folder already exists"
 msgstr "Folder already exists"
 
-#: ../camel/providers/local/camel-mbox-store.c:650
-#: ../camel/providers/local/camel-mbox-store.c:663
-#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../src/camel/providers/local/camel-mbox-store.c:648
+#: ../src/camel/providers/local/camel-mbox-store.c:661
+#: ../src/camel/providers/local/camel-mbox-store.c:690
 #, c-format
+#| msgid ""
+#| "Could not delete folder '%s':\n"
+#| "%s"
 msgid ""
-"Could not delete folder '%s':\n"
+"Could not delete folder “%s”:\n"
 "%s"
 msgstr ""
-"Could not delete folder '%s':\n"
+"Could not delete folder “%s”:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:673
+#: ../src/camel/providers/local/camel-mbox-store.c:671
 #, c-format
-msgid "'%s' is not a regular file."
-msgstr "'%s' is not a regular file."
+#| msgid "'%s' is not a regular file."
+msgid "“%s” is not a regular file."
+msgstr "“%s” is not a regular file."
 
-#: ../camel/providers/local/camel-mbox-store.c:682
+#: ../src/camel/providers/local/camel-mbox-store.c:680
 #, c-format
-msgid "Folder '%s' is not empty. Not deleted."
-msgstr "Folder '%s' is not empty. Not deleted."
+#| msgid "Folder '%s' is not empty. Not deleted."
+msgid "Folder “%s” is not empty. Not deleted."
+msgstr "Folder “%s” is not empty. Not deleted."
 
-#: ../camel/providers/local/camel-mbox-store.c:709
-#: ../camel/providers/local/camel-mbox-store.c:724
+#: ../src/camel/providers/local/camel-mbox-store.c:707
+#: ../src/camel/providers/local/camel-mbox-store.c:722
 #, c-format
-msgid "Could not delete folder summary file '%s': %s"
-msgstr "Could not delete folder summary file '%s': %s"
+#| msgid "Could not delete folder summary file '%s': %s"
+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:806
+#: ../src/camel/providers/local/camel-mbox-store.c:804
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "The new folder name is illegal."
 
-#: ../camel/providers/local/camel-mbox-store.c:822
+#: ../src/camel/providers/local/camel-mbox-store.c:820
 #, c-format
-msgid "Could not rename '%s': '%s': %s"
-msgstr "Could not rename '%s': '%s': %s"
+#| msgid "Could not rename '%s': '%s': %s"
+msgid "Could not rename “%s”: “%s”: %s"
+msgstr "Could not rename “%s”: “%s”: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../src/camel/providers/local/camel-mbox-summary.c:377
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Could not open folder: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:611
+#: ../src/camel/providers/local/camel-mbox-summary.c:509
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Cannot check folder: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:696
-#: ../camel/providers/local/camel-mbox-summary.c:845
-#: ../camel/providers/local/camel-spool-summary.c:146
+#: ../src/camel/providers/local/camel-mbox-summary.c:594
+#: ../src/camel/providers/local/camel-mbox-summary.c:748
+#: ../src/camel/providers/local/camel-spool-summary.c:148
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Could not open file: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-spool-summary.c:161
+#: ../src/camel/providers/local/camel-mbox-summary.c:613
+#: ../src/camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Cannot open temporary mailbox: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:732
-#: ../camel/providers/local/camel-mbox-summary.c:967
+#: ../src/camel/providers/local/camel-mbox-summary.c:630
+#: ../src/camel/providers/local/camel-mbox-summary.c:870
 #, 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:745
+#: ../src/camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:764
+#: ../src/camel/providers/local/camel-mbox-summary.c:662
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Could not rename folder: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:859
-#: ../camel/providers/local/camel-mbox-summary.c:1132
+#: ../src/camel/providers/local/camel-mbox-summary.c:762
+#: ../src/camel/providers/local/camel-mbox-summary.c:1033
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Could not store folder: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:898
-#: ../camel/providers/local/camel-mbox-summary.c:1172
+#: ../src/camel/providers/local/camel-mbox-summary.c:803
+#: ../src/camel/providers/local/camel-mbox-summary.c:1076
 #, c-format
+#| msgid ""
+#| "MBOX file is corrupted, please fix it. (Expected a From line, but didn't "
+#| "get it.)"
 msgid ""
-"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn’t get "
 "it.)"
 msgstr ""
-"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn’t get "
 "it.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:908
-#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../src/camel/providers/local/camel-mbox-summary.c:813
+#: ../src/camel/providers/local/camel-mbox-summary.c:1088
 #, 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:1077
-#: ../camel/providers/local/camel-spool-summary.c:356
+#: ../src/camel/providers/local/camel-mbox-summary.c:980
+#: ../src/camel/providers/local/camel-spool-summary.c:358
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unknown error: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1242
-#: ../camel/providers/local/camel-mbox-summary.c:1272
+#: ../src/camel/providers/local/camel-mbox-summary.c:1149
+#: ../src/camel/providers/local/camel-mbox-summary.c:1179
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Writing to temporary mailbox failed: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1261
+#: ../src/camel/providers/local/camel-mbox-summary.c:1168
 #, 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:116
+#: ../src/camel/providers/local/camel-mh-folder.c:114
 #, 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:542
+#: ../src/camel/providers/local/camel-mh-store.c:538
 #, c-format
-msgid "Could not create folder '%s': %s"
-msgstr "Could not create folder '%s': %s"
+#| msgid "Could not create folder '%s': %s"
+msgid "Could not create folder “%s”: %s"
+msgstr "Could not create folder “%s”: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:558
+#: ../src/camel/providers/local/camel-mh-store.c:554
 #, c-format
-msgid "Cannot get folder '%s': not a directory."
-msgstr "Cannot get folder '%s': not a directory."
+#| msgid "Cannot get folder '%s': not a directory."
+msgid "Cannot get folder “%s”: not a directory."
+msgstr "Cannot get folder “%s”: not a directory."
 
-#: ../camel/providers/local/camel-mh-summary.c:236
+#: ../src/camel/providers/local/camel-mh-summary.c:238
 #, 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:95
+#: ../src/camel/providers/local/camel-spool-store.c:93
 #, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "Spool '%s' cannot be opened: %s"
+#| msgid "Spool '%s' cannot be opened: %s"
+msgid "Spool “%s” cannot be opened: %s"
+msgstr "Spool “%s” cannot be opened: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../src/camel/providers/local/camel-spool-store.c:107
 #, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "Spool '%s' is not a regular file or directory"
+#| msgid "Spool '%s' is not a regular file or directory"
+msgid "Spool “%s” is not a regular file or directory"
+msgstr "Spool “%s” is not a regular file or directory"
 
-#: ../camel/providers/local/camel-spool-store.c:425
+#: ../src/camel/providers/local/camel-spool-store.c:422
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool mail file %s"
 
-#: ../camel/providers/local/camel-spool-store.c:429
+#: ../src/camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool folder tree %s"
 
-#: ../camel/providers/local/camel-spool-store.c:432
+#: ../src/camel/providers/local/camel-spool-store.c:429
 msgid "Invalid spool"
 msgstr "Invalid spool"
 
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../src/camel/providers/local/camel-spool-store.c:478
 #, c-format
-msgid "Folder '%s/%s' does not exist."
-msgstr "Folder '%s/%s' does not exist."
+#| msgid "Folder '%s/%s' does not exist."
+msgid "Folder “%s/%s” does not exist."
+msgstr "Folder “%s/%s” does not exist."
 
-#: ../camel/providers/local/camel-spool-store.c:494
+#: ../src/camel/providers/local/camel-spool-store.c:491
 #, c-format
+#| msgid ""
+#| "Could not open folder '%s':\n"
+#| "%s"
 msgid ""
-"Could not open folder '%s':\n"
+"Could not open folder “%s”:\n"
 "%s"
 msgstr ""
-"Could not open folder '%s':\n"
+"Could not open folder “%s”:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:500
+#: ../src/camel/providers/local/camel-spool-store.c:497
 #, c-format
-msgid "Folder '%s' does not exist."
-msgstr "Folder '%s' does not exist."
+#| msgid "Folder '%s' does not exist."
+msgid "Folder “%s” does not exist."
+msgstr "Folder “%s” does not exist."
 
-#: ../camel/providers/local/camel-spool-store.c:508
+#: ../src/camel/providers/local/camel-spool-store.c:505
 #, c-format
+#| msgid ""
+#| "Could not create folder '%s':\n"
+#| "%s"
 msgid ""
-"Could not create folder '%s':\n"
+"Could not create folder “%s”:\n"
 "%s"
 msgstr ""
-"Could not create folder '%s':\n"
+"Could not create folder “%s”:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:521
+#: ../src/camel/providers/local/camel-spool-store.c:518
 #, c-format
-msgid "'%s' is not a mailbox file."
-msgstr "'%s' is not a mailbox file."
+#| msgid "'%s' is not a mailbox file."
+msgid "“%s” is not a mailbox file."
+msgstr "“%s” is not a mailbox file."
 
-#: ../camel/providers/local/camel-spool-store.c:585
+#: ../src/camel/providers/local/camel-spool-store.c:582
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Store does not support an INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:604
+#: ../src/camel/providers/local/camel-spool-store.c:601
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spool folders cannot be deleted"
 
-#: ../camel/providers/local/camel-spool-store.c:619
+#: ../src/camel/providers/local/camel-spool-store.c:616
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool folders cannot be renamed"
 
-#: ../camel/providers/local/camel-spool-summary.c:177
-#: ../camel/providers/local/camel-spool-summary.c:189
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../src/camel/providers/local/camel-spool-summary.c:179
+#: ../src/camel/providers/local/camel-spool-summary.c:191
+#: ../src/camel/providers/local/camel-spool-summary.c:203
 #, 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:219
+#: ../src/camel/providers/local/camel-spool-summary.c:221
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Could not synchronise spool folder %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:253
-#: ../camel/providers/local/camel-spool-summary.c:272
-#: ../camel/providers/local/camel-spool-summary.c:285
+#: ../src/camel/providers/local/camel-spool-summary.c:255
+#: ../src/camel/providers/local/camel-spool-summary.c:274
+#: ../src/camel/providers/local/camel-spool-summary.c:287
 #, c-format
+#| msgid ""
+#| "Could not synchronize spool folder %s: %s\n"
+#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in '%s'"
+"Folder may be corrupt, copy saved in “%s”"
 msgstr ""
-"Could not synchronise spool folder %s: %s\n"
-"Folder may be corrupt; copy saved in '%s'"
+"Could not synchronize spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in “%s”"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
-#: ../camel/providers/nntp/camel-nntp-folder.c:595
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:219
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:636
 #, 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: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
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:287
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:292
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:575
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1090
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: ../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
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:299
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:670
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:479
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:511
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:543
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:565
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:584
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Cannot get message %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:435
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:428
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:434
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Posting failed: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:486
 msgid "Posting failed: "
 msgstr "Posting failed: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:618
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:659
 #, c-format
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:727
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:768
 #, c-format
 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:45
+#: ../src/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:48
+#: ../src/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:54
+#. Translators: The '%s' is replaced with a spin button with the actual value to use
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:51
+#, c-format
+msgid "Download only up to %s latest messages"
+msgstr "Download only up to %s latest messages"
+
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
 msgstr "Default NNTP port"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over TLS"
 msgstr "NNTP over TLS"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "USENET news"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:63
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:66
 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:84
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:87
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
@@ -4261,7 +4585,7 @@ msgstr ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:94
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:97
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4269,37 +4593,38 @@ msgstr ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:381
+#: ../src/camel/providers/nntp/camel-nntp-store.c:379
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Could not read greeting from %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:393
+#: ../src/camel/providers/nntp/camel-nntp-store.c:391
 #, 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:412
+#: ../src/camel/providers/nntp/camel-nntp-store.c:410
 #, 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
+#: ../src/camel/providers/nntp/camel-nntp-store.c:421
 #, c-format
-msgid "NNTP server %s doesn't support STARTTLS: %s"
-msgstr "NNTP server %s doesn't support STARTTLS: %s"
+#| msgid "NNTP server %s doesn't support STARTTLS: %s"
+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
+#: ../src/camel/providers/nntp/camel-nntp-store.c:441
 #, 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
+#: ../src/camel/providers/nntp/camel-nntp-store.c:512
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1248
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4310,22 +4635,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1367
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1363
 #, 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:1383
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1379
 #, 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:1406
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1402
 #, 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:1616
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1616
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4336,7 +4661,7 @@ msgstr ""
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1683
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1683
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4347,116 +4672,132 @@ msgstr ""
 "\n"
 "newsgroup does not exist!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2109
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2109
 msgid "NNTP Command failed: "
 msgstr "NNTP Command failed: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2214
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2215
 #, c-format
 msgid "Not connected."
 msgstr "Not connected."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2316
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2320
 #, c-format
 msgid "No such folder: %s"
 msgstr "No such folder: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:197
-#: ../camel/providers/nntp/camel-nntp-summary.c:337
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:195
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Scanning new messages"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:219
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:217
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Unexpected server response from xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:358
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:361
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Unexpected server response from head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:406
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operation failed: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:357
-#: ../camel/providers/pop3/camel-pop3-folder.c:441
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:457
+#, c-format
+#| msgid "%s: Scanning new messages"
+msgid "%s: Scanning existing messages"
+msgstr "%s: Scanning existing messages"
+
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:470
+#, c-format
+#| msgid "Unexpected server response from xover: %s"
+msgid "Unexpected server response from listgroup: %s"
+msgstr "Unexpected server response from listgroup: %s"
+
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:358
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:442
 #, c-format
 msgid "No message with UID %s"
 msgstr "No message with UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:458
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Retrieving POP message %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:576
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:644
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:645
 msgid "Retrieving POP summary"
 msgstr "Retrieving POP summary"
 
-#: ../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
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:704
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:707
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:720
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:733
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:747
 msgid "Cannot get POP summary: "
 msgstr "Cannot get POP summary: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:811
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:895
 msgid "Expunging old messages"
 msgstr "Expunging old messages"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:839
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:925
 msgid "Expunging deleted messages"
 msgstr "Expunging deleted messages"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:36
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:34
 msgid "Message Storage"
 msgstr "Message Storage"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:38
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:36
 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:42
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:40
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Delete after %s day(s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:42
+msgid "Hint: Use 0 days to keep messages on the server indefinitely."
+msgstr "Hint: Use 0 days to keep messages on the server indefinitely."
+
+#: ../src/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:46
+#: ../src/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:52
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:52
 msgid "Default POP3 port"
 msgstr "Default POP3 port"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP3 over TLS"
 msgstr "POP3 over TLS"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:60
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../src/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:82
+#: ../src/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."
@@ -4464,7 +4805,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:92
+#: ../src/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 "
@@ -4475,59 +4816,59 @@ msgstr ""
 "claim to support it."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:95
+#: ../src/camel/providers/pop3/camel-pop3-store.c:93
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:162
+#: ../src/camel/providers/pop3/camel-pop3-store.c:160
 #, 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:177
+#: ../src/camel/providers/pop3/camel-pop3-store.c:175
 #, 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:178
+#: ../src/camel/providers/pop3/camel-pop3-store.c:176
 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:199
+#: ../src/camel/providers/pop3/camel-pop3-store.c:197
 #, 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:217
+#: ../src/camel/providers/pop3/camel-pop3-store.c:215
 #, 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:357
+#: ../src/camel/providers/pop3/camel-pop3-store.c:355
 #, 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:379
+#: ../src/camel/providers/pop3/camel-pop3-store.c:377
 #, 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:487
+#: ../src/camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 server %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../src/camel/providers/pop3/camel-pop3-store.c:488
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3 server for %s on %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:702
-#: ../camel/providers/pop3/camel-pop3-store.c:715
-#: ../camel/providers/pop3/camel-pop3-store.c:801
+#: ../src/camel/providers/pop3/camel-pop3-store.c:700
+#: ../src/camel/providers/pop3/camel-pop3-store.c:713
+#: ../src/camel/providers/pop3/camel-pop3-store.c:799
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4536,7 +4877,8 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:742
+#. Translators: Do not translate APOP.
+#: ../src/camel/providers/pop3/camel-pop3-store.c:740
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4547,7 +4889,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:816
+#: ../src/camel/providers/pop3/camel-pop3-store.c:814
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4556,322 +4898,331 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:900
+#: ../src/camel/providers/pop3/camel-pop3-store.c:898
 #, c-format
-msgid "No such folder '%s'."
-msgstr "No such folder '%s'."
+#| msgid "No such folder %s"
+msgid "No such folder “%s”."
+msgstr "No such folder “%s”."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:917
+#: ../src/camel/providers/pop3/camel-pop3-store.c:915
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 stores have no folder hierarchy"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
-#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:31
+#: ../src/services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:33
+#| msgid ""
+#| "For delivering mail by passing it to the \"sendmail\" program on the "
+#| "local system."
 msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
+"For delivering mail by passing it to the “sendmail” program on the local "
 "system."
 msgstr ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
+"For delivering mail by passing it to the “sendmail” program on the local "
 "system."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:44
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail delivery via the sendmail program"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:137
+#: ../src/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
+#: ../src/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
+#: ../src/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:199
+#: ../src/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:230
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:215
 #, c-format
-msgid "Could not create pipe to '%s': %s: mail not sent"
-msgstr "Could not create pipe to '%s': %s: mail not sent"
+#| msgid "Could not create pipe to '%s': %s: mail not sent"
+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:255
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
-msgid "Could not fork '%s': %s: mail not sent"
-msgstr "Could not fork '%s': %s: mail not sent"
+#| msgid "Could not fork '%s': %s: mail not sent"
+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:304
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:301
 msgid "Could not send message: "
 msgstr "Could not send message: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:334
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:343
 #, c-format
-msgid "'%s' exited with signal %s: mail not sent."
-msgstr "'%s' exited with signal %s: mail not sent."
+#| msgid "'%s' exited with signal %s: mail not sent."
+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:344
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:353
 #, c-format
-msgid "Could not execute '%s': mail not sent."
-msgstr "Could not execute '%s': mail not sent."
+#| msgid "Could not execute '%s': mail not sent."
+msgid "Could not execute “%s”: mail not sent."
+msgstr "Could not execute “%s”: mail not sent."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:349
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:358
 #, c-format
-msgid "'%s' exited with status %d: mail not sent."
-msgstr "'%s' exited with status %d: mail not sent."
+#| msgid "'%s' exited with status %d: mail not sent."
+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:39
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:37
 msgid "Default SMTP port"
 msgstr "Default SMTP port"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP over TLS"
 msgstr "SMTP over TLS"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Message submission port"
 msgstr "Message submission port"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:47
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:45
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:49
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:47
 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:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:244
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:235
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:242
 msgid "Welcome response error: "
 msgstr "Welcome response error: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:280
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:278
 #, 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:289
-#: ../camel/providers/smtp/camel-smtp-transport.c:302
-#: ../camel/providers/smtp/camel-smtp-transport.c:309
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:287
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:300
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:307
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:328
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:326
 #, 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:439
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:437
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:442
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail delivery via %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:582
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:580
 #, 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:663
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:661
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "No SASL mechanism was specified"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:697
 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
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:704
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:718
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:734
 msgid "AUTH command failed: "
 msgstr "AUTH command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:885
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Cannot send message: service not connected."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:898
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:894
 #, 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:902
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:898
 msgid "Sending message"
 msgstr "Sending message"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:931
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Cannot send message: no recipients defined."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:946
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:942
 #, 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:1078
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1074
 msgid "Syntax error, command unrecognized"
 msgstr "Syntax error, command unrecognised"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1080
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1076
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntax error in parameters or arguments"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1078
 msgid "Command not implemented"
 msgstr "Command not implemented"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1084
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1080
 msgid "Command parameter not implemented"
 msgstr "Command parameter not implemented"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "System status, or system help reply"
 msgstr "System status, or system help reply"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1088
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Help message"
 msgstr "Help message"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "Service ready"
 msgstr "Service ready"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1092
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1088
 msgid "Service closing transmission channel"
 msgstr "Service closing transmission channel"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1090
 msgid "Service not available, closing transmission channel"
 msgstr "Service not available, closing transmission channel"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1092
 msgid "Requested mail action okay, completed"
 msgstr "Requested mail action okay, completed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1098
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1094
 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:1100
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Requested mail action not taken: mailbox unavailable"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1098
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Requested action not taken: mailbox unavailable"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1104
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Requested action aborted: error in processing"
 msgstr "Requested action aborted: error in processing"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1106
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1102
 msgid "User not local; please try <forward-path>"
 msgstr "User not local; please try <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1108
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1104
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Requested action not taken: insufficient system storage"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1110
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1106
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Requested mail action aborted: exceeded storage allocation"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1108
 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:1114
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1110
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start mail input; end with <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "Transaction failed"
 msgstr "Transaction failed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1116
 msgid "A password transition is needed"
 msgstr "A password transition is needed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1118
 msgid "Authentication mechanism is too weak"
 msgstr "Authentication mechanism is too weak"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encryption required for requested authentication mechanism"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1126
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1122
 msgid "Temporary authentication failure"
 msgstr "Temporary authentication failure"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1416
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "SMTP Greeting"
 msgstr "SMTP Greeting"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1425
-#: ../camel/providers/smtp/camel-smtp-transport.c:1438
-#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "HELO command failed: "
 msgstr "HELO command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1521
-#: ../camel/providers/smtp/camel-smtp-transport.c:1535
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1517
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1531
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1540
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1572
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1568
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1588
-#: ../camel/providers/smtp/camel-smtp-transport.c:1597
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1584
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1593
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> failed: "
 
-#: ../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
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1667
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1678
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1689
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1738
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1756
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1769
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1777
 msgid "DATA command failed: "
 msgstr "DATA command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1818
-#: ../camel/providers/smtp/camel-smtp-transport.c:1832
-#: ../camel/providers/smtp/camel-smtp-transport.c:1840
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1803
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1817
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1825
 msgid "RSET command failed: "
 msgstr "RSET command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1866
-#: ../camel/providers/smtp/camel-smtp-transport.c:1878
-#: ../camel/providers/smtp/camel-smtp-transport.c:1884
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1851
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1863
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1869
 msgid "QUIT command failed: "
 msgstr "QUIT command failed: "
 
@@ -4900,12 +5251,13 @@ msgid "Birthday and anniversary reminder units"
 msgstr "Birthday and anniversary reminder units"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+#| msgid ""
+#| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+#| "\"days\""
 msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
+"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 msgstr ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
+"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
 msgid "Whether the migration of old setting was already done"
@@ -4916,23 +5268,31 @@ msgid "An absolute path where the gpg (or gpg2) binary is"
 msgstr "An absolute path where the gpg (or gpg2) binary is"
 
 #: ../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."
 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."
+"An example is “/usr/bin/gpg”; when it is left empty, or an incorrect value "
+"is set, then it will be searched for. 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."
+"An example is “/usr/bin/gpg”; when it is left empty, or an incorrect value "
+"is set, then it will be searched for. Change requires restart of the "
+"application."
 
 #: ../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"
 
 #: ../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."
 msgid ""
-"When set to 'true', tries to load also photo of the signers/encrypters, if "
+"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 "
+"When set to “true”, tries to load also photo of the signers/encrypters, if "
 "available in the key/certificate."
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:6
@@ -4940,27 +5300,101 @@ msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
 msgstr "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
 
 #: ../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."
 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 "
+"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 "
+"the background. A special value “always-online” is used for no network "
 "monitoring."
 
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:8
+msgid ""
+"A full path to a directory where .source files with preconfigured options "
+"can be stored"
+msgstr ""
+"A full path to a directory where .source files with preconfigured options "
+"can be stored"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:9
+msgid ""
+"This directory, if filled with an existing path, is checked additionally to "
+"XDG configure directories."
+msgstr ""
+"This directory, if filled with an existing path, is checked additionally to "
+"XDG configure directories."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:10
+msgid "A list of variables which can be part of the autoconfig .source files"
+msgstr "A list of variables which can be part of the autoconfig .source files"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:11
+msgid ""
+"Each item of the array is expected to be of the form: name=value. These "
+"variables are checked before environment variables, but after the predefined "
+"USER, REALNAME and HOST variables."
+msgstr ""
+"Each item of the array is expected to be of the form: name=value. These "
+"variables are checked before environment variables, but after the predefined "
+"USER, REALNAME and HOST variables."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:12
+msgid "A list of hints for OAuth2 services"
+msgstr "A list of hints for OAuth2 services"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:13
+msgid ""
+"Users can extend the list of supported protocols and hostnames for defined "
+"OAuth2 services, in addition to those hard-coded. Each line can be of the "
+"form: servicename[-protocol]:hostname1,hostname2,... where 'servicename' is "
+"the actual service name; the '-protocol' is optional, and if written, then "
+"the service can be used only if both 'protocol' and 'hostnameX' match; the "
+"'hostnameX' is the actual host name to compare with, case insensitively. "
+"Each line can contain multiple values, separated by comma. There can be "
+"provided multiple lines for one OAuth2 service. Note that the actual URL "
+"where the token is requested and refreshed cannot be changed here, the "
+"hostname is to allow other servers, where the OAuth2 service can be used. "
+"Examples: Company:mail.company.com - enables 'Company' OAuth2 authentication "
+"for 'mail.company.com' host Company-CalDAV:caldav.company.com - enables "
+"'Company' OAuth2 authentication for any 'CalDAV' source, which reads data "
+"from 'caldav.company.com' host"
+msgstr ""
+"Users can extend the list of supported protocols and hostnames for defined "
+"OAuth2 services, in addition to those hard-coded. Each line can be of the "
+"form: servicename[-protocol]:hostname1,hostname2,... where 'servicename' is "
+"the actual service name; the '-protocol' is optional, and if written, then "
+"the service can be used only if both 'protocol' and 'hostnameX' match; the "
+"'hostnameX' is the actual host name to compare with, case insensitively. "
+"Each line can contain multiple values, separated by comma. There can be "
+"provided multiple lines for one OAuth2 service. Note that the actual URL "
+"where the token is requested and refreshed cannot be changed here, the "
+"hostname is to allow other servers, where the OAuth2 service can be used. "
+"Examples: Company:mail.company.com - enables 'Company' OAuth2 authentication "
+"for 'mail.company.com' host Company-CalDAV:caldav.company.com - enables "
+"'Company' OAuth2 authentication for any 'CalDAV' source, which reads data "
+"from 'caldav.company.com' host"
+
 #: ../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."
 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 "
+"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 "
+"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
@@ -5011,293 +5445,368 @@ msgstr "(Deprecated) Port number for SOCKS requests"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(Deprecated) Automatic proxy configuration URL"
 
-#: ../libebackend/e-collection-backend.c:976
+#: ../src/libebackend/e-cache.c:751
+msgid "Out of memory"
+msgstr "Out of memory"
+
+#: ../src/libebackend/e-cache.c:943
+#, c-format
+#| msgid "Cannot create directory '%s': %s."
+msgid "Can not make parent directory: %s"
+msgstr "Can not make parent directory: %s"
+
+#: ../src/libebackend/e-collection-backend.c:1017
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s does not support creating remote resources"
 
-#: ../libebackend/e-collection-backend.c:1035
+#: ../src/libebackend/e-collection-backend.c:1076
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s does not support deleting remote resources"
 
-#: ../libebackend/e-data-factory.c:1294
+#: ../src/libebackend/e-data-factory.c:1359
 #, c-format
-msgid "Backend factory for source '%s' and extension '%s' cannot be found."
-msgstr "Backend factory for source '%s' and extension '%s' cannot be found."
+#| msgid "Backend factory for source '%s' and extension '%s' cannot be found."
+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:141
+#: ../src/libebackend/e-server-side-source.c:142
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "Data source is missing a [%s] group"
 
-#: ../libebackend/e-server-side-source.c:466
+#: ../src/libebackend/e-server-side-source.c:470
 msgid "Failed to lookup credentials: "
 msgstr "Failed to lookup credentials: "
 
-#: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
+#: ../src/libebackend/e-server-side-source.c:1395
+#: ../src/libedataserver/e-source.c:1597
 #, c-format
-msgid "Data source '%s' does not support creating remote resources"
-msgstr "Data source '%s' does not support creating remote resources"
+#| msgid "Data source '%s' does not support creating remote resources"
+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:1405
+#: ../src/libebackend/e-server-side-source.c:1409
 #, c-format
+#| msgid ""
+#| "Data source '%s' has no collection backend to create the remote resource"
 msgid ""
-"Data source '%s' has no collection backend to create the remote resource"
+"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"
+"Data source “%s” has no collection backend to create the remote resource"
 
-#: ../libebackend/e-server-side-source.c:1433 ../libedataserver/e-source.c:1708
+#: ../src/libebackend/e-server-side-source.c:1437
+#: ../src/libedataserver/e-source.c:1710
 #, c-format
-msgid "Data source '%s' does not support deleting remote resources"
-msgstr "Data source '%s' does not support deleting remote resources"
+#| msgid "Data source '%s' does not support deleting remote resources"
+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:1447
+#: ../src/libebackend/e-server-side-source.c:1451
 #, c-format
+#| msgid ""
+#| "Data source '%s' has no collection backend to delete the remote resource"
 msgid ""
-"Data source '%s' has no collection backend to delete the remote resource"
+"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"
+"Data source “%s” has no collection backend to delete the remote resource"
 
-#: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
+#: ../src/libebackend/e-server-side-source.c:1482
+#: ../src/libedataserver/e-source.c:1806
+#: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080
 #, c-format
-msgid "Data source '%s' does not support OAuth 2.0 authentication"
-msgstr "Data source '%s' does not support OAuth 2.0 authentication"
+#| msgid "Data source '%s' does not support OAuth 2.0 authentication"
+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:1856
+#: ../src/libebackend/e-server-side-source.c:1860
 #, c-format
-msgid "File must have a '.source' extension"
-msgstr "File must have a '.source' extension"
+#| msgid "File must have a '.source' extension"
+msgid "File must have a “.source” extension"
+msgstr "File must have a “.source” extension"
 
-#: ../libebackend/e-source-registry-server.c:319
+#: ../src/libebackend/e-source-registry-server.c:322
 #, c-format
-msgid "UID '%s' is already in use"
-msgstr "UID '%s' is already in use"
+#| msgid "UID '%s' is already in use"
+msgid "UID “%s” is already in use"
+msgstr "UID “%s” is already in use"
 
-#: ../libebackend/e-subprocess-factory.c:279
+#: ../src/libebackend/e-subprocess-factory.c:277
 #, c-format
-msgid "Module '%s' for source UID '%s' cannot be loaded"
-msgstr "Module '%s' for source UID '%s' cannot be loaded"
+#| msgid "Module '%s' for source UID '%s' cannot be loaded"
+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
+#: ../src/libebackend/e-subprocess-factory.c:289
 #, c-format
-msgid "No such source for UID '%s'"
-msgstr "No such source for UID '%s'"
+#| msgid "No such source for UID '%s'"
+msgid "No such source for UID “%s”"
+msgstr "No such source for UID “%s”"
 
-#: ../libebackend/e-subprocess-factory.c:302
+#: ../src/libebackend/e-subprocess-factory.c:300
 #, 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'"
+#| msgid "Failed to create backend of type '%s' for source UID '%s'"
+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
+#: ../src/libebackend/e-user-prompter-server.c:303
 #, c-format
-msgid "Extension dialog '%s' not found."
-msgstr "Extension dialogue '%s' not found."
+#| msgid "Extension dialog '%s' not found."
+msgid "Extension dialog “%s” not found."
+msgstr "Extension dialogue “%s” not found."
 
-#: ../libedataserver/e-categories.c:49
+#: ../src/libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Anniversary"
 
-#: ../libedataserver/e-categories.c:50
+#: ../src/libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../libedataserver/e-categories.c:51
+#: ../src/libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Business"
 
-#: ../libedataserver/e-categories.c:52
+#: ../src/libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Competition"
 
-#: ../libedataserver/e-categories.c:53
+#: ../src/libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Favourites"
 
-#: ../libedataserver/e-categories.c:54
+#: ../src/libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Gifts"
 
-#: ../libedataserver/e-categories.c:55
+#: ../src/libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Goals/Objectives"
 
-#: ../libedataserver/e-categories.c:56
+#: ../src/libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Holiday"
 
-#: ../libedataserver/e-categories.c:57
+#: ../src/libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Holiday Cards"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:59
+#: ../src/libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Hot Contacts"
 
-#: ../libedataserver/e-categories.c:60
+#: ../src/libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideas"
 
-#: ../libedataserver/e-categories.c:61
+#: ../src/libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "International"
 msgstr "International"
 
-#: ../libedataserver/e-categories.c:62
+#: ../src/libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Key Customer"
 
-#: ../libedataserver/e-categories.c:63
+#: ../src/libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-#: ../libedataserver/e-categories.c:64
+#: ../src/libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libedataserver/e-categories.c:65
+#: ../src/libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Phone Calls"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:67
+#: ../src/libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:68
+#: ../src/libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategies"
 
-#: ../libedataserver/e-categories.c:69
+#: ../src/libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Suppliers"
 
-#: ../libedataserver/e-categories.c:70
+#: ../src/libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Time & Expenses"
 
-#: ../libedataserver/e-categories.c:71
+#: ../src/libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:72
+#: ../src/libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Waiting"
 
-#: ../libedataserver/e-client.c:146
+#: ../src/libedataserver/e-client.c:144
 msgid "Source not loaded"
 msgstr "Source not loaded"
 
-#: ../libedataserver/e-client.c:148
+#: ../src/libedataserver/e-client.c:146
 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:159
+#: ../src/libedataserver/e-client.c:157
 msgid "Offline unavailable"
 msgstr "Offline unavailable"
 
-#: ../libedataserver/e-client.c:181
+#: ../src/libedataserver/e-client.c:179
 msgid "D-Bus error"
 msgstr "D-Bus error"
 
-#: ../libedataserver/e-client.c:2023
+#: ../src/libedataserver/e-client.c:2021
 msgid "Timeout was reached"
 msgstr "Timeout was reached"
 
-#: ../libedataserver/e-source.c:771
+#. Translators: The first %s is a display name of the source, the second is its UID and
+#. the third is the name of the OAuth service.
+#: ../src/libedataserver/e-oauth2-service.c:1208
+#, c-format
+#| msgid "Source '%s' (%s) is not a valid Google source"
+msgid "Source “%s” (%s) is not valid for “%s” OAuth2 service"
+msgstr "Source “%s” (%s) is not valid for “%s” OAuth2 service"
+
+#: ../src/libedataserver/e-oauth2-service.c:1223
+#| msgid "Google secret not found"
+msgid "OAuth2 secret not found"
+msgstr "OAuth2 secret not found"
+
+#: ../src/libedataserver/e-oauth2-service.c:1411
+#, c-format
+#| msgid "Unexpected OK response from IMAP server: %s"
+msgid "Received incorrect response from server “%s”."
+msgstr "Received incorrect response from server “%s”."
+
+#: ../src/libedataserver/e-oauth2-service.c:1420
+msgid "Failed to refresh access token. Sign to the server again, please."
+msgstr "Failed to refresh access token. Sign to the server again, please."
+
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../src/libedataserver/e-oauth2-service.c:1462
+#, c-format
+#| msgid "Source '%s' (%s) is not a valid Google source"
+msgid "Source “%s” (%s) is not a valid OAuth2 source"
+msgstr "Source “%s” (%s) is not a valid OAuth2 source"
+
+#: ../src/libedataserver/e-oauth2-service.c:1535
+msgid ""
+"The access token is expired and it failed to refresh it. Sign to the server "
+"again, please."
+msgstr ""
+"The access token is expired and it failed to refresh it. Sign to the server "
+"again, please."
+
+#. Translators: This is a user-visible string, display name of an OAuth2 service.
+#: ../src/libedataserver/e-oauth2-service-google.c:56
+#| msgid "Google"
+msgctxt "OAuth2Service"
+msgid "Google"
+msgstr "Google"
+
+#. Translators: This is a user-visible string, display name of an OAuth2 service.
+#: ../src/libedataserver/e-oauth2-service-outlook.c:57
+msgctxt "OAuth2Service"
+msgid "Outlook"
+msgstr "Outlook"
+
+#: ../src/libedataserver/e-soup-session.c:824
+#| msgid "Operation has been cancelled"
+msgid "Operation was cancelled"
+msgstr "Operation was cancelled"
+
+#: ../src/libedataserver/e-soup-session.c:827
+#, c-format
+#| msgid "Failed to make directory %s: %s"
+msgid "Failed with HTTP error %d: %s"
+msgstr "Failed with HTTP error %d: %s"
+
+#: ../src/libedataserver/e-source.c:772
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "Source file is missing a [%s] group"
 
-#: ../libedataserver/e-source.c:1375
+#: ../src/libedataserver/e-source.c:1377
 #, c-format
-msgid "Data source '%s' is not removable"
-msgstr "Data source '%s' is not removable"
+#| msgid "Data source '%s' is not removable"
+msgid "Data source “%s” is not removable"
+msgstr "Data source “%s” is not removable"
 
-#: ../libedataserver/e-source.c:1498
+#: ../src/libedataserver/e-source.c:1500
 #, c-format
-msgid "Data source '%s' is not writable"
-msgstr "Data source '%s' is not writable"
+#| msgid "Data source '%s' is not writable"
+msgid "Data source “%s” is not writable"
+msgstr "Data source “%s” is not writable"
 
-#: ../libedataserver/e-source.c:2194
+#: ../src/libedataserver/e-source.c:2196
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:41
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:39
 msgid "Credentials lookup is not supported"
 msgstr "Credentials lookup is not supported"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:54
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:52
 msgid "Credentials store is not supported"
 msgstr "Credentials store is not supported"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:65
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:63
 msgid "Credentials delete is not supported"
 msgstr "Credentials delete is not supported"
 
-#: ../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 "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
+#: ../src/libedataserver/e-source-credentials-provider-impl-password.c:79
 msgid "Password not found"
 msgstr "Password not found"
 
-#: ../libedataserver/e-source-mail-signature.c:481
+#: ../src/libedataserver/e-source-mail-signature.c:483
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "Signature script must be a local file"
 
-#: ../libedataserver/e-source-proxy.c:1641
+#: ../src/libedataserver/e-source-proxy.c:1642
 #, c-format
-msgid "Source '%s' does not support proxy lookups"
-msgstr "Source '%s' does not support proxy lookups"
+#| msgid "Source '%s' does not support proxy lookups"
+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:1692 ../libedataserver/e-time-utils.c:1991
+#: ../src/libedataserver/e-time-utils.c:1691
+#: ../src/libedataserver/e-time-utils.c:1990
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -5305,7 +5814,8 @@ 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:1697 ../libedataserver/e-time-utils.c:1982
+#: ../src/libedataserver/e-time-utils.c:1696
+#: ../src/libedataserver/e-time-utils.c:1981
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -5313,7 +5823,8 @@ 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:1702 ../libedataserver/e-time-utils.c:1987
+#: ../src/libedataserver/e-time-utils.c:1701
+#: ../src/libedataserver/e-time-utils.c:1986
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5321,78 +5832,83 @@ 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:1707 ../libedataserver/e-time-utils.c:1978
+#: ../src/libedataserver/e-time-utils.c:1706
+#: ../src/libedataserver/e-time-utils.c:1977
 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:1712
+#: ../src/libedataserver/e-time-utils.c:1711
 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:1717
+#: ../src/libedataserver/e-time-utils.c:1716
 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:1720 ../libedataserver/e-time-utils.c:1840
-#: ../libedataserver/e-time-utils.c:1973
+#: ../src/libedataserver/e-time-utils.c:1719
+#: ../src/libedataserver/e-time-utils.c:1839
+#: ../src/libedataserver/e-time-utils.c:1972
 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:1727
+#: ../src/libedataserver/e-time-utils.c:1726
 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:1731
+#: ../src/libedataserver/e-time-utils.c:1730
 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:1736
+#: ../src/libedataserver/e-time-utils.c:1735
 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:1741
+#: ../src/libedataserver/e-time-utils.c:1740
 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:1746
+#: ../src/libedataserver/e-time-utils.c:1745
 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:1751
+#: ../src/libedataserver/e-time-utils.c:1750
 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:1754 ../libedataserver/e-time-utils.c:1843
+#: ../src/libedataserver/e-time-utils.c:1753
+#: ../src/libedataserver/e-time-utils.c:1842
 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:1914 ../libedataserver/e-time-utils.c:2035
+#: ../src/libedataserver/e-time-utils.c:1913
+#: ../src/libedataserver/e-time-utils.c:2034
 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:1918 ../libedataserver/e-time-utils.c:2027
+#: ../src/libedataserver/e-time-utils.c:1917
+#: ../src/libedataserver/e-time-utils.c:2026
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5400,273 +5916,548 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1923 ../libedataserver/e-time-utils.c:2032
+#: ../src/libedataserver/e-time-utils.c:1922
+#: ../src/libedataserver/e-time-utils.c:2031
 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:1927 ../libedataserver/e-time-utils.c:2024
+#: ../src/libedataserver/e-time-utils.c:1926
+#: ../src/libedataserver/e-time-utils.c:2023
 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:1931
+#: ../src/libedataserver/e-time-utils.c:1930
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1935
+#: ../src/libedataserver/e-time-utils.c:1934
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserver/e-webdav-discover.c:484
-#: ../libedataserver/e-webdav-discover.c:493
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP Error: %s"
-
-#: ../libedataserver/e-webdav-discover.c:523
-msgid "Could not parse response"
-msgstr "Could not parse response"
+#: ../src/libedataserver/e-webdav-session.c:670
+msgid "Cannot determine destination URL without WebDAV extension"
+msgstr "Cannot determine destination URL without WebDAV extension"
 
-#: ../libedataserver/e-webdav-discover.c:532
-msgid "Empty response"
-msgstr "Empty response"
-
-#: ../libedataserver/e-webdav-discover.c:540
-msgid "Unexpected reply from server"
-msgstr "Unexpected reply from server"
+#: ../src/libedataserver/e-webdav-session.c:955
+#, c-format
+msgid ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request. The used URI was: %s"
+msgstr ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request. The used URI was: %s"
 
-#: ../libedataserverui/e-credentials-prompter.c:260
-#: ../libedataserverui/e-credentials-prompter.c:1563
-#: ../libedataserverui/e-credentials-prompter.c:1607
+#: ../src/libedataserver/e-webdav-session.c:957
+#, c-format
+msgid ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request."
+msgstr ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request."
+
+#. Translators: The first '%s' is replaced with error prefix, as provided
+#. by the caller, which can be in a form: "Failed with something".
+#. The '%d' is replaced with actual HTTP status code.
+#. The second '%s' is replaced with a reason phrase of the error (user readable text).
+#. The last '%s' is replaced with detailed error text, as returned by the server.
+#: ../src/libedataserver/e-webdav-session.c:978
+#, c-format
+#| msgid "NSPR error code %d"
+msgid "%s: HTTP error code %d (%s): %s"
+msgstr "%s: HTTP error code %d (%s): %s"
+
+#. Translators: The '%d' is replaced with actual HTTP status code.
+#. The '%s' is replaced with a reason phrase of the error (user readable text).
+#. The last '%s' is replaced with detailed error text, as returned by the server.
+#: ../src/libedataserver/e-webdav-session.c:986
+#, c-format
+msgid "Failed with HTTP error code %d (%s): %s"
+msgstr "Failed with HTTP error code %d (%s): %s"
+
+#. Translators: The first '%s' is replaced with error prefix, as provided
+#. by the caller, which can be in a form: "Failed with something".
+#. The '%d' is replaced with actual HTTP status code.
+#. The second '%s' is replaced with a reason phrase of the error (user readable text).
+#: ../src/libedataserver/e-webdav-session.c:1001
+#, c-format
+#| msgid "NSPR error code %d"
+msgid "%s: HTTP error code %d (%s)"
+msgstr "%s: HTTP error code %d (%s)"
+
+#. Translators: The '%d' is replaced with actual HTTP status code.
+#. The '%s' is replaced with a reason phrase of the error (user readable text).
+#: ../src/libedataserver/e-webdav-session.c:1007
+#, c-format
+msgid "Failed with HTTP error code %d (%s)"
+msgstr "Failed with HTTP error code %d (%s)"
+
+#: ../src/libedataserver/e-webdav-session.c:1257
+#| msgid "Failed to encode data"
+msgid "Failed to post data"
+msgstr "Failed to post data"
+
+#: ../src/libedataserver/e-webdav-session.c:1350
+#: ../src/libedataserver/e-webdav-session.c:1425
+#: ../src/libedataserver/e-webdav-session.c:1529
+#: ../src/libedataserver/e-webdav-session.c:2784
+#: ../src/libedataserver/e-webdav-session.c:4036
+#| msgid "Failed to find Account element"
+msgid "Failed to get input XML content"
+msgstr "Failed to get input XML content"
+
+#: ../src/libedataserver/e-webdav-session.c:1361
+#| msgid "Failed to get capabilities"
+msgid "Failed to get properties"
+msgstr "Failed to get properties"
+
+#: ../src/libedataserver/e-webdav-session.c:1435
+#| msgid "Failed to authenticate"
+msgid "Failed to update properties"
+msgstr "Failed to update properties"
+
+#: ../src/libedataserver/e-webdav-session.c:1539
+#| msgid "Failed to issue NOTIFY"
+msgid "Failed to issue REPORT"
+msgstr "Failed to issue REPORT"
+
+#: ../src/libedataserver/e-webdav-session.c:1598
+#| msgid "Failed to select mailbox"
+msgid "Failed to create collection"
+msgstr "Failed to create collection"
+
+#: ../src/libedataserver/e-webdav-session.c:1689
+#: ../src/libedataserver/e-webdav-session.c:1843
+#| msgid "Failed to get lock using fcntl(2): %s"
+msgid "Failed to get XML request content"
+msgstr "Failed to get XML request content"
+
+#: ../src/libedataserver/e-webdav-session.c:1701
+#| msgid "Failed to read From address"
+msgid "Failed to create address book"
+msgstr "Failed to create address book"
+
+#: ../src/libedataserver/e-webdav-session.c:1856
+#| msgid "Failed to run calendar factory"
+msgid "Failed to create calendar"
+msgstr "Failed to create calendar"
+
+#: ../src/libedataserver/e-webdav-session.c:1988
+#: ../src/libedataserver/e-webdav-session.c:1999
+#| msgid "Failed to read From address"
+msgid "Failed to read resource"
+msgstr "Failed to read resource"
+
+#: ../src/libedataserver/e-webdav-session.c:2148
+#| msgid "Credentials store is not supported"
+msgid "Cannot rewind input stream: Not supported"
+msgstr "Cannot rewind input stream: Not supported"
+
+#: ../src/libedataserver/e-webdav-session.c:2299
+#: ../src/libedataserver/e-webdav-session.c:2451
+#| msgid "Failed to encode data"
+msgid "Failed to put data"
+msgstr "Failed to put data"
+
+#: ../src/libedataserver/e-webdav-session.c:2318
+#: ../src/libedataserver/e-webdav-session.c:2459
+#, c-format
+#| msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgid "Failed to put data to server, error code %d (%s)"
+msgstr "Failed to put data to server, error code %d (%s)"
+
+#: ../src/libedataserver/e-webdav-session.c:2561
+#| msgid "Failed to enable QResync"
+msgid "Failed to delete resource"
+msgstr "Failed to delete resource"
+
+#: ../src/libedataserver/e-webdav-session.c:2628
+#| msgid "Failed to copy the tmp file"
+msgid "Failed to copy resource"
+msgstr "Failed to copy resource"
+
+#: ../src/libedataserver/e-webdav-session.c:2690
+#| msgid "Failed to retrieve message"
+msgid "Failed to move resource"
+msgstr "Failed to move resource"
+
+#: ../src/libedataserver/e-webdav-session.c:2795
+#| msgid "Failed to lookup credentials: "
+msgid "Failed to lock resource"
+msgstr "Failed to lock resource"
+
+#: ../src/libedataserver/e-webdav-session.c:2809
+#: ../src/libedataserver/e-webdav-session.c:3011
+msgid "Expected application/xml response, but none returned"
+msgstr "Expected application/xml response, but none returned"
+
+#: ../src/libedataserver/e-webdav-session.c:2812
+#: ../src/libedataserver/e-webdav-session.c:3014
+#, c-format
+msgid "Expected application/xml response, but %s returned"
+msgstr "Expected application/xml response, but %s returned"
+
+#: ../src/libedataserver/e-webdav-session.c:2824
+#: ../src/libedataserver/e-webdav-session.c:3027
+#| msgid "Failed to encode data"
+msgid "Failed to parse XML data"
+msgstr "Failed to parse XML data"
+
+#: ../src/libedataserver/e-webdav-session.c:2903
+#| msgid "Failed to select mailbox"
+msgid "Failed to refresh lock"
+msgstr "Failed to refresh lock"
+
+#: ../src/libedataserver/e-webdav-session.c:2962
+#| msgid "Failed to authenticate"
+msgid "Failed to unlock"
+msgstr "Failed to unlock"
+
+#: ../src/libedataserver/e-webdav-session.c:2999
+#, c-format
+#| msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
+msgid "Expected multistatus response, but %d returned (%s)"
+msgstr "Expected multistatus response, but %d returned (%s)"
+
+#: ../src/libedataserver/e-webdav-session.c:4046
+#| msgid "Failed to get lock using fcntl(2): %s"
+msgid "Failed to get access control list"
+msgstr "Failed to get access control list"
+
+#: ../src/libedataserver/e-webdav-session.c:4787
+msgid "Cannot store protected nor inherited Access Control Entry."
+msgstr "Cannot store protected nor inherited Access Control Entry."
+
+#: ../src/libedataserver/e-webdav-session.c:4794
+msgid "Provided invalid principal kind for Access Control Entry."
+msgstr "Provided invalid principal kind for Access Control Entry."
+
+#: ../src/libedataserver/e-webdav-session.c:4801
+msgid "Cannot store property-based Access Control Entry."
+msgstr "Cannot store property-based Access Control Entry."
+
+#: ../src/libedataserver/e-webdav-session.c:4808
+msgid "Access Control Entry can be only to Grant or Deny, but not None."
+msgstr "Access Control Entry can be only to Grant or Deny, but not None."
+
+#: ../src/libedataserver/e-webdav-session.c:4816
+msgid "Access Control Entry can be only to Grant or Deny, but not both."
+msgstr "Access Control Entry can be only to Grant or Deny, but not both."
+
+#: ../src/libedataserver/e-webdav-session.c:4875
+msgid "Access Control Entry privilege cannot be NULL."
+msgstr "Access Control Entry privilege cannot be NULL."
+
+#: ../src/libedataserverui/e-credentials-prompter.c:258
+#: ../src/libedataserverui/e-credentials-prompter.c:1576
+#: ../src/libedataserverui/e-credentials-prompter.c:1620
 msgid "Credentials prompt was cancelled"
 msgstr "Credentials prompt was cancelled"
 
-#: ../libedataserverui/e-credentials-prompter.c:664
+#: ../src/libedataserverui/e-credentials-prompter.c:662
 #, c-format
-msgid "Source '%s' doesn't support prompt for credentials"
-msgstr "Source '%s' doesn't support prompt for credentials"
+#| msgid "Source '%s' doesn't support prompt for credentials"
+msgid "Source “%s” doesn’t support prompt for credentials"
+msgstr "Source “%s” doesn’t support prompt for credentials"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:441
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:202
 #, 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)"
+#| msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgid "Failed to obtain access token from address “%s”: %s"
+msgstr "Failed to obtain access token from address “%s”: %s"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:487
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:246
 msgid "Requesting access token, please wait..."
 msgstr "Requesting access token, please wait…"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:589
-msgid "Google Address book authentication request"
-msgstr "Google Address book authentication request"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Address Book authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:472
+#, c-format
+#| msgid "Address book authentication request"
+msgid "%s Address Book authentication request"
+msgstr "%s Address Book authentication request"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:592
-msgid "Google Calendar authentication request"
-msgstr "Google Calendar authentication request"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Calendar authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:477
+#, c-format
+#| msgid "Calendar authentication request"
+msgid "%s Calendar authentication request"
+msgstr "%s Calendar authentication request"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:595
-msgid "Google Memo List authentication request"
-msgstr "Google Memo List authentication request"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Memo List authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:482
+#, c-format
+#| msgid "Google Memo List authentication request"
+msgid "%s Memo List authentication request"
+msgstr "%s Memo List authentication request"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:598
-msgid "Google Task List authentication request"
-msgstr "Google Task List authentication request"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Task List authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:487
+#, c-format
+#| msgid "Google Task List authentication request"
+msgid "%s Task List authentication request"
+msgstr "%s Task List authentication request"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
-msgid "Google Mail authentication request"
-msgstr "Google Mail authentication request"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Mail authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:493
+#, c-format
+#| msgid "Mail authentication request"
+msgid "%s Mail authentication request"
+msgstr "%s Mail authentication request"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
-msgid "Google account authentication request"
-msgstr "Google account authentication request"
-
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:616
-#, c-format
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google account authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:498
+#, c-format
+#| msgid "Google account authentication request"
+msgid "%s account authentication request"
+msgstr "%s account authentication request"
+
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:512
+#, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your address book \"%s\"."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"address book \"%s\"."
+"Login to your %s account and accept conditions in order to access your "
+"address book “%s”."
 msgstr ""
-"Login to your Google account and accept conditions in order to access your "
-"address book \"%s\"."
+"Login to your %s account and accept conditions in order to access your "
+"address book “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:620
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:519
 #, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your calendar \"%s\"."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"calendar \"%s\"."
+"Login to your %s 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\"."
+"Login to your %s account and accept conditions in order to access your "
+"calendar “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:624
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:526
 #, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your mail account \"%s\"."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"mail account \"%s\"."
+"Login to your %s 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\"."
+"Login to your %s account and accept conditions in order to access your mail "
+"account “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:628
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:533
 #, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your mail transport \"%s\"."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"mail transport \"%s\"."
+"Login to your %s 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\"."
+"Login to your %s account and accept conditions in order to access your mail "
+"transport “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:632
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:540
 #, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your memo list \"%s\"."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"memo list \"%s\"."
+"Login to your %s 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\"."
+"Login to your %s account and accept conditions in order to access your memo "
+"list “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:636
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:547
 #, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your task list \"%s\"."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"task list \"%s\"."
+"Login to your %s account and accept conditions in order to access your task "
+"list “%s”."
 msgstr ""
-"Login to your Google account and accept conditions in order to access your "
-"task list \"%s\"."
+"Login to your %s account and accept conditions in order to access your task "
+"list “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:640
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:554
 #, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your account \"%s\"."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"account \"%s\"."
+"Login to your %s 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\"."
+"Login to your %s account and accept conditions in order to access your "
+"account “%s”."
 
-#: ../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
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:602
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:230
+#: ../src/libedataserverui/e-trust-prompt.c:112
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1067
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:132
 msgid "Address book authentication request"
 msgstr "Address book authentication request"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:137
 msgid "Calendar authentication request"
 msgstr "Calendar authentication request"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:141
 msgid "Mail authentication request"
 msgstr "Mail authentication request"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:144
 msgid "Authentication request"
 msgstr "Authentication request"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:155
 #, c-format
-msgid "Please enter the password for address book \"%s\"."
-msgstr "Please enter the password for address book \"%s\"."
+#| msgid "Please enter the password for address book \"%s\"."
+msgid "Please enter the password for address book “%s”."
+msgstr "Please enter the password for address book “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:159
 #, c-format
-msgid "Please enter the password for calendar \"%s\"."
-msgstr "Please enter the password for calendar \"%s\"."
+#| msgid "Please enter the password for calendar \"%s\"."
+msgid "Please enter the password for calendar “%s”."
+msgstr "Please enter the password for calendar “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:163
 #, c-format
-msgid "Please enter the password for mail account \"%s\"."
-msgstr "Please enter the password for mail account \"%s\"."
+#| msgid "Please enter the password for mail account \"%s\"."
+msgid "Please enter the password for mail account “%s”."
+msgstr "Please enter the password for mail account “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:167
 #, c-format
-msgid "Please enter the password for mail transport \"%s\"."
-msgstr "Please enter the password for mail transport \"%s\"."
+#| msgid "Please enter the password for mail transport \"%s\"."
+msgid "Please enter the password for mail transport “%s”."
+msgstr "Please enter the password for mail transport “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:171
 #, c-format
-msgid "Please enter the password for memo list \"%s\"."
-msgstr "Please enter the password for memo list \"%s\"."
+#| msgid "Please enter the password for memo list \"%s\"."
+msgid "Please enter the password for memo list “%s”."
+msgstr "Please enter the password for memo list “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:175
 #, c-format
-msgid "Please enter the password for task list \"%s\"."
-msgstr "Please enter the password for task list \"%s\"."
+#| msgid "Please enter the password for task list \"%s\"."
+msgid "Please enter the password for task list “%s”."
+msgstr "Please enter the password for task list “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:179
 #, c-format
-msgid "Please enter the password for account \"%s\"."
-msgstr "Please enter the password for account \"%s\"."
+#| msgid "Please enter the password for account \"%s\"."
+msgid "Please enter the password for account “%s”."
+msgstr "Please enter the password for account “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
-#: ../libedataserverui/e-webdav-discover-widget.c:1064
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:231
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1068
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:341
 msgid "_User Name:"
 msgstr "_User Name:"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:353
 msgid "_Password:"
 msgstr "_Password:"
 
 #. Remember password check
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:369
 msgid "_Add this password to your keyring"
 msgstr "_Add this password to your keyring"
 
-#: ../libedataserverui/e-trust-prompt.c:113
-#: ../modules/trust-prompt/trust-prompt-gtk.c:119
+#: ../src/libedataserverui/e-trust-prompt.c:111
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:117
 msgid "Certificate trust..."
 msgstr "Certificate trust…"
 
-#: ../libedataserverui/e-trust-prompt.c:115
-#: ../modules/trust-prompt/trust-prompt-gtk.c:120
+#: ../src/libedataserverui/e-trust-prompt.c:113
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:118
 msgid "_Reject"
 msgstr "_Reject"
 
-#: ../libedataserverui/e-trust-prompt.c:116
-#: ../modules/trust-prompt/trust-prompt-gtk.c:121
+#: ../src/libedataserverui/e-trust-prompt.c:114
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:119
 msgid "Accept _Temporarily"
 msgstr "Accept _Temporarily"
 
-#: ../libedataserverui/e-trust-prompt.c:117
-#: ../modules/trust-prompt/trust-prompt-gtk.c:122
+#: ../src/libedataserverui/e-trust-prompt.c:115
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:120
 msgid "_Accept Permanently"
 msgstr "_Accept Permanently"
 
-#: ../libedataserverui/e-trust-prompt.c:188
-#: ../modules/trust-prompt/trust-prompt-gtk.c:159
+#: ../src/libedataserverui/e-trust-prompt.c:186
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:157
 #, 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?"
+#| msgid ""
+#| "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
+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?"
 
-#: ../libedataserverui/e-trust-prompt.c:210
-#: ../modules/trust-prompt/trust-prompt-gtk.c:174
+#: ../src/libedataserverui/e-trust-prompt.c:208
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:172
 msgid "Reason:"
 msgstr "Reason:"
 
-#: ../libedataserverui/e-trust-prompt.c:213
+#: ../src/libedataserverui/e-trust-prompt.c:211
 msgid "Detailed error:"
 msgstr "Detailed error:"
 
-#: ../libedataserverui/e-trust-prompt.c:275
-#: ../modules/trust-prompt/module-trust-prompt.c:82
+#: ../src/libedataserverui/e-trust-prompt.c:273
+#: ../src/modules/trust-prompt/module-trust-prompt.c:80
 msgid "The signing certificate authority is not known."
 msgstr "The signing certificate authority is not known."
 
-#: ../libedataserverui/e-trust-prompt.c:277
-#: ../modules/trust-prompt/module-trust-prompt.c:84
+#: ../src/libedataserverui/e-trust-prompt.c:275
+#: ../src/modules/trust-prompt/module-trust-prompt.c:82
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
@@ -5674,339 +6465,668 @@ msgstr ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 
-#: ../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."
+#: ../src/libedataserverui/e-trust-prompt.c:277
+#: ../src/modules/trust-prompt/module-trust-prompt.c:84
+#| msgid "The certificate's activation time is still in the future."
+msgid "The certificate’s activation time is still in the future."
+msgstr "The certificate’s activation time is still in the future."
 
-#: ../libedataserverui/e-trust-prompt.c:281
-#: ../modules/trust-prompt/module-trust-prompt.c:88
+#: ../src/libedataserverui/e-trust-prompt.c:279
+#: ../src/modules/trust-prompt/module-trust-prompt.c:86
 msgid "The certificate has expired."
 msgstr "The certificate has expired."
 
-#: ../libedataserverui/e-trust-prompt.c:283
-#: ../modules/trust-prompt/module-trust-prompt.c:90
+#: ../src/libedataserverui/e-trust-prompt.c:281
+#: ../src/modules/trust-prompt/module-trust-prompt.c:88
+#| msgid ""
+#| "The certificate has been revoked according to the connection's "
+#| "certificate revocation list."
 msgid ""
-"The certificate has been revoked according to the connection's certificate "
+"The certificate has been revoked according to the connection’s certificate "
 "revocation list."
 msgstr ""
-"The certificate has been revoked according to the connection's certificate "
+"The certificate has been revoked according to the connection’s certificate "
 "revocation list."
 
-#: ../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."
+#: ../src/libedataserverui/e-trust-prompt.c:283
+#: ../src/modules/trust-prompt/module-trust-prompt.c:90
+#| msgid "The certificate's algorithm is considered insecure."
+msgid "The certificate’s algorithm is considered insecure."
+msgstr "The certificate’s algorithm is considered insecure."
 
-#: ../libedataserverui/e-webdav-discover-widget.c:166
+#: ../src/libedataserverui/e-webdav-discover-widget.c:164
 msgid "Supports"
 msgstr "Supports"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:177
+#: ../src/libedataserverui/e-webdav-discover-widget.c:175
 msgid "_User mail:"
 msgstr "_User mail:"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:523
+#: ../src/libedataserverui/e-webdav-discover-widget.c:521
 msgctxt "WebDAVDiscover"
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:524
+#: ../src/libedataserverui/e-webdav-discover-widget.c:522
 msgctxt "WebDAVDiscover"
 msgid "Events"
 msgstr "Events"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:525
+#: ../src/libedataserverui/e-webdav-discover-widget.c:523
 msgctxt "WebDAVDiscover"
 msgid "Memos"
 msgstr "Memos"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:526
+#: ../src/libedataserverui/e-webdav-discover-widget.c:524
 msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:825
+#: ../src/libedataserverui/e-webdav-discover-widget.c:826
 msgid "Invalid URL"
 msgstr "Invalid URI"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:839
+#: ../src/libedataserverui/e-webdav-discover-widget.c:840
 msgid "User name not filled"
 msgstr "User name not filled"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:880
+#: ../src/libedataserverui/e-webdav-discover-widget.c:881
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:883
+#: ../src/libedataserverui/e-webdav-discover-widget.c:884
 msgid "Searching server sources..."
 msgstr "Searching server sources…"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:210
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:248
 #, c-format
+#| msgid ""
+#| "Cannot find a corresponding account in the org.gnome.OnlineAccounts "
+#| "service from which to obtain a password for '%s'"
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain a password for '%s'"
+"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'"
+"from which to obtain a password for “%s”"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:273
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:315
 msgid "Failed to get password from GOA: "
 msgstr "Failed to get password from GOA: "
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:219
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:220
 #, c-format
-msgid "Code: %u - Unexpected response from server"
-msgstr "Code: %u - Unexpected response from server"
+#| msgid "Code: %u - Unexpected response from server"
+msgid "Code: %u — Unexpected response from server"
+msgstr "Code: %u — Unexpected response from server"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:240
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:241
 #, 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:249
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:250
 #, c-format
 msgid "Failed to find Autodiscover element"
 msgstr "Failed to find Autodiscover element"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:261
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:262
 #, c-format
 msgid "Failed to find Response element"
 msgstr "Failed to find Response element"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:273
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:274
 #, c-format
 msgid "Failed to find Account element"
 msgstr "Failed to find Account element"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:287
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:288
 #, 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
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1336
 #, c-format
+#| msgid ""
+#| "Cannot find a corresponding account in the org.gnome.OnlineAccounts "
+#| "service from which to obtain an access token for '%s'"
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an access token for '%s'"
+"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'"
+"from which to obtain an access token for “%s”"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1366
 #, c-format
-msgid "Failed to obtain an access token for '%s': "
-msgstr "Failed to obtain an access token for '%s': "
+#| msgid "Failed to obtain an access token for '%s': "
+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
+#: ../src/modules/google-backend/module-google-backend.c:587
+#: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../src/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
+#: ../src/modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../src/tools/list-sources/list-sources.c:148
 msgid "Calendar"
 msgstr "Calendar"
 
-#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
+#: ../src/modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
 msgid "Integrate your calendars"
 msgstr "Integrate your calendars"
 
-#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
+#: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
 msgid "Integrate your contacts"
 msgstr "Integrate your contacts"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:272
+#: ../src/modules/ubuntu-online-accounts/e-signon-session-password.c:273
 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
+#: ../src/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
+#: ../src/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
+#: ../src/modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
 msgid "Google Calendar"
 msgstr "Google Calendar"
 
-#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
 msgid "Google Contacts"
 msgstr "Google Contacts"
 
-#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
 msgid "GMail"
 msgstr "GMail"
 
-#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
 msgid "Mail"
 msgstr "Mail"
 
-#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
+#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
 msgid "Integrate your mailboxes"
 msgstr "Integrate your mailboxes"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
+#: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1061
 #, c-format
+#| msgid ""
+#| "Cannot find a corresponding account service in the accounts database from "
+#| "which to obtain an access token for '%s'"
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
-"which to obtain an access token for '%s'"
+"which to obtain an access token for “%s”"
 msgstr ""
 "Cannot find a corresponding account service in the accounts database from "
-"which to obtain an access token for '%s'"
+"which to obtain an access token for “%s”"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:85
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:282
 #, c-format
 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:101
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:102
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:299
 msgid "Error parsing response as JSON: "
 msgstr "Error parsing response as JSON: "
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
-msgid "Didn't find 'email' in JSON data"
-msgstr "Didn't find 'email' in JSON data"
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:120
+#| msgid "Didn't find 'email' in JSON data"
+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"
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:317
+#| msgid "Didn't find 'id' in JSON data"
+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"
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:322
+#| msgid "Didn't find 'emails.account' in JSON data"
+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
+#: ../src/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
+#: ../src/modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
 msgid "Yahoo! Calendar"
 msgstr "Yahoo! Calendar"
 
-#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
 msgid "Yahoo! Mail"
 msgstr "Yahoo! Mail"
 
-#: ../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
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../src/services/evolution-user-prompter/evolution-user-prompter.c:33
 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:38
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:40
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:42
 msgid "Wait running until at least one client is connected"
 msgstr "Wait running until at least one client is connected"
 
-#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:42
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:44
+msgid ""
+"Overrides compile-time backend per process option; use 1 to enable, 0 to "
+"disable, any other value is to use compile-time option"
+msgstr ""
+"Overrides compile-time backend per process option; use 1 to enable, 0 to "
+"disable, any other value is to use compile-time option"
+
+#: ../src/services/evolution-source-registry/builtin/birthdays.source.in.h:1
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
-#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/google-stub.source.in.h:1
 msgid "Google"
 msgstr "Google"
 
-#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
-#: ../services/evolution-source-registry/builtin/local.source.in.h:1
-#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/local.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/local-stub.source.in.h:1
 msgid "On This Computer"
 msgstr "On This Computer"
 
-#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1
 msgid "Search Folders"
 msgstr "Search Folders"
 
-#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/weather-stub.source.in.h:1
 msgid "Weather"
 msgstr "Weather"
 
-#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
 msgid "On The Web"
 msgstr "On The Web"
 
-#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
-msgid "WebDAV"
-msgstr "WebDAV"
+#: ../src/services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
+msgid "CardDAV"
+msgstr "CardDAV"
 
-#: ../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"
+#: ../src/services/evolution-source-registry/evolution-source-registry.c:41
+#| msgid "Don't migrate user data from previous versions of Evolution"
+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
+#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
 msgid "_Dismiss"
 msgstr "_Dismiss"
 
-#: ../tools/addressbook-export/addressbook-export.c:70
-#: ../tools/addressbook-export/addressbook-export.c:767
+#: ../src/tools/addressbook-export/addressbook-export.c:69
+#: ../src/tools/addressbook-export/addressbook-export.c:781
 msgid "Can not open file"
 msgstr "Cannot open file"
 
-#: ../tools/addressbook-export/addressbook-export.c:100
+#: ../src/tools/addressbook-export/addressbook-export.c:99
 #, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Failed to open client '%s': %s"
+#| msgid "Failed to open client '%s': %s"
+msgid "Failed to open client “%s”: %s"
+msgstr "Failed to open client “%s”: %s"
 
-#: ../tools/addressbook-export/addressbook-export.c:877
+#: ../src/tools/addressbook-export/addressbook-export.c:889
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
-#: ../tools/addressbook-export/addressbook-export.c:910
+#: ../src/tools/addressbook-export/addressbook-export.c:922
 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
+#: ../src/tools/addressbook-export/addressbook-export.c:923
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../tools/addressbook-export/addressbook-export.c:914
+#: ../src/tools/addressbook-export/addressbook-export.c:926
 msgid "List local address book folders"
 msgstr "List local address book folders"
 
-#: ../tools/addressbook-export/addressbook-export.c:917
+#: ../src/tools/addressbook-export/addressbook-export.c:929
 msgid "Show cards as vcard or csv file"
 msgstr "Show cards as vcard or csv file"
 
-#: ../tools/addressbook-export/addressbook-export.c:918
+#: ../src/tools/addressbook-export/addressbook-export.c:930
 msgid "[vcard|csv]"
 msgstr "csv]"
 
-#: ../tools/addressbook-export/addressbook-export.c:966
+#: ../src/tools/addressbook-export/addressbook-export.c:978
 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
+#: ../src/tools/addressbook-export/addressbook-export.c:992
 msgid "Only support csv or vcard format."
 msgstr "Only support csv or vcard format."
 
+#: ../src/tools/list-sources/list-sources.c:83
+#| msgid "_Show only subscribed folders"
+msgid "Show only enabled sources"
+msgstr "Show only enabled sources"
+
+#: ../src/tools/list-sources/list-sources.c:86
+#| msgid "POP Source UID"
+msgid "Show source’s UID"
+msgstr "Show source’s UID"
+
+#: ../src/tools/list-sources/list-sources.c:89
+#| msgid "Unsupported authentication method"
+msgid "Show source’s authentication information"
+msgstr "Show source’s authentication information"
+
+#: ../src/tools/list-sources/list-sources.c:92
+msgid ""
+"Write in machine readable format (one source per line, without localized "
+"property names and tab as separator)"
+msgstr ""
+"Write in machine readable format (one source per line, without localised "
+"property names and tab as separator)"
+
+#: ../src/tools/list-sources/list-sources.c:95
+msgid "Limit only to sources with given extension name"
+msgstr "Limit only to sources with given extension name"
+
+#: ../src/tools/list-sources/list-sources.c:106
+msgid "yes"
+msgstr "yes"
+
+#: ../src/tools/list-sources/list-sources.c:106
+#| msgid "Snow"
+msgid "no"
+msgstr "no"
+
+#: ../src/tools/list-sources/list-sources.c:126
+#| msgctxt "CategoryName"
+#| msgid "Competition"
+msgid "Collection"
+msgstr "Collection"
+
+#: ../src/tools/list-sources/list-sources.c:132
+msgid "Collection/GNOME Online Accounts"
+msgstr "Collection/GNOME Online Accounts"
+
+#: ../src/tools/list-sources/list-sources.c:137
+msgid "Collection/Ubuntu Online Accounts"
+msgstr "Collection/Ubuntu Online Accounts"
+
+#: ../src/tools/list-sources/list-sources.c:147
+msgid "Address Book"
+msgstr "Address Book"
+
+#: ../src/tools/list-sources/list-sources.c:149
+#| msgctxt "WebDAVDiscover"
+#| msgid "Memos"
+msgid "Memo List"
+msgstr "Memo List"
+
+#: ../src/tools/list-sources/list-sources.c:150
+#| msgid "Tasks"
+msgid "Task List"
+msgstr "Task List"
+
+#: ../src/tools/list-sources/list-sources.c:151
+msgid "Mail Account"
+msgstr "Mail Account"
+
+#: ../src/tools/list-sources/list-sources.c:152
+msgid "Mail Transport"
+msgstr "Mail Transport"
+
+#: ../src/tools/list-sources/list-sources.c:153
+#| msgid "Identity"
+msgid "Mail Identity"
+msgstr "Mail Identity"
+
+#: ../src/tools/list-sources/list-sources.c:154
+#| msgid "Message submission port"
+msgid "Mail Submission"
+msgstr "Mail Submission"
+
+#: ../src/tools/list-sources/list-sources.c:155
+#| msgid "Bad signature"
+msgid "Mail Signature"
+msgstr "Mail Signature"
+
+#: ../src/tools/list-sources/list-sources.c:156
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../src/tools/list-sources/list-sources.c:224
+#, c-format
+msgid "UID: %s"
+msgstr "UID: %s"
+
+#: ../src/tools/list-sources/list-sources.c:228
+#, c-format
+#| msgid "Malformed URI: %s"
+msgid "Parent UID: %s"
+msgstr "Parent UID: %s"
+
+#: ../src/tools/list-sources/list-sources.c:231
+#, c-format
+#| msgid "Posting failed: %s"
+msgid "Enabled: %s"
+msgstr "Enabled: %s"
+
+#: ../src/tools/list-sources/list-sources.c:233
+#, c-format
+#| msgid "Backend is busy"
+msgid "Backend: %s"
+msgstr "Backend: %s"
+
+#: ../src/tools/list-sources/list-sources.c:238
+#, c-format
+#| msgid "Calendar does not exist"
+msgid "Calendar enabled: %s"
+msgstr "Calendar enabled: %s"
+
+#: ../src/tools/list-sources/list-sources.c:239
+#, c-format
+#| msgid "Contact ID already exists"
+msgid "Contacts enabled: %s"
+msgstr "Contacts enabled: %s"
+
+#: ../src/tools/list-sources/list-sources.c:240
+#, c-format
+#| msgid "Operation failed: %s"
+msgid "Mail enabled: %s"
+msgstr "Mail enabled: %s"
+
+#: ../src/tools/list-sources/list-sources.c:247
+#, c-format
+msgid "MIME Type: %s"
+msgstr "MIME Type: %s"
+
+#: ../src/tools/list-sources/list-sources.c:269
+#, c-format
+msgid "Auth Host: %s:%d"
+msgstr "Auth Host: %s:%d"
+
+#: ../src/tools/list-sources/list-sources.c:275
+#, c-format
+msgid "Auth Host: %s"
+msgstr "Auth Host: %s"
+
+#: ../src/tools/list-sources/list-sources.c:283
+#, c-format
+msgid "Auth User: %s"
+msgstr "Auth User: %s"
+
+#: ../src/tools/list-sources/list-sources.c:291
+#, c-format
+msgid "Auth Method: %s"
+msgstr "Auth Method: %s"
+
+#: ../src/tools/list-sources/list-sources.c:299
+#, c-format
+msgid "Auth Proxy UID: %s"
+msgstr "Auth Proxy UID: %s"
+
+#: ../src/tools/list-sources/list-sources.c:420
+#| msgid "Failed to parse autodiscover response XML"
+msgid "Failed to parse arguments: Unknown error"
+msgstr "Failed to parse arguments: Unknown error"
+
+#: ../src/tools/list-sources/list-sources.c:429
+#, c-format
+#| msgid "Failed to connect to a server using SSL/TLS: %s"
+msgid "Failed to connect to source registry: %s\n"
+msgstr "Failed to connect to source registry: %s\n"
+
+#: ../src/tools/list-sources/list-sources.c:445
+#, c-format
+msgid "No sources had been found\n"
+msgstr "No sources had been found\n"
+
+#~ msgid "Querying for updated contacts…"
+#~ msgstr "Querying for updated contacts…"
+
+#~ msgid "Querying for updated groups…"
+#~ msgstr "Querying for updated groups…"
+
+#~ msgid "The backend does not support bulk removals"
+#~ msgstr "The backend does not support bulk removals"
+
+#~ msgid "Loading…"
+#~ msgstr "Loading…"
+
+#~ msgid "Loading Addressbook summary..."
+#~ msgstr "Loading Addressbook summary…"
+
+#~ msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+#~ msgstr "PROPFIND on webdav failed with HTTP status %d (%s)"
+
+#~ msgid "No response body in webdav PROPFIND result"
+#~ msgstr "No response body in webdav PROPFIND result"
+
+#~ msgid "Loading Contacts (%d%%)"
+#~ msgstr "Loading Contacts (%d%%)"
+
+#~ msgid "Cannot transform SoupURI to string"
+#~ msgstr "Cannot transform SoupURI to string"
+
+#~ msgid "Create resource '%s' failed with HTTP status %d (%s)"
+#~ msgstr "Create resource '%s' failed with HTTP status %d (%s)"
+
+#~ msgid "Contact on server changed -> not modifying"
+#~ msgstr "Contact on server changed -> not modifying"
+
+#~ msgid "Modify contact failed with HTTP status %d (%s)"
+#~ msgstr "Modify contact failed with HTTP status %d (%s)"
+
+#~ msgid "DELETE failed with HTTP status %d"
+#~ msgstr "DELETE failed with HTTP status %d"
+
+#~ msgid "Server is unreachable (%s)"
+#~ msgstr "Server is unreachable (%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"
+
+#~ msgid "CalDAV backend is not loaded yet"
+#~ msgstr "CalDAV backend is not loaded yet"
+
+#~ msgid "Invalid Redirect URL"
+#~ msgstr "Invalid Redirect URL"
+
+#~ msgid "Cannot create local cache folder '%s'"
+#~ msgstr "Cannot create local cache folder '%s'"
+
+#~ msgid ""
+#~ "Server is unreachable, calendar is opened in read-only mode.\n"
+#~ "Error message: %s"
+#~ msgstr ""
+#~ "Server is unreachable, calendar is opened in read-only mode.\n"
+#~ "Error message: %s"
+
+#~ msgid "CalDAV does not support bulk additions"
+#~ msgstr "CalDAV does not support bulk additions"
+
+#~ msgid "CalDAV does not support bulk modifications"
+#~ msgstr "CalDAV does not support bulk modifications"
+
+#~ msgid "CalDAV does not support bulk removals"
+#~ msgstr "CalDAV does not support bulk removals"
+
+#~ msgid "Calendar doesn't support Free/Busy"
+#~ msgstr "Calendar doesn't support Free/Busy"
+
+#~ msgid "Schedule outbox url not found"
+#~ msgstr "Schedule outbox url not found"
+
+#~ msgid "Unexpected result in schedule-response"
+#~ msgstr "Unexpected result in schedule-response"
+
+#~ msgid "Redirected to Invalid URI"
+#~ msgstr "Redirected to Invalid URI"
+
+#~ msgid "Update preview data for folder '%s : %s'"
+#~ msgstr "Update preview data for folder '%s : %s'"
+
+#~ msgid "IMAP+"
+#~ msgstr "IMAP+"
+
+#~ msgid "Cannot create folder '%s': %s"
+#~ msgstr "Cannot create folder '%s': %s"
+
+#~ msgid "Cannot get folder '%s': %s"
+#~ msgstr "Cannot get folder '%s': %s"
+
+#~ msgid "No such folder '%s'."
+#~ msgstr "No such folder '%s'."
+
+#~ msgid "Google authentication is not supported"
+#~ msgstr "Google authentication is not supported"
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP Error: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Could not parse response"
+
+#~ msgid "Empty response"
+#~ msgstr "Empty response"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Unexpected reply from server"
+
+#~ msgid "Google Address book authentication request"
+#~ msgstr "Google Address book authentication request"
+
+#~ msgid "Google Calendar authentication request"
+#~ msgstr "Google Calendar authentication request"
+
+#~ msgid "Google Mail authentication request"
+#~ msgstr "Google Mail authentication request"
+
+#~ msgid "WebDAV"
+#~ msgstr "WebDAV"
+
 #~ msgid "Creating new contact…"
 #~ msgstr "Creating new contact…"
 
@@ -6111,9 +7231,6 @@ msgstr "Only support csv or vcard format."
 #~ 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"
 
@@ -6528,9 +7645,6 @@ msgstr "Only support csv or vcard format."
 #~ msgid "Could not create synch slave thread"
 #~ msgstr "Could not create synch slave thread"
 
-#~ msgid "Failed to run calendar factory"
-#~ msgstr "Failed to run calendar factory"
-
 #~ msgid "Cannot process, calendar backend is opening"
 #~ msgstr "Cannot process, calendar backend is opening"
 
@@ -6614,9 +7728,6 @@ msgstr "Only support csv or vcard format."
 #~ msgid "IMAP server response did not contain %s information"
 #~ msgstr "IMAP server response did not contain %s information"
 
-#~ msgid "Unexpected OK response from IMAP server: %s"
-#~ msgstr "Unexpected OK response from IMAP server: %s"
-
 #~ msgid "Could not create directory %s: %s"
 #~ msgstr "Could not create directory %s: %s"
 
@@ -6653,9 +7764,6 @@ msgstr "Only support csv or vcard format."
 #~ msgid "IMAP default port"
 #~ msgstr "IMAP default port"
 
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
 #~ msgid "Retrieving list of folders at '%s'"
 #~ msgstr "Retrieving list of folders at '%s'"
 
@@ -6732,9 +7840,6 @@ msgstr "Only support csv or vcard format."
 #~ msgid "Search"
 #~ msgstr "Search"
 
-#~ msgid "Address Book"
-#~ msgstr "Address Book"
-
 #~ msgid "Select Contacts from Address Book"
 #~ msgstr "Select Contacts from Address Book"
 
@@ -6792,9 +7897,6 @@ msgstr "Only support csv or vcard format."
 #~ msgid "Flags"
 #~ msgstr "Flags"
 
-#~ msgid "Identity"
-#~ msgstr "Identity"
-
 #~ msgid "Cannot remove book: "
 #~ msgstr "Cannot remove book: "
 
@@ -7564,9 +8666,6 @@ msgstr "Only support csv or vcard format."
 #~ msgid "Error in Certificate Revocation List (CRL)"
 #~ msgstr "Error in Certificate Revocation List (CRL)"
 
-#~ msgid "Out of memory"
-#~ msgstr "Out of memory"
-
 #~ msgid "Zero-depth self-signed certificate"
 #~ msgstr "Zero-depth self-signed certificate"
 
@@ -7629,9 +8728,6 @@ msgstr "Only support csv or vcard format."
 #~ msgid "Publishing Author"
 #~ msgstr "Publishing Author"
 
-#~ msgid "Author"
-#~ msgstr "Author"
-
 #~ msgid "Reviewer"
 #~ msgstr "Reviewer"
 
@@ -7754,9 +8850,6 @@ msgstr "Only support csv or vcard format."
 #~ msgid "Snow showers"
 #~ msgstr "Snow showers"
 
-#~ msgid "Snow"
-#~ msgstr "Snow"
-
 #~ msgid "Partly cloudy"
 #~ msgstr "Partly cloudy"
 
@@ -7847,9 +8940,6 @@ msgstr "Only support csv or vcard format."
 #~ msgid "%.1f-%.1fin snow\n"
 #~ msgstr "%.1f-%.1fin snow\n"
 
-#~ msgid "Failed to create create child process '%s': %s"
-#~ msgstr "Failed to create create child process '%s': %s"
-
 #~ msgid "Performing query on unknown header: %s"
 #~ msgstr "Performing query on unknown header: %s"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]