Update British English translation

author: Bruce Cowan <bruce@bcowan.me.uk> 2023-03-13 13:15:20 +0000
committer: GNOME Translation Robot <gnome-sysadmin@gnome.org> 2023-03-13 13:15:20 +0000
commit: fc39a0f714a4b34fe42af4ea43495cae33c0e437 (patch)
tree: ffaea5a0ef482a7b2fc3fe17f46cdff9c7355ea2
parent: 7f9bf3ab8e6435ac690b823b8a4c83a4a86e885d (diff)
download: evolution-data-server-fc39a0f714a4b34fe42af4ea43495cae33c0e437.tar.gz
1 files changed, 2365 insertions, 2069 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index fc8f35e78..3668b2ce6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,106 +4,48 @@
 # Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
 # Philip Withnall <philip@tecnocode.co.uk>, 2009, 2010.
 # Chris Leonard <cjl@laptop.org>, 2012.
-# Bruce Cowan <bruce@bcowan.me.uk>, 2010-2021.
 # Zander Brown <zbrown@gnome.org>, 2020-2021.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2010-2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution-data-server/"
 "issues\n"
-"POT-Creation-Date: 2021-08-05 08:45+0000\n"
-"PO-Revision-Date: 2021-08-29 15:22+0100\n"
-"Last-Translator: Zander Brown <zbrown@gnome.org>\n"
-"Language-Team: English - United Kingdom <en_GB@li.org>\n"
+"POT-Creation-Date: 2023-02-20 09:59+0000\n"
+"PO-Revision-Date: 2023-03-11 15:02+0000\n"
+"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
+"Language-Team: English - United Kingdom <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: Gtranslator 40.0\n"
+"X-Generator: Gtranslator 42.0\n"
 "X-Project-Style: gnome\n"
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:234
+#: src/addressbook/backends/carddav/e-book-backend-carddav.c:240
 #, c-format
 msgid "Given URL “%s” doesn’t reference CardDAV address book"
 msgstr "Given URL “%s” doesn’t reference CardDAV address book"
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:293
-#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1136
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4379
-#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:51
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:54
-#: ../src/addressbook/libebook/e-book.c:1067
-#: ../src/addressbook/libebook/e-book-client.c:2122
-#: ../src/addressbook/libebook/e-book-client.c:2300
-#: ../src/addressbook/libebook/e-book-client.c:2519
-#: ../src/addressbook/libebook/e-book-client.c:2656
-#: ../src/addressbook/libebook/e-book-client.c:2821
-#: ../src/addressbook/libebook/e-book-client.c:2961
-#: ../src/addressbook/libebook/e-book-client.c:3098
-#: ../src/addressbook/libebook/e-book-client.c:3261
-#: ../src/addressbook/libebook/e-book-client.c:3456
-#: ../src/addressbook/libebook/e-book-client.c:3674
-#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:873
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:275
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:288
-#: ../src/calendar/backends/http/e-cal-backend-http.c:313
-#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:197
-#: ../src/calendar/libecal/e-cal-client.c:257
-#: ../src/calendar/libecal/e-cal-client.c:3242
-#: ../src/calendar/libecal/e-cal-client.c:3415
-#: ../src/calendar/libecal/e-cal-client.c:3688
-#: ../src/calendar/libecal/e-cal-client.c:3926
-#: ../src/calendar/libecal/e-cal-client.c:4118
-#: ../src/calendar/libecal/e-cal-client.c:4301
-#: ../src/calendar/libecal/e-cal-client.c:4509
-#: ../src/calendar/libecal/e-cal-client.c:4686
-#: ../src/calendar/libecal/e-cal-client.c:4897
-#: ../src/calendar/libecal/e-cal-client.c:5053
-#: ../src/calendar/libecal/e-cal-client.c:5253
-#: ../src/calendar/libecal/e-cal-client.c:5419
-#: ../src/calendar/libecal/e-cal-client.c:5646
-#: ../src/calendar/libecal/e-cal-client.c:5806
-#: ../src/calendar/libecal/e-cal-client.c:6037
-#: ../src/calendar/libecal/e-cal-client.c:6236
-#: ../src/calendar/libecal/e-cal-client.c:6604
-#: ../src/calendar/libecal/e-cal-client.c:6828
-#: ../src/calendar/libedata-cal/e-cal-cache.c:1847
-#: ../src/camel/camel-filter-driver.c:1717
-#: ../src/camel/camel-filter-driver.c:1846
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3327
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3333
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3343
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3355
-#: ../src/camel/providers/nntp/camel-nntp-store.c:419
-#: ../src/libebackend/e-server-side-source.c:498
-#: ../src/libedataserver/e-client.c:183
-#: ../src/libedataserver/e-soup-session.c:1239
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:204
-#: ../src/libedataserverui/e-reminders-widget.c:1994
-#: ../src/tools/list-sources/list-sources.c:429
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1155
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1376
-#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:930
+#: src/addressbook/backends/carddav/e-book-backend-carddav.c:1127
+#: src/calendar/backends/caldav/e-cal-backend-caldav.c:1340
+#: src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:934
 msgid "Server didn’t return object’s href"
 msgstr "Server didn’t return object’s href"
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1157
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1378
-#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:932
+#: src/addressbook/backends/carddav/e-book-backend-carddav.c:1129
+#: src/calendar/backends/caldav/e-cal-backend-caldav.c:1342
+#: src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:936
 msgid "Server didn’t return object’s ETag"
 msgstr "Server didn’t return object’s ETag"
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1159
+#: src/addressbook/backends/carddav/e-book-backend-carddav.c:1131
 msgid "Received object is not a valid vCard"
 msgstr "Received object is not a valid vCard"
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1276
+#: src/addressbook/backends/carddav/e-book-backend-carddav.c:1248
 msgid ""
 "Missing information about vCard URL, local cache is possibly incomplete or "
 "broken. Remove it, please."
@@ -111,128 +53,184 @@ msgstr ""
 "Missing information about vCard URL, local cache is possibly incomplete or "
 "broken. Remove it, please."
 
-#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1279
+#: src/addressbook/backends/carddav/e-book-backend-carddav.c:1251
 msgid "Object to save is not a valid vCard"
 msgstr "Object to save is not a valid vCard"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:117
+#: src/addressbook/backends/file/e-book-backend-file.c:318
 #, c-format
 msgid "Failed to remove file “%s”: %s"
 msgstr "Failed to remove file “%s”: %s"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:145
+#: src/addressbook/backends/file/e-book-backend-file.c:346
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Failed to make directory %s: %s"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:429
+#: src/addressbook/backends/file/e-book-backend-file.c:630
 #, c-format
 msgid "Failed to create hardlink for resource “%s”: %s"
 msgstr "Failed to create hardlink for resource “%s”: %s"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:534
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1275
+#: src/addressbook/backends/file/e-book-backend-file.c:735
+#: src/addressbook/backends/file/e-book-backend-file.c:1480
 msgid "No UID in the contact"
 msgstr "No UID in the contact"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:871
+#: src/addressbook/backends/file/e-book-backend-file.c:1072
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr "Conflicting UIDs found in added contacts"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1001
+#: src/addressbook/backends/file/e-book-backend-file.c:1202
 msgid "Loading..."
 msgstr "Loading..."
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1003
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4494
+#: src/addressbook/backends/file/e-book-backend-file.c:1204
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:4858
 msgid "Searching..."
 msgstr "Searching…"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1303
+#: src/addressbook/backends/file/e-book-backend-file.c:1508
 #, c-format
 msgid "Tried to modify contact “%s” with out of sync revision"
 msgstr "Tried to modify contact “%s” with out of sync revision"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1484
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1570
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3076
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7371
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7440
+#: src/addressbook/backends/file/e-book-backend-file.c:1689
+#: src/addressbook/backends/file/e-book-backend-file.c:1775
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
+#: src/addressbook/libedata-book/e-book-sqlite.c:7378
+#: src/addressbook/libedata-book/e-book-sqlite.c:7447
 #, c-format
 msgid "Contact “%s” not found"
 msgstr "Contact “%s” not found"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1634
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1717
+#: src/addressbook/backends/file/e-book-backend-file.c:1839
+#: src/addressbook/backends/file/e-book-backend-file.c:1922
 #, c-format
 msgid "Query “%s” not supported"
 msgstr "Query “%s” not supported"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1643
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1726
+#: src/addressbook/backends/file/e-book-backend-file.c:1848
+#: src/addressbook/backends/file/e-book-backend-file.c:1931
 #, c-format
 msgid "Invalid Query “%s”"
 msgstr "Invalid Query “%s”"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1975
-#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2050
+#: src/addressbook/backends/file/e-book-backend-file.c:2236
+#: src/addressbook/libedata-book/e-book-meta-backend.c:2124
 msgid "Requested to delete an unrelated cursor"
 msgstr "Requested to delete an unrelated cursor"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:2046
+#: src/addressbook/backends/file/e-book-backend-file.c:2320
 #, c-format
 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:149
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:1158
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:4743
+#: src/addressbook/libebook-contacts/e-book-contacts-utils.c:51
+#: src/addressbook/libebook-contacts/e-phone-number.c:54
+#: src/addressbook/libebook/e-book.c:1067
+#: src/addressbook/libebook/e-book-client.c:2139
+#: src/addressbook/libebook/e-book-client.c:2317
+#: src/addressbook/libebook/e-book-client.c:2536
+#: src/addressbook/libebook/e-book-client.c:2673
+#: src/addressbook/libebook/e-book-client.c:2838
+#: src/addressbook/libebook/e-book-client.c:2978
+#: src/addressbook/libebook/e-book-client.c:3115
+#: src/addressbook/libebook/e-book-client.c:3278
+#: src/addressbook/libebook/e-book-client.c:3473
+#: src/addressbook/libebook/e-book-client.c:3691
+#: src/addressbook/libedata-book/e-book-backend-sexp.c:873
+#: src/calendar/backends/contacts/e-cal-backend-contacts.c:288
+#: src/calendar/backends/http/e-cal-backend-http.c:300
+#: src/calendar/libecal/e-cal-client.c:257
+#: src/calendar/libecal/e-cal-client.c:3242
+#: src/calendar/libecal/e-cal-client.c:3415
+#: src/calendar/libecal/e-cal-client.c:3688
+#: src/calendar/libecal/e-cal-client.c:3926
+#: src/calendar/libecal/e-cal-client.c:4118
+#: src/calendar/libecal/e-cal-client.c:4301
+#: src/calendar/libecal/e-cal-client.c:4536
+#: src/calendar/libecal/e-cal-client.c:4713
+#: src/calendar/libecal/e-cal-client.c:4921
+#: src/calendar/libecal/e-cal-client.c:5077
+#: src/calendar/libecal/e-cal-client.c:5275
+#: src/calendar/libecal/e-cal-client.c:5441
+#: src/calendar/libecal/e-cal-client.c:5668
+#: src/calendar/libecal/e-cal-client.c:5825
+#: src/calendar/libecal/e-cal-client.c:6053
+#: src/calendar/libecal/e-cal-client.c:6252
+#: src/calendar/libecal/e-cal-client.c:6620
+#: src/calendar/libecal/e-cal-client.c:6844
+#: src/calendar/libedata-cal/e-cal-cache.c:1837
+#: src/camel/camel-filter-driver.c:1724 src/camel/camel-filter-driver.c:1853
+#: src/camel/providers/imapx/camel-imapx-server.c:3331
+#: src/camel/providers/imapx/camel-imapx-server.c:3337
+#: src/camel/providers/imapx/camel-imapx-server.c:3347
+#: src/camel/providers/imapx/camel-imapx-server.c:3359
+#: src/camel/providers/nntp/camel-nntp-store.c:419
+#: src/libebackend/e-server-side-source.c:498 src/libedataserver/e-client.c:183
+#: src/libedataserver/e-soup-session.c:1019
+#: src/libedataserver/e-soup-session.c:1899
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:266
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:853
+#: src/libedataserverui/e-reminders-widget.c:2141
+#: src/tools/list-sources/list-sources.c:429
+msgid "Unknown error"
+msgstr "Unknown error"
+
 #. 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
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:109
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:109
 msgid "Not connected"
 msgstr "Not connected"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:873
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:893
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "Failed to bind using either v3 or v2 binds"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:982
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:1004
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconnecting to LDAP server…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1117
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:1139
 msgid "Invalid DN syntax"
 msgstr "Invalid DN syntax"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1133
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4378
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:1155
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:4742
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP error 0x%x (%s)"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1776
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2125
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2138
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:1808
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:2159
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:2172
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: NULL returned from ldap_first_entry"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2053
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2197
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:2087
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:2231
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: Unhandled result type %d returned"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2340
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2478
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:2374
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:2512
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:6325
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: Unhandled search result type %d returned"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2628
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:2670
 msgid "LDAP contact lists cannot be empty."
 msgstr "LDAP contact lists cannot be empty."
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2666
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:2708
 #, c-format
 msgid ""
 "Contact lists in LDAP address books require each member to be from the same "
@@ -247,72 +245,72 @@ msgstr[1] ""
 "Contact lists in LDAP address books require each member to be from the same "
 "LDAP address book, but %d members could not be recognised."
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4317
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:4681
 msgid "Receiving LDAP search results..."
 msgstr "Receiving LDAP search results…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4520
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:4884
 msgid "Error performing search"
 msgstr "Error performing search"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4660
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:5033
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Downloading contacts (%d)…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4761
-#: ../src/addressbook/libedata-book/e-book-meta-backend.c:790
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:691
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:5134
+#: src/addressbook/libedata-book/e-book-meta-backend.c:822
+#: src/calendar/libedata-cal/e-cal-meta-backend.c:722
 msgid "Refreshing…"
 msgstr "Refreshing…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5148
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:5620
 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:5239
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:5715
 msgid "Adding contact to LDAP server..."
 msgstr "Adding contact to LDAP server…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5301
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:5777
 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:5323
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:5799
 msgid "Modifying contact from LDAP server..."
 msgstr "Modifying contact from LDAP server…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5395
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:5871
 msgid "Removing contact from LDAP server..."
 msgstr "Removing contact from LDAP server…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5805
+#: src/addressbook/backends/ldap/e-book-backend-ldap.c:6522
 #, c-format
 msgid "Failed to get the DN for user “%s”"
 msgstr "Failed to get the DN for user “%s”"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:40
+#: src/addressbook/libebook-contacts/e-book-contacts-utils.c:40
 msgid "No such book"
 msgstr "No such book"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:42
+#: src/addressbook/libebook-contacts/e-book-contacts-utils.c:42
 msgid "Contact not found"
 msgstr "Contact not found"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:44
+#: src/addressbook/libebook-contacts/e-book-contacts-utils.c:44
 msgid "Contact ID already exists"
 msgstr "Contact ID already exists"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:46
+#: src/addressbook/libebook-contacts/e-book-contacts-utils.c:46
 msgid "No such source"
 msgstr "No such source"
 
-#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:48
+#: src/addressbook/libebook-contacts/e-book-contacts-utils.c:48
 msgid "No space"
 msgstr "No space"
 
 #. Dummy row as EContactField starts from 1
-#: ../src/addressbook/libebook-contacts/e-contact.c:149
+#: src/addressbook/libebook-contacts/e-contact.c:149
 msgid "Unique ID"
 msgstr "Unique ID"
 
@@ -320,12 +318,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.
-#: ../src/addressbook/libebook-contacts/e-contact.c:154
+#: src/addressbook/libebook-contacts/e-contact.c:154
 msgid "File Under"
 msgstr "File Under"
 
 #. URI of the book to which the contact belongs to
-#: ../src/addressbook/libebook-contacts/e-contact.c:156
+#: src/addressbook/libebook-contacts/e-contact.c:156
 msgid "Book UID"
 msgstr "Book UID"
 
@@ -333,435 +331,438 @@ 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*)
-#: ../src/addressbook/libebook-contacts/e-contact.c:162
+#: src/addressbook/libebook-contacts/e-contact.c:162
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:163
+#: src/addressbook/libebook-contacts/e-contact.c:163
 msgid "Given Name"
 msgstr "Given Name"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:164
+#: src/addressbook/libebook-contacts/e-contact.c:164
 msgid "Family Name"
 msgstr "Family Name"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:165
+#: src/addressbook/libebook-contacts/e-contact.c:165
+#: src/libedataserverui/e-certificate-widget.c:415
 msgid "Nickname"
 msgstr "Nickname"
 
 #. Email fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:168
+#: src/addressbook/libebook-contacts/e-contact.c:168
 msgid "Email 1"
 msgstr "E-mail 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:169
+#: src/addressbook/libebook-contacts/e-contact.c:169
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:170
+#: src/addressbook/libebook-contacts/e-contact.c:170
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:171
+#: src/addressbook/libebook-contacts/e-contact.c:171
 msgid "Email 4"
 msgstr "E-mail 4"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:173
+#: src/addressbook/libebook-contacts/e-contact.c:173
 msgid "Mailer"
 msgstr "Mailer"
 
 #. Address Labels
-#: ../src/addressbook/libebook-contacts/e-contact.c:176
+#: src/addressbook/libebook-contacts/e-contact.c:176
 msgid "Home Address Label"
 msgstr "Home Address Label"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:177
+#: src/addressbook/libebook-contacts/e-contact.c:177
 msgid "Work Address Label"
 msgstr "Work Address Label"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:178
+#: src/addressbook/libebook-contacts/e-contact.c:178
 msgid "Other Address Label"
 msgstr "Other Address Label"
 
 #. Phone fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:181
+#: src/addressbook/libebook-contacts/e-contact.c:181
 msgid "Assistant Phone"
 msgstr "Assistant Phone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:182
+#: src/addressbook/libebook-contacts/e-contact.c:182
 msgid "Business Phone"
 msgstr "Business Phone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:183
+#: src/addressbook/libebook-contacts/e-contact.c:183
 msgid "Business Phone 2"
 msgstr "Business Phone 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:184
+#: src/addressbook/libebook-contacts/e-contact.c:184
 msgid "Business Fax"
 msgstr "Business Fax"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:185
+#: src/addressbook/libebook-contacts/e-contact.c:185
 msgid "Callback Phone"
 msgstr "Callback Phone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:186
+#: src/addressbook/libebook-contacts/e-contact.c:186
 msgid "Car Phone"
 msgstr "Car Phone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:187
+#: src/addressbook/libebook-contacts/e-contact.c:187
 msgid "Company Phone"
 msgstr "Company Phone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:188
+#: src/addressbook/libebook-contacts/e-contact.c:188
 msgid "Home Phone"
 msgstr "Home Phone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:189
+#: src/addressbook/libebook-contacts/e-contact.c:189
 msgid "Home Phone 2"
 msgstr "Home Phone 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:190
+#: src/addressbook/libebook-contacts/e-contact.c:190
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:191
+#: src/addressbook/libebook-contacts/e-contact.c:191
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:192
+#: src/addressbook/libebook-contacts/e-contact.c:192
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:193
+#: src/addressbook/libebook-contacts/e-contact.c:193
 msgid "Other Phone"
 msgstr "Other Phone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:194
+#: src/addressbook/libebook-contacts/e-contact.c:194
 msgid "Other Fax"
 msgstr "Other Fax"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:195
+#: src/addressbook/libebook-contacts/e-contact.c:195
 msgid "Pager"
 msgstr "Pager"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:196
+#: src/addressbook/libebook-contacts/e-contact.c:196
 msgid "Primary Phone"
 msgstr "Primary Phone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:197
+#: src/addressbook/libebook-contacts/e-contact.c:197
 msgid "Radio"
 msgstr "Radio"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:198
+#: src/addressbook/libebook-contacts/e-contact.c:198
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../src/addressbook/libebook-contacts/e-contact.c:200
+#: src/addressbook/libebook-contacts/e-contact.c:200
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:203
+#: src/addressbook/libebook-contacts/e-contact.c:203
+#: src/libedataserverui/e-certificate-widget.c:417
+#: src/libedataserverui/e-certificate-widget.c:426
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:204
+#: src/addressbook/libebook-contacts/e-contact.c:204
 msgid "Organizational Unit"
 msgstr "Organisational Unit"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:205
+#: src/addressbook/libebook-contacts/e-contact.c:205
 msgid "Office"
 msgstr "Office"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:206
+#: src/addressbook/libebook-contacts/e-contact.c:206
 msgid "Title"
 msgstr "Title"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:207
+#: src/addressbook/libebook-contacts/e-contact.c:207
 msgid "Role"
 msgstr "Role"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:208
+#: src/addressbook/libebook-contacts/e-contact.c:208
 msgid "Manager"
 msgstr "Manager"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:209
+#: src/addressbook/libebook-contacts/e-contact.c:209
 msgid "Assistant"
 msgstr "Assistant"
 
 #. Web fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:212
+#: src/addressbook/libebook-contacts/e-contact.c:212
 msgid "Homepage URL"
 msgstr "Homepage URL"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:213
+#: src/addressbook/libebook-contacts/e-contact.c:213
 msgid "Weblog URL"
 msgstr "Weblog URL"
 
 #. Contact categories
-#: ../src/addressbook/libebook-contacts/e-contact.c:216
+#: src/addressbook/libebook-contacts/e-contact.c:216
 msgid "Categories"
 msgstr "Categories"
 
 #. Collaboration fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:219
+#: src/addressbook/libebook-contacts/e-contact.c:219
 msgid "Calendar URI"
 msgstr "Calendar URI"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:220
+#: src/addressbook/libebook-contacts/e-contact.c:220
 msgid "Free/Busy URL"
 msgstr "Free/Busy URL"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:221
+#: src/addressbook/libebook-contacts/e-contact.c:221
 msgid "ICS Calendar"
 msgstr "ICS Calendar"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:222
+#: src/addressbook/libebook-contacts/e-contact.c:222
 msgid "Video Conferencing URL"
 msgstr "Video Conferencing URL"
 
 #. Misc fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:225
+#: src/addressbook/libebook-contacts/e-contact.c:225
 msgid "Spouse’s Name"
 msgstr "Spouse’s Name"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:226
+#: src/addressbook/libebook-contacts/e-contact.c:226
 msgid "Note"
 msgstr "Note"
 
 #. Instant messaging fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:229
+#: src/addressbook/libebook-contacts/e-contact.c:229
 msgid "AIM Home Screen Name 1"
 msgstr "AIM Home Screen Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:230
+#: src/addressbook/libebook-contacts/e-contact.c:230
 msgid "AIM Home Screen Name 2"
 msgstr "AIM Home Screen Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:231
+#: src/addressbook/libebook-contacts/e-contact.c:231
 msgid "AIM Home Screen Name 3"
 msgstr "AIM Home Screen Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:232
+#: src/addressbook/libebook-contacts/e-contact.c:232
 msgid "AIM Work Screen Name 1"
 msgstr "AIM Work Screen Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:233
+#: src/addressbook/libebook-contacts/e-contact.c:233
 msgid "AIM Work Screen Name 2"
 msgstr "AIM Work Screen Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:234
+#: src/addressbook/libebook-contacts/e-contact.c:234
 msgid "AIM Work Screen Name 3"
 msgstr "AIM Work Screen Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:235
+#: src/addressbook/libebook-contacts/e-contact.c:235
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise Home Screen Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:236
+#: src/addressbook/libebook-contacts/e-contact.c:236
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise Home Screen Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:237
+#: src/addressbook/libebook-contacts/e-contact.c:237
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise Home Screen Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:238
+#: src/addressbook/libebook-contacts/e-contact.c:238
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise Work Screen Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:239
+#: src/addressbook/libebook-contacts/e-contact.c:239
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise Work Screen Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:240
+#: src/addressbook/libebook-contacts/e-contact.c:240
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise Work Screen Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:241
+#: src/addressbook/libebook-contacts/e-contact.c:241
 msgid "Jabber Home ID 1"
 msgstr "Jabber Home ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:242
+#: src/addressbook/libebook-contacts/e-contact.c:242
 msgid "Jabber Home ID 2"
 msgstr "Jabber Home ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:243
+#: src/addressbook/libebook-contacts/e-contact.c:243
 msgid "Jabber Home ID 3"
 msgstr "Jabber Home ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:244
+#: src/addressbook/libebook-contacts/e-contact.c:244
 msgid "Jabber Work ID 1"
 msgstr "Jabber Work ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:245
+#: src/addressbook/libebook-contacts/e-contact.c:245
 msgid "Jabber Work ID 2"
 msgstr "Jabber Work ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:246
+#: src/addressbook/libebook-contacts/e-contact.c:246
 msgid "Jabber Work ID 3"
 msgstr "Jabber Work ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:247
+#: src/addressbook/libebook-contacts/e-contact.c:247
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! Home Screen Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:248
+#: src/addressbook/libebook-contacts/e-contact.c:248
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! Home Screen Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:249
+#: src/addressbook/libebook-contacts/e-contact.c:249
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! Home Screen Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:250
+#: src/addressbook/libebook-contacts/e-contact.c:250
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! Work Screen Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:251
+#: src/addressbook/libebook-contacts/e-contact.c:251
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! Work Screen Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:252
+#: src/addressbook/libebook-contacts/e-contact.c:252
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! Work Screen Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:253
+#: src/addressbook/libebook-contacts/e-contact.c:253
 msgid "MSN Home Screen Name 1"
 msgstr "MSN Home Screen Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:254
+#: src/addressbook/libebook-contacts/e-contact.c:254
 msgid "MSN Home Screen Name 2"
 msgstr "MSN Home Screen Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:255
+#: src/addressbook/libebook-contacts/e-contact.c:255
 msgid "MSN Home Screen Name 3"
 msgstr "MSN Home Screen Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:256
+#: src/addressbook/libebook-contacts/e-contact.c:256
 msgid "MSN Work Screen Name 1"
 msgstr "MSN Work Screen Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:257
+#: src/addressbook/libebook-contacts/e-contact.c:257
 msgid "MSN Work Screen Name 2"
 msgstr "MSN Work Screen Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:258
+#: src/addressbook/libebook-contacts/e-contact.c:258
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:259
+#: src/addressbook/libebook-contacts/e-contact.c:259
 msgid "ICQ Home ID 1"
 msgstr "ICQ Home ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:260
+#: src/addressbook/libebook-contacts/e-contact.c:260
 msgid "ICQ Home ID 2"
 msgstr "ICQ Home ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:261
+#: src/addressbook/libebook-contacts/e-contact.c:261
 msgid "ICQ Home ID 3"
 msgstr "ICQ Home ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:262
+#: src/addressbook/libebook-contacts/e-contact.c:262
 msgid "ICQ Work ID 1"
 msgstr "ICQ Work ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:263
+#: src/addressbook/libebook-contacts/e-contact.c:263
 msgid "ICQ Work ID 2"
 msgstr "ICQ Work ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:264
+#: src/addressbook/libebook-contacts/e-contact.c:264
 msgid "ICQ Work ID 3"
 msgstr "ICQ Work ID 3"
 
 #. Last modified time
-#: ../src/addressbook/libebook-contacts/e-contact.c:267
+#: src/addressbook/libebook-contacts/e-contact.c:267
 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.
-#: ../src/addressbook/libebook-contacts/e-contact.c:271
+#: src/addressbook/libebook-contacts/e-contact.c:271
 msgid "Name or Org"
 msgstr "Name or Org"
 
 #. Address fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:274
+#: src/addressbook/libebook-contacts/e-contact.c:274
 msgid "Address List"
 msgstr "Address List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:275
+#: src/addressbook/libebook-contacts/e-contact.c:275
 msgid "Home Address"
 msgstr "Home Address"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:276
+#: src/addressbook/libebook-contacts/e-contact.c:276
 msgid "Work Address"
 msgstr "Work Address"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:277
+#: src/addressbook/libebook-contacts/e-contact.c:277
 msgid "Other Address"
 msgstr "Other Address"
 
 #. Contact categories
-#: ../src/addressbook/libebook-contacts/e-contact.c:280
+#: src/addressbook/libebook-contacts/e-contact.c:280
 msgid "Category List"
 msgstr "Category List"
 
 #. Photo/Logo
-#: ../src/addressbook/libebook-contacts/e-contact.c:283
+#: src/addressbook/libebook-contacts/e-contact.c:283
 msgid "Photo"
 msgstr "Photo"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:284
+#: src/addressbook/libebook-contacts/e-contact.c:284
 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
-#: ../src/addressbook/libebook-contacts/e-contact.c:288
-#: ../src/libedataserverui/e-webdav-discover-widget.c:180
+#: src/addressbook/libebook-contacts/e-contact.c:288
+#: src/libedataserverui/e-webdav-discover-widget.c:195
 msgid "Name"
 msgstr "Name"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:289
+#: src/addressbook/libebook-contacts/e-contact.c:289
 msgid "Email List"
 msgstr "E-mail List"
 
 #. Instant messaging fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:292
+#: src/addressbook/libebook-contacts/e-contact.c:292
 msgid "AIM Screen Name List"
 msgstr "AIM Screen Name List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:293
+#: src/addressbook/libebook-contacts/e-contact.c:293
 msgid "GroupWise ID List"
 msgstr "GroupWise ID List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:294
+#: src/addressbook/libebook-contacts/e-contact.c:294
 msgid "Jabber ID List"
 msgstr "Jabber ID List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:295
+#: src/addressbook/libebook-contacts/e-contact.c:295
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! Screen Name List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:296
+#: src/addressbook/libebook-contacts/e-contact.c:296
 msgid "MSN Screen Name List"
 msgstr "MSN Screen Name List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:297
+#: src/addressbook/libebook-contacts/e-contact.c:297
 msgid "ICQ ID List"
 msgstr "ICQ ID List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:299
+#: src/addressbook/libebook-contacts/e-contact.c:299
 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/...
-#: ../src/addressbook/libebook-contacts/e-contact.c:304
+#: src/addressbook/libebook-contacts/e-contact.c:304
 msgid "List"
 msgstr "List"
 
@@ -769,257 +770,249 @@ 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.
-#: ../src/addressbook/libebook-contacts/e-contact.c:309
+#: src/addressbook/libebook-contacts/e-contact.c:309
 msgid "List Shows Addresses"
 msgstr "List Shows Addresses"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:311
+#: src/addressbook/libebook-contacts/e-contact.c:311
 msgid "Birth Date"
 msgstr "Birth Date"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:312
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:957
+#: src/addressbook/libebook-contacts/e-contact.c:312
+#: src/calendar/backends/contacts/e-cal-backend-contacts.c:957
 msgid "Anniversary"
 msgstr "Anniversary"
 
 #. Security fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:315
+#: src/addressbook/libebook-contacts/e-contact.c:315
 msgid "X.509 Certificate"
 msgstr "X.509 Certificate"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:316
+#: src/addressbook/libebook-contacts/e-contact.c:316
 msgid "PGP Certificate"
 msgstr "PGP Certificate"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:318
+#: src/addressbook/libebook-contacts/e-contact.c:318
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu Home ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:319
+#: src/addressbook/libebook-contacts/e-contact.c:319
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu Home ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:320
+#: src/addressbook/libebook-contacts/e-contact.c:320
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu Home ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:321
+#: src/addressbook/libebook-contacts/e-contact.c:321
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu Work ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:322
+#: src/addressbook/libebook-contacts/e-contact.c:322
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu Work ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:323
+#: src/addressbook/libebook-contacts/e-contact.c:323
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu Work ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:324
+#: src/addressbook/libebook-contacts/e-contact.c:324
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID List"
 
 #. Geo information
-#: ../src/addressbook/libebook-contacts/e-contact.c:327
+#: src/addressbook/libebook-contacts/e-contact.c:327
 msgid "Geographic Information"
 msgstr "Geographic Information"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:329
+#: src/addressbook/libebook-contacts/e-contact.c:329
 msgid "Telephone"
 msgstr "Telephone"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:331
+#: src/addressbook/libebook-contacts/e-contact.c:331
 msgid "Skype Home Name 1"
 msgstr "Skype Home Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:332
+#: src/addressbook/libebook-contacts/e-contact.c:332
 msgid "Skype Home Name 2"
 msgstr "Skype Home Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:333
+#: src/addressbook/libebook-contacts/e-contact.c:333
 msgid "Skype Home Name 3"
 msgstr "Skype Home Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:334
+#: src/addressbook/libebook-contacts/e-contact.c:334
 msgid "Skype Work Name 1"
 msgstr "Skype Work Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:335
+#: src/addressbook/libebook-contacts/e-contact.c:335
 msgid "Skype Work Name 2"
 msgstr "Skype Work Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:336
+#: src/addressbook/libebook-contacts/e-contact.c:336
 msgid "Skype Work Name 3"
 msgstr "Skype Work Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:337
+#: src/addressbook/libebook-contacts/e-contact.c:337
 msgid "Skype Name List"
 msgstr "Skype Name List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:339
+#: src/addressbook/libebook-contacts/e-contact.c:339
 msgid "SIP address"
 msgstr "SIP address"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:341
+#: src/addressbook/libebook-contacts/e-contact.c:341
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk Home Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:342
+#: src/addressbook/libebook-contacts/e-contact.c:342
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk Home Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:343
+#: src/addressbook/libebook-contacts/e-contact.c:343
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk Home Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:344
+#: src/addressbook/libebook-contacts/e-contact.c:344
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk Work Name 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:345
+#: src/addressbook/libebook-contacts/e-contact.c:345
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk Work Name 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:346
+#: src/addressbook/libebook-contacts/e-contact.c:346
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk Work Name 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:347
+#: src/addressbook/libebook-contacts/e-contact.c:347
 msgid "Google Talk Name List"
 msgstr "Google Talk Name List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:349
+#: src/addressbook/libebook-contacts/e-contact.c:349
 msgid "Twitter Name List"
 msgstr "Twitter Name List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:351
-#| msgid "Jabber Home ID 1"
+#: src/addressbook/libebook-contacts/e-contact.c:351
 msgid "Matrix Home ID 1"
 msgstr "Matrix Home ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:352
-#| msgid "Jabber Home ID 2"
+#: src/addressbook/libebook-contacts/e-contact.c:352
 msgid "Matrix Home ID 2"
 msgstr "Matrix Home ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:353
-#| msgid "Jabber Home ID 3"
+#: src/addressbook/libebook-contacts/e-contact.c:353
 msgid "Matrix Home ID 3"
 msgstr "Matrix Home ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:354
-#| msgid "Jabber Work ID 1"
+#: src/addressbook/libebook-contacts/e-contact.c:354
 msgid "Matrix Work ID 1"
 msgstr "Matrix Work ID 1"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:355
-#| msgid "Jabber Work ID 2"
+#: src/addressbook/libebook-contacts/e-contact.c:355
 msgid "Matrix Work ID 2"
 msgstr "Matrix Work ID 2"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:356
-#| msgid "Jabber Work ID 3"
+#: src/addressbook/libebook-contacts/e-contact.c:356
 msgid "Matrix Work ID 3"
 msgstr "Matrix Work ID 3"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:357
-#| msgid "Jabber ID List"
+#: src/addressbook/libebook-contacts/e-contact.c:357
 msgid "Matrix ID List"
 msgstr "Matrix ID List"
 
-#: ../src/addressbook/libebook-contacts/e-contact.c:1924
-#: ../src/addressbook/libebook/e-destination.c:911
+#: src/addressbook/libebook-contacts/e-contact.c:1924
+#: src/addressbook/libebook/e-destination.c:914
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:39
+#: 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."
 
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:41
+#: 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."
 
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:43
+#: src/addressbook/libebook-contacts/e-phone-number.c:43
 msgid "Not a phone number"
 msgstr "Not a phone number"
 
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:45
+#: src/addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Invalid country calling code"
 msgstr "Invalid country calling code"
 
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:47
+#: 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"
 
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:49
+#: 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"
 
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:51
+#: 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"
 
-#: ../src/addressbook/libebook/e-book-client.c:924
+#: src/addressbook/libebook/e-book-client.c:939
 #, c-format
 msgid "Unknown book property “%s”"
 msgstr "Unknown book property “%s”"
 
-#: ../src/addressbook/libebook/e-book-client.c:939
+#: src/addressbook/libebook/e-book-client.c:954
 #, c-format
 msgid "Cannot change value of book property “%s”"
 msgstr "Cannot change value of book property “%s”"
 
-#: ../src/addressbook/libebook/e-book-client.c:1381
-#: ../src/addressbook/libebook/e-book-client.c:1611
-#: ../src/addressbook/libebook/e-book-client.c:1887
-#: ../src/calendar/libecal/e-cal-client.c:1714
-#: ../src/calendar/libecal/e-cal-client.c:1952
+#: src/addressbook/libebook/e-book-client.c:1397
+#: src/addressbook/libebook/e-book-client.c:1628
+#: src/addressbook/libebook/e-book-client.c:1904
+#: src/calendar/libecal/e-cal-client.c:1714
+#: src/calendar/libecal/e-cal-client.c:1952
 #, c-format
 msgid "Unable to connect to “%s”: "
 msgstr "Unable to connect to “%s”: "
 
-#: ../src/addressbook/libebook/e-book-client-view.c:857
-#: ../src/calendar/libecal/e-cal-client-view.c:667
+#: src/addressbook/libebook/e-book-client-view.c:858
+#: src/calendar/libecal/e-cal-client-view.c:667
 #, c-format
 msgid "Client disappeared"
 msgstr "Client disappeared"
 
-#: ../src/addressbook/libedata-book/e-book-backend.c:3253
+#: src/addressbook/libedata-book/e-book-backend.c:3448
 #, c-format
 msgid "Addressbook backend does not support cursors"
 msgstr "Addressbook backend does not support cursors"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:895
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:2254
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:895
+#: src/addressbook/libedata-book/e-book-sqlite.c:2259
 #, c-format
 msgid "Error introspecting unknown summary field “%s”"
 msgstr "Error introspecting unknown summary field “%s”"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1504
-#: ../src/addressbook/libedata-book/e-book-cache.c:549
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1393
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1505
+#: src/addressbook/libedata-book/e-book-cache.c:558
+#: src/addressbook/libedata-book/e-book-sqlite.c:1398
 msgid "Error parsing regular expression"
 msgstr "Error parsing regular expression"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1549
-#: ../src/addressbook/libedata-book/e-book-cache.c:4586
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1877
-#: ../src/camel/camel-db.c:816
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1550
+#: src/addressbook/libedata-book/e-book-cache.c:4751
+#: src/addressbook/libedata-book/e-book-sqlite.c:1882 src/camel/camel-db.c:830
 #, c-format
 msgid "Insufficient memory"
 msgstr "Insufficient memory"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1686
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1687
 #, c-format
 msgid "Invalid contact field “%d” specified in summary"
 msgstr "Invalid contact field “%d” specified in summary"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1720
-#: ../src/addressbook/libedata-book/e-book-cache.c:372
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:603
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1721
+#: src/addressbook/libedata-book/e-book-cache.c:381
+#: src/addressbook/libedata-book/e-book-sqlite.c:608
 #, c-format
 msgid ""
 "Contact field “%s” of type “%s” specified in summary, but only boolean, "
@@ -1028,28 +1021,28 @@ msgstr ""
 "Contact field “%s” of type “%s” specified in summary, but only boolean, "
 "string and string list field types are supported"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3064
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4165
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3065
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4166
 #, 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."
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4389
-#: ../src/addressbook/libedata-book/e-book-cache.c:3468
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5848
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4297
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4390
+#: src/addressbook/libedata-book/e-book-cache.c:3484
+#: src/addressbook/libedata-book/e-book-sqlite.c:5854
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "Query contained unsupported elements"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4301
 #, c-format
 msgid "Invalid Query"
 msgstr "Invalid Query"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4324
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4325
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
@@ -1058,50 +1051,50 @@ msgstr ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
-#: ../src/addressbook/libedata-book/e-data-book.c:868
-#: ../src/calendar/libedata-cal/e-data-cal.c:1143
-#: ../src/libedataserver/e-client.c:170
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4394
+#: src/addressbook/libedata-book/e-data-book.c:868
+#: src/calendar/libedata-cal/e-data-cal.c:1143
+#: src/libedataserver/e-client.c:170
 #, c-format
 msgid "Invalid query"
 msgstr "Invalid query"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4436
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4437
 #, 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."
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5259
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5260
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "Unable to remove the db file: errno %d"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6046
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6446
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6449
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "Only summary queries are supported by EbSdbCursor"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6053
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6056
 #, 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"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6067
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6070
 #, 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"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6074
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6077
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "Cannot sort by a field which may have multiple values"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6207
-#: ../src/addressbook/libedata-book/e-book-cache.c:5797
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8145
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6210
+#: src/addressbook/libedata-book/e-book-cache.c:6082
+#: src/addressbook/libedata-book/e-book-sqlite.c:8152
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
@@ -1110,9 +1103,9 @@ msgstr ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
 "the contact list"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6215
-#: ../src/addressbook/libedata-book/e-book-cache.c:5804
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8153
+#: src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
+#: src/addressbook/libedata-book/e-book-cache.c:6089
+#: src/addressbook/libedata-book/e-book-sqlite.c:8160
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
@@ -1121,81 +1114,98 @@ msgstr ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
 "contact list"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:337
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:569
+#: src/addressbook/libedata-book/e-book-cache.c:346
+#: src/addressbook/libedata-book/e-book-sqlite.c:574
 #, c-format
 msgid "Unsupported contact field “%d” specified in summary"
 msgstr "Unsupported contact field “%d” specified in summary"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:3463
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5841
-#: ../src/calendar/libedata-cal/e-cal-cache.c:1702
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3560
+#: src/addressbook/libedata-book/e-book-cache.c:3479
+#: src/addressbook/libedata-book/e-book-sqlite.c:5847
+#: src/calendar/libedata-cal/e-cal-cache.c:1703
+#: src/calendar/libedata-cal/e-cal-cache.c:3550
 #, c-format
 msgid "Invalid query: %s"
 msgstr "Invalid query: %s"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:3648
+#: src/addressbook/libedata-book/e-book-cache.c:3664
 msgid "Invalid query for a book cursor"
 msgstr "Invalid query for a book cursor"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:4590
-#: ../src/libebackend/e-cache.c:756
+#: src/addressbook/libedata-book/e-book-cache.c:4755
+#: src/libebackend/e-cache.c:755
 #, c-format
 msgid "Can’t open database %s: %s"
 msgstr "Can’t open database %s: %s"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5224
-#: ../src/addressbook/libedata-book/e-book-cache.c:5271
-#: ../src/addressbook/libedata-book/e-book-cache.c:5318
-#: ../src/addressbook/libedata-book/e-book-cache.c:5370
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2842
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2900
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2959
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3022
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3193
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1375
-#: ../src/libebackend/e-cache.c:1371 ../src/libebackend/e-cache.c:2349
-#: ../src/libebackend/e-cache.c:2389
+#: src/addressbook/libedata-book/e-book-cache.c:5421
+#: src/addressbook/libedata-book/e-book-cache.c:5468
+#: src/addressbook/libedata-book/e-book-cache.c:5515
+#: src/addressbook/libedata-book/e-book-cache.c:5567
+#: src/calendar/libedata-cal/e-cal-cache.c:2832
+#: src/calendar/libedata-cal/e-cal-cache.c:2890
+#: src/calendar/libedata-cal/e-cal-cache.c:2949
+#: src/calendar/libedata-cal/e-cal-cache.c:3012
+#: src/calendar/libedata-cal/e-cal-cache.c:3183
+#: src/calendar/libedata-cal/e-cal-meta-backend.c:1412
+#: src/libebackend/e-cache.c:1370 src/libebackend/e-cache.c:2348
+#: src/libebackend/e-cache.c:2388
 #, c-format
 msgid "Object “%s” not found"
 msgstr "Object “%s” not found"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5430
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3084
+#: src/addressbook/libedata-book/e-book-cache.c:5627
+#: src/calendar/libedata-cal/e-cal-cache.c:3074
 #, c-format
 msgid "Object with extra “%s” not found"
 msgstr "Object with extra “%s” not found"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5584
+#: src/addressbook/libedata-book/e-book-cache.c:5803
+msgid "Search by email not supported"
+msgstr "Search by e-mail not supported"
+
+#: src/addressbook/libedata-book/e-book-cache.c:5814
+msgid "No email address provided"
+msgstr "No e-mail address provided"
+
+#: src/addressbook/libedata-book/e-book-cache.c:5869
 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:5593
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7985
+#: src/addressbook/libedata-book/e-book-cache.c:5878
+#: src/addressbook/libedata-book/e-book-sqlite.c:7992
 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:1088
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1098
+#: src/addressbook/libedata-book/e-book-meta-backend.c:1120
+#: src/calendar/libedata-cal/e-cal-meta-backend.c:1129
 #, 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:1096
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1106
+#: src/addressbook/libedata-book/e-book-meta-backend.c:1128
+#: src/calendar/libedata-cal/e-cal-meta-backend.c:1137
 #, 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:1920
-#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2376
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3332
+#: src/addressbook/libedata-book/e-book-meta-backend.c:1355
+#: src/calendar/libedata-cal/e-cal-meta-backend.c:1366
+msgid ""
+"Refresh skipped due to enabled Power Saver mode. Disable Power Saver mode "
+"and repeat the action."
+msgstr ""
+"Refresh skipped due to enabled Power Saver mode. Disable Power Saver mode "
+"and repeat the action."
+
+#: src/addressbook/libedata-book/e-book-meta-backend.c:1994
+#: src/addressbook/libedata-book/e-book-meta-backend.c:2450
+#: src/calendar/libedata-cal/e-cal-meta-backend.c:3369
 #, c-format
 msgid "Failed to create cache “%s”:"
 msgstr "Failed to create cache “%s”:"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1950
+#: src/addressbook/libedata-book/e-book-sqlite.c:1955
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the “folders” table first."
@@ -1203,93 +1213,98 @@ msgstr ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the “folders” table first."
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:6016
+#: src/addressbook/libedata-book/e-book-sqlite.c:6022
 msgid "Invalid query for EbSqlCursor"
 msgstr "Invalid query for EbSqlCursor"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7967
+#: src/addressbook/libedata-book/e-book-sqlite.c:7974
 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"
 
-#: ../src/addressbook/libedata-book/e-data-book.c:893
-#: ../src/calendar/libedata-cal/e-data-cal.c:1168
+#: src/addressbook/libedata-book/e-data-book.c:893
+#: src/calendar/libedata-cal/e-data-cal.c:1168
 msgid "Invalid query: "
 msgstr "Invalid query: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1142
+#: src/addressbook/libedata-book/e-data-book.c:1192
 msgid "Cannot open book: "
 msgstr "Cannot open book: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1180
+#: src/addressbook/libedata-book/e-data-book.c:1230
 msgid "Cannot refresh address book: "
 msgstr "Cannot refresh address book: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1221
+#: src/addressbook/libedata-book/e-data-book.c:1271
 msgid "Cannot get contact: "
 msgstr "Cannot get contact: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1266
+#: src/addressbook/libedata-book/e-data-book.c:1316
 msgid "Cannot get contact list: "
 msgstr "Cannot get contact list: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1318
+#: src/addressbook/libedata-book/e-data-book.c:1368
 msgid "Cannot get contact list uids: "
 msgstr "Cannot get contact list uids: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1369
+#: src/addressbook/libedata-book/e-data-book.c:1419
 msgid "Cannot add contact: "
 msgstr "Cannot add contact: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1420
+#: src/addressbook/libedata-book/e-data-book.c:1470
 msgid "Cannot modify contacts: "
 msgstr "Cannot modify contacts: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1472
+#: src/addressbook/libedata-book/e-data-book.c:1522
 msgid "Cannot remove contacts: "
 msgstr "Cannot remove contacts: "
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:771
+#. Translators: This is prefix to a detailed error message
+#: src/addressbook/libedata-book/e-data-book.c:1569
+msgid "Cannot find email address: "
+msgstr "Cannot find e-mail address: "
+
+#: src/addressbook/libedata-book/e-data-book-cursor.c:771
 msgid "Cursor does not support setting the search expression"
 msgstr "Cursor does not support setting the search expression"
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:858
+#: src/addressbook/libedata-book/e-data-book-cursor.c:858
 msgid "Cursor does not support step"
 msgstr "Cursor does not support step"
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:934
+#: src/addressbook/libedata-book/e-data-book-cursor.c:934
 msgid "Cursor does not support alphabetic indexes"
 msgstr "Cursor does not support alphabetic indexes"
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:92
-#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:260
+#: src/addressbook/libedata-book/e-data-book-cursor-cache.c:92
+#: src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:260
 msgid "Unrecognized cursor origin"
 msgstr "Unrecognised cursor origin"
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:151
-#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:328
+#: src/addressbook/libedata-book/e-data-book-cursor-cache.c:151
+#: src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:328
 msgid "Out of sync revision while moving cursor"
 msgstr "Out of sync revision while moving cursor"
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:222
-#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:422
+#: src/addressbook/libedata-book/e-data-book-cursor-cache.c:222
+#: src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:422
 msgid "Alphabetic index was set for incorrect locale"
 msgstr "Alphabetic index was set for incorrect locale"
 
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:218
+#: src/calendar/backends/caldav/e-cal-backend-caldav.c:221
 #, c-format
 msgid "Given URL “%s” doesn’t reference CalDAV calendar"
 msgstr "Given URL “%s” doesn’t reference CalDAV calendar"
 
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1513
-#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:1164
+#: src/calendar/backends/caldav/e-cal-backend-caldav.c:1477
+#: src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:1189
 msgid ""
 "Missing information about component URL, local cache is possibly incomplete "
 "or broken. Remove it, please."
@@ -1297,356 +1312,356 @@ msgstr ""
 "Missing information about component URL, local cache is possibly incomplete "
 "or broken. Remove it, please."
 
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:2025
+#: src/calendar/backends/caldav/e-cal-backend-caldav.c:1989
 msgid "Failed to parse response data"
 msgstr "Failed to parse response data"
 
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:959
+#: src/calendar/backends/contacts/e-cal-backend-contacts.c:959
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:995
+#: src/calendar/backends/contacts/e-cal-backend-contacts.c:995
 #, c-format
 msgid "Birthday: %s"
 msgstr "Birthday: %s"
 
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1026
+#: src/calendar/backends/contacts/e-cal-backend-contacts.c:1026
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Anniversary: %s"
 
-#: ../src/calendar/backends/file/e-cal-backend-file.c:43
+#: src/calendar/backends/file/e-cal-backend-file.c:43
 msgid "Cannot get URI"
 msgstr "Cannot get URI"
 
-#: ../src/calendar/backends/file/e-cal-backend-file.c:243
+#: src/calendar/backends/file/e-cal-backend-file.c:243
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Cannot save calendar data: Malformed URI."
 
-#: ../src/calendar/backends/file/e-cal-backend-file.c:250
-#: ../src/calendar/backends/file/e-cal-backend-file.c:256
+#: 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"
 
-#: ../src/calendar/backends/file/e-cal-backend-file.c:1185
-#: ../src/calendar/backends/file/e-cal-backend-file.c:1314
+#: src/calendar/backends/file/e-cal-backend-file.c:1187
+#: src/calendar/backends/file/e-cal-backend-file.c:1316
 #, c-format
 msgid "Cannot parse ISC file “%s”"
 msgstr "Cannot parse ISC file “%s”"
 
-#: ../src/calendar/backends/file/e-cal-backend-file.c:1196
-#: ../src/calendar/backends/file/e-cal-backend-file.c:1325
+#: src/calendar/backends/file/e-cal-backend-file.c:1198
+#: src/calendar/backends/file/e-cal-backend-file.c:1327
 #, c-format
 msgid "File “%s” is not a VCALENDAR component"
 msgstr "File “%s” is not a VCALENDAR component"
 
 #. FIXME This should be doable once all the recurid stuff is done
-#: ../src/calendar/backends/file/e-cal-backend-file.c:3740
-#: ../src/calendar/backends/file/e-cal-backend-file.c:3746
-#: ../src/calendar/backends/file/e-cal-backend-file.c:3752
-#: ../src/calendar/backends/file/e-cal-backend-file.c:3779
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:2559
+#: src/calendar/backends/file/e-cal-backend-file.c:3742
+#: src/calendar/backends/file/e-cal-backend-file.c:3748
+#: src/calendar/backends/file/e-cal-backend-file.c:3754
+#: src/calendar/backends/file/e-cal-backend-file.c:3781
+#: src/calendar/libedata-cal/e-cal-meta-backend.c:2596
 msgid "Unsupported method"
 msgstr "Unsupported method"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:227
+#: src/calendar/backends/http/e-cal-backend-http.c:221
 msgid "URI not set"
 msgstr "URI not set"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:312
+#: src/calendar/backends/http/e-cal-backend-http.c:299
 #, c-format
 msgid "Malformed URI “%s”: %s"
 msgstr "Malformed URI “%s”: %s"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:460
+#: src/calendar/backends/http/e-cal-backend-http.c:433
 #, c-format
 msgid "Bad file format."
 msgstr "Bad file format."
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:469
+#: src/calendar/backends/http/e-cal-backend-http.c:442
 #, c-format
 msgid "Not a calendar."
 msgstr "Not a calendar."
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:214
+#: src/calendar/backends/weather/e-cal-backend-weather.c:214
 msgid "Could not retrieve weather data"
 msgstr "Could not retrieve weather data"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:358
+#: src/calendar/backends/weather/e-cal-backend-weather.c:358
 msgid "Weather: Fog"
 msgstr "Weather: Fog"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:359
+#: src/calendar/backends/weather/e-cal-backend-weather.c:359
 msgid "Weather: Cloudy Night"
 msgstr "Weather: Cloudy Night"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:360
+#: src/calendar/backends/weather/e-cal-backend-weather.c:360
 msgid "Weather: Cloudy"
 msgstr "Weather: Cloudy"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:361
+#: src/calendar/backends/weather/e-cal-backend-weather.c:361
 msgid "Weather: Overcast"
 msgstr "Weather: Overcast"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:362
+#: src/calendar/backends/weather/e-cal-backend-weather.c:362
 msgid "Weather: Showers"
 msgstr "Weather: Showers"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:363
+#: src/calendar/backends/weather/e-cal-backend-weather.c:363
 msgid "Weather: Snow"
 msgstr "Weather: Snow"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:364
+#: src/calendar/backends/weather/e-cal-backend-weather.c:364
 msgid "Weather: Clear Night"
 msgstr "Weather: Clear Night"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:365
+#: src/calendar/backends/weather/e-cal-backend-weather.c:365
 msgid "Weather: Sunny"
 msgstr "Weather: Sunny"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:366
+#: src/calendar/backends/weather/e-cal-backend-weather.c:366
 msgid "Weather: Thunderstorms"
 msgstr "Weather: Thunderstorms"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:392
+#: src/calendar/backends/weather/e-cal-backend-weather.c:392
 #, c-format
 msgid "%.1f °F"
 msgstr "%.1f °F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:395
+#: src/calendar/backends/weather/e-cal-backend-weather.c:395
 #, c-format
 msgid "%.1f °C"
 msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:398
+#: src/calendar/backends/weather/e-cal-backend-weather.c:398
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:404
+#: src/calendar/backends/weather/e-cal-backend-weather.c:404
 #, c-format
 msgid "%.1f"
 msgstr "%.1f"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:567
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:595
+#: src/calendar/backends/weather/e-cal-backend-weather.c:567
+#: src/calendar/backends/weather/e-cal-backend-weather.c:595
 msgid "Forecast"
 msgstr "Forecast"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:691
+#: src/calendar/backends/weather/e-cal-backend-weather.c:691
 msgid "Could not create cache file"
 msgstr "Could not create cache file"
 
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:693
+#: src/calendar/backends/weather/e-cal-backend-weather.c:693
 msgid "Could not create cache file: "
 msgstr "Could not create cache file: "
 
-#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:973
-#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:1002
+#: src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:977
+#: src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:1006
 msgid "New note"
 msgstr "New note"
 
-#: ../src/calendar/libecal/e-cal-client.c:244
+#: src/calendar/libecal/e-cal-client.c:244
 msgid "No such calendar"
 msgstr "No such calendar"
 
-#: ../src/calendar/libecal/e-cal-client.c:246
+#: src/calendar/libecal/e-cal-client.c:246
 msgid "Object not found"
 msgstr "Object not found"
 
-#: ../src/calendar/libecal/e-cal-client.c:248
+#: src/calendar/libecal/e-cal-client.c:248
 msgid "Invalid object"
 msgstr "Invalid object"
 
-#: ../src/calendar/libecal/e-cal-client.c:250
+#: src/calendar/libecal/e-cal-client.c:250
 msgid "Unknown user"
 msgstr "Unknown user"
 
-#: ../src/calendar/libecal/e-cal-client.c:252
+#: src/calendar/libecal/e-cal-client.c:252
 msgid "Object ID already exists"
 msgstr "Object ID already exists"
 
-#: ../src/calendar/libecal/e-cal-client.c:254
+#: src/calendar/libecal/e-cal-client.c:254
 msgid "Invalid range"
 msgstr "Invalid range"
 
-#: ../src/calendar/libecal/e-cal-client.c:1073
+#: src/calendar/libecal/e-cal-client.c:1073
 #, c-format
 msgid "Unknown calendar property “%s”"
 msgstr "Unknown calendar property “%s”"
 
-#: ../src/calendar/libecal/e-cal-client.c:1088
+#: src/calendar/libecal/e-cal-client.c:1088
 #, c-format
 msgid "Cannot change value of calendar property “%s”"
 msgstr "Cannot change value of calendar property “%s”"
 
-#: ../src/calendar/libecal/e-cal-component.c:716
+#: src/calendar/libecal/e-cal-component.c:702
 msgid "Untitled appointment"
 msgstr "Untitled appointment"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4889
+#: src/calendar/libecal/e-cal-recur.c:4892
 msgid "1st"
 msgstr "1st"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4890
+#: src/calendar/libecal/e-cal-recur.c:4893
 msgid "2nd"
 msgstr "2nd"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4891
+#: src/calendar/libecal/e-cal-recur.c:4894
 msgid "3rd"
 msgstr "3rd"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4892
+#: src/calendar/libecal/e-cal-recur.c:4895
 msgid "4th"
 msgstr "4th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4893
+#: src/calendar/libecal/e-cal-recur.c:4896
 msgid "5th"
 msgstr "5th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4894
+#: src/calendar/libecal/e-cal-recur.c:4897
 msgid "6th"
 msgstr "6th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4895
+#: src/calendar/libecal/e-cal-recur.c:4898
 msgid "7th"
 msgstr "7th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4896
+#: src/calendar/libecal/e-cal-recur.c:4899
 msgid "8th"
 msgstr "8th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4897
+#: src/calendar/libecal/e-cal-recur.c:4900
 msgid "9th"
 msgstr "9th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4898
+#: src/calendar/libecal/e-cal-recur.c:4901
 msgid "10th"
 msgstr "10th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4899
+#: src/calendar/libecal/e-cal-recur.c:4902
 msgid "11th"
 msgstr "11th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4900
+#: src/calendar/libecal/e-cal-recur.c:4903
 msgid "12th"
 msgstr "12th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4901
+#: src/calendar/libecal/e-cal-recur.c:4904
 msgid "13th"
 msgstr "13th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4902
+#: src/calendar/libecal/e-cal-recur.c:4905
 msgid "14th"
 msgstr "14th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4903
+#: src/calendar/libecal/e-cal-recur.c:4906
 msgid "15th"
 msgstr "15th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4904
+#: src/calendar/libecal/e-cal-recur.c:4907
 msgid "16th"
 msgstr "16th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4905
+#: src/calendar/libecal/e-cal-recur.c:4908
 msgid "17th"
 msgstr "17th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4906
+#: src/calendar/libecal/e-cal-recur.c:4909
 msgid "18th"
 msgstr "18th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4907
+#: src/calendar/libecal/e-cal-recur.c:4910
 msgid "19th"
 msgstr "19th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4908
+#: src/calendar/libecal/e-cal-recur.c:4911
 msgid "20th"
 msgstr "20th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4909
+#: src/calendar/libecal/e-cal-recur.c:4912
 msgid "21st"
 msgstr "21st"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4910
+#: src/calendar/libecal/e-cal-recur.c:4913
 msgid "22nd"
 msgstr "22nd"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4911
+#: src/calendar/libecal/e-cal-recur.c:4914
 msgid "23rd"
 msgstr "23rd"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4912
+#: src/calendar/libecal/e-cal-recur.c:4915
 msgid "24th"
 msgstr "24th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4913
+#: src/calendar/libecal/e-cal-recur.c:4916
 msgid "25th"
 msgstr "25th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4914
+#: src/calendar/libecal/e-cal-recur.c:4917
 msgid "26th"
 msgstr "26th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4915
+#: src/calendar/libecal/e-cal-recur.c:4918
 msgid "27th"
 msgstr "27th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4916
+#: src/calendar/libecal/e-cal-recur.c:4919
 msgid "28th"
 msgstr "28th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4917
+#: src/calendar/libecal/e-cal-recur.c:4920
 msgid "29th"
 msgstr "29th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4918
+#: src/calendar/libecal/e-cal-recur.c:4921
 msgid "30th"
 msgstr "30th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4919
+#: src/calendar/libecal/e-cal-recur.c:4922
 msgid "31st"
 msgstr "31st"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5069
+#: src/calendar/libecal/e-cal-recur.c:5072
 #, c-format
 msgid "every day forever"
 msgid_plural "every %d days forever"
 msgstr[0] "every day forever"
 msgstr[1] "every %d days forever"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5075
+#: src/calendar/libecal/e-cal-recur.c:5078
 #, c-format
 msgid "Every day forever"
 msgid_plural "Every %d days forever"
 msgstr[0] "Every day forever"
 msgstr[1] "Every %d days forever"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5083
+#: src/calendar/libecal/e-cal-recur.c:5086
 #, c-format
 msgid "every day"
 msgid_plural "every %d days"
 msgstr[0] "every day"
 msgstr[1] "every %d days"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5089
+#: src/calendar/libecal/e-cal-recur.c:5092
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every %d days"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5175
+#: src/calendar/libecal/e-cal-recur.c:5178
 #, c-format
 msgid "every week"
 msgid_plural "every %d weeks"
 msgstr[0] "every week"
 msgstr[1] "every %d weeks"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5181
+#: src/calendar/libecal/e-cal-recur.c:5184
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -1658,556 +1673,556 @@ msgstr[1] "Every %d weeks"
 #. with ", DAYNAME" or " and DAYNAME", thus it can be something like "on Monday and Tuesday"
 #. or "on Monday, Wednesday and Friday" or simply "on Saturday". The '%1$s' is replaced with
 #. the previously gathered text, while the '%2$s' is replaced with the text to append.
-#: ../src/calendar/libecal/e-cal-recur.c:5195
+#: src/calendar/libecal/e-cal-recur.c:5198
 #, c-format
 msgctxt "recur-description-dayname"
 msgid "%1$s%2$s"
 msgstr "%1$s%2$s"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5212
+#: src/calendar/libecal/e-cal-recur.c:5215
 msgctxt "recur-description"
 msgid "on Sunday"
 msgstr "on Sunday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5213
+#: src/calendar/libecal/e-cal-recur.c:5216
 msgctxt "recur-description"
 msgid ", Sunday"
 msgstr ", Sunday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5214
+#: src/calendar/libecal/e-cal-recur.c:5217
 msgctxt "recur-description"
 msgid " and Sunday"
 msgstr " and Sunday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5217
+#: src/calendar/libecal/e-cal-recur.c:5220
 msgctxt "recur-description"
 msgid "on Monday"
 msgstr "on Monday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5218
+#: src/calendar/libecal/e-cal-recur.c:5221
 msgctxt "recur-description"
 msgid ", Monday"
 msgstr ", Monday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5219
+#: src/calendar/libecal/e-cal-recur.c:5222
 msgctxt "recur-description"
 msgid " and Monday"
 msgstr " and Monday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5222
+#: src/calendar/libecal/e-cal-recur.c:5225
 msgctxt "recur-description"
 msgid "on Tuesday"
 msgstr "on Tuesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5223
+#: src/calendar/libecal/e-cal-recur.c:5226
 msgctxt "recur-description"
 msgid ", Tuesday"
 msgstr ", Tuesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5224
+#: src/calendar/libecal/e-cal-recur.c:5227
 msgctxt "recur-description"
 msgid " and Tuesday"
 msgstr " and Tuesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5227
+#: src/calendar/libecal/e-cal-recur.c:5230
 msgctxt "recur-description"
 msgid "on Wednesday"
 msgstr "on Wednesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5228
+#: src/calendar/libecal/e-cal-recur.c:5231
 msgctxt "recur-description"
 msgid ", Wednesday"
 msgstr ", Wednesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5229
+#: src/calendar/libecal/e-cal-recur.c:5232
 msgctxt "recur-description"
 msgid " and Wednesday"
 msgstr " and Wednesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5232
+#: src/calendar/libecal/e-cal-recur.c:5235
 msgctxt "recur-description"
 msgid "on Thursday"
 msgstr "on Thursday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5233
+#: src/calendar/libecal/e-cal-recur.c:5236
 msgctxt "recur-description"
 msgid ", Thursday"
 msgstr ", Thursday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5234
+#: src/calendar/libecal/e-cal-recur.c:5237
 msgctxt "recur-description"
 msgid " and Thursday"
 msgstr " and Thursday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5237
+#: src/calendar/libecal/e-cal-recur.c:5240
 msgctxt "recur-description"
 msgid "on Friday"
 msgstr "on Friday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5238
+#: src/calendar/libecal/e-cal-recur.c:5241
 msgctxt "recur-description"
 msgid ", Friday"
 msgstr ", Friday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5239
+#: src/calendar/libecal/e-cal-recur.c:5242
 msgctxt "recur-description"
 msgid " and Friday"
 msgstr " and Friday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5242
+#: src/calendar/libecal/e-cal-recur.c:5245
 msgctxt "recur-description"
 msgid "on Saturday"
 msgstr "on Saturday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5243
+#: src/calendar/libecal/e-cal-recur.c:5246
 msgctxt "recur-description"
 msgid ", Saturday"
 msgstr ", Saturday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5244
+#: src/calendar/libecal/e-cal-recur.c:5247
 msgctxt "recur-description"
 msgid " and Saturday"
 msgstr " and Saturday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5373
+#: src/calendar/libecal/e-cal-recur.c:5376
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every %d months"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5379
+#: src/calendar/libecal/e-cal-recur.c:5382
 #, c-format
 msgid "Every month"
 msgid_plural "Every %d months"
 msgstr[0] "Every month"
 msgstr[1] "Every %d months"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5389
-#: ../src/calendar/libecal/e-cal-recur.c:5710
+#: src/calendar/libecal/e-cal-recur.c:5392
+#: src/calendar/libecal/e-cal-recur.c:5713
 msgctxt "recur-description"
 msgid "on the last Sunday"
 msgstr "on the last Sunday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5392
-#: ../src/calendar/libecal/e-cal-recur.c:5560
+#: src/calendar/libecal/e-cal-recur.c:5395
+#: src/calendar/libecal/e-cal-recur.c:5563
 msgctxt "recur-description"
 msgid "on the last Monday"
 msgstr "on the last Monday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5395
-#: ../src/calendar/libecal/e-cal-recur.c:5585
+#: src/calendar/libecal/e-cal-recur.c:5398
+#: src/calendar/libecal/e-cal-recur.c:5588
 msgctxt "recur-description"
 msgid "on the last Tuesday"
 msgstr "on the last Tuesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5398
-#: ../src/calendar/libecal/e-cal-recur.c:5610
+#: src/calendar/libecal/e-cal-recur.c:5401
+#: src/calendar/libecal/e-cal-recur.c:5613
 msgctxt "recur-description"
 msgid "on the last Wednesday"
 msgstr "on the last Wednesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5401
-#: ../src/calendar/libecal/e-cal-recur.c:5635
+#: src/calendar/libecal/e-cal-recur.c:5404
+#: src/calendar/libecal/e-cal-recur.c:5638
 msgctxt "recur-description"
 msgid "on the last Thursday"
 msgstr "on the last Thursday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5404
-#: ../src/calendar/libecal/e-cal-recur.c:5660
+#: src/calendar/libecal/e-cal-recur.c:5407
+#: src/calendar/libecal/e-cal-recur.c:5663
 msgctxt "recur-description"
 msgid "on the last Friday"
 msgstr "on the last Friday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5407
-#: ../src/calendar/libecal/e-cal-recur.c:5685
+#: src/calendar/libecal/e-cal-recur.c:5410
+#: src/calendar/libecal/e-cal-recur.c:5688
 msgctxt "recur-description"
 msgid "on the last Saturday"
 msgstr "on the last Saturday"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5417
+#: src/calendar/libecal/e-cal-recur.c:5420
 msgctxt "recur-description"
 msgid "on the 1st day"
 msgstr "on the 1st day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5421
+#: src/calendar/libecal/e-cal-recur.c:5424
 msgctxt "recur-description"
 msgid "on the 2nd day"
 msgstr "on the 2nd day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5425
+#: src/calendar/libecal/e-cal-recur.c:5428
 msgctxt "recur-description"
 msgid "on the 3rd day"
 msgstr "on the 3rd day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5429
+#: src/calendar/libecal/e-cal-recur.c:5432
 msgctxt "recur-description"
 msgid "on the 4th day"
 msgstr "on the 4th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5433
+#: src/calendar/libecal/e-cal-recur.c:5436
 msgctxt "recur-description"
 msgid "on the 5th day"
 msgstr "on the 5th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5437
+#: src/calendar/libecal/e-cal-recur.c:5440
 msgctxt "recur-description"
 msgid "on the 6th day"
 msgstr "on the 6th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5441
+#: src/calendar/libecal/e-cal-recur.c:5444
 msgctxt "recur-description"
 msgid "on the 7th day"
 msgstr "on the 7th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5445
+#: src/calendar/libecal/e-cal-recur.c:5448
 msgctxt "recur-description"
 msgid "on the 8th day"
 msgstr "on the 8th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5449
+#: src/calendar/libecal/e-cal-recur.c:5452
 msgctxt "recur-description"
 msgid "on the 9th day"
 msgstr "on the 9th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5453
+#: src/calendar/libecal/e-cal-recur.c:5456
 msgctxt "recur-description"
 msgid "on the 10th day"
 msgstr "on the 10th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5457
+#: src/calendar/libecal/e-cal-recur.c:5460
 msgctxt "recur-description"
 msgid "on the 11th day"
 msgstr "on the 11th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5461
+#: src/calendar/libecal/e-cal-recur.c:5464
 msgctxt "recur-description"
 msgid "on the 12th day"
 msgstr "on the 12th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5465
+#: src/calendar/libecal/e-cal-recur.c:5468
 msgctxt "recur-description"
 msgid "on the 13th day"
 msgstr "on the 13th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5469
+#: src/calendar/libecal/e-cal-recur.c:5472
 msgctxt "recur-description"
 msgid "on the 14th day"
 msgstr "on the 14th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5473
+#: src/calendar/libecal/e-cal-recur.c:5476
 msgctxt "recur-description"
 msgid "on the 15th day"
 msgstr "on the 15th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5477
+#: src/calendar/libecal/e-cal-recur.c:5480
 msgctxt "recur-description"
 msgid "on the 16th day"
 msgstr "on the 16th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5481
+#: src/calendar/libecal/e-cal-recur.c:5484
 msgctxt "recur-description"
 msgid "on the 17th day"
 msgstr "on the 17th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5485
+#: src/calendar/libecal/e-cal-recur.c:5488
 msgctxt "recur-description"
 msgid "on the 18th day"
 msgstr "on the 18th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5489
+#: src/calendar/libecal/e-cal-recur.c:5492
 msgctxt "recur-description"
 msgid "on the 19th day"
 msgstr "on the 19th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5493
+#: src/calendar/libecal/e-cal-recur.c:5496
 msgctxt "recur-description"
 msgid "on the 20th day"
 msgstr "on the 20th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5497
+#: src/calendar/libecal/e-cal-recur.c:5500
 msgctxt "recur-description"
 msgid "on the 21st day"
 msgstr "on the 21st day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5501
+#: src/calendar/libecal/e-cal-recur.c:5504
 msgctxt "recur-description"
 msgid "on the 22nd day"
 msgstr "on the 22nd day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5505
+#: src/calendar/libecal/e-cal-recur.c:5508
 msgctxt "recur-description"
 msgid "on the 23rd day"
 msgstr "on the 23rd day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5509
+#: src/calendar/libecal/e-cal-recur.c:5512
 msgctxt "recur-description"
 msgid "on the 24th day"
 msgstr "on the 24th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5513
+#: src/calendar/libecal/e-cal-recur.c:5516
 msgctxt "recur-description"
 msgid "on the 25th day"
 msgstr "on the 25th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5517
+#: src/calendar/libecal/e-cal-recur.c:5520
 msgctxt "recur-description"
 msgid "on the 26th day"
 msgstr "on the 26th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5521
+#: src/calendar/libecal/e-cal-recur.c:5524
 msgctxt "recur-description"
 msgid "on the 27th day"
 msgstr "on the 27th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5525
+#: src/calendar/libecal/e-cal-recur.c:5528
 msgctxt "recur-description"
 msgid "on the 28th day"
 msgstr "on the 28th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5529
+#: src/calendar/libecal/e-cal-recur.c:5532
 msgctxt "recur-description"
 msgid "on the 29th day"
 msgstr "on the 29th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5533
+#: src/calendar/libecal/e-cal-recur.c:5536
 msgctxt "recur-description"
 msgid "on the 30th day"
 msgstr "on the 30th day"
 
 #. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
-#: ../src/calendar/libecal/e-cal-recur.c:5537
+#: src/calendar/libecal/e-cal-recur.c:5540
 msgctxt "recur-description"
 msgid "on the 31st day"
 msgstr "on the 31st day"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5545
+#: src/calendar/libecal/e-cal-recur.c:5548
 msgctxt "recur-description"
 msgid "on the first Monday"
 msgstr "on the first Monday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5548
+#: src/calendar/libecal/e-cal-recur.c:5551
 msgctxt "recur-description"
 msgid "on the second Monday"
 msgstr "on the second Monday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5551
+#: src/calendar/libecal/e-cal-recur.c:5554
 msgctxt "recur-description"
 msgid "on the third Monday"
 msgstr "on the third Monday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5554
+#: src/calendar/libecal/e-cal-recur.c:5557
 msgctxt "recur-description"
 msgid "on the fourth Monday"
 msgstr "on the fourth Monday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5557
+#: src/calendar/libecal/e-cal-recur.c:5560
 msgctxt "recur-description"
 msgid "on the fifth Monday"
 msgstr "on the fifth Monday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5570
+#: src/calendar/libecal/e-cal-recur.c:5573
 msgctxt "recur-description"
 msgid "on the first Tuesday"
 msgstr "on the first Tuesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5573
+#: src/calendar/libecal/e-cal-recur.c:5576
 msgctxt "recur-description"
 msgid "on the second Tuesday"
 msgstr "on the second Tuesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5576
+#: src/calendar/libecal/e-cal-recur.c:5579
 msgctxt "recur-description"
 msgid "on the third Tuesday"
 msgstr "on the third Tuesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5579
+#: src/calendar/libecal/e-cal-recur.c:5582
 msgctxt "recur-description"
 msgid "on the fourth Tuesday"
 msgstr "on the fourth Tuesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5582
+#: src/calendar/libecal/e-cal-recur.c:5585
 msgctxt "recur-description"
 msgid "on the fifth Tuesday"
 msgstr "on the fifth Tuesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5595
+#: src/calendar/libecal/e-cal-recur.c:5598
 msgctxt "recur-description"
 msgid "on the first Wednesday"
 msgstr "on the first Wednesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5598
+#: src/calendar/libecal/e-cal-recur.c:5601
 msgctxt "recur-description"
 msgid "on the second Wednesday"
 msgstr "on the second Wednesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5601
+#: src/calendar/libecal/e-cal-recur.c:5604
 msgctxt "recur-description"
 msgid "on the third Wednesday"
 msgstr "on the third Wednesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5604
+#: src/calendar/libecal/e-cal-recur.c:5607
 msgctxt "recur-description"
 msgid "on the fourth Wednesday"
 msgstr "on the fourth Wednesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5607
+#: src/calendar/libecal/e-cal-recur.c:5610
 msgctxt "recur-description"
 msgid "on the fifth Wednesday"
 msgstr "on the fifth Wednesday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5620
+#: src/calendar/libecal/e-cal-recur.c:5623
 msgctxt "recur-description"
 msgid "on the first Thursday"
 msgstr "on the first Thursday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5623
+#: src/calendar/libecal/e-cal-recur.c:5626
 msgctxt "recur-description"
 msgid "on the second Thursday"
 msgstr "on the second Thursday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5626
+#: src/calendar/libecal/e-cal-recur.c:5629
 msgctxt "recur-description"
 msgid "on the third Thursday"
 msgstr "on the third Thursday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5629
+#: src/calendar/libecal/e-cal-recur.c:5632
 msgctxt "recur-description"
 msgid "on the fourth Thursday"
 msgstr "on the fourth Thursday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5632
+#: src/calendar/libecal/e-cal-recur.c:5635
 msgctxt "recur-description"
 msgid "on the fifth Thursday"
 msgstr "on the fifth Thursday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5645
+#: src/calendar/libecal/e-cal-recur.c:5648
 msgctxt "recur-description"
 msgid "on the first Friday"
 msgstr "on the first Friday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5648
+#: src/calendar/libecal/e-cal-recur.c:5651
 msgctxt "recur-description"
 msgid "on the second Friday"
 msgstr "on the second Friday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5651
+#: src/calendar/libecal/e-cal-recur.c:5654
 msgctxt "recur-description"
 msgid "on the third Friday"
 msgstr "on the third Friday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5654
+#: src/calendar/libecal/e-cal-recur.c:5657
 msgctxt "recur-description"
 msgid "on the fourth Friday"
 msgstr "on the fourth Friday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5657
+#: src/calendar/libecal/e-cal-recur.c:5660
 msgctxt "recur-description"
 msgid "on the fifth Friday"
 msgstr "on the fifth Friday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5670
+#: src/calendar/libecal/e-cal-recur.c:5673
 msgctxt "recur-description"
 msgid "on the first Saturday"
 msgstr "on the first Saturday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5673
+#: src/calendar/libecal/e-cal-recur.c:5676
 msgctxt "recur-description"
 msgid "on the second Saturday"
 msgstr "on the second Saturday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5676
+#: src/calendar/libecal/e-cal-recur.c:5679
 msgctxt "recur-description"
 msgid "on the third Saturday"
 msgstr "on the third Saturday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5679
+#: src/calendar/libecal/e-cal-recur.c:5682
 msgctxt "recur-description"
 msgid "on the fourth Saturday"
 msgstr "on the fourth Saturday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5682
+#: src/calendar/libecal/e-cal-recur.c:5685
 msgctxt "recur-description"
 msgid "on the fifth Saturday"
 msgstr "on the fifth Saturday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5695
+#: src/calendar/libecal/e-cal-recur.c:5698
 msgctxt "recur-description"
 msgid "on the first Sunday"
 msgstr "on the first Sunday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5698
+#: src/calendar/libecal/e-cal-recur.c:5701
 msgctxt "recur-description"
 msgid "on the second Sunday"
 msgstr "on the second Sunday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5701
+#: src/calendar/libecal/e-cal-recur.c:5704
 msgctxt "recur-description"
 msgid "on the third Sunday"
 msgstr "on the third Sunday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5704
+#: src/calendar/libecal/e-cal-recur.c:5707
 msgctxt "recur-description"
 msgid "on the fourth Sunday"
 msgstr "on the fourth Sunday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5707
+#: src/calendar/libecal/e-cal-recur.c:5710
 msgctxt "recur-description"
 msgid "on the fifth Sunday"
 msgstr "on the fifth Sunday"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5736
+#: src/calendar/libecal/e-cal-recur.c:5739
 #, c-format
 msgid "every year forever"
 msgid_plural "every %d years forever"
 msgstr[0] "every year forever"
 msgstr[1] "every %d years forever"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5742
+#: src/calendar/libecal/e-cal-recur.c:5745
 #, c-format
 msgid "Every year forever"
 msgid_plural "Every %d years forever"
 msgstr[0] "Every year forever"
 msgstr[1] "Every %d years forever"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5750
+#: src/calendar/libecal/e-cal-recur.c:5753
 #, c-format
 msgid "every year"
 msgid_plural "every %d years"
 msgstr[0] "every year"
 msgstr[1] "every %d years"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5756
+#: src/calendar/libecal/e-cal-recur.c:5759
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -2217,7 +2232,7 @@ msgstr[1] "Every %d years"
 #. Translators: This is one of the last possible parts of a recurrence description.
 #. The text is appended at the end of the complete recurrence description, making it
 #. for example: "Every 3 days for 10 occurrences"
-#: ../src/calendar/libecal/e-cal-recur.c:5775
+#: src/calendar/libecal/e-cal-recur.c:5778
 #, c-format
 msgid "for one occurrence"
 msgid_plural "for %d occurrences"
@@ -2228,7 +2243,7 @@ msgstr[1] "for %d occurrences"
 #. The '%s' is replaced with actual date, thus it can create something like
 #. "until Mon 15.1.2018". The text is appended at the end of the complete
 #. recurrence description, making it for example: "Every 3 days until Mon 15.1.2018"
-#: ../src/calendar/libecal/e-cal-recur.c:5811
+#: src/calendar/libecal/e-cal-recur.c:5814
 #, c-format
 msgctxt "recur-description"
 msgid "until %s"
@@ -2237,7 +2252,7 @@ msgstr "until %s"
 #. Translators: This is one of the last possible parts of a recurrence description.
 #. The text is appended at the end of the complete recurrence description, making it
 #. for example: "Every 2 months on Tuesday, Thursday and Friday forever"
-#: ../src/calendar/libecal/e-cal-recur.c:5817
+#: src/calendar/libecal/e-cal-recur.c:5820
 msgctxt "recur-description"
 msgid "forever"
 msgstr "forever"
@@ -2245,7 +2260,7 @@ msgstr "forever"
 #. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 weeks",
 #. the '%2$s' is like "on Tuesday and Friday" and the '%3$s' is like "for 10 occurrences", constructing
 #. together one sentence: "Every 2 weeks on Tuesday and Friday for 10 occurrences".
-#: ../src/calendar/libecal/e-cal-recur.c:5827
+#: src/calendar/libecal/e-cal-recur.c:5830
 #, c-format
 msgctxt "recur-description"
 msgid "%1$s %2$s %3$s"
@@ -2254,7 +2269,7 @@ msgstr "%1$s %2$s %3$s"
 #. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 days",
 #. the '%2$s' is like "for 10 occurrences", constructing together one sentence:
 #. "Every 2 days for 10 occurrences".
-#: ../src/calendar/libecal/e-cal-recur.c:5832
+#: src/calendar/libecal/e-cal-recur.c:5835
 #, c-format
 msgctxt "recur-description"
 msgid "%1$s %2$s"
@@ -2262,7 +2277,7 @@ msgstr "%1$s %2$s"
 
 #. Translators: This text is appended at the end of complete recur description using "%s%s" in
 #. context "recur-description"
-#: ../src/calendar/libecal/e-cal-recur.c:5848
+#: src/calendar/libecal/e-cal-recur.c:5851
 #, c-format
 msgid ", with one exception"
 msgid_plural ", with %d exceptions"
@@ -2272,33 +2287,33 @@ msgstr[1] ", with %d exceptions"
 #. Translators: This appends text like ", with 3 exceptions" at the end of complete recurrence description.
 #. The "%1$s" is replaced with the recurrence description, the "%2$s" with the text about exceptions.
 #. It will form something like: "Every 2 weeks on Tuesday and Friday for 10 occurrences, with 3 exceptions"
-#: ../src/calendar/libecal/e-cal-recur.c:5855
+#: src/calendar/libecal/e-cal-recur.c:5858
 #, c-format
 msgctxt "recur-description"
 msgid "%1$s%2$s"
 msgstr "%1$s%2$s"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5868
-#: ../src/calendar/libecal/e-cal-recur.c:5891
+#: src/calendar/libecal/e-cal-recur.c:5871
+#: src/calendar/libecal/e-cal-recur.c:5894
 msgctxt "recur-description"
 msgid "The meeting recurs"
 msgstr "The meeting recurs"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5870
-#: ../src/calendar/libecal/e-cal-recur.c:5893
+#: src/calendar/libecal/e-cal-recur.c:5873
+#: src/calendar/libecal/e-cal-recur.c:5896
 msgctxt "recur-description"
 msgid "The appointment recurs"
 msgstr "The appointment recurs"
 
-#: ../src/calendar/libecal/e-cal-recur.c:5873
-#: ../src/calendar/libecal/e-cal-recur.c:5896
+#: src/calendar/libecal/e-cal-recur.c:5876
+#: src/calendar/libecal/e-cal-recur.c:5899
 msgctxt "recur-description"
 msgid "The task recurs"
 msgstr "The task recurs"
 
 #. if (i_cal_component_isa (comp) == I_CAL_VJOURNAL_COMPONENT)
-#: ../src/calendar/libecal/e-cal-recur.c:5875
-#: ../src/calendar/libecal/e-cal-recur.c:5898
+#: src/calendar/libecal/e-cal-recur.c:5878
+#: src/calendar/libecal/e-cal-recur.c:5901
 msgctxt "recur-description"
 msgid "The memo recurs"
 msgstr "The memo recurs"
@@ -2307,62 +2322,59 @@ msgstr "The memo recurs"
 #. The '%1$s' is replaced with something like "The meeting recurs" and
 #. the '%2$s' with something like "every 2 days forever", thus forming
 #. sentence like "This meeting recurs every 2 days forever"
-#: ../src/calendar/libecal/e-cal-recur.c:5882
+#: src/calendar/libecal/e-cal-recur.c:5885
 #, c-format
 msgctxt "recur-description-prefix"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: ../src/calendar/libecal/e-cal-util.c:837
-#: ../src/calendar/libecal/e-cal-util.c:864
+#: src/calendar/libecal/e-cal-util.c:837 src/calendar/libecal/e-cal-util.c:864
 msgctxt "Priority"
 msgid "High"
 msgstr "High"
 
-#: ../src/calendar/libecal/e-cal-util.c:839
-#: ../src/calendar/libecal/e-cal-util.c:866
+#: src/calendar/libecal/e-cal-util.c:839 src/calendar/libecal/e-cal-util.c:866
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/libecal/e-cal-util.c:841
-#: ../src/calendar/libecal/e-cal-util.c:868
+#: src/calendar/libecal/e-cal-util.c:841 src/calendar/libecal/e-cal-util.c:868
 msgctxt "Priority"
 msgid "Low"
 msgstr "Low"
 
 #. An empty string is the same as 'None'.
-#: ../src/calendar/libecal/e-cal-util.c:862
+#: src/calendar/libecal/e-cal-util.c:862
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../src/calendar/libecal/e-cal-util.c:904
-#: ../src/libedataserverui/e-reminders-widget.c:299
+#: src/calendar/libecal/e-cal-util.c:904
+#: src/libedataserverui/e-reminders-widget.c:337
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weeks"
 
-#: ../src/calendar/libecal/e-cal-util.c:913
-#: ../src/libedataserverui/e-reminders-widget.c:295
+#: src/calendar/libecal/e-cal-util.c:913
+#: src/libedataserverui/e-reminders-widget.c:333
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d day"
 msgstr[1] "%d days"
 
-#: ../src/calendar/libecal/e-cal-util.c:922
-#: ../src/libedataserverui/e-reminders-widget.c:291
+#: src/calendar/libecal/e-cal-util.c:922
+#: src/libedataserverui/e-reminders-widget.c:329
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../src/calendar/libecal/e-cal-util.c:931
-#: ../src/libedataserverui/e-reminders-widget.c:287
+#: src/calendar/libecal/e-cal-util.c:931
+#: src/libedataserverui/e-reminders-widget.c:325
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2370,21 +2382,21 @@ msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
 #. Translators: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../src/calendar/libecal/e-cal-util.c:936
+#: src/calendar/libecal/e-cal-util.c:936
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
-#: ../src/calendar/libecal/e-reminder-watcher.c:2824
+#: src/calendar/libecal/e-reminder-watcher.c:2902
 msgid "No Summary"
 msgstr "No Summary"
 
 #. Translators: The first %s is replaced with the time string,
 #. the second %s with a duration, and the third %s with an event location,
 #. making it something like: "24.1.2018 10:30 (30 minutes) Meeting room A1"
-#: ../src/calendar/libecal/e-reminder-watcher.c:2840
+#: src/calendar/libecal/e-reminder-watcher.c:2918
 #, c-format
 msgctxt "overdue"
 msgid "%s (%s) %s"
@@ -2393,7 +2405,7 @@ msgstr "%s (%s) %s"
 #. Translators: The first %s is replaced with the time string,
 #. the second %s with a duration, making is something like:
 #. "24.1.2018 10:30 (30 minutes)"
-#: ../src/calendar/libecal/e-reminder-watcher.c:2845
+#: src/calendar/libecal/e-reminder-watcher.c:2923
 #, c-format
 msgctxt "overdue"
 msgid "%s (%s)"
@@ -2402,94 +2414,94 @@ msgstr "%s (%s)"
 #. Translators: The first %s is replaced with the time string,
 #. the second %s with an event location, making it something like:
 #. "24.1.2018 10:30 Meeting room A1"
-#: ../src/calendar/libecal/e-reminder-watcher.c:2850
+#: src/calendar/libecal/e-reminder-watcher.c:2928
 #, c-format
 msgctxt "overdue"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:77
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1173
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1234
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1579
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1706
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1755
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1173
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1234
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1579
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1706
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1755
 #, c-format
 msgid "“%s” expects one argument"
 msgstr "“%s” expects one argument"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:84
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:707
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1586
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1594
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:84
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:707
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1586
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1594
 #, 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:164
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:164
 #, c-format
 msgid "“%s” expects two or three arguments"
 msgstr "“%s” expects two or three arguments"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:171
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:272
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:340
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:926
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1180
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1241
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1655
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1713
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1762
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:171
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:272
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:340
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:926
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1180
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1241
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1655
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1713
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1762
 #, c-format
 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:180
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:280
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:350
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:935
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:180
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:350
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:935
 #, c-format
 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:190
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
 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:264
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:264
 #, c-format
 msgid "“%s” expects none or two arguments"
 msgstr "“%s” expects none or two arguments"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:700
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:919
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1648
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:700
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:919
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1648
 #, c-format
 msgid "“%s” expects two arguments"
 msgstr "“%s” expects two arguments"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:639
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:662
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:790
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:812
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:834
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:857
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:883
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1092
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1125
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1540
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:639
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:662
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:790
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:812
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:834
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:857
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:883
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1092
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1125
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1540
 #, c-format
 msgid "“%s” expects no arguments"
 msgstr "“%s” expects no arguments"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:716
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:716
 #, 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-backend-sexp.c:747
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:747
 #, c-format
 msgid ""
 "“%s” expects the first argument to be either “any”, “summary”, or "
@@ -2500,12 +2512,12 @@ msgstr ""
 "“description”, or “location”, or “attendee”, or “organizer”, or "
 "“classification”"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:987
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:987
 #, c-format
 msgid "“%s” expects at least one argument"
 msgstr "“%s” expects at least one argument"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1002
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1002
 #, c-format
 msgid ""
 "“%s” expects all arguments to be strings or one and only one argument to be "
@@ -2514,168 +2526,167 @@ 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-backend-sexp.c:1603
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1603
 #, 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"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1664
+#: src/calendar/libedata-cal/e-cal-backend-sexp.c:1664
 #, c-format
 msgid "“%s” expects the second argument to be an integer"
 msgstr "“%s” expects the second argument to be an integer"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:1846
+#: src/calendar/libedata-cal/e-cal-cache.c:1836
 #, c-format
 msgid "Failed to create SQLite function, error code “%d”: %s"
 msgstr "Failed to create SQLite function, error code “%d”: %s"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2840
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2898
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2957
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3020
+#: src/calendar/libedata-cal/e-cal-cache.c:2830
+#: src/calendar/libedata-cal/e-cal-cache.c:2888
+#: src/calendar/libedata-cal/e-cal-cache.c:2947
+#: src/calendar/libedata-cal/e-cal-cache.c:3010
 #, c-format
 msgid "Object “%s”, “%s” not found"
 msgstr "Object “%s”, “%s” not found"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3799
+#: src/calendar/libedata-cal/e-cal-cache.c:3767
 msgid "Cannot add timezone without tzid"
 msgstr "Cannot add timezone without tzid"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3808
+#: src/calendar/libedata-cal/e-cal-cache.c:3776
 msgid "Cannot add timezone without component"
 msgstr "Cannot add timezone without component"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3816
+#: src/calendar/libedata-cal/e-cal-cache.c:3784
 msgid "Cannot add timezone with invalid component"
 msgstr "Cannot add timezone with invalid component"
 
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1153
+#: src/calendar/libedata-cal/e-cal-meta-backend.c:1184
 #, c-format
 msgid "Received object for UID “%s” doesn’t contain any expected component"
 msgstr "Received object for UID “%s” doesn’t contain any expected component"
 
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:4206
+#: src/calendar/libedata-cal/e-cal-meta-backend.c:4243
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1362
+#: src/calendar/libedata-cal/e-data-cal.c:1362
 msgid "Cannot open calendar: "
 msgstr "Cannot open calendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1400
+#: src/calendar/libedata-cal/e-data-cal.c:1400
 msgid "Cannot refresh calendar: "
 msgstr "Cannot refresh calendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1442
+#: src/calendar/libedata-cal/e-data-cal.c:1442
 msgid "Cannot retrieve calendar object path: "
 msgstr "Cannot retrieve calendar object path: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1495
+#: src/calendar/libedata-cal/e-data-cal.c:1495
 msgid "Cannot retrieve calendar object list: "
 msgstr "Cannot retrieve calendar object list: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1553
+#: src/calendar/libedata-cal/e-data-cal.c:1553
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Cannot retrieve calendar free/busy list: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1604
+#: src/calendar/libedata-cal/e-data-cal.c:1604
 msgid "Cannot create calendar object: "
 msgstr "Cannot create calendar object: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1673
+#: src/calendar/libedata-cal/e-data-cal.c:1673
 msgid "Cannot modify calendar object: "
 msgstr "Cannot modify calendar object: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1752
+#: src/calendar/libedata-cal/e-data-cal.c:1752
 msgid "Cannot remove calendar object: "
 msgstr "Cannot remove calendar object: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1839
+#: src/calendar/libedata-cal/e-data-cal.c:1839
 msgid "Cannot receive calendar objects: "
 msgstr "Cannot receive calendar objects: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1883
+#: src/calendar/libedata-cal/e-data-cal.c:1883
 msgid "Cannot send calendar objects: "
 msgstr "Cannot send calendar objects: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1936
+#: src/calendar/libedata-cal/e-data-cal.c:1936
 msgid "Could not retrieve attachment uris: "
 msgstr "Could not retrieve attachment uris: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1982
+#: src/calendar/libedata-cal/e-data-cal.c:1982
 msgid "Could not discard reminder: "
 msgstr "Could not discard reminder: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2024
+#: src/calendar/libedata-cal/e-data-cal.c:2024
 msgid "Could not retrieve calendar time zone: "
 msgstr "Could not retrieve calendar time zone: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2065
+#: src/calendar/libedata-cal/e-data-cal.c:2065
 msgid "Could not add calendar time zone: "
 msgstr "Could not add calendar time zone: "
 
-#: ../src/camel/camel-cipher-context.c:194
+#: src/camel/camel-cipher-context.c:194
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Signing is not supported by this cypher"
 
-#: ../src/camel/camel-cipher-context.c:207
+#: src/camel/camel-cipher-context.c:207
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifying is not supported by this cypher"
 
-#: ../src/camel/camel-cipher-context.c:223
+#: src/camel/camel-cipher-context.c:223
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Encryption is not supported by this cypher"
 
-#: ../src/camel/camel-cipher-context.c:237
+#: src/camel/camel-cipher-context.c:237
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Decryption is not supported by this cypher"
 
-#: ../src/camel/camel-cipher-context.c:352
+#: src/camel/camel-cipher-context.c:352
 msgid "Signing message"
 msgstr "Signing message"
 
-#: ../src/camel/camel-cipher-context.c:644
+#: src/camel/camel-cipher-context.c:644
 msgid "Encrypting message"
 msgstr "Encrypting message"
 
-#: ../src/camel/camel-cipher-context.c:817
+#: src/camel/camel-cipher-context.c:817
 msgid "Decrypting message"
 msgstr "Decrypting message"
 
-#: ../src/camel/camel-data-cache.c:199
+#: src/camel/camel-data-cache.c:199
 #, c-format
 msgid "Unable to create cache path"
 msgstr "Unable to create cache path"
 
-#: ../src/camel/camel-data-cache.c:528
+#: src/camel/camel-data-cache.c:528
 msgid "Empty cache file"
 msgstr "Empty cache file"
 
-#: ../src/camel/camel-data-cache.c:605
+#: src/camel/camel-data-cache.c:605
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Could not remove cache entry: %s: %s"
 
-#: ../src/camel/camel-db.c:870
-#: ../src/camel/providers/local/camel-mbox-store.c:913
+#: src/camel/camel-db.c:884 src/camel/providers/local/camel-mbox-store.c:913
 #, c-format
 msgid "Could not rename “%s” to %s: %s"
 msgstr "Could not rename “%s” to %s: %s"
@@ -2683,118 +2694,110 @@ msgstr "Could not rename “%s” to %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-filter-driver.c:264
+#: src/camel/camel-filter-driver.c:264
 #, c-format
 msgid "Transferring filtered messages in “%s : %s”"
 msgstr "Transferring filtered messages in “%s : %s”"
 
-#: ../src/camel/camel-filter-driver.c:1125
-#: ../src/camel/camel-filter-search.c:934
+#: src/camel/camel-filter-driver.c:1126 src/camel/camel-filter-search.c:936
 #, c-format
 msgid "Failed to create child process “%s”: %s"
 msgstr "Failed to create child process “%s”: %s"
 
-#: ../src/camel/camel-filter-driver.c:1173
+#: src/camel/camel-filter-driver.c:1180
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Invalid message stream received from %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1397
-#: ../src/camel/camel-filter-driver.c:1410
+#: src/camel/camel-filter-driver.c:1404 src/camel/camel-filter-driver.c:1417
 msgid "Syncing folders"
 msgstr "Syncing folders"
 
-#: ../src/camel/camel-filter-driver.c:1518
+#: src/camel/camel-filter-driver.c:1525
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parsing filter: %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1529
+#: src/camel/camel-filter-driver.c:1536
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error executing filter: %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1627
+#: src/camel/camel-filter-driver.c:1634
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Unable to open spool folder"
 
-#: ../src/camel/camel-filter-driver.c:1639
+#: src/camel/camel-filter-driver.c:1646
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Unable to process spool folder"
 
-#: ../src/camel/camel-filter-driver.c:1667
+#: src/camel/camel-filter-driver.c:1674
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Getting message %d (%d%%)"
 
-#: ../src/camel/camel-filter-driver.c:1676
-#: ../src/camel/camel-filter-driver.c:1699
+#: src/camel/camel-filter-driver.c:1683 src/camel/camel-filter-driver.c:1706
 #, c-format
 msgid "Failed on message %d"
 msgstr "Failed on message %d"
 
-#: ../src/camel/camel-filter-driver.c:1717
-#: ../src/camel/camel-filter-driver.c:1846
+#: src/camel/camel-filter-driver.c:1724 src/camel/camel-filter-driver.c:1853
 #, c-format
 msgid "Failed to transfer messages: %s"
 msgstr "Failed to transfer messages: %s"
 
-#: ../src/camel/camel-filter-driver.c:1727
-#: ../src/camel/camel-filter-driver.c:1860
+#: src/camel/camel-filter-driver.c:1734 src/camel/camel-filter-driver.c:1876
 msgid "Syncing folder"
 msgstr "Syncing folder"
 
-#: ../src/camel/camel-filter-driver.c:1732
-#: ../src/camel/camel-filter-driver.c:1868
+#: src/camel/camel-filter-driver.c:1739 src/camel/camel-filter-driver.c:1884
 msgid "Complete"
 msgstr "Complete"
 
-#: ../src/camel/camel-filter-driver.c:1800
+#: src/camel/camel-filter-driver.c:1807
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Getting message %d of %d"
 
-#: ../src/camel/camel-filter-driver.c:1818
+#: src/camel/camel-filter-driver.c:1825
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Failed at message %d of %d"
 
-#: ../src/camel/camel-filter-driver.c:2025
-#: ../src/camel/camel-filter-driver.c:2049
+#: src/camel/camel-filter-driver.c:2040 src/camel/camel-filter-driver.c:2064
 #, c-format
 msgid "Execution of filter “%s” failed: "
 msgstr "Execution of filter “%s” failed: "
 
-#: ../src/camel/camel-filter-driver.c:2039
+#: src/camel/camel-filter-driver.c:2054
 #, c-format
 msgid "Error parsing filter “%s”: %s: %s"
 msgstr "Error parsing filter “%s”: %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:2058
+#: src/camel/camel-filter-driver.c:2073
 #, c-format
 msgid "Error executing filter “%s”: %s: %s"
 msgstr "Error executing filter “%s”: %s: %s"
 
-#: ../src/camel/camel-filter-search.c:171
+#: src/camel/camel-filter-search.c:173
 msgid "Failed to retrieve message"
 msgstr "Failed to retrieve message"
 
-#: ../src/camel/camel-filter-search.c:635
+#: src/camel/camel-filter-search.c:637
 msgid "Invalid arguments to (system-flag)"
 msgstr "Invalid arguments to (system-flag)"
 
-#: ../src/camel/camel-filter-search.c:654
+#: src/camel/camel-filter-search.c:656
 msgid "Invalid arguments to (user-tag)"
 msgstr "Invalid arguments to (user-tag)"
 
-#: ../src/camel/camel-filter-search.c:1236
+#: src/camel/camel-filter-search.c:1238
 msgid "Invalid arguments to (message-location)"
 msgstr "Invalid arguments to (message-location)"
 
-#: ../src/camel/camel-filter-search.c:1391
-#: ../src/camel/camel-filter-search.c:1402
+#: src/camel/camel-filter-search.c:1451 src/camel/camel-filter-search.c:1462
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
@@ -2802,7 +2805,7 @@ msgstr "Error executing filter search: %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:171
+#: src/camel/camel-folder.c:171
 #, c-format
 msgid "Storing changes in folder “%s : %s”"
 msgstr "Storing changes in folder “%s : %s”"
@@ -2810,7 +2813,7 @@ 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.
-#: ../src/camel/camel-folder.c:456
+#: src/camel/camel-folder.c:457
 #, c-format
 msgid "Learning new spam message in “%s : %s”"
 msgid_plural "Learning new spam messages in “%s : %s”"
@@ -2820,7 +2823,7 @@ 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:499
+#: src/camel/camel-folder.c:500
 #, c-format
 msgid "Learning new ham message in “%s : %s”"
 msgid_plural "Learning new ham messages in “%s : %s”"
@@ -2830,26 +2833,26 @@ 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:547
+#: src/camel/camel-folder.c:548
 #, 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”"
 
-#: ../src/camel/camel-folder.c:1210
-#: ../src/camel/providers/local/camel-maildir-folder.c:332
+#: src/camel/camel-folder.c:1211
+#: src/camel/providers/local/camel-maildir-folder.c:332
 msgid "Moving messages"
 msgstr "Moving messages"
 
-#: ../src/camel/camel-folder.c:1213
+#: src/camel/camel-folder.c:1214
 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.
-#: ../src/camel/camel-folder.c:1258
+#: src/camel/camel-folder.c:1259
 #, c-format
 msgid "Quota information not supported for folder “%s : %s”"
 msgstr "Quota information not supported for folder “%s : %s”"
@@ -2857,7 +2860,7 @@ 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.
-#: ../src/camel/camel-folder.c:1360
+#: src/camel/camel-folder.c:1361
 #, c-format
 msgid "Filtering folder “%s : %s”"
 msgstr "Filtering folder “%s : %s”"
@@ -2865,7 +2868,7 @@ 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.
-#: ../src/camel/camel-folder.c:3326
+#: src/camel/camel-folder.c:3374
 #, c-format
 msgid "Expunging folder “%s : %s”"
 msgstr "Expunging folder “%s : %s”"
@@ -2873,7 +2876,7 @@ 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.
-#: ../src/camel/camel-folder.c:3461
+#: src/camel/camel-folder.c:3509
 #, c-format
 msgid "Retrieving message “%s” in “%s : %s”"
 msgstr "Retrieving message “%s” in “%s : %s”"
@@ -2881,7 +2884,7 @@ 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.
-#: ../src/camel/camel-folder.c:3686
+#: src/camel/camel-folder.c:3734
 #, c-format
 msgid "Retrieving quota information for “%s : %s”"
 msgstr "Retrieving quota information for “%s : %s”"
@@ -2889,45 +2892,42 @@ 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.
-#: ../src/camel/camel-folder.c:3986
+#: src/camel/camel-folder.c:4034
 #, c-format
 msgid "Refreshing folder “%s : %s”"
 msgstr "Refreshing folder “%s : %s”"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:926
-#: ../src/camel/camel-folder-search.c:969
+#: src/camel/camel-folder-search.c:930 src/camel/camel-folder-search.c:973
 #, 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
-#: ../src/camel/camel-folder-search.c:1007
+#: src/camel/camel-folder-search.c:1011
 #, 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
-#: ../src/camel/camel-folder-search.c:1014
-#: ../src/camel/camel-folder-search.c:1022
+#: src/camel/camel-folder-search.c:1018 src/camel/camel-folder-search.c:1026
 #, 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
-#: ../src/camel/camel-folder-search.c:1050
+#: src/camel/camel-folder-search.c:1054
 #, 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
-#: ../src/camel/camel-folder-search.c:1060
+#: src/camel/camel-folder-search.c:1064
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) requires the folder set"
 
-#: ../src/camel/camel-folder-search.c:2218
-#: ../src/camel/camel-folder-search.c:2392
+#: src/camel/camel-folder-search.c:2286 src/camel/camel-folder-search.c:2460
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2936,8 +2936,7 @@ msgstr ""
 "Cannot parse search expression: %s:\n"
 "%s"
 
-#: ../src/camel/camel-folder-search.c:2230
-#: ../src/camel/camel-folder-search.c:2404
+#: src/camel/camel-folder-search.c:2298 src/camel/camel-folder-search.c:2472
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2949,29 +2948,29 @@ msgstr ""
 #. 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:1662
+#: src/camel/camel-folder-summary.c:1662
 #, c-format
 msgid "Release unused memory for folder “%s : %s”"
 msgstr "Release unused memory for folder “%s : %s”"
 
 #. 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:447
+#: src/camel/camel-gpg-context.c:458
 #, c-format
 msgid "Output from %s:"
 msgstr "Output from %s:"
 
-#: ../src/camel/camel-gpg-context.c:928 ../src/camel/camel-gpg-context.c:933
-#: ../src/camel/camel-gpg-context.c:1674
+#: src/camel/camel-gpg-context.c:943 src/camel/camel-gpg-context.c:948
+#: src/camel/camel-gpg-context.c:1742
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: ../src/camel/camel-gpg-context.c:933
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1205
+#: src/camel/camel-gpg-context.c:948
+#: src/camel/providers/smtp/camel-smtp-transport.c:1209
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/camel/camel-gpg-context.c:1045
+#: src/camel/camel-gpg-context.c:1060
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2982,17 +2981,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/camel/camel-gpg-context.c:1081
+#: src/camel/camel-gpg-context.c:1096
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: ../src/camel/camel-gpg-context.c:1106 ../src/camel/camel-gpg-context.c:1121
+#: src/camel/camel-gpg-context.c:1121 src/camel/camel-gpg-context.c:1136
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: ../src/camel/camel-gpg-context.c:1142
+#: src/camel/camel-gpg-context.c:1157
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -3001,7 +3000,7 @@ msgstr ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: “%s”"
 
-#: ../src/camel/camel-gpg-context.c:1146
+#: src/camel/camel-gpg-context.c:1161
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -3010,12 +3009,12 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: “%s”"
 
-#: ../src/camel/camel-gpg-context.c:1152
+#: src/camel/camel-gpg-context.c:1167
 #, c-format
 msgid "Unexpected request from GnuPG for “%s”"
 msgstr "Unexpected request from GnuPG for “%s”"
 
-#: ../src/camel/camel-gpg-context.c:1164
+#: src/camel/camel-gpg-context.c:1179
 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."
@@ -3023,31 +3022,31 @@ msgstr ""
 "Note the encrypted content doesn’t contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 
-#: ../src/camel/camel-gpg-context.c:1195 ../src/camel/camel-net-utils.c:522
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:393
-#: ../src/libedataserver/e-client.c:156
+#: src/camel/camel-gpg-context.c:1210 src/camel/camel-net-utils.c:524
+#: src/camel/providers/nntp/camel-nntp-summary.c:393
+#: src/libedataserver/e-client.c:156
 #, c-format
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../src/camel/camel-gpg-context.c:1216
+#: src/camel/camel-gpg-context.c:1231
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Failed to unlock secret key: 3 bad passphrases given."
 
-#: ../src/camel/camel-gpg-context.c:1229
+#: src/camel/camel-gpg-context.c:1244
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: ../src/camel/camel-gpg-context.c:1346
+#: src/camel/camel-gpg-context.c:1361
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
 #. 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:1359
+#: src/camel/camel-gpg-context.c:1382
 #, c-format
 msgid ""
 "Failed to encrypt: Invalid recipient %s specified. A common issue is that "
@@ -3056,197 +3055,236 @@ 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:2185 ../src/camel/camel-smime-context.c:869
+#. Translators: The '%s' is replaced with the e-mail address, like '<user@example.com>'
+#: src/camel/camel-gpg-context.c:1389
+#, c-format
+msgid "Failed to encrypt: The public key for recipient %s was not found."
+msgstr "Failed to encrypt: The public key for recipient %s was not found."
+
+#. Translators: The '%s' is replaced with the e-mail address, like '<user@example.com>'
+#: src/camel/camel-gpg-context.c:1396
+#, c-format
+msgid "Failed to encrypt: The key for recipient %s is revoked."
+msgstr "Failed to encrypt: The key for recipient %s is revoked."
+
+#. Translators: The '%s' is replaced with the e-mail address, like '<user@example.com>'
+#: src/camel/camel-gpg-context.c:1403
+#, c-format
+msgid "Failed to encrypt: The key for recipient %s is expired."
+msgstr "Failed to encrypt: The key for recipient %s is expired."
+
+#. Translators: The '%s' is replaced with the e-mail address, like '<user@example.com>'
+#: src/camel/camel-gpg-context.c:1410
+#, c-format
+msgid "Failed to encrypt: The key for recipient %s is not trusted."
+msgstr "Failed to encrypt: The key for recipient %s is not trusted."
+
+#. Translators: The '%s' is replaced with the e-mail address, like '<user@example.com>'
+#: src/camel/camel-gpg-context.c:1417
+#, c-format
+msgid "Failed to encrypt: The key for recipient %s is disabled."
+msgstr "Failed to encrypt: The key for recipient %s is disabled."
+
+#. 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:1425
+#, c-format
+msgid ""
+"Failed to encrypt: Invalid recipient %s specified (code %d). A common issue "
+"is that the %s doesn’t have imported public key for this recipient."
+msgstr ""
+"Failed to encrypt: Invalid recipient %s specified (code %d). A common issue "
+"is that the %s doesn’t have imported public key for this recipient."
+
+#: src/camel/camel-gpg-context.c:2266 src/camel/camel-smime-context.c:869
 msgid "Could not generate signing data: "
 msgstr "Could not generate signing data: "
 
-#: ../src/camel/camel-gpg-context.c:2236 ../src/camel/camel-gpg-context.c:2475
-#: ../src/camel/camel-gpg-context.c:2614 ../src/camel/camel-gpg-context.c:2791
+#: src/camel/camel-gpg-context.c:2317 src/camel/camel-gpg-context.c:2556
+#: src/camel/camel-gpg-context.c:2696 src/camel/camel-gpg-context.c:2873
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
-#: ../src/camel/camel-gpg-context.c:2343 ../src/camel/camel-gpg-context.c:2351
-#: ../src/camel/camel-gpg-context.c:2359 ../src/camel/camel-gpg-context.c:2379
-#: ../src/camel/camel-smime-context.c:1000
-#: ../src/camel/camel-smime-context.c:1014
-#: ../src/camel/camel-smime-context.c:1026
+#: src/camel/camel-gpg-context.c:2424 src/camel/camel-gpg-context.c:2432
+#: src/camel/camel-gpg-context.c:2440 src/camel/camel-gpg-context.c:2460
+#: src/camel/camel-smime-context.c:1000 src/camel/camel-smime-context.c:1014
+#: src/camel/camel-smime-context.c:1026
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: ../src/camel/camel-gpg-context.c:2425
+#: src/camel/camel-gpg-context.c:2506
 msgid "Cannot verify message signature: "
 msgstr "Cannot verify message signature: "
 
-#: ../src/camel/camel-gpg-context.c:2573
+#: src/camel/camel-gpg-context.c:2654
 msgid "Could not generate encrypting data: "
 msgstr "Could not generate encrypting data: "
 
-#: ../src/camel/camel-gpg-context.c:2654
+#: src/camel/camel-gpg-context.c:2736
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: ../src/camel/camel-gpg-context.c:2714 ../src/camel/camel-gpg-context.c:2723
-#: ../src/camel/camel-gpg-context.c:2746
+#: src/camel/camel-gpg-context.c:2796 src/camel/camel-gpg-context.c:2805
+#: src/camel/camel-gpg-context.c:2828
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Cannot decrypt message: Incorrect message format"
 
-#: ../src/camel/camel-gpg-context.c:2734
+#: src/camel/camel-gpg-context.c:2816
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Failed to decrypt MIME part: protocol error"
 
-#: ../src/camel/camel-gpg-context.c:2806
+#: src/camel/camel-gpg-context.c:2888
 #, c-format
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "Failed to decrypt MIME part: Secret key not found"
 
-#: ../src/camel/camel-gpg-context.c:2843
+#: src/camel/camel-gpg-context.c:2925
 #, c-format
 msgid "GPG blob contains unencrypted text: %s"
 msgstr "GPG blob contains unencrypted text: %s"
 
-#: ../src/camel/camel-gpg-context.c:2845
-#: ../src/camel/camel-smime-context.c:1546
+#: src/camel/camel-gpg-context.c:2927 src/camel/camel-smime-context.c:1550
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: ../src/camel/camel-junk-filter.c:167
+#: src/camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr "Synchronising junk database"
 
-#: ../src/camel/camel-lock.c:111
+#: 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"
 
-#: ../src/camel/camel-lock.c:154
+#: 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."
 
-#: ../src/camel/camel-lock.c:221
+#: 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"
 
-#: ../src/camel/camel-lock.c:293
+#: 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"
 
-#: ../src/camel/camel-lock-client.c:105
+#: src/camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Cannot build locking helper pipe: %s"
 
-#: ../src/camel/camel-lock-client.c:129
+#: src/camel/camel-lock-client.c:129
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Cannot fork locking helper: %s"
 
-#: ../src/camel/camel-lock-client.c:216 ../src/camel/camel-lock-client.c:244
+#: 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"
 
-#: ../src/camel/camel-lock-client.c:232
+#: src/camel/camel-lock-client.c:232
 #, c-format
 msgid "Could not lock “%s”"
 msgstr "Could not lock “%s”"
 
-#: ../src/camel/camel-movemail.c:99
+#: src/camel/camel-movemail.c:99
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Could not open mail file %s: %s"
 
-#: ../src/camel/camel-movemail.c:119
+#: src/camel/camel-movemail.c:119
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Could not check mail file %s: %s"
 
-#: ../src/camel/camel-movemail.c:134
+#: 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"
 
-#: ../src/camel/camel-movemail.c:164
+#: 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"
 
-#: ../src/camel/camel-movemail.c:198
+#: src/camel/camel-movemail.c:198
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Could not create pipe: %s"
 
-#: ../src/camel/camel-movemail.c:212
+#: src/camel/camel-movemail.c:212
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Could not fork: %s"
 
-#: ../src/camel/camel-movemail.c:250
+#: src/camel/camel-movemail.c:250
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail program failed: %s"
 
-#: ../src/camel/camel-movemail.c:251
+#: src/camel/camel-movemail.c:251
 msgid "(Unknown error)"
 msgstr "(Unknown error)"
 
-#: ../src/camel/camel-movemail.c:278
+#: src/camel/camel-movemail.c:278
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error reading mail file: %s"
 
-#: ../src/camel/camel-movemail.c:291
+#: src/camel/camel-movemail.c:291
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error writing mail temp file: %s"
 
-#: ../src/camel/camel-movemail.c:499 ../src/camel/camel-movemail.c:573
+#: 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"
 
-#: ../src/camel/camel-multipart-signed.c:273
-#: ../src/camel/camel-multipart-signed.c:426
+#: src/camel/camel-multipart-signed.c:273
+#: src/camel/camel-multipart-signed.c:426
 #, c-format
 msgid "No content available"
 msgstr "No content available"
 
-#: ../src/camel/camel-multipart-signed.c:281
-#: ../src/camel/camel-multipart-signed.c:434
+#: src/camel/camel-multipart-signed.c:281
+#: src/camel/camel-multipart-signed.c:434
 #, c-format
 msgid "No signature available"
 msgstr "No signature available"
 
-#: ../src/camel/camel-multipart-signed.c:798
+#: src/camel/camel-multipart-signed.c:798
 #, c-format
 msgid "parse error"
 msgstr "parse error"
 
-#: ../src/camel/camel-net-utils.c:714
+#: src/camel/camel-net-utils.c:716
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving: %s"
 
-#: ../src/camel/camel-net-utils.c:739
+#: src/camel/camel-net-utils.c:741
 msgid "Host lookup failed"
 msgstr "Host lookup failed"
 
-#: ../src/camel/camel-net-utils.c:745
+#: src/camel/camel-net-utils.c:747
 #, 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."
 
-#: ../src/camel/camel-net-utils.c:749
+#: src/camel/camel-net-utils.c:751
 #, c-format
 msgid "Host lookup “%s” failed: %s"
 msgstr "Host lookup “%s” failed: %s"
 
-#: ../src/camel/camel-network-service.c:1128
+#: src/camel/camel-network-service.c:1130
 #, c-format
 msgid "Checking reachability of account “%s”"
 msgstr "Checking reachability of account “%s”"
@@ -3254,7 +3292,7 @@ msgstr "Checking reachability 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.
-#: ../src/camel/camel-offline-folder.c:175
+#: src/camel/camel-offline-folder.c:175
 #, c-format
 msgid "Downloading new messages for offline mode in “%s : %s”"
 msgstr "Downloading new messages for offline mode in “%s : %s”"
@@ -3262,7 +3300,7 @@ 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.
-#: ../src/camel/camel-offline-folder.c:260
+#: src/camel/camel-offline-folder.c:260
 #, c-format
 msgid "Checking download of new messages for offline in “%s : %s”"
 msgstr "Checking download of new messages for offline in “%s : %s”"
@@ -3270,7 +3308,7 @@ 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.
-#: ../src/camel/camel-offline-folder.c:336
+#: src/camel/camel-offline-folder.c:336
 #, c-format
 msgid "Syncing messages in folder “%s : %s” to disk"
 msgstr "Syncing messages in folder “%s : %s” to disk"
@@ -3280,58 +3318,58 @@ msgstr "Syncing messages in folder “%s : %s” to disk"
 #. 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:430
+#: src/camel/camel-offline-folder.c:430
 #, c-format
 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:484
+#: src/camel/camel-offline-folder.c:484
 msgid "Copy folder content locally for _offline operation"
 msgstr "Copy folder content locally for _offline operation"
 
-#: ../src/camel/camel-offline-store.c:326
+#: src/camel/camel-offline-store.c:326
 #, c-format
 msgid "Syncing messages in account “%s” to disk"
 msgstr "Syncing messages in account “%s” to disk"
 
-#: ../src/camel/camel-provider.c:90
+#: src/camel/camel-provider.c:90
 msgid "Virtual folder email provider"
 msgstr "Virtual folder e-mail provider"
 
-#: ../src/camel/camel-provider.c:92
+#: src/camel/camel-provider.c:92
 msgid "For reading mail as a query of another set of folders"
 msgstr "For reading mail as a query of another set of folders"
 
-#: ../src/camel/camel-provider.c:335
+#: src/camel/camel-provider.c:335
 #, 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."
 
-#: ../src/camel/camel-provider.c:344
+#: src/camel/camel-provider.c:344
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Could not load %s: %s"
 
-#: ../src/camel/camel-provider.c:353
+#: src/camel/camel-provider.c:353
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Could not load %s: No initialisation code in module."
 
-#: ../src/camel/camel-provider.c:499 ../src/camel/camel-session.c:430
+#: src/camel/camel-provider.c:499 src/camel/camel-session.c:430
 #, c-format
 msgid "No provider available for protocol “%s”"
 msgstr "No provider available for protocol “%s”"
 
-#: ../src/camel/camel-sasl-anonymous.c:35
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:85
+#: src/camel/camel-sasl-anonymous.c:35
+#: src/camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../src/camel/camel-sasl-anonymous.c:37
+#: 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."
 
-#: ../src/camel/camel-sasl-anonymous.c:70
+#: src/camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
 msgstr "Authentication failed."
@@ -3339,7 +3377,7 @@ msgstr "Authentication failed."
 #. Translators: the 'trace information' term comes from https://tools.ietf.org/html/rfc4505
 #. In this case the user set to use an email address as the trace information,
 #. but the provided value is not a valid email address.
-#: ../src/camel/camel-sasl-anonymous.c:84
+#: src/camel/camel-sasl-anonymous.c:84
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -3351,7 +3389,7 @@ msgstr ""
 #. Translators: the 'trace information' term comes from https://tools.ietf.org/html/rfc4505
 #. In this case the user set to use an opaque trace information,
 #. but the provided value looks like an email address.
-#: ../src/camel/camel-sasl-anonymous.c:101
+#: src/camel/camel-sasl-anonymous.c:101
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3360,15 +3398,15 @@ msgstr ""
 "Invalid opaque trace information:\n"
 "%s"
 
-#: ../src/camel/camel-sasl-anonymous.c:115 ../src/libedataserver/e-client.c:135
+#: src/camel/camel-sasl-anonymous.c:115 src/libedataserver/e-client.c:135
 msgid "Invalid argument"
 msgstr "Invalid argument"
 
-#: ../src/camel/camel-sasl-cram-md5.c:37
+#: src/camel/camel-sasl-cram-md5.c:37
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../src/camel/camel-sasl-cram-md5.c:39
+#: src/camel/camel-sasl-cram-md5.c:39
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -3376,11 +3414,11 @@ msgstr ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 
-#: ../src/camel/camel-sasl-digest-md5.c:50
+#: src/camel/camel-sasl-digest-md5.c:50
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../src/camel/camel-sasl-digest-md5.c:52
+#: src/camel/camel-sasl-digest-md5.c:52
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -3388,59 +3426,59 @@ msgstr ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 
-#: ../src/camel/camel-sasl-digest-md5.c:848
+#: src/camel/camel-sasl-digest-md5.c:848
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Server challenge too long (>2048 octets)"
 
-#: ../src/camel/camel-sasl-digest-md5.c:859
+#: src/camel/camel-sasl-digest-md5.c:859
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Server challenge invalid\n"
 
-#: ../src/camel/camel-sasl-digest-md5.c:867
+#: src/camel/camel-sasl-digest-md5.c:867
 #, c-format
 msgid "Server challenge contained invalid “Quality of Protection” token"
 msgstr "Server challenge contained invalid “Quality of Protection” token"
 
-#: ../src/camel/camel-sasl-digest-md5.c:900
+#: src/camel/camel-sasl-digest-md5.c:900
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Server response did not contain authorisation data"
 
-#: ../src/camel/camel-sasl-digest-md5.c:921
+#: src/camel/camel-sasl-digest-md5.c:921
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Server response contained incomplete authorisation data"
 
-#: ../src/camel/camel-sasl-digest-md5.c:934
+#: src/camel/camel-sasl-digest-md5.c:934
 #, c-format
 msgid "Server response does not match"
 msgstr "Server response does not match"
 
-#: ../src/camel/camel-sasl-gssapi.c:88
+#: src/camel/camel-sasl-gssapi.c:88
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../src/camel/camel-sasl-gssapi.c:90
+#: src/camel/camel-sasl-gssapi.c:90
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "This option will connect to the server using Kerberos 5 authentication."
 
-#: ../src/camel/camel-sasl-gssapi.c:151
+#: src/camel/camel-sasl-gssapi.c:151
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
 msgstr "(Unknown GSSAPI mechanism code: %x)"
 
 #. Translators: the first '%s' is replaced with a generic error message,
 #. the second '%s' is replaced with additional error information.
-#: ../src/camel/camel-sasl-gssapi.c:174 ../src/camel/camel-sasl-gssapi.c:246
+#: src/camel/camel-sasl-gssapi.c:174 src/camel/camel-sasl-gssapi.c:246
 #, c-format
 msgctxt "gssapi_error"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/camel/camel-sasl-gssapi.c:196
+#: src/camel/camel-sasl-gssapi.c:196
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -3448,11 +3486,11 @@ msgstr ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognised by the implementation."
 
-#: ../src/camel/camel-sasl-gssapi.c:201
+#: src/camel/camel-sasl-gssapi.c:201
 msgid "The provided target_name parameter was ill-formed."
 msgstr "The provided target_name parameter was ill-formed."
 
-#: ../src/camel/camel-sasl-gssapi.c:204
+#: src/camel/camel-sasl-gssapi.c:204
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -3460,7 +3498,7 @@ msgstr ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 
-#: ../src/camel/camel-sasl-gssapi.c:208
+#: src/camel/camel-sasl-gssapi.c:208
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -3468,7 +3506,7 @@ msgstr ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 
-#: ../src/camel/camel-sasl-gssapi.c:213
+#: src/camel/camel-sasl-gssapi.c:213
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -3476,7 +3514,7 @@ msgstr ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 
-#: ../src/camel/camel-sasl-gssapi.c:217
+#: src/camel/camel-sasl-gssapi.c:217
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -3484,34 +3522,34 @@ msgstr ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 
-#: ../src/camel/camel-sasl-gssapi.c:222
+#: src/camel/camel-sasl-gssapi.c:222
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "The supplied context handle did not refer to a valid context."
 
-#: ../src/camel/camel-sasl-gssapi.c:225
+#: src/camel/camel-sasl-gssapi.c:225
 msgid "The consistency checks performed on the input_token failed."
 msgstr "The consistency checks performed on the input_token failed."
 
-#: ../src/camel/camel-sasl-gssapi.c:228
+#: src/camel/camel-sasl-gssapi.c:228
 msgid "The consistency checks performed on the credential failed."
 msgstr "The consistency checks performed on the credential failed."
 
-#: ../src/camel/camel-sasl-gssapi.c:231
+#: src/camel/camel-sasl-gssapi.c:231
 msgid "The referenced credentials have expired."
 msgstr "The referenced credentials have expired."
 
-#: ../src/camel/camel-sasl-gssapi.c:237 ../src/camel/camel-sasl-gssapi.c:441
-#: ../src/camel/camel-sasl-gssapi.c:491 ../src/camel/camel-sasl-gssapi.c:508
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:856
+#: src/camel/camel-sasl-gssapi.c:237 src/camel/camel-sasl-gssapi.c:441
+#: src/camel/camel-sasl-gssapi.c:491 src/camel/camel-sasl-gssapi.c:508
+#: src/camel/providers/smtp/camel-smtp-transport.c:860
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
-#: ../src/camel/camel-sasl-gssapi.c:288
+#: src/camel/camel-sasl-gssapi.c:288
 msgid "Could not get session bus:"
 msgstr "Could not get session bus:"
 
-#: ../src/camel/camel-sasl-gssapi.c:322
+#: src/camel/camel-sasl-gssapi.c:322
 #, c-format
 msgid ""
 "Cannot ask for Kerberos ticket. Obtain the ticket manually, like on command "
@@ -3522,29 +3560,29 @@ msgstr ""
 "line with “kinit” or open “Online Accounts” in “Settings” and add the "
 "Kerberos account there. Reported error was: %s"
 
-#: ../src/camel/camel-sasl-gssapi.c:520
+#: src/camel/camel-sasl-gssapi.c:520
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Unsupported security layer."
 
-#: ../src/camel/camel-sasl-login.c:31
+#: src/camel/camel-sasl-login.c:31
 msgid "Login"
 msgstr "Login"
 
-#: ../src/camel/camel-sasl-login.c:33 ../src/camel/camel-sasl-plain.c:37
+#: src/camel/camel-sasl-login.c:33 src/camel/camel-sasl-plain.c:37
 msgid "This option will connect to the server using a simple password."
 msgstr "This option will connect to the server using a simple password."
 
-#: ../src/camel/camel-sasl-login.c:101
+#: src/camel/camel-sasl-login.c:101
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Unknown authentication state."
 
-#: ../src/camel/camel-sasl-ntlm.c:40
+#: src/camel/camel-sasl-ntlm.c:40
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../src/camel/camel-sasl-ntlm.c:42
+#: src/camel/camel-sasl-ntlm.c:42
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -3552,47 +3590,46 @@ msgstr ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 
-#: ../src/camel/camel-sasl-plain.c:35
+#: src/camel/camel-sasl-plain.c:35
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../src/camel/camel-sasl-popb4smtp.c:37
+#: src/camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "POP before SMTP"
 
-#: ../src/camel/camel-sasl-popb4smtp.c:39
+#: src/camel/camel-sasl-popb4smtp.c:39
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "This option will authorise a POP connection before attempting SMTP"
 
-#: ../src/camel/camel-sasl-popb4smtp.c:77
+#: src/camel/camel-sasl-popb4smtp.c:77
 msgid "POP Source UID"
 msgstr "POP Source UID"
 
-#: ../src/camel/camel-sasl-popb4smtp.c:91
+#: src/camel/camel-sasl-popb4smtp.c:91
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP Before SMTP authentication using an unknown transport"
 
-#: ../src/camel/camel-sasl-popb4smtp.c:103
-#: ../src/camel/camel-sasl-popb4smtp.c:112
+#: src/camel/camel-sasl-popb4smtp.c:103 src/camel/camel-sasl-popb4smtp.c:112
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP Before SMTP authentication attempted with a %s service"
 
-#: ../src/camel/camel-sasl-xoauth2.c:26
+#: src/camel/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: ../src/camel/camel-sasl-xoauth2.c:27
+#: 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
+#: src/camel/camel-sasl-xoauth2-google.c:23
 msgid "OAuth2 (Google)"
 msgstr "OAuth2 (Google)"
 
-#: ../src/camel/camel-sasl-xoauth2-google.c:24
+#: 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"
@@ -3600,11 +3637,11 @@ 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
+#: src/camel/camel-sasl-xoauth2-outlook.c:23
 msgid "OAuth2 (Outlook)"
 msgstr "OAuth2 (Outlook)"
 
-#: ../src/camel/camel-sasl-xoauth2-outlook.c:24
+#: 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"
@@ -3612,11 +3649,11 @@ msgstr ""
 "This option will use an OAuth 2.0 access token to connect to the Outlook.com "
 "server"
 
-#: ../src/camel/camel-sasl-xoauth2-yahoo.c:23
+#: src/camel/camel-sasl-xoauth2-yahoo.c:23
 msgid "OAuth2 (Yahoo!)"
 msgstr "OAuth2 (Yahoo!)"
 
-#: ../src/camel/camel-sasl-xoauth2-yahoo.c:24
+#: src/camel/camel-sasl-xoauth2-yahoo.c:24
 msgid ""
 "This option will use an OAuth 2.0 access token to connect to the Yahoo! "
 "server"
@@ -3624,327 +3661,320 @@ msgstr ""
 "This option will use an OAuth 2.0 access token to connect to the Yahoo! "
 "server"
 
-#: ../src/camel/camel-search-private.c:114
+#: src/camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regular expression compilation failed: %s: %s"
 
-#: ../src/camel/camel-session.c:439
+#: src/camel/camel-session.c:439
 #, c-format
 msgid "Invalid GType registered for protocol “%s”"
 msgstr "Invalid GType registered for protocol “%s”"
 
-#: ../src/camel/camel-session.c:508
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3246
-#: ../src/camel/providers/pop3/camel-pop3-store.c:305
-#: ../src/camel/providers/pop3/camel-pop3-store.c:809
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:696
+#: src/camel/camel-session.c:508
+#: src/camel/providers/imapx/camel-imapx-server.c:3252
+#: src/camel/providers/pop3/camel-pop3-store.c:305
+#: src/camel/providers/pop3/camel-pop3-store.c:809
+#: src/camel/providers/smtp/camel-smtp-transport.c:696
 #, c-format
 msgid "No support for %s authentication"
 msgstr "No support for %s authentication"
 
-#: ../src/camel/camel-session.c:523
+#: src/camel/camel-session.c:523
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s authentication failed"
 
-#: ../src/camel/camel-session.c:592
+#: src/camel/camel-session.c:592
 msgid "Forwarding messages is not supported"
 msgstr "Forwarding messages is not supported"
 
-#: ../src/camel/camel-smime-context.c:343
+#: src/camel/camel-smime-context.c:343
 #, c-format
 msgid "Cannot find certificate for “%s”"
 msgstr "Cannot find certificate for “%s”"
 
-#: ../src/camel/camel-smime-context.c:371
+#: src/camel/camel-smime-context.c:371
 msgid "Cannot create CMS message"
 msgstr "Cannot create CMS message"
 
-#: ../src/camel/camel-smime-context.c:376
+#: src/camel/camel-smime-context.c:376
 msgid "Cannot create CMS signed data"
 msgstr "Cannot create CMS signed data"
 
-#: ../src/camel/camel-smime-context.c:382
+#: src/camel/camel-smime-context.c:382
 msgid "Cannot attach CMS signed data"
 msgstr "Cannot attach CMS signed data"
 
-#: ../src/camel/camel-smime-context.c:389
+#: src/camel/camel-smime-context.c:389
 msgid "Cannot attach CMS data"
 msgstr "Cannot attach CMS data"
 
-#: ../src/camel/camel-smime-context.c:395
+#: src/camel/camel-smime-context.c:395
 msgid "Cannot create CMS Signer information"
 msgstr "Cannot create CMS Signer information"
 
-#: ../src/camel/camel-smime-context.c:401
+#: src/camel/camel-smime-context.c:401
 msgid "Cannot find certificate chain"
 msgstr "Cannot find certificate chain"
 
-#: ../src/camel/camel-smime-context.c:407
+#: src/camel/camel-smime-context.c:407
 msgid "Cannot add CMS Signing time"
 msgstr "Cannot add CMS Signing time"
 
-#: ../src/camel/camel-smime-context.c:431
-#: ../src/camel/camel-smime-context.c:446
+#: src/camel/camel-smime-context.c:431 src/camel/camel-smime-context.c:446
 #, c-format
 msgid "Encryption certificate for “%s” does not exist"
 msgstr "Encryption certificate for “%s” does not exist"
 
-#: ../src/camel/camel-smime-context.c:453
+#: src/camel/camel-smime-context.c:453
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add SMIMEEncKeyPrefs attribute"
 
-#: ../src/camel/camel-smime-context.c:458
+#: src/camel/camel-smime-context.c:458
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
 
-#: ../src/camel/camel-smime-context.c:463
+#: src/camel/camel-smime-context.c:463
 msgid "Cannot add encryption certificate"
 msgstr "Cannot add encryption certificate"
 
-#: ../src/camel/camel-smime-context.c:469
+#: src/camel/camel-smime-context.c:469
 msgid "Cannot add CMS Signer information"
 msgstr "Cannot add CMS Signer information"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../src/camel/camel-smime-context.c:502
+#: src/camel/camel-smime-context.c:502
 msgid "Unverified"
 msgstr "Unverified"
 
-#: ../src/camel/camel-smime-context.c:504
+#: src/camel/camel-smime-context.c:504
 msgid "Good signature"
 msgstr "Good signature"
 
-#: ../src/camel/camel-smime-context.c:506
+#: src/camel/camel-smime-context.c:506
 msgid "Bad signature"
 msgstr "Bad signature"
 
-#: ../src/camel/camel-smime-context.c:508
+#: src/camel/camel-smime-context.c:508
 msgid "Content tampered with or altered in transit"
 msgstr "Content tampered with or altered in transit"
 
-#: ../src/camel/camel-smime-context.c:510
+#: src/camel/camel-smime-context.c:510
 msgid "Signing certificate not found"
 msgstr "Signing certificate not found"
 
-#: ../src/camel/camel-smime-context.c:512
+#: src/camel/camel-smime-context.c:512
 msgid "Signing certificate not trusted"
 msgstr "Signing certificate not trusted"
 
-#: ../src/camel/camel-smime-context.c:514
+#: src/camel/camel-smime-context.c:514
 msgid "Signature algorithm unknown"
 msgstr "Signature algorithm unknown"
 
-#: ../src/camel/camel-smime-context.c:516
+#: src/camel/camel-smime-context.c:516
 msgid "Signature algorithm unsupported"
 msgstr "Signature algorithm unsupported"
 
-#: ../src/camel/camel-smime-context.c:518
+#: src/camel/camel-smime-context.c:518
 msgid "Malformed signature"
 msgstr "Malformed signature"
 
-#: ../src/camel/camel-smime-context.c:520
+#: src/camel/camel-smime-context.c:520
 msgid "Processing error"
 msgstr "Processing error"
 
-#: ../src/camel/camel-smime-context.c:565
+#: src/camel/camel-smime-context.c:565
 msgid "No signed data in signature"
 msgstr "No signed data in signature"
 
-#: ../src/camel/camel-smime-context.c:570
+#: src/camel/camel-smime-context.c:570
 msgid "Digests missing from enveloped data"
 msgstr "Digests missing from enveloped data"
 
-#: ../src/camel/camel-smime-context.c:583
-#: ../src/camel/camel-smime-context.c:594
+#: src/camel/camel-smime-context.c:583 src/camel/camel-smime-context.c:594
 msgid "Cannot calculate digests"
 msgstr "Cannot calculate digests"
 
-#: ../src/camel/camel-smime-context.c:601
-#: ../src/camel/camel-smime-context.c:605
+#: src/camel/camel-smime-context.c:601 src/camel/camel-smime-context.c:605
 msgid "Cannot set message digests"
 msgstr "Cannot set message digests"
 
-#: ../src/camel/camel-smime-context.c:615
-#: ../src/camel/camel-smime-context.c:620
+#: src/camel/camel-smime-context.c:615 src/camel/camel-smime-context.c:620
 msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
-#: ../src/camel/camel-smime-context.c:630
+#: src/camel/camel-smime-context.c:630
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Certificate is the only message, cannot verify certificates"
 
-#: ../src/camel/camel-smime-context.c:633
+#: src/camel/camel-smime-context.c:633
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Certificate is the only message, certificates imported and verified"
 
-#: ../src/camel/camel-smime-context.c:637
+#: src/camel/camel-smime-context.c:637
 msgid "Cannot find signature digests"
 msgstr "Cannot find signature digests"
 
-#: ../src/camel/camel-smime-context.c:656
+#: src/camel/camel-smime-context.c:656
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signer: %s <%s>: %s\n"
 
-#: ../src/camel/camel-smime-context.c:881
-#: ../src/camel/camel-smime-context.c:1403
+#: src/camel/camel-smime-context.c:881 src/camel/camel-smime-context.c:1407
 msgid "Cannot create encoder context"
 msgstr "Cannot create encoder context"
 
-#: ../src/camel/camel-smime-context.c:887
+#: src/camel/camel-smime-context.c:887
 msgid "Failed to add data to CMS encoder"
 msgstr "Failed to add data to CMS encoder"
 
-#: ../src/camel/camel-smime-context.c:892
-#: ../src/camel/camel-smime-context.c:1420
+#: src/camel/camel-smime-context.c:892 src/camel/camel-smime-context.c:1424
 msgid "Failed to encode data"
 msgstr "Failed to encode data"
 
-#: ../src/camel/camel-smime-context.c:1045
-#: ../src/camel/camel-smime-context.c:1521
+#: src/camel/camel-smime-context.c:1045 src/camel/camel-smime-context.c:1525
 msgid "Decoder failed"
 msgstr "Decoder failed"
 
-#: ../src/camel/camel-smime-context.c:1297
+#: src/camel/camel-smime-context.c:1301
 #, c-format
 msgid "No valid or appropriate certificate for “%s” was found"
 msgstr "No valid or appropriate certificate for “%s” was found"
 
-#: ../src/camel/camel-smime-context.c:1337
+#: src/camel/camel-smime-context.c:1341
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Cannot find common bulk encryption algorithm"
 
-#: ../src/camel/camel-smime-context.c:1345
+#: src/camel/camel-smime-context.c:1349
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Cannot allocate slot for encryption bulk key"
 
-#: ../src/camel/camel-smime-context.c:1356
+#: src/camel/camel-smime-context.c:1360
 msgid "Cannot create CMS Message"
 msgstr "Cannot create CMS Message"
 
-#: ../src/camel/camel-smime-context.c:1362
+#: src/camel/camel-smime-context.c:1366
 msgid "Cannot create CMS Enveloped data"
 msgstr "Cannot create CMS Enveloped data"
 
-#: ../src/camel/camel-smime-context.c:1368
+#: src/camel/camel-smime-context.c:1372
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Cannot attach CMS Enveloped data"
 
-#: ../src/camel/camel-smime-context.c:1374
+#: src/camel/camel-smime-context.c:1378
 msgid "Cannot attach CMS data object"
 msgstr "Cannot attach CMS data object"
 
-#: ../src/camel/camel-smime-context.c:1383
+#: src/camel/camel-smime-context.c:1387
 msgid "Cannot create CMS Recipient information"
 msgstr "Cannot create CMS Recipient information"
 
-#: ../src/camel/camel-smime-context.c:1388
+#: src/camel/camel-smime-context.c:1392
 msgid "Cannot add CMS Recipient information"
 msgstr "Cannot add CMS Recipient information"
 
-#: ../src/camel/camel-smime-context.c:1414
+#: src/camel/camel-smime-context.c:1418
 msgid "Failed to add data to encoder"
 msgstr "Failed to add data to encoder"
 
-#: ../src/camel/camel-smime-context.c:1528
+#: src/camel/camel-smime-context.c:1532
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: No encrypted content found"
 
-#: ../src/camel/camel-store.c:1413
+#: src/camel/camel-store.c:1413
 #, c-format
 msgid "Opening folder “%s”"
 msgstr "Opening folder “%s”"
 
-#: ../src/camel/camel-store.c:1710
+#: src/camel/camel-store.c:1710
 #, c-format
 msgid "Scanning folders in “%s”"
 msgstr "Scanning folders in “%s”"
 
-#: ../src/camel/camel-store.c:1738 ../src/camel/camel-store.c:1783
-#: ../src/camel/camel-vtrash-folder.c:48
+#: src/camel/camel-store.c:1738 src/camel/camel-store.c:1783
+#: src/camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Wastebasket"
 
-#: ../src/camel/camel-store.c:1752 ../src/camel/camel-store.c:1800
-#: ../src/camel/camel-vtrash-folder.c:50
+#: src/camel/camel-store.c:1752 src/camel/camel-store.c:1800
+#: src/camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Junk"
 
-#: ../src/camel/camel-store.c:2405
+#: src/camel/camel-store.c:2405
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Cannot create folder: %s: folder exists"
 
-#: ../src/camel/camel-store.c:2412
+#: src/camel/camel-store.c:2412
 #, c-format
 msgid "Creating folder “%s”"
 msgstr "Creating folder “%s”"
 
-#: ../src/camel/camel-store.c:2590 ../src/camel/camel-vee-store.c:426
-#: ../src/camel/providers/local/camel-maildir-store.c:341
+#: src/camel/camel-store.c:2590 src/camel/camel-vee-store.c:426
+#: src/camel/providers/local/camel-maildir-store.c:341
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: ../src/camel/camel-store.c:2781 ../src/camel/camel-vee-store.c:477
-#: ../src/camel/providers/local/camel-maildir-store.c:912
+#: src/camel/camel-store.c:2781 src/camel/camel-vee-store.c:477
+#: 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"
 
-#: ../src/camel/camel-stream.c:167
+#: src/camel/camel-stream.c:167
 msgid "Cannot write with no base stream"
 msgstr "Cannot write with no base stream"
 
-#: ../src/camel/camel-stream.c:287 ../src/camel/camel-stream.c:338
+#: src/camel/camel-stream.c:287 src/camel/camel-stream.c:338
 #, c-format
 msgid "Stream type “%s” is not seekable"
 msgstr "Stream type “%s” is not seekable"
 
-#: ../src/camel/camel-stream-filter.c:339
+#: src/camel/camel-stream-filter.c:339
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "Only reset to beginning is supported with CamelStreamFilter"
 
-#: ../src/camel/camel-stream-null.c:89
+#: src/camel/camel-stream-null.c:89
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Only reset to beginning is supported with CamelHttpStream"
 
-#: ../src/camel/camel-stream-process.c:282
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:743
+#: src/camel/camel-stream-process.c:282
+#: src/camel/providers/smtp/camel-smtp-transport.c:747
 #, c-format
 msgid "Connection cancelled"
 msgstr "Connection cancelled"
 
-#: ../src/camel/camel-stream-process.c:287
+#: src/camel/camel-stream-process.c:287
 #, c-format
 msgid "Could not connect with command “%s”: %s"
 msgstr "Could not connect with command “%s”: %s"
 
-#: ../src/camel/camel-subscribable.c:234
+#: src/camel/camel-subscribable.c:234
 #, c-format
 msgid "Subscribing to folder “%s”"
 msgstr "Subscribing to folder “%s”"
 
-#: ../src/camel/camel-subscribable.c:403
+#: src/camel/camel-subscribable.c:403
 #, c-format
 msgid "Unsubscribing from folder “%s”"
 msgstr "Unsubscribing from folder “%s”"
 
-#: ../src/camel/camel-url.c:325
+#: src/camel/camel-url.c:325
 #, c-format
 msgid "Could not parse URL “%s”"
 msgstr "Could not parse URL “%s”"
 
-#: ../src/camel/camel-vee-folder.c:558
+#: src/camel/camel-vee-folder.c:558
 #, c-format
 msgid "Updating folder “%s”"
 msgstr "Updating folder “%s”"
 
-#: ../src/camel/camel-vee-folder.c:1283 ../src/camel/camel-vee-folder.c:1419
+#: src/camel/camel-vee-folder.c:1283 src/camel/camel-vee-folder.c:1419
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
@@ -3953,104 +3983,104 @@ msgstr "Cannot copy or move messages into a Virtual Folder"
 #. 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.
-#: ../src/camel/camel-vee-folder.c:1320
+#: src/camel/camel-vee-folder.c:1320
 #, c-format
 msgid "No such message %s in “%s : %s”"
 msgstr "No such message %s in “%s : %s”"
 
-#: ../src/camel/camel-vee-folder.c:1395
+#: src/camel/camel-vee-folder.c:1395
 #, c-format
 msgid "Error storing “%s”: "
 msgstr "Error storing “%s”: "
 
-#: ../src/camel/camel-vee-folder.c:1585
+#: src/camel/camel-vee-folder.c:1585
 #, c-format
 msgid "Updating search folder “%s”"
 msgstr "Updating search folder “%s”"
 
-#: ../src/camel/camel-vee-folder.c:1643
+#: src/camel/camel-vee-folder.c:1643
 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
-#: ../src/camel/camel-vee-store.c:34
+#: src/camel/camel-vee-store.c:34
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: ../src/camel/camel-vee-store.c:452
+#: src/camel/camel-vee-store.c:452
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: ../src/camel/camel-vee-store.c:487
+#: src/camel/camel-vee-store.c:487
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
 
-#: ../src/camel/camel-vee-store.c:556
+#: src/camel/camel-vee-store.c:556
 msgid "Enable _Unmatched folder"
 msgstr "Enable _Unmatched folder"
 
-#: ../src/camel/camel-vee-store.c:1112
+#: src/camel/camel-vee-store.c:1112
 msgid "Updating Unmatched search folder"
 msgstr "Updating Unmatched search folder"
 
-#: ../src/camel/camel-vtrash-folder.c:49
+#: src/camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Cannot copy messages to the Wastebasket folder"
 
-#: ../src/camel/camel-vtrash-folder.c:51
+#: src/camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Cannot copy messages to the Junk folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:979
+#: src/camel/providers/imapx/camel-imapx-conn-manager.c:979
 #, c-format
 msgid "You must be working online to complete this operation (%s)"
 msgstr "You must be working online to complete this operation (%s)"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:987
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3412
-#: ../src/camel/providers/nntp/camel-nntp-store.c:348
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1343
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2153
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2308
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:447
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:630
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:916
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:1130
-#: ../src/camel/providers/pop3/camel-pop3-store.c:293
-#: ../src/camel/providers/pop3/camel-pop3-store.c:528
-#: ../src/camel/providers/pop3/camel-pop3-store.c:576
-#: ../src/camel/providers/pop3/camel-pop3-store.c:673
-#: ../src/camel/providers/pop3/camel-pop3-store.c:1124
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:547
+#: src/camel/providers/imapx/camel-imapx-conn-manager.c:987
+#: src/camel/providers/imapx/camel-imapx-server.c:3424
+#: src/camel/providers/nntp/camel-nntp-store.c:348
+#: src/camel/providers/nntp/camel-nntp-store.c:1343
+#: src/camel/providers/nntp/camel-nntp-store.c:2156
+#: src/camel/providers/nntp/camel-nntp-store.c:2311
+#: src/camel/providers/pop3/camel-pop3-folder.c:447
+#: src/camel/providers/pop3/camel-pop3-folder.c:630
+#: src/camel/providers/pop3/camel-pop3-folder.c:916
+#: src/camel/providers/pop3/camel-pop3-folder.c:1130
+#: src/camel/providers/pop3/camel-pop3-store.c:293
+#: src/camel/providers/pop3/camel-pop3-store.c:528
+#: src/camel/providers/pop3/camel-pop3-store.c:576
+#: src/camel/providers/pop3/camel-pop3-store.c:673
+#: src/camel/providers/pop3/camel-pop3-store.c:1124
+#: src/camel/providers/smtp/camel-smtp-transport.c:547
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "You must be working online to complete this operation"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1611
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1707
+#: src/camel/providers/imapx/camel-imapx-conn-manager.c:1611
+#: src/camel/providers/imapx/camel-imapx-conn-manager.c:1707
 #, c-format
 msgid "No destination folder specified"
 msgstr "No destination folder specified"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1638
+#: src/camel/providers/imapx/camel-imapx-conn-manager.c:1638
 msgid "Unable to move junk messages"
 msgstr "Unable to move junk messages"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1741
+#: src/camel/providers/imapx/camel-imapx-conn-manager.c:1741
 msgid "Unable to move deleted messages"
 msgstr "Unable to move deleted messages"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1809
+#: src/camel/providers/imapx/camel-imapx-conn-manager.c:1809
 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:765
+#: src/camel/providers/imapx/camel-imapx-folder.c:765
 #, c-format
 msgid "No quota information available for folder “%s : %s”"
 msgstr "No quota information available for folder “%s : %s”"
@@ -4059,26 +4089,26 @@ msgstr "No quota information available 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.
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1032
+#: src/camel/providers/imapx/camel-imapx-folder.c:1032
 #, c-format
 msgid "Removing stale cache files in folder “%s : %s”"
 msgstr "Removing stale cache files in folder “%s : %s”"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1124
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:832
+#: src/camel/providers/imapx/camel-imapx-folder.c:1124
+#: src/camel/providers/nntp/camel-nntp-folder.c:832
 msgid "Apply message _filters to this folder"
 msgstr "Apply message _filters to this folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1136
+#: src/camel/providers/imapx/camel-imapx-folder.c:1136
 msgid "Always check for _new mail in this folder"
 msgstr "Always check for _new mail in this folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1251
+#: src/camel/providers/imapx/camel-imapx-folder.c:1251
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Could not create folder summary for %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1263
+#: src/camel/providers/imapx/camel-imapx-folder.c:1263
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Could not create cache for %s: "
@@ -4086,152 +4116,193 @@ 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.
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1463
+#: src/camel/providers/imapx/camel-imapx-folder.c:1463
 #, c-format
 msgid "No IMAP mailbox available for folder “%s : %s”"
 msgstr "No IMAP mailbox available for folder “%s : %s”"
 
-#: ../src/camel/providers/imapx/camel-imapx-input-stream.c:101
+#: src/camel/providers/imapx/camel-imapx-input-stream.c:101
 #, c-format
 msgid "Source stream returned no data"
 msgstr "Source stream returned no data"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:36
+#: src/camel/providers/imapx/camel-imapx-provider.c:36
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:38
+#: 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:40
+#: 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:42
+#: 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:44
+#: src/camel/providers/imapx/camel-imapx-provider.c:44
 msgid "_Listen for server change notifications"
 msgstr "_Listen for server change notifications"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:47
-msgid "Connection to Server"
-msgstr "Connection to Server"
-
-#: ../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"
-
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:51
-msgid "Enable full folder update on _metered network"
-msgstr "Enable full folder update on _metered network"
-
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:43
+#: src/camel/providers/imapx/camel-imapx-provider.c:47
+#: src/camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "Folders"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:56
+#: src/camel/providers/imapx/camel-imapx-provider.c:49
 msgid "_Show only subscribed folders"
 msgstr "_Show only subscribed folders"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
-msgid "O_verride server-supplied folder namespace"
-msgstr "O_verride server-supplied folder namespace"
-
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:61
-msgid "Namespace:"
-msgstr "Namespace:"
-
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:64
-#: ../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
+#: src/camel/providers/imapx/camel-imapx-provider.c:51
+#: 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:66
-#: ../src/camel/providers/local/camel-local-provider.c:39
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:38
+#: src/camel/providers/imapx/camel-imapx-provider.c:53
+#: 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:68
+#: src/camel/providers/imapx/camel-imapx-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Apply filters to new messages in Inbox on this server"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:70
-#: ../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:114
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:40
+#: src/camel/providers/imapx/camel-imapx-provider.c:57
+#: 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:114
+#: src/camel/providers/nntp/camel-nntp-provider.c:40
 msgid "Check new messages for _Junk contents"
 msgstr "Check new messages for _Junk contents"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:72
+#: src/camel/providers/imapx/camel-imapx-provider.c:59
 msgid "Only check for Junk messages in the In_box folder"
 msgstr "Only check for Junk messages in the In_box folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:74
+#: src/camel/providers/imapx/camel-imapx-provider.c:61
 msgid "Synchroni_ze remote mail locally in all folders"
 msgstr "Synchronise remote mail locally in all folders"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:81
+#: src/camel/providers/imapx/camel-imapx-provider.c:66
+msgid "Numbe_r of concurrent connections to use"
+msgstr "Numbe_r of concurrent connections to use"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:68
+msgid "Enable full folder update on _metered network"
+msgstr "Enable full folder update on _metered network"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Send client I_D to the server"
+msgstr "Send client I_D to the server"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:72
+msgid "O_verride server-supplied folder namespace"
+msgstr "O_verride server-supplied folder namespace"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:74
+msgid "Namespace:"
+msgstr "Namespace:"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:76
+msgid "Ignore other users namespace"
+msgstr "Ignore other users namespace"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Ignore shared folders namespace"
+msgstr "Ignore shared folders namespace"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:80
+msgid "Use shell command for connecting to the server"
+msgstr "Use shell command for connecting to the server"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:82
+msgid "Command:"
+msgstr "Command:"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:84
+msgid "Download large messages in chunks"
+msgstr "Download large messages in chunks"
+
+#. Translators: This constructs either "Fetch new messages in ascending order" or "Fetch new messages in descending order"
+#: src/camel/providers/imapx/camel-imapx-provider.c:87
+msgid "Fetch new messages in"
+msgstr "Fetch new messages in"
+
+#. Translators: This constructs "Fetch new messages in ascending order"
+#: src/camel/providers/imapx/camel-imapx-provider.c:90
+msgid "ascending order"
+msgstr "ascending order"
+
+#. Translators: This constructs "Fetch new messages in descending order"
+#: src/camel/providers/imapx/camel-imapx-provider.c:92
+msgid "descending order"
+msgstr "descending order"
+
+#. Translators: The '%s' is replaced with a spin button with the actual value
+#: src/camel/providers/imapx/camel-imapx-provider.c:95
+#, c-format
+msgid "Store folder changes after %s second(s)"
+msgstr "Store folder changes after %s second(s)"
+
+#: src/camel/providers/imapx/camel-imapx-provider.c:101
 msgid "Default IMAP port"
 msgstr "Default IMAP port"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:82
+#: src/camel/providers/imapx/camel-imapx-provider.c:102
 msgid "IMAP over TLS"
 msgstr "IMAP over TLS"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:89
+#: src/camel/providers/imapx/camel-imapx-provider.c:109
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:91
+#: src/camel/providers/imapx/camel-imapx-provider.c:111
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For reading and storing mail on IMAP servers."
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:1152
+#: src/camel/providers/imapx/camel-imapx-server.c:1157
 msgid "Error writing to cache stream"
 msgstr "Error writing to cache stream"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3044
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3131
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3445
+#: src/camel/providers/imapx/camel-imapx-server.c:3047
+#: src/camel/providers/imapx/camel-imapx-server.c:3134
+#: src/camel/providers/imapx/camel-imapx-server.c:3457
 msgid "Failed to get capabilities"
 msgstr "Failed to get capabilities"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3063
+#: src/camel/providers/imapx/camel-imapx-server.c:3066
 #, 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"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3064
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:283
+#: src/camel/providers/imapx/camel-imapx-server.c:3067
+#: src/camel/providers/smtp/camel-smtp-transport.c:283
 msgid "STARTTLS not supported"
 msgstr "STARTTLS not supported"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3073
+#: src/camel/providers/imapx/camel-imapx-server.c:3076
 msgid "Failed to issue STARTTLS"
 msgstr "Failed to issue STARTTLS"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3120
+#: src/camel/providers/imapx/camel-imapx-server.c:3123
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Failed to connect to IMAP server %s in secure mode: "
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3233
+#: src/camel/providers/imapx/camel-imapx-server.c:3239
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP server %s does not support %s authentication"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3259
+#: src/camel/providers/imapx/camel-imapx-server.c:3265
 #, c-format
 msgid ""
 "Plaintext authentication disallowed on insecure connections. Change "
@@ -4240,232 +4311,244 @@ msgstr ""
 "Plaintext authentication disallowed on insecure connections. Change "
 "encryption to STARTTLS or TLS for account “%s”."
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3272
-#: ../src/camel/providers/nntp/camel-nntp-store.c:454
-#: ../src/camel/providers/nntp/camel-nntp-store.c:596
+#: src/camel/providers/imapx/camel-imapx-server.c:3278
+#: src/camel/providers/nntp/camel-nntp-store.c:454
+#: src/camel/providers/nntp/camel-nntp-store.c:596
 msgid "Cannot authenticate without a username"
 msgstr "Cannot authenticate without a username"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3281
-#: ../src/camel/providers/nntp/camel-nntp-store.c:605
-#: ../src/camel/providers/pop3/camel-pop3-store.c:709
-#: ../src/camel/providers/pop3/camel-pop3-store.c:747
+#: src/camel/providers/imapx/camel-imapx-server.c:3287
+#: src/camel/providers/nntp/camel-nntp-store.c:605
+#: src/camel/providers/pop3/camel-pop3-store.c:709
+#: src/camel/providers/pop3/camel-pop3-store.c:747
 msgid "Authentication password not available"
 msgstr "Authentication password not available"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3291
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3306
+#: src/camel/providers/imapx/camel-imapx-server.c:3297
+#: src/camel/providers/imapx/camel-imapx-server.c:3310
 msgid "Failed to authenticate"
 msgstr "Failed to authenticate"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3472
+#: src/camel/providers/imapx/camel-imapx-server.c:3382
+msgid "Failed to issue ID"
+msgstr "Failed to issue ID"
+
+#: src/camel/providers/imapx/camel-imapx-server.c:3484
 msgid "Failed to issue ENABLE UTF8=ACCEPT"
 msgstr "Failed to issue ENABLE UTF8=ACCEPT"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3494
+#: src/camel/providers/imapx/camel-imapx-server.c:3506
 msgid "Failed to issue NAMESPACE"
 msgstr "Failed to issue NAMESPACE"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3512
+#: src/camel/providers/imapx/camel-imapx-server.c:3524
 msgid "Failed to enable QResync"
 msgstr "Failed to enable QResync"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3549
+#: src/camel/providers/imapx/camel-imapx-server.c:3561
 msgid "Failed to issue NOTIFY"
 msgstr "Failed to issue NOTIFY"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4028
+#: src/camel/providers/imapx/camel-imapx-server.c:4040
 msgid "Failed to select mailbox"
 msgstr "Failed to select mailbox"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4128
+#: src/camel/providers/imapx/camel-imapx-server.c:4140
 msgid "Cannot issue command, no stream available"
 msgstr "Cannot issue command, no stream available"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4394
+#: src/camel/providers/imapx/camel-imapx-server.c:4406
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Cannot get message with message ID %s: %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4395
+#: src/camel/providers/imapx/camel-imapx-server.c:4407
 msgid "No such message available."
 msgstr "No such message available."
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4444
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4469
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4508
+#: src/camel/providers/imapx/camel-imapx-server.c:4456
+#: src/camel/providers/imapx/camel-imapx-server.c:4481
+#: src/camel/providers/imapx/camel-imapx-server.c:4520
 msgid "Error fetching message"
 msgstr "Error fetching message"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4486
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5259
+#: src/camel/providers/imapx/camel-imapx-server.c:4498
+#: src/camel/providers/imapx/camel-imapx-server.c:5271
 msgid "Error performing NOOP"
 msgstr "Error performing NOOP"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4501
+#: src/camel/providers/imapx/camel-imapx-server.c:4513
 msgid "Failed to close the tmp stream"
 msgstr "Failed to close the tmp stream"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4532
+#: src/camel/providers/imapx/camel-imapx-server.c:4544
 msgid "Failed to copy the tmp file"
 msgstr "Failed to copy the tmp file"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4770
+#: src/camel/providers/imapx/camel-imapx-server.c:4782
 msgid "Error moving messages"
 msgstr "Error moving messages"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4770
+#: src/camel/providers/imapx/camel-imapx-server.c:4782
 msgid "Error copying messages"
 msgstr "Error copying messages"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5049
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5070
+#: src/camel/providers/imapx/camel-imapx-server.c:5061
+#: src/camel/providers/imapx/camel-imapx-server.c:5082
 msgid "Cannot create spool file: "
 msgstr "Cannot create spool file: "
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5156
+#: src/camel/providers/imapx/camel-imapx-server.c:5168
 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.
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5412
+#: src/camel/providers/imapx/camel-imapx-server.c:5439
 #, c-format
 msgid "Scanning for changed messages in “%s : %s”"
 msgstr "Scanning for changed messages in “%s : %s”"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5416
+#: src/camel/providers/imapx/camel-imapx-server.c:5443
 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.
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5437
+#: src/camel/providers/imapx/camel-imapx-server.c:5466
 #, c-format
 msgid "Fetching summary information for new messages in “%s : %s”"
 msgstr "Fetching summary information for new messages in “%s : %s”"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5465
+#: src/camel/providers/imapx/camel-imapx-server.c:5493
 msgid "Error fetching message info"
 msgstr "Error fetching message info"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5598
+#: src/camel/providers/imapx/camel-imapx-server.c:5645
 msgid "Error running STATUS"
 msgstr "Error running STATUS"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6178
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6233
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6297
+#: src/camel/providers/imapx/camel-imapx-server.c:6231
+#: src/camel/providers/imapx/camel-imapx-server.c:6286
+#: src/camel/providers/imapx/camel-imapx-server.c:6350
 msgid "Error syncing changes"
 msgstr "Error syncing changes"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6191
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6243
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6316
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6457
+#: src/camel/providers/imapx/camel-imapx-server.c:6244
+#: src/camel/providers/imapx/camel-imapx-server.c:6296
+#: src/camel/providers/imapx/camel-imapx-server.c:6369
+#: src/camel/providers/imapx/camel-imapx-server.c:6510
 msgid "Error expunging message"
 msgstr "Error expunging message"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6539
+#: src/camel/providers/imapx/camel-imapx-server.c:6592
 msgid "Error fetching folders"
 msgstr "Error fetching folders"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6547
+#: src/camel/providers/imapx/camel-imapx-server.c:6600
 msgid "Error fetching subscribed folders"
 msgstr "Error fetching subscribed folders"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6604
+#: src/camel/providers/imapx/camel-imapx-server.c:6657
 msgid "Error creating folder"
 msgstr "Error creating folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6654
+#: src/camel/providers/imapx/camel-imapx-server.c:6707
 msgid "Error deleting folder"
 msgstr "Error deleting folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6700
+#: src/camel/providers/imapx/camel-imapx-server.c:6753
 msgid "Error renaming folder"
 msgstr "Error renaming folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6732
+#: src/camel/providers/imapx/camel-imapx-server.c:6785
 msgid "Error subscribing to folder"
 msgstr "Error subscribing to folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6768
+#: src/camel/providers/imapx/camel-imapx-server.c:6821
 msgid "Error unsubscribing from folder"
 msgstr "Error unsubscribing from folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6808
+#: src/camel/providers/imapx/camel-imapx-server.c:6861
 msgid "IMAP server does not support quotas"
 msgstr "IMAP server does not support quotas"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6820
+#: src/camel/providers/imapx/camel-imapx-server.c:6873
 msgid "Error retrieving quota information"
 msgstr "Error retrieving quota information"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6885
+#: src/camel/providers/imapx/camel-imapx-server.c:6938
 msgid "Search failed"
 msgstr "Search failed"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../src/camel/providers/imapx/camel-imapx-server.c:7013
+#: src/camel/providers/imapx/camel-imapx-server.c:7066
 msgid "Error running IDLE"
 msgstr "Error running IDLE"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../src/camel/providers/imapx/camel-imapx-store.c:353
-#: ../src/camel/providers/local/camel-maildir-folder.c:477
-#: ../src/camel/providers/local/camel-maildir-store.c:342
-#: ../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:397
+#: src/camel/providers/imapx/camel-imapx-store.c:349
+#: src/camel/providers/local/camel-maildir-folder.c:485
+#: src/camel/providers/local/camel-maildir-store.c:342
+#: 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:397
 msgid "Inbox"
 msgstr "Inbox"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:956
+#: src/camel/providers/imapx/camel-imapx-store.c:958
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:959
+#: src/camel/providers/imapx/camel-imapx-store.c:961
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP service for %s on %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1050
+#: src/camel/providers/imapx/camel-imapx-store.c:1052
 msgid "No IMAPx connection object provided"
 msgstr "No IMAPx connection object provided"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1067
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:95
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:82
+#: src/camel/providers/imapx/camel-imapx-store.c:1069
+#: src/camel/providers/nntp/camel-nntp-provider.c:95
+#: src/camel/providers/pop3/camel-pop3-provider.c:82
 msgid "Password"
 msgstr "Password"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1069
+#: src/camel/providers/imapx/camel-imapx-store.c:1071
 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."
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1156
+#: src/camel/providers/imapx/camel-imapx-store.c:1155
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1620
+#: src/camel/providers/imapx/camel-imapx-store.c:1615
 #, c-format
 msgid "No IMAP namespace for folder path “%s”"
 msgstr "No IMAP namespace for folder path “%s”"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1887
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2081
+#: src/camel/providers/imapx/camel-imapx-store.c:1885
+#: src/camel/providers/imapx/camel-imapx-store.c:2080
 #, c-format
 msgid "Retrieving folder list for “%s”"
 msgstr "Retrieving folder list for “%s”"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2349
+#: src/camel/providers/imapx/camel-imapx-store.c:2323
+msgid ""
+"The account does not support folder hierarchy. Create the folder on the "
+"account level instead."
+msgstr ""
+"The account does not support folder hierarchy. Create the folder on the "
+"account level instead."
+
+#: src/camel/providers/imapx/camel-imapx-store.c:2370
 #, 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”"
@@ -4475,97 +4558,97 @@ msgstr "The folder name “%s” is invalid because it contains the character �
 #. 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:2744
+#: src/camel/providers/imapx/camel-imapx-store.c:2765
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Drafts"
 msgstr "[Gmail]/Drafts"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2745
+#: src/camel/providers/imapx/camel-imapx-store.c:2766
 msgctxt "IMAPDefaults"
 msgid "Drafts"
 msgstr "Drafts"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2746
+#: src/camel/providers/imapx/camel-imapx-store.c:2767
 msgctxt "IMAPDefaults"
 msgid "Draft"
 msgstr "Draft"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2749
+#: src/camel/providers/imapx/camel-imapx-store.c:2770
 msgctxt "IMAPDefaults"
 msgid "Templates"
 msgstr "Templates"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2752
+#: src/camel/providers/imapx/camel-imapx-store.c:2773
 msgctxt "IMAPDefaults"
 msgid "Archive"
 msgstr "Archive"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2755
+#: src/camel/providers/imapx/camel-imapx-store.c:2776
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Sent Mail"
 msgstr "[Gmail]/Sent Mail"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2756
+#: src/camel/providers/imapx/camel-imapx-store.c:2777
 msgctxt "IMAPDefaults"
 msgid "Sent"
 msgstr "Sent"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2757
+#: src/camel/providers/imapx/camel-imapx-store.c:2778
 msgctxt "IMAPDefaults"
 msgid "Sent Items"
 msgstr "Sent Items"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2758
+#: src/camel/providers/imapx/camel-imapx-store.c:2779
 msgctxt "IMAPDefaults"
 msgid "Sent Messages"
 msgstr "Sent Message"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2761
+#: src/camel/providers/imapx/camel-imapx-store.c:2782
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Spam"
 msgstr "[Gmail]/Spam"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2762
+#: src/camel/providers/imapx/camel-imapx-store.c:2783
 msgctxt "IMAPDefaults"
 msgid "Junk"
 msgstr "Junk"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2763
+#: src/camel/providers/imapx/camel-imapx-store.c:2784
 msgctxt "IMAPDefaults"
 msgid "Junk E-mail"
 msgstr "Junk E-mail"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2764
+#: src/camel/providers/imapx/camel-imapx-store.c:2785
 msgctxt "IMAPDefaults"
 msgid "Junk Email"
 msgstr "Junk Email"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2765
+#: src/camel/providers/imapx/camel-imapx-store.c:2786
 msgctxt "IMAPDefaults"
 msgid "Spam"
 msgstr "Spam"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2766
+#: src/camel/providers/imapx/camel-imapx-store.c:2787
 msgctxt "IMAPDefaults"
 msgid "Bulk Mail"
 msgstr "Bulk Mail"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2769
+#: src/camel/providers/imapx/camel-imapx-store.c:2790
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Trash"
 msgstr "[Gmail]/Wastebasket"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2770
+#: src/camel/providers/imapx/camel-imapx-store.c:2791
 msgctxt "IMAPDefaults"
 msgid "Trash"
 msgstr "Trash"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2771
+#: src/camel/providers/imapx/camel-imapx-store.c:2792
 msgctxt "IMAPDefaults"
 msgid "Deleted Items"
 msgstr "Deleted Items"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2772
+#: src/camel/providers/imapx/camel-imapx-store.c:2793
 msgctxt "IMAPDefaults"
 msgid "Deleted Messages"
 msgstr "Deleted Messages"
@@ -4574,7 +4657,7 @@ msgstr "Deleted Messages"
 #. * 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:186
+#: src/camel/providers/local/camel-local-folder.c:186
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
@@ -4588,8 +4671,8 @@ msgstr "~%s (%s)"
 #. * 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:196
-#: ../src/camel/providers/local/camel-local-folder.c:205
+#: src/camel/providers/local/camel-local-folder.c:196
+#: src/camel/providers/local/camel-local-folder.c:205
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
@@ -4598,19 +4681,19 @@ msgstr "mailbox: %s (%s)"
 #. * 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:214
+#: src/camel/providers/local/camel-local-folder.c:214
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/camel/providers/local/camel-local-folder.c:505
+#: src/camel/providers/local/camel-local-folder.c:505
 msgid "_Index message body data"
 msgstr "_Index message body data"
 
 #. 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:744
+#: src/camel/providers/local/camel-local-folder.c:744
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -4619,27 +4702,27 @@ msgstr ""
 "Cannot get message %s from folder %s\n"
 "%s"
 
-#: ../src/camel/providers/local/camel-local-provider.c:43
+#: src/camel/providers/local/camel-local-provider.c:43
 msgid "_Use the “.folders” folder summary file (exmh)"
 msgstr "_Use the “.folders” folder summary file (exmh)"
 
-#: ../src/camel/providers/local/camel-local-provider.c:50
+#: src/camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-format mail directories"
 
-#: ../src/camel/providers/local/camel-local-provider.c:51
+#: 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."
 
-#: ../src/camel/providers/local/camel-local-provider.c:65
+#: src/camel/providers/local/camel-local-provider.c:65
 msgid "Apply _filters to new messages"
 msgstr "Apply _filters to new messages"
 
-#: ../src/camel/providers/local/camel-local-provider.c:73
+#: src/camel/providers/local/camel-local-provider.c:73
 msgid "Local delivery"
 msgstr "Local delivery"
 
-#: ../src/camel/providers/local/camel-local-provider.c:74
+#: 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."
@@ -4647,34 +4730,33 @@ msgstr ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 
-#: ../src/camel/providers/local/camel-local-provider.c:86
-#: ../src/camel/providers/local/camel-local-provider.c:112
+#: src/camel/providers/local/camel-local-provider.c:86
+#: src/camel/providers/local/camel-local-provider.c:112
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Apply filters to new messages in Inbox"
 
-#: ../src/camel/providers/local/camel-local-provider.c:95
+#: src/camel/providers/local/camel-local-provider.c:95
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format mail directories"
 
-#: ../src/camel/providers/local/camel-local-provider.c:96
+#: 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."
 
-#: ../src/camel/providers/local/camel-local-provider.c:110
-#| msgid "_Listen for server change notifications"
+#: src/camel/providers/local/camel-local-provider.c:110
 msgid "_Listen for change notifications"
 msgstr "_Listen for change notifications"
 
-#: ../src/camel/providers/local/camel-local-provider.c:115
+#: src/camel/providers/local/camel-local-provider.c:115
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Store status headers in Elm/Pine/Mutt format"
 
-#: ../src/camel/providers/local/camel-local-provider.c:122
+#: src/camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool file"
 msgstr "Standard Unix mbox spool file"
 
-#: ../src/camel/providers/local/camel-local-provider.c:123
-#: ../src/camel/providers/local/camel-local-provider.c:137
+#: src/camel/providers/local/camel-local-provider.c:123
+#: src/camel/providers/local/camel-local-provider.c:137
 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."
@@ -4682,220 +4764,220 @@ msgstr ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 
-#: ../src/camel/providers/local/camel-local-provider.c:136
+#: src/camel/providers/local/camel-local-provider.c:136
 msgid "Standard Unix mbox spool directory"
 msgstr "Standard Unix mbox spool directory"
 
-#: ../src/camel/providers/local/camel-local-store.c:82
+#: src/camel/providers/local/camel-local-store.c:82
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Could not rename folder %s to %s: %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:164
+#: src/camel/providers/local/camel-local-store.c:164
 #, c-format
 msgid "Local mail file %s"
 msgstr "Local mail file %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:207
-#: ../src/camel/providers/local/camel-local-store.c:367
-#: ../src/camel/providers/local/camel-maildir-store.c:118
-#: ../src/camel/providers/local/camel-mbox-store.c:579
-#: ../src/camel/providers/local/camel-spool-store.c:90
+#: src/camel/providers/local/camel-local-store.c:207
+#: src/camel/providers/local/camel-local-store.c:367
+#: src/camel/providers/local/camel-maildir-store.c:118
+#: src/camel/providers/local/camel-mbox-store.c:579
+#: src/camel/providers/local/camel-spool-store.c:90
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Store root %s is not an absolute path"
 
-#: ../src/camel/providers/local/camel-local-store.c:216
+#: src/camel/providers/local/camel-local-store.c:216
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Store root %s is not a regular directory"
 
-#: ../src/camel/providers/local/camel-local-store.c:228
-#: ../src/camel/providers/local/camel-local-store.c:238
-#: ../src/camel/providers/local/camel-local-store.c:380
-#: ../src/camel/providers/local/camel-maildir-store.c:160
+#: src/camel/providers/local/camel-local-store.c:228
+#: src/camel/providers/local/camel-local-store.c:238
+#: src/camel/providers/local/camel-local-store.c:380
+#: src/camel/providers/local/camel-maildir-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Cannot get folder: %s: %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:275
+#: src/camel/providers/local/camel-local-store.c:275
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Local stores do not have an inbox"
 
-#: ../src/camel/providers/local/camel-local-store.c:440
-#: ../src/camel/providers/local/camel-mbox-store.c:746
+#: src/camel/providers/local/camel-local-store.c:440
+#: src/camel/providers/local/camel-mbox-store.c:746
 #, c-format
 msgid "Could not delete folder index file “%s”: %s"
 msgstr "Could not delete folder index file “%s”: %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:468
-#: ../src/camel/providers/local/camel-mbox-store.c:776
+#: src/camel/providers/local/camel-local-store.c:468
+#: src/camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not delete folder meta file “%s”: %s"
 msgstr "Could not delete folder meta file “%s”: %s"
 
-#: ../src/camel/providers/local/camel-local-store.c:581
+#: src/camel/providers/local/camel-local-store.c:581
 #, c-format
 msgid "Could not rename “%s”: %s"
 msgstr "Could not rename “%s”: %s"
 
-#: ../src/camel/providers/local/camel-maildir-folder.c:107
-#: ../src/camel/providers/local/camel-maildir-folder.c:346
-#: ../src/camel/providers/local/camel-mbox-folder.c:133
-#: ../src/camel/providers/local/camel-mbox-folder.c:348
-#: ../src/camel/providers/local/camel-mh-folder.c:159
+#: src/camel/providers/local/camel-maildir-folder.c:107
+#: src/camel/providers/local/camel-maildir-folder.c:354
+#: src/camel/providers/local/camel-mbox-folder.c:133
+#: src/camel/providers/local/camel-mbox-folder.c:348
+#: src/camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "No such message"
 
-#: ../src/camel/providers/local/camel-maildir-folder.c:240
+#: src/camel/providers/local/camel-maildir-folder.c:240
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Cannot append message to maildir folder: %s: "
 
-#: ../src/camel/providers/local/camel-maildir-folder.c:287
-#: ../src/camel/providers/local/camel-maildir-folder.c:297
-#: ../src/camel/providers/local/camel-mbox-folder.c:407
-#: ../src/camel/providers/local/camel-mh-folder.c:171
-#: ../src/camel/providers/local/camel-mh-folder.c:181
+#: src/camel/providers/local/camel-maildir-folder.c:287
+#: src/camel/providers/local/camel-maildir-folder.c:297
+#: src/camel/providers/local/camel-mbox-folder.c:407
+#: src/camel/providers/local/camel-mh-folder.c:171
+#: src/camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "Cannot get message %s from folder %s: "
 
-#: ../src/camel/providers/local/camel-maildir-folder.c:364
+#: src/camel/providers/local/camel-maildir-folder.c:372
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Cannot transfer message to destination folder: %s"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:126
-#: ../src/camel/providers/local/camel-maildir-store.c:929
+#: src/camel/providers/local/camel-maildir-store.c:126
+#: src/camel/providers/local/camel-maildir-store.c:929
 #, c-format
 msgid "Cannot create folder containing “%s”"
 msgstr "Cannot create folder containing “%s”"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:134
-#: ../src/camel/providers/local/camel-maildir-store.c:153
-#: ../src/camel/providers/local/camel-maildir-store.c:921
+#: src/camel/providers/local/camel-maildir-store.c:134
+#: src/camel/providers/local/camel-maildir-store.c:153
+#: src/camel/providers/local/camel-maildir-store.c:921
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Folder %s already exists"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:261
-#: ../src/camel/providers/local/camel-maildir-store.c:292
-#: ../src/camel/providers/local/camel-mbox-store.c:410
-#: ../src/camel/providers/local/camel-mbox-store.c:431
+#: src/camel/providers/local/camel-maildir-store.c:261
+#: src/camel/providers/local/camel-maildir-store.c:292
+#: src/camel/providers/local/camel-mbox-store.c:410
+#: src/camel/providers/local/camel-mbox-store.c:431
 #, c-format
 msgid "Cannot create folder “%s”: %s"
 msgstr "Cannot create folder “%s”: %s"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:276
-#: ../src/camel/providers/local/camel-mbox-store.c:376
-#: ../src/camel/providers/local/camel-mh-store.c:519
+#: src/camel/providers/local/camel-maildir-store.c:276
+#: src/camel/providers/local/camel-mbox-store.c:376
+#: src/camel/providers/local/camel-mh-store.c:519
 #, c-format
 msgid "Cannot get folder “%s”: %s"
 msgstr "Cannot get folder “%s”: %s"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:282
-#: ../src/camel/providers/local/camel-mbox-store.c:386
-#: ../src/camel/providers/local/camel-mh-store.c:528
+#: src/camel/providers/local/camel-maildir-store.c:282
+#: src/camel/providers/local/camel-mbox-store.c:386
+#: 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."
 
-#: ../src/camel/providers/local/camel-maildir-store.c:309
+#: src/camel/providers/local/camel-maildir-store.c:309
 #, c-format
 msgid "Cannot get folder “%s”: not a maildir directory."
 msgstr "Cannot get folder “%s”: not a maildir directory."
 
-#: ../src/camel/providers/local/camel-maildir-store.c:373
-#: ../src/camel/providers/local/camel-maildir-store.c:413
-#: ../src/camel/providers/local/camel-mh-store.c:672
+#: src/camel/providers/local/camel-maildir-store.c:373
+#: src/camel/providers/local/camel-maildir-store.c:413
+#: 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"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:375
+#: src/camel/providers/local/camel-maildir-store.c:375
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: ../src/camel/providers/local/camel-maildir-store.c:664
-#: ../src/camel/providers/local/camel-maildir-store.c:1142
-#: ../src/camel/providers/local/camel-spool-store.c:217
-#: ../src/camel/providers/local/camel-spool-store.c:236
+#: src/camel/providers/local/camel-maildir-store.c:664
+#: src/camel/providers/local/camel-maildir-store.c:1142
+#: src/camel/providers/local/camel-spool-store.c:217
+#: src/camel/providers/local/camel-spool-store.c:236
 #, c-format
 msgid "Could not scan folder “%s”: %s"
 msgstr "Could not scan folder “%s”: %s"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:494
-#: ../src/camel/providers/local/camel-maildir-summary.c:636
+#: src/camel/providers/local/camel-maildir-summary.c:494
+#: src/camel/providers/local/camel-maildir-summary.c:636
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Cannot open maildir directory path: %s: %s"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:627
+#: src/camel/providers/local/camel-maildir-summary.c:627
 msgid "Checking folder consistency"
 msgstr "Checking folder consistency"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:749
+#: src/camel/providers/local/camel-maildir-summary.c:749
 msgid "Checking for new messages"
 msgstr "Checking for new messages"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:853
-#: ../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
+#: src/camel/providers/local/camel-maildir-summary.c:853
+#: src/camel/providers/local/camel-mbox-summary.c:372
+#: src/camel/providers/local/camel-mbox-summary.c:590
+#: src/camel/providers/local/camel-mbox-summary.c:744
+#: src/camel/providers/local/camel-spool-summary.c:141
 msgid "Storing folder"
 msgstr "Storing folder"
 
-#: ../src/camel/providers/local/camel-mbox-folder.c:205
+#: src/camel/providers/local/camel-mbox-folder.c:205
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "Cannot open mailbox: %s: "
 
-#: ../src/camel/providers/local/camel-mbox-folder.c:266
+#: src/camel/providers/local/camel-mbox-folder.c:266
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "Cannot append message to mbox file: %s: "
 
-#: ../src/camel/providers/local/camel-mbox-folder.c:399
+#: src/camel/providers/local/camel-mbox-folder.c:399
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "The folder appears to be irrecoverably corrupted."
 
-#: ../src/camel/providers/local/camel-mbox-folder.c:454
-#: ../src/camel/providers/local/camel-spool-folder.c:65
+#: src/camel/providers/local/camel-mbox-folder.c:454
+#: 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"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:398
-#: ../src/camel/providers/local/camel-mbox-store.c:587
+#: src/camel/providers/local/camel-mbox-store.c:398
+#: src/camel/providers/local/camel-mbox-store.c:587
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Cannot create a folder by this name."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:442
+#: src/camel/providers/local/camel-mbox-store.c:442
 #, c-format
 msgid "Cannot get folder “%s”: not a regular file."
 msgstr "Cannot get folder “%s”: not a regular file."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:603
+#: src/camel/providers/local/camel-mbox-store.c:603
 #, c-format
 msgid "Cannot create directory “%s”: %s."
 msgstr "Cannot create directory “%s”: %s."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:615
+#: src/camel/providers/local/camel-mbox-store.c:615
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Cannot create folder: %s: %s"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:617
+#: src/camel/providers/local/camel-mbox-store.c:617
 msgid "Folder already exists"
 msgstr "Folder already exists"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:657
-#: ../src/camel/providers/local/camel-mbox-store.c:670
-#: ../src/camel/providers/local/camel-mbox-store.c:699
+#: src/camel/providers/local/camel-mbox-store.c:657
+#: src/camel/providers/local/camel-mbox-store.c:670
+#: src/camel/providers/local/camel-mbox-store.c:699
 #, c-format
 msgid ""
 "Could not delete folder “%s”:\n"
@@ -4904,79 +4986,79 @@ msgstr ""
 "Could not delete folder “%s”:\n"
 "%s"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:680
+#: src/camel/providers/local/camel-mbox-store.c:680
 #, c-format
 msgid "“%s” is not a regular file."
 msgstr "“%s” is not a regular file."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:689
+#: src/camel/providers/local/camel-mbox-store.c:689
 #, c-format
 msgid "Folder “%s” is not empty. Not deleted."
 msgstr "Folder “%s” is not empty. Not deleted."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:716
-#: ../src/camel/providers/local/camel-mbox-store.c:731
+#: src/camel/providers/local/camel-mbox-store.c:716
+#: src/camel/providers/local/camel-mbox-store.c:731
 #, c-format
 msgid "Could not delete folder summary file “%s”: %s"
 msgstr "Could not delete folder summary file “%s”: %s"
 
-#: ../src/camel/providers/local/camel-mbox-store.c:813
+#: src/camel/providers/local/camel-mbox-store.c:813
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "The new folder name is illegal."
 
-#: ../src/camel/providers/local/camel-mbox-store.c:829
+#: src/camel/providers/local/camel-mbox-store.c:829
 #, c-format
 msgid "Could not rename “%s”: “%s”: %s"
 msgstr "Could not rename “%s”: “%s”: %s"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:377
+#: src/camel/providers/local/camel-mbox-summary.c:382
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Could not open folder: %s: %s"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:509
+#: src/camel/providers/local/camel-mbox-summary.c:514
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Cannot check folder: %s: %s"
 
-#: ../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
+#: src/camel/providers/local/camel-mbox-summary.c:599
+#: src/camel/providers/local/camel-mbox-summary.c:753
+#: 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"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:613
-#: ../src/camel/providers/local/camel-spool-summary.c:163
+#: src/camel/providers/local/camel-mbox-summary.c:618
+#: src/camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Cannot open temporary mailbox: %s"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:630
-#: ../src/camel/providers/local/camel-mbox-summary.c:870
+#: src/camel/providers/local/camel-mbox-summary.c:635
+#: src/camel/providers/local/camel-mbox-summary.c:875
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Could not close source folder %s: %s"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:643
+#: src/camel/providers/local/camel-mbox-summary.c:648
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:662
+#: src/camel/providers/local/camel-mbox-summary.c:667
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Could not rename folder: %s"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:762
-#: ../src/camel/providers/local/camel-mbox-summary.c:1032
+#: src/camel/providers/local/camel-mbox-summary.c:767
+#: src/camel/providers/local/camel-mbox-summary.c:1037
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Could not store folder: %s"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:803
-#: ../src/camel/providers/local/camel-mbox-summary.c:1075
+#: src/camel/providers/local/camel-mbox-summary.c:808
+#: src/camel/providers/local/camel-mbox-summary.c:1080
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn’t get "
@@ -4985,79 +5067,79 @@ msgstr ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn’t get "
 "it.)"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:813
-#: ../src/camel/providers/local/camel-mbox-summary.c:1087
+#: src/camel/providers/local/camel-mbox-summary.c:818
+#: src/camel/providers/local/camel-mbox-summary.c:1092
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Summary and folder mismatch, even after a sync"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:979
-#: ../src/camel/providers/local/camel-spool-summary.c:358
+#: src/camel/providers/local/camel-mbox-summary.c:984
+#: src/camel/providers/local/camel-spool-summary.c:358
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unknown error: %s"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:1148
-#: ../src/camel/providers/local/camel-mbox-summary.c:1178
+#: src/camel/providers/local/camel-mbox-summary.c:1153
+#: src/camel/providers/local/camel-mbox-summary.c:1183
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Writing to temporary mailbox failed: %s"
 
-#: ../src/camel/providers/local/camel-mbox-summary.c:1167
+#: src/camel/providers/local/camel-mbox-summary.c:1172
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Writing to temporary mailbox failed: %s: %s"
 
-#: ../src/camel/providers/local/camel-mh-folder.c:119
+#: src/camel/providers/local/camel-mh-folder.c:119
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Cannot append message to mh folder: %s: "
 
-#: ../src/camel/providers/local/camel-mh-store.c:538
+#: 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"
 
-#: ../src/camel/providers/local/camel-mh-store.c:554
+#: 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."
 
-#: ../src/camel/providers/local/camel-mh-summary.c:232
+#: src/camel/providers/local/camel-mh-summary.c:232
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Cannot open MH directory path: %s: %s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:98
+#: src/camel/providers/local/camel-spool-store.c:98
 #, c-format
 msgid "Spool “%s” cannot be opened: %s"
 msgstr "Spool “%s” cannot be opened: %s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:112
+#: src/camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Spool “%s” is not a regular file or directory"
 msgstr "Spool “%s” is not a regular file or directory"
 
-#: ../src/camel/providers/local/camel-spool-store.c:429
+#: src/camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool mail file %s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:433
+#: src/camel/providers/local/camel-spool-store.c:433
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool folder tree %s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:436
+#: src/camel/providers/local/camel-spool-store.c:436
 msgid "Invalid spool"
 msgstr "Invalid spool"
 
-#: ../src/camel/providers/local/camel-spool-store.c:485
+#: src/camel/providers/local/camel-spool-store.c:485
 #, c-format
 msgid "Folder “%s/%s” does not exist."
 msgstr "Folder “%s/%s” does not exist."
 
-#: ../src/camel/providers/local/camel-spool-store.c:498
+#: src/camel/providers/local/camel-spool-store.c:498
 #, c-format
 msgid ""
 "Could not open folder “%s”:\n"
@@ -5066,12 +5148,12 @@ msgstr ""
 "Could not open folder “%s”:\n"
 "%s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:504
+#: src/camel/providers/local/camel-spool-store.c:504
 #, c-format
 msgid "Folder “%s” does not exist."
 msgstr "Folder “%s” does not exist."
 
-#: ../src/camel/providers/local/camel-spool-store.c:512
+#: src/camel/providers/local/camel-spool-store.c:512
 #, c-format
 msgid ""
 "Could not create folder “%s”:\n"
@@ -5080,46 +5162,45 @@ msgstr ""
 "Could not create folder “%s”:\n"
 "%s"
 
-#: ../src/camel/providers/local/camel-spool-store.c:525
+#: src/camel/providers/local/camel-spool-store.c:525
 #, c-format
 msgid "“%s” is not a mailbox file."
 msgstr "“%s” is not a mailbox file."
 
-#: ../src/camel/providers/local/camel-spool-store.c:589
+#: src/camel/providers/local/camel-spool-store.c:589
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Store does not support an INBOX"
 
-#: ../src/camel/providers/local/camel-spool-store.c:608
+#: src/camel/providers/local/camel-spool-store.c:608
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spool folders cannot be deleted"
 
-#: ../src/camel/providers/local/camel-spool-store.c:623
+#: src/camel/providers/local/camel-spool-store.c:623
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool folders cannot be renamed"
 
-#: ../src/camel/providers/local/camel-spool-store.c:779
-#| msgid "Error refreshing folder"
+#: src/camel/providers/local/camel-spool-store.c:779
 msgid "Refreshing spool folder"
 msgstr "Refreshing spool folder"
 
-#: ../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
+#: 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"
 
-#: ../src/camel/providers/local/camel-spool-summary.c:221
+#: 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"
 
-#: ../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
+#: 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"
@@ -5128,84 +5209,84 @@ msgstr ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in “%s”"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:212
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:629
+#: src/camel/providers/nntp/camel-nntp-folder.c:212
+#: src/camel/providers/nntp/camel-nntp-folder.c:629
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Internal error: UID in invalid format: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:280
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:285
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:572
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:1086
+#: src/camel/providers/nntp/camel-nntp-folder.c:280
+#: src/camel/providers/nntp/camel-nntp-folder.c:285
+#: src/camel/providers/pop3/camel-pop3-folder.c:572
+#: src/camel/providers/pop3/camel-pop3-folder.c:1086
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:292
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:663
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:476
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:508
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:540
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:562
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:581
+#: src/camel/providers/nntp/camel-nntp-folder.c:292
+#: src/camel/providers/nntp/camel-nntp-folder.c:663
+#: src/camel/providers/pop3/camel-pop3-folder.c:476
+#: src/camel/providers/pop3/camel-pop3-folder.c:508
+#: src/camel/providers/pop3/camel-pop3-folder.c:540
+#: src/camel/providers/pop3/camel-pop3-folder.c:562
+#: src/camel/providers/pop3/camel-pop3-folder.c:581
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Cannot get message %s: "
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:421
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:427
+#: src/camel/providers/nntp/camel-nntp-folder.c:421
+#: src/camel/providers/nntp/camel-nntp-folder.c:427
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Posting failed: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:479
+#: src/camel/providers/nntp/camel-nntp-folder.c:479
 msgid "Posting failed: "
 msgstr "Posting failed: "
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:652
+#: src/camel/providers/nntp/camel-nntp-folder.c:652
 #, c-format
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:761
+#: src/camel/providers/nntp/camel-nntp-folder.c:761
 #, c-format
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "You cannot copy messages from a NNTP folder"
 
-#: ../src/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)"
 
-#: ../src/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"
 
 #. Translators: The '%s' is replaced with a spin button with the actual value to use
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:51
+#: 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
+#: src/camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
 msgstr "Default NNTP port"
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:58
+#: src/camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over TLS"
 msgstr "NNTP over TLS"
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:64
+#: src/camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "USENET news"
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:66
+#: 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."
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:87
+#: src/camel/providers/nntp/camel-nntp-provider.c:87
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
@@ -5213,7 +5294,7 @@ msgstr ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:97
+#: src/camel/providers/nntp/camel-nntp-provider.c:97
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -5221,37 +5302,37 @@ msgstr ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:376
+#: src/camel/providers/nntp/camel-nntp-store.c:376
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Could not read greeting from %s: "
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:388
+#: src/camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s returned error code %d: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:407
+#: src/camel/providers/nntp/camel-nntp-store.c:407
 #, c-format
 msgid "Failed to issue STARTTLS for NNTP server %s: "
 msgstr "Failed to issue STARTTLS for NNTP server %s: "
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:418
+#: src/camel/providers/nntp/camel-nntp-store.c:418
 #, c-format
 msgid "NNTP server %s doesn’t support STARTTLS: %s"
 msgstr "NNTP server %s doesn’t support STARTTLS: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:438
+#: src/camel/providers/nntp/camel-nntp-store.c:438
 #, c-format
 msgid "Failed to connect to NNTP server %s in secure mode: "
 msgstr "Failed to connect to SMTP server %s in secure mode: "
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:509
+#: src/camel/providers/nntp/camel-nntp-store.c:509
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1245
+#: src/camel/providers/nntp/camel-nntp-store.c:1245
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -5262,22 +5343,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1360
+#: src/camel/providers/nntp/camel-nntp-store.c:1360
 #, 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."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1376
+#: src/camel/providers/nntp/camel-nntp-store.c:1376
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "You cannot rename a folder in a News store."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1399
+#: src/camel/providers/nntp/camel-nntp-store.c:1399
 #, 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."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1613
+#: src/camel/providers/nntp/camel-nntp-store.c:1616
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -5288,7 +5369,7 @@ msgstr ""
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1680
+#: src/camel/providers/nntp/camel-nntp-store.c:1683
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -5299,135 +5380,135 @@ msgstr ""
 "\n"
 "newsgroup does not exist!"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2104
+#: src/camel/providers/nntp/camel-nntp-store.c:2107
 msgid "NNTP Command failed: "
 msgstr "NNTP Command failed: "
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2210
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2245
+#: src/camel/providers/nntp/camel-nntp-store.c:2213
+#: src/camel/providers/nntp/camel-nntp-store.c:2248
 #, c-format
 msgid "Not connected."
 msgstr "Not connected."
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2322
+#: src/camel/providers/nntp/camel-nntp-store.c:2325
 #, c-format
 msgid "No such folder: %s"
 msgstr "No such folder: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:189
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:331
+#: src/camel/providers/nntp/camel-nntp-summary.c:189
+#: src/camel/providers/nntp/camel-nntp-summary.c:331
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Scanning new messages"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:211
+#: src/camel/providers/nntp/camel-nntp-summary.c:211
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Unexpected server response from xover: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:352
+#: src/camel/providers/nntp/camel-nntp-summary.c:352
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Unexpected server response from head: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:398
+#: src/camel/providers/nntp/camel-nntp-summary.c:398
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operation failed: %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:442
+#: src/camel/providers/nntp/camel-nntp-summary.c:442
 #, c-format
 msgid "%s: Scanning existing messages"
 msgstr "%s: Scanning existing messages"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:455
+#: src/camel/providers/nntp/camel-nntp-summary.c:455
 #, c-format
 msgid "Unexpected server response from listgroup: %s"
 msgstr "Unexpected server response from listgroup: %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:355
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:439
+#: src/camel/providers/pop3/camel-pop3-folder.c:355
+#: src/camel/providers/pop3/camel-pop3-folder.c:439
 #, c-format
 msgid "No message with UID %s"
 msgstr "No message with UID %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:455
+#: src/camel/providers/pop3/camel-pop3-folder.c:455
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Retrieving POP message %d"
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:573
+#: src/camel/providers/pop3/camel-pop3-folder.c:573
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:642
+#: src/camel/providers/pop3/camel-pop3-folder.c:642
 msgid "Retrieving POP summary"
 msgstr "Retrieving POP summary"
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:698
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:701
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:714
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:727
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:741
+#: src/camel/providers/pop3/camel-pop3-folder.c:698
+#: src/camel/providers/pop3/camel-pop3-folder.c:701
+#: src/camel/providers/pop3/camel-pop3-folder.c:714
+#: src/camel/providers/pop3/camel-pop3-folder.c:727
+#: src/camel/providers/pop3/camel-pop3-folder.c:741
 msgid "Cannot get POP summary: "
 msgstr "Cannot get POP summary: "
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:889
+#: src/camel/providers/pop3/camel-pop3-folder.c:889
 msgid "Expunging old messages"
 msgstr "Expunging old messages"
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:921
+#: src/camel/providers/pop3/camel-pop3-folder.c:921
 msgid "Expunging deleted messages"
 msgstr "Expunging deleted messages"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:34
+#: src/camel/providers/pop3/camel-pop3-provider.c:34
 msgid "Message Storage"
 msgstr "Message Storage"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:36
+#: 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.
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:40
+#: src/camel/providers/pop3/camel-pop3-provider.c:40
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Delete after %s day(s)"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:42
+#: 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
+#: src/camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
 msgstr "Delete _expunged from local Inbox"
 
-#: ../src/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"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:48
+#: src/camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Enable _UTF-8 extension, when the server supports it"
 msgstr "Enable _UTF-8 extension, when the server supports it"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:54
+#: src/camel/providers/pop3/camel-pop3-provider.c:54
 msgid "Default POP3 port"
 msgstr "Default POP3 port"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:55
+#: src/camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP3 over TLS"
 msgstr "POP3 over TLS"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:62
+#: src/camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:64
+#: src/camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "For connecting to and downloading mail from POP servers."
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:84
+#: src/camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -5435,7 +5516,7 @@ msgstr ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:94
+#: src/camel/providers/pop3/camel-pop3-provider.c:94
 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 "
@@ -5446,57 +5527,57 @@ msgstr ""
 "claim to support it."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../src/camel/providers/pop3/camel-pop3-store.c:90
+#: src/camel/providers/pop3/camel-pop3-store.c:90
 msgid ": "
 msgstr ": "
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:157
+#: src/camel/providers/pop3/camel-pop3-store.c:157
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Failed to read a valid greeting from POP server %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:172
+#: src/camel/providers/pop3/camel-pop3-store.c:172
 #, 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"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:173
+#: src/camel/providers/pop3/camel-pop3-store.c:173
 msgid "STLS not supported by server"
 msgstr "STLS not supported by server"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:194
+#: src/camel/providers/pop3/camel-pop3-store.c:194
 #, 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"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:214
+#: src/camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Failed to connect to POP server %s in secure mode: "
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:356
+#: src/camel/providers/pop3/camel-pop3-store.c:356
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Cannot login to POP server %s: SASL Protocol error"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:378
+#: src/camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Failed to authenticate on POP server %s: "
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:486
+#: src/camel/providers/pop3/camel-pop3-store.c:486
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 server %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:489
+#: src/camel/providers/pop3/camel-pop3-store.c:489
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3 server for %s on %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:693
+#: src/camel/providers/pop3/camel-pop3-store.c:693
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5505,9 +5586,9 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error enabling UTF-8 mode: "
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:721
-#: ../src/camel/providers/pop3/camel-pop3-store.c:734
-#: ../src/camel/providers/pop3/camel-pop3-store.c:820
+#: src/camel/providers/pop3/camel-pop3-store.c:721
+#: src/camel/providers/pop3/camel-pop3-store.c:734
+#: src/camel/providers/pop3/camel-pop3-store.c:820
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5517,7 +5598,7 @@ msgstr ""
 "Error sending password: "
 
 #. Translators: Do not translate APOP.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:761
+#: src/camel/providers/pop3/camel-pop3-store.c:761
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5528,7 +5609,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:835
+#: src/camel/providers/pop3/camel-pop3-store.c:835
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5537,22 +5618,22 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:919
+#: src/camel/providers/pop3/camel-pop3-store.c:919
 #, c-format
 msgid "No such folder “%s”."
 msgstr "No such folder “%s”."
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:936
+#: src/camel/providers/pop3/camel-pop3-store.c:936
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 stores have no folder hierarchy"
 
-#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:31
-#: ../src/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.desktop.in:4
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:33
+#: src/camel/providers/sendmail/camel-sendmail-provider.c:33
 msgid ""
 "For delivering mail by passing it to the “sendmail” program on the local "
 "system."
@@ -5560,358 +5641,396 @@ msgstr ""
 "For delivering mail by passing it to the “sendmail” program on the local "
 "system."
 
-#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:44
+#: src/camel/providers/sendmail/camel-sendmail-transport.c:44
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:46
+#: src/camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail delivery via the sendmail program"
 
-#: ../src/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"
 
-#: ../src/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"
 
-#: ../src/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"
 
-#: ../src/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"
 
-#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:215
+#: 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"
 
-#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:246
+#: 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"
 
-#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:301
+#: src/camel/providers/sendmail/camel-sendmail-transport.c:301
 msgid "Could not send message: "
 msgstr "Could not send message: "
 
-#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:343
+#: 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."
 
-#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:353
+#: 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."
 
-#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:358
+#: 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."
 
-#: ../src/camel/providers/smtp/camel-smtp-provider.c:37
+#: src/camel/providers/smtp/camel-smtp-provider.c:38
+msgid "Send Options"
+msgstr "Send Options"
+
+#: src/camel/providers/smtp/camel-smtp-provider.c:40
+msgid "_Re-encode message before send"
+msgstr "_Re-encode message before send"
+
+#: src/camel/providers/smtp/camel-smtp-provider.c:46
 msgid "Default SMTP port"
 msgstr "Default SMTP port"
 
-#: ../src/camel/providers/smtp/camel-smtp-provider.c:38
+#: src/camel/providers/smtp/camel-smtp-provider.c:47
 msgid "SMTP over TLS"
 msgstr "SMTP over TLS"
 
-#: ../src/camel/providers/smtp/camel-smtp-provider.c:39
+#: src/camel/providers/smtp/camel-smtp-provider.c:48
 msgid "Message submission port"
 msgstr "Message submission port"
 
-#: ../src/camel/providers/smtp/camel-smtp-provider.c:45
+#: src/camel/providers/smtp/camel-smtp-provider.c:54
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../src/camel/providers/smtp/camel-smtp-provider.c:47
+#: src/camel/providers/smtp/camel-smtp-provider.c:56
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "For delivering mail by connecting to a remote mailhub using SMTP."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:237
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:244
+#: src/camel/providers/smtp/camel-smtp-transport.c:237
+#: src/camel/providers/smtp/camel-smtp-transport.c:244
 msgid "Welcome response error: "
 msgstr "Welcome response error: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:282
+#: src/camel/providers/smtp/camel-smtp-transport.c:282
 #, 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"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:291
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:304
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:311
+#: src/camel/providers/smtp/camel-smtp-transport.c:291
+#: src/camel/providers/smtp/camel-smtp-transport.c:304
+#: src/camel/providers/smtp/camel-smtp-transport.c:311
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS command failed: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:332
+#: src/camel/providers/smtp/camel-smtp-transport.c:332
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Failed to connect to SMTP server %s in secure mode: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:443
+#: src/camel/providers/smtp/camel-smtp-transport.c:443
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:446
+#: src/camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail delivery via %s"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:586
+#: src/camel/providers/smtp/camel-smtp-transport.c:586
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP server %s does not support %s authentication"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:686
+#: src/camel/providers/smtp/camel-smtp-transport.c:686
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "No SASL mechanism was specified"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:723
+#: src/camel/providers/smtp/camel-smtp-transport.c:727
 msgid "AUTH command failed: Not connected."
 msgstr "AUTH command failed: Not connected."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:730
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:744
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:760
+#: src/camel/providers/smtp/camel-smtp-transport.c:734
+#: src/camel/providers/smtp/camel-smtp-transport.c:748
+#: src/camel/providers/smtp/camel-smtp-transport.c:764
 msgid "AUTH command failed: "
 msgstr "AUTH command failed: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:963
+#: src/camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Cannot send message: service not connected."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:972
+#: src/camel/providers/smtp/camel-smtp-transport.c:976
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Cannot send message: sender address not valid."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:976
+#: src/camel/providers/smtp/camel-smtp-transport.c:980
 msgid "Sending message"
 msgstr "Sending message"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1005
+#: src/camel/providers/smtp/camel-smtp-transport.c:1009
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Cannot send message: no recipients defined."
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1020
+#: src/camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Cannot send message: one or more invalid recipients"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1152
+#: src/camel/providers/smtp/camel-smtp-transport.c:1156
 msgid "Syntax error, command unrecognized"
 msgstr "Syntax error, command unrecognised"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1154
+#: src/camel/providers/smtp/camel-smtp-transport.c:1158
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntax error in parameters or arguments"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1156
+#: src/camel/providers/smtp/camel-smtp-transport.c:1160
 msgid "Command not implemented"
 msgstr "Command not implemented"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1158
+#: src/camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "Command parameter not implemented"
 msgstr "Command parameter not implemented"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1160
+#: src/camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "System status, or system help reply"
 msgstr "System status, or system help reply"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1162
+#: src/camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "Help message"
 msgstr "Help message"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1164
+#: src/camel/providers/smtp/camel-smtp-transport.c:1168
 msgid "Service ready"
 msgstr "Service ready"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1166
+#: src/camel/providers/smtp/camel-smtp-transport.c:1170
 msgid "Service closing transmission channel"
 msgstr "Service closing transmission channel"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1168
+#: src/camel/providers/smtp/camel-smtp-transport.c:1172
 msgid "Service not available, closing transmission channel"
 msgstr "Service not available, closing transmission channel"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1170
+#: src/camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "Requested mail action okay, completed"
 msgstr "Requested mail action okay, completed"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1172
+#: src/camel/providers/smtp/camel-smtp-transport.c:1176
 msgid "User not local; will forward to <forward-path>"
 msgstr "User not local; will forward to <forward-path>"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1174
+#: src/camel/providers/smtp/camel-smtp-transport.c:1178
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Requested mail action not taken: mailbox unavailable"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1176
+#: src/camel/providers/smtp/camel-smtp-transport.c:1180
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Requested action not taken: mailbox unavailable"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1178
+#: src/camel/providers/smtp/camel-smtp-transport.c:1182
 msgid "Requested action aborted: error in processing"
 msgstr "Requested action aborted: error in processing"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1180
+#: src/camel/providers/smtp/camel-smtp-transport.c:1184
 msgid "User not local; please try <forward-path>"
 msgstr "User not local; please try <forward-path>"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1182
+#: src/camel/providers/smtp/camel-smtp-transport.c:1186
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Requested action not taken: insufficient system storage"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1184
+#: src/camel/providers/smtp/camel-smtp-transport.c:1188
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Requested mail action aborted: exceeded storage allocation"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1186
+#: src/camel/providers/smtp/camel-smtp-transport.c:1190
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Requested action not taken: mailbox name not allowed"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1188
+#: src/camel/providers/smtp/camel-smtp-transport.c:1192
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start mail input; end with <CRLF>.<CRLF>"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1190
+#: src/camel/providers/smtp/camel-smtp-transport.c:1194
 msgid "Transaction failed"
 msgstr "Transaction failed"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1194
+#: src/camel/providers/smtp/camel-smtp-transport.c:1198
 msgid "A password transition is needed"
 msgstr "A password transition is needed"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1196
+#: src/camel/providers/smtp/camel-smtp-transport.c:1200
 msgid "Authentication mechanism is too weak"
 msgstr "Authentication mechanism is too weak"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1198
+#: src/camel/providers/smtp/camel-smtp-transport.c:1202
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encryption required for requested authentication mechanism"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1200
+#: src/camel/providers/smtp/camel-smtp-transport.c:1204
 msgid "Temporary authentication failure"
 msgstr "Temporary authentication failure"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1202
-#: ../src/libedataserver/e-client.c:145
+#: src/camel/providers/smtp/camel-smtp-transport.c:1206
+#: src/libedataserver/e-client.c:145
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1512
+#: src/camel/providers/smtp/camel-smtp-transport.c:1516
 msgid "SMTP Greeting"
 msgstr "SMTP Greeting"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1521
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1534
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1541
+#: src/camel/providers/smtp/camel-smtp-transport.c:1525
+#: src/camel/providers/smtp/camel-smtp-transport.c:1538
+#: src/camel/providers/smtp/camel-smtp-transport.c:1545
 msgid "HELO command failed: "
 msgstr "HELO command failed: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1625
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1639
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1648
+#: src/camel/providers/smtp/camel-smtp-transport.c:1629
+#: src/camel/providers/smtp/camel-smtp-transport.c:1643
+#: src/camel/providers/smtp/camel-smtp-transport.c:1652
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM command failed: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1676
+#: src/camel/providers/smtp/camel-smtp-transport.c:1680
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO command failed: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1692
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1701
+#: src/camel/providers/smtp/camel-smtp-transport.c:1696
+#: src/camel/providers/smtp/camel-smtp-transport.c:1705
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> failed: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1775
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1786
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1797
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1882
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1900
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1913
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1921
+#: src/camel/providers/smtp/camel-smtp-transport.c:1788
+#: src/camel/providers/smtp/camel-smtp-transport.c:1799
+#: src/camel/providers/smtp/camel-smtp-transport.c:1810
+#: src/camel/providers/smtp/camel-smtp-transport.c:1895
+#: src/camel/providers/smtp/camel-smtp-transport.c:1913
+#: src/camel/providers/smtp/camel-smtp-transport.c:1926
+#: src/camel/providers/smtp/camel-smtp-transport.c:1934
 msgid "DATA command failed: "
 msgstr "DATA command failed: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1947
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1961
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1969
+#: src/camel/providers/smtp/camel-smtp-transport.c:1960
+#: src/camel/providers/smtp/camel-smtp-transport.c:1974
+#: src/camel/providers/smtp/camel-smtp-transport.c:1982
 msgid "RSET command failed: "
 msgstr "RSET command failed: "
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1995
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:2007
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:2013
+#: src/camel/providers/smtp/camel-smtp-transport.c:2008
+#: src/camel/providers/smtp/camel-smtp-transport.c:2020
+#: src/camel/providers/smtp/camel-smtp-transport.c:2026
 msgid "QUIT command failed: "
 msgstr "QUIT command failed: "
 
-#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+#: data/org.gnome.evolution-data-server.addressbook.gschema.xml.in:5
 msgid "Contact UID of a user"
 msgstr "Contact UID of a user"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:13
 msgid "Birthday and anniversary reminder"
 msgstr "Birthday and anniversary reminder"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:14
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Whether to set a reminder for birthdays and anniversaries"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:18
 msgid "Birthday and anniversary reminder value"
 msgstr "Birthday and anniversary reminder value"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:19
 msgid "Number of units for determining a birthday or anniversary reminder"
 msgstr "Number of units for determining a birthday or anniversary reminder"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:23
 msgid "Birthday and anniversary reminder units"
 msgstr "Birthday and anniversary reminder units"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:24
 msgid ""
 "Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 msgstr ""
 "Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:7
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:29
 msgid "Past reminders for EReminderWatcher"
 msgstr "Past reminders for EReminderWatcher"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:8
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:33
 msgid "Snoozed reminders for EReminderWatcher"
 msgstr "Snoozed reminders for EReminderWatcher"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:9
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:37
+msgid ""
+"How many days the reminders-past can hold back. Reminders older than these "
+"days are automatically removed from the list of the past reminders. Use '0' "
+"to not remove old reminders."
+msgstr ""
+"How many days the reminders-past can hold back. Reminders older than these "
+"days are automatically removed from the list of the past reminders. Use '0' "
+"to not remove old reminders."
+
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:42
 msgid "Reminder programs"
 msgstr "Reminder programs"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:10
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:43
 msgid "Programs that are allowed to be run by reminders"
 msgstr "Programs that are allowed to be run by reminders"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:11
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:47
+msgid "Enable desktop notifications"
+msgstr "Enable desktop notifications"
+
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:48
+msgid "When set to true, the desktop/system notifications are shown"
+msgstr "When set to true, the desktop/system notifications are shown"
+
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:52
+msgid "Enable audio notifications"
+msgstr "Enable audio notifications"
+
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:53
+msgid ""
+"When set to true, the audio reminders will be played, otherwise audio "
+"reminders will be silently ignored"
+msgstr ""
+"When set to true, the audio reminders will be played, otherwise audio "
+"reminders will be silently ignored"
+
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:57
 msgid "Show reminders in notification tray only"
 msgstr "Show reminders in notification tray only"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:12
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:58
 msgid ""
 "When set to true, the reminders are shown only in the notification tray, "
 "otherwise the reminders dialog is shown immediately"
@@ -5919,11 +6038,11 @@ msgstr ""
 "When set to true, the reminders are shown only in the notification tray, "
 "otherwise the reminders dialogue is shown immediately"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:13
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:62
 msgid "Show reminder notification dialog always on top"
 msgstr "Show reminder notification dialog always on top"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:14
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:63
 msgid ""
 "Whether or not to show reminder notification dialog always on top. Note this "
 "works only as a hint for the window manager, which may or may not obey it."
@@ -5932,51 +6051,51 @@ msgstr ""
 "this works only as a hint for the window manager, which may or may not obey "
 "it."
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:15
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:67
 msgid "X position of the reminder notification dialog"
 msgstr "X position of the reminder notification dialogue"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:16
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:71
 msgid "Y position of the reminder notification dialog"
 msgstr "Y position of the reminder notification dialogue"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:17
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:75
 msgid "Width of the reminder notification dialog"
 msgstr "Width of the reminder notification dialogue"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:18
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:79
 msgid "Height of the reminder notification dialog"
 msgstr "Height of the reminder notification dialogue"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:19
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:83
 msgid "Size in pixels of the event list in the reminder notification dialog"
 msgstr "Size in pixels of the event list in the reminder notification dialogue"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:20
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:87
 msgid "Show reminder notification for completed tasks"
 msgstr "Show reminder notification for completed tasks"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:21
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:91
 msgid "Show reminder notification for past events"
 msgstr "Show reminder notification for past events"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:22
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:95
 msgid "The last used snooze time, in minutes"
 msgstr "The last used snooze time, in minutes"
 
-#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:23
+#: data/org.gnome.evolution-data-server.calendar.gschema.xml.in:99
 msgid "User-defined snooze times, in minutes"
 msgstr "User-defined snooze times, in minutes"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
+#: data/org.gnome.evolution-data-server.gschema.xml.in:5
 msgid "Whether the migration of old setting was already done"
 msgstr "Whether the migration of old setting was already done"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:2
+#: data/org.gnome.evolution-data-server.gschema.xml.in:9
 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
+#: data/org.gnome.evolution-data-server.gschema.xml.in:10
 msgid ""
 "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 "
@@ -5986,11 +6105,11 @@ msgstr ""
 "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
+#: data/org.gnome.evolution-data-server.gschema.xml.in:14
 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
+#: data/org.gnome.evolution-data-server.gschema.xml.in:15
 msgid ""
 "When set to “true”, tries to load also photo of the signers/encrypters, if "
 "available in the key/certificate."
@@ -5998,11 +6117,11 @@ msgstr ""
 "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
+#: data/org.gnome.evolution-data-server.gschema.xml.in:19
 msgid "Override SMTP HELO/EHLO argument"
 msgstr "Override SMTP HELO/EHLO argument"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:7
+#: data/org.gnome.evolution-data-server.gschema.xml.in:20
 msgid ""
 "When not empty, it's used as the SMTP HELO/EHLO argument, instead of the "
 "local host name/IP."
@@ -6010,25 +6129,25 @@ msgstr ""
 "When not empty, it's used as the SMTP HELO/EHLO argument, instead of the "
 "local host name/IP."
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:8
+#: data/org.gnome.evolution-data-server.gschema.xml.in:24
 msgid "Array of user header names"
 msgstr "Array of user header names"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:9
+#: data/org.gnome.evolution-data-server.gschema.xml.in:25
 msgid ""
-"These headers can be stored in the folder summary, eventually being visible "
-"in the GUI. The value can contain a pipe character ('|'), which delimits the "
-"display name from the header name. Example: 'Span Score|X-Spam-Score'"
+"These headers can be stored in the folder summary, possibly being visible in "
+"the GUI. The value can contain a pipe character ('|'), which delimits the "
+"display name from the header name. Example: 'Spam Score|X-Spam-Score'"
 msgstr ""
-"These headers can be stored in the folder summary, eventually being visible "
-"in the GUI. The value can contain a pipe character ('|'), which delimits the "
-"display name from the header name. Example: 'Span Score|X-Spam-Score'"
+"These headers can be stored in the folder summary, possibly being visible in "
+"the GUI. The value can contain a pipe character ('|'), which delimits the "
+"display name from the header name. Example: 'Spam Score|X-Spam-Score'"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:10
+#: data/org.gnome.evolution-data-server.gschema.xml.in:29
 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:11
+#: data/org.gnome.evolution-data-server.gschema.xml.in:30
 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 "
@@ -6038,7 +6157,7 @@ msgstr ""
 "the background. A special value “always-online” is used for no network "
 "monitoring."
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:12
+#: data/org.gnome.evolution-data-server.gschema.xml.in:34
 msgid ""
 "A full path to a directory where .source files with preconfigured options "
 "can be stored"
@@ -6046,7 +6165,7 @@ 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:13
+#: data/org.gnome.evolution-data-server.gschema.xml.in:35
 msgid ""
 "This directory, if filled with an existing path, is checked additionally to "
 "XDG configure directories."
@@ -6054,11 +6173,11 @@ 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:14
+#: data/org.gnome.evolution-data-server.gschema.xml.in:39
 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:15
+#: data/org.gnome.evolution-data-server.gschema.xml.in:40
 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 "
@@ -6068,11 +6187,11 @@ msgstr ""
 "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:16
+#: data/org.gnome.evolution-data-server.gschema.xml.in:44
 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:17
+#: data/org.gnome.evolution-data-server.gschema.xml.in:45
 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 "
@@ -6104,7 +6223,7 @@ msgstr ""
 "“Company” OAuth2 authentication for any “CalDAV” source, which reads data "
 "from “caldav.company.com” host"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:18
+#: data/org.gnome.evolution-data-server.gschema.xml.in:61
 msgid ""
 "An OAuth2 client ID to use to connect to Google servers, instead of the one "
 "provided during build time"
@@ -6112,7 +6231,7 @@ msgstr ""
 "An OAuth2 client ID to use to connect to Google servers, instead of the one "
 "provided during build time"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:19
+#: data/org.gnome.evolution-data-server.gschema.xml.in:62
 msgid ""
 "User-specified OAuth2 client ID for Google servers. Empty string means to "
 "use the one provided during build time. Change of this requires restart."
@@ -6120,7 +6239,7 @@ msgstr ""
 "User-specified OAuth2 client ID for Google servers. Empty string means to "
 "use the one provided during build time. Change of this requires restart."
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:20
+#: data/org.gnome.evolution-data-server.gschema.xml.in:66
 msgid ""
 "An OAuth2 client secret to use to connect to Google servers, instead of the "
 "one provided during build time"
@@ -6128,7 +6247,7 @@ msgstr ""
 "An OAuth2 client secret to use to connect to Google servers, instead of the "
 "one provided during build time"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:21
+#: data/org.gnome.evolution-data-server.gschema.xml.in:67
 msgid ""
 "User-specified OAuth2 client secret for Google servers. Empty string means "
 "to use the one provided during build time. Change of this requires restart."
@@ -6136,7 +6255,7 @@ msgstr ""
 "User-specified OAuth2 client secret for Google servers. Empty string means "
 "to use the one provided during build time. Change of this requires restart."
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:22
+#: data/org.gnome.evolution-data-server.gschema.xml.in:71
 msgid ""
 "An OAuth2 client ID to use to connect to Outlook servers, instead of the one "
 "provided during build time"
@@ -6144,7 +6263,7 @@ msgstr ""
 "An OAuth2 client ID to use to connect to Outlook servers, instead of the one "
 "provided during build time"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:23
+#: data/org.gnome.evolution-data-server.gschema.xml.in:72
 msgid ""
 "User-specified OAuth2 client ID for Outlook servers. Empty string means to "
 "use the one provided during build time. Change of this requires restart."
@@ -6152,7 +6271,7 @@ msgstr ""
 "User-specified OAuth2 client ID for Outlook servers. Empty string means to "
 "use the one provided during build time. Change of this requires restart."
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:24
+#: data/org.gnome.evolution-data-server.gschema.xml.in:76
 msgid ""
 "An OAuth2 client secret to use to connect to Outlook servers, instead of the "
 "one provided during build time"
@@ -6160,7 +6279,7 @@ msgstr ""
 "An OAuth2 client secret to use to connect to Outlook servers, instead of the "
 "one provided during build time"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:25
+#: data/org.gnome.evolution-data-server.gschema.xml.in:77
 msgid ""
 "User-specified OAuth2 client secret for Outlook servers. Empty string means "
 "to use the one provided during build time. Change of this requires restart."
@@ -6168,7 +6287,7 @@ msgstr ""
 "User-specified OAuth2 client secret for Outlook servers. Empty string means "
 "to use the one provided during build time. Change of this requires restart."
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:26
+#: data/org.gnome.evolution-data-server.gschema.xml.in:81
 msgid ""
 "An OAuth2 client ID to use to connect to Yahoo! servers, instead of the one "
 "provided during build time"
@@ -6176,7 +6295,7 @@ msgstr ""
 "An OAuth2 client ID to use to connect to Yahoo! servers, instead of the one "
 "provided during build time"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:27
+#: data/org.gnome.evolution-data-server.gschema.xml.in:82
 msgid ""
 "User-specified OAuth2 client ID for Yahoo! servers. Empty string means to "
 "use the one provided during build time. Change of this requires restart."
@@ -6184,7 +6303,7 @@ msgstr ""
 "User-specified OAuth2 client ID for Yahoo! servers. Empty string means to "
 "use the one provided during build time. Change of this requires restart."
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:28
+#: data/org.gnome.evolution-data-server.gschema.xml.in:86
 msgid ""
 "An OAuth2 client secret to use to connect to Yahoo! servers, instead of the "
 "one provided during build time"
@@ -6192,7 +6311,7 @@ msgstr ""
 "An OAuth2 client secret to use to connect to Yahoo! servers, instead of the "
 "one provided during build time"
 
-#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:29
+#: data/org.gnome.evolution-data-server.gschema.xml.in:87
 msgid ""
 "User-specified OAuth2 client secret for Yahoo! servers. Empty string means "
 "to use the one provided during build time. Change of this requires restart."
@@ -6200,11 +6319,37 @@ msgstr ""
 "User-specified OAuth2 client secret for Yahoo! servers. Empty string means "
 "to use the one provided during build time. Change of this requires restart."
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+#: data/org.gnome.evolution-data-server.gschema.xml.in:91
+msgid "Whether to limit operations in Power Saver mode"
+msgstr "Whether to limit operations in Power Saver mode"
+
+#: data/org.gnome.evolution-data-server.gschema.xml.in:92
+msgid ""
+"When set to “true”, possibly expensive operations required to refresh books/"
+"calendars/mail accounts/... are skipped when the machine is in the Power "
+"Saver mode."
+msgstr ""
+"When set to “true”, possibly expensive operations required to refresh books/"
+"calendars/mail accounts/... are skipped when the machine is in the Power "
+"Saver mode."
+
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:11
 msgid "(Deprecated) Proxy type to use"
 msgstr "(Deprecated) Proxy type to use"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:12
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:17
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:22
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:27
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:32
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:37
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:42
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:47
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:52
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:57
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:62
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:67
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:72
 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 "
@@ -6214,396 +6359,432 @@ msgstr ""
 "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
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:16
 msgid "(Deprecated) Whether to use http-proxy"
 msgstr "(Deprecated) Whether to use http-proxy"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:21
 msgid "(Deprecated) Whether proxy server requires authentication"
 msgstr "(Deprecated) Whether proxy server requires authentication"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:26
 msgid "(Deprecated) Host name for HTTP requests"
 msgstr "(Deprecated) Host name for HTTP requests"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:31
 msgid "(Deprecated) Port number for HTTP requests"
 msgstr "(Deprecated) Port number for HTTP requests"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:36
 msgid "(Deprecated) Proxy authentication user name"
 msgstr "(Deprecated) Proxy authentication user name"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:41
 msgid "(Deprecated) Proxy authentication password"
 msgstr "(Deprecated) Proxy authentication password"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:46
 msgid "(Deprecated) List of hosts to connect to without proxy"
 msgstr "(Deprecated) List of hosts to connect to without proxy"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:51
 msgid "(Deprecated) Host name for HTTPS requests"
 msgstr "(Deprecated) Host name for HTTPS requests"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:56
 msgid "(Deprecated) Port number for HTTPS requests"
 msgstr "(Deprecated) Port number for HTTPS requests"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:61
 msgid "(Deprecated) Host name for SOCKS requests"
 msgstr "(Deprecated) Host name for SOCKS requests"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:66
 msgid "(Deprecated) Port number for SOCKS requests"
 msgstr "(Deprecated) Port number for SOCKS requests"
 
-#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+#: data/org.gnome.evolution.shell.network-config.gschema.xml.in:71
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(Deprecated) Automatic proxy configuration URL"
 
-#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+#: data/org.gnome.Evolution-alarm-notify.desktop.in.in:4
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Alarm Notify"
 
-#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+#: data/org.gnome.Evolution-alarm-notify.desktop.in.in:5
 msgid "Calendar event notifications"
 msgstr "Calendar event notifications"
 
-#: ../src/libebackend/e-cache.c:751
+#: src/libebackend/e-cache.c:750
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ../src/libebackend/e-cache.c:943
+#: src/libebackend/e-cache.c:942
 #, c-format
 msgid "Can not make parent directory: %s"
 msgstr "Can not make parent directory: %s"
 
-#: ../src/libebackend/e-collection-backend.c:1111
+#: src/libebackend/e-collection-backend.c:1111
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s does not support creating remote resources"
 
-#: ../src/libebackend/e-collection-backend.c:1170
+#: src/libebackend/e-collection-backend.c:1170
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s does not support deleting remote resources"
 
-#: ../src/libebackend/e-data-factory.c:1441
-#: ../src/libebackend/e-subprocess-factory.c:288
+#: src/libebackend/e-data-factory.c:1447
+#: src/libebackend/e-subprocess-factory.c:288
 #, c-format
 msgid "No such source for UID “%s”"
 msgstr "No such source for UID “%s”"
 
-#: ../src/libebackend/e-data-factory.c:1596
+#: src/libebackend/e-data-factory.c:1602
 #, 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."
 
-#: ../src/libebackend/e-server-side-source.c:139
+#: src/libebackend/e-server-side-source.c:139
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "Data source is missing a [%s] group"
 
-#: ../src/libebackend/e-server-side-source.c:467
+#: src/libebackend/e-server-side-source.c:467
 msgid "Failed to lookup credentials: "
 msgstr "Failed to lookup credentials: "
 
-#: ../src/libebackend/e-server-side-source.c:1389
-#: ../src/libedataserver/e-source.c:1584
+#: src/libebackend/e-server-side-source.c:1389
+#: src/libedataserver/e-source.c:1601
 #, c-format
 msgid "Data source “%s” does not support creating remote resources"
 msgstr "Data source “%s” does not support creating remote resources"
 
-#: ../src/libebackend/e-server-side-source.c:1403
+#: src/libebackend/e-server-side-source.c:1403
 #, c-format
 msgid ""
 "Data source “%s” has no collection backend to create the remote resource"
 msgstr ""
 "Data source “%s” has no collection backend to create the remote resource"
 
-#: ../src/libebackend/e-server-side-source.c:1431
-#: ../src/libedataserver/e-source.c:1697
+#: src/libebackend/e-server-side-source.c:1431
+#: src/libedataserver/e-source.c:1714
 #, c-format
 msgid "Data source “%s” does not support deleting remote resources"
 msgstr "Data source “%s” does not support deleting remote resources"
 
-#: ../src/libebackend/e-server-side-source.c:1445
+#: src/libebackend/e-server-side-source.c:1445
 #, c-format
 msgid ""
 "Data source “%s” has no collection backend to delete the remote resource"
 msgstr ""
 "Data source “%s” has no collection backend to delete the remote resource"
 
-#: ../src/libebackend/e-server-side-source.c:1484
-#: ../src/libebackend/e-source-registry-server.c:1038
-#: ../src/libedataserver/e-source.c:1826
+#: src/libebackend/e-server-side-source.c:1484
+#: src/libebackend/e-source-registry-server.c:1038
+#: src/libedataserver/e-source.c:1843
 #, c-format
 msgid "Data source “%s” does not support OAuth 2.0 authentication"
 msgstr "Data source “%s” does not support OAuth 2.0 authentication"
 
-#: ../src/libebackend/e-server-side-source.c:1867
+#: src/libebackend/e-server-side-source.c:1867
 #, c-format
 msgid "File must have a “.source” extension"
 msgstr "File must have a “.source” extension"
 
-#: ../src/libebackend/e-source-registry-server.c:319
+#: src/libebackend/e-source-registry-server.c:319
 #, c-format
 msgid "UID “%s” is already in use"
 msgstr "UID “%s” is already in use"
 
-#: ../src/libebackend/e-source-registry-server.c:444
+#: src/libebackend/e-source-registry-server.c:444
 #, c-format
 msgid "Cannot find corresponding collection backend for source “%s”"
 msgstr "Cannot find corresponding collection backend for source “%s”"
 
-#: ../src/libebackend/e-source-registry-server.c:448
+#: src/libebackend/e-source-registry-server.c:448
 #, c-format
 msgid "Source “%s” is not a collection source"
 msgstr "Source “%s” is not a collection source"
 
-#: ../src/libebackend/e-source-registry-server.c:454
+#: src/libebackend/e-source-registry-server.c:454
 #, c-format
 msgid "Cannot find source “%s”"
 msgstr "Cannot find source “%s”"
 
-#: ../src/libebackend/e-subprocess-factory.c:276
+#: src/libebackend/e-subprocess-factory.c:276
 #, c-format
 msgid "Module “%s” for source UID “%s” cannot be loaded"
 msgstr "Module “%s” for source UID “%s” cannot be loaded"
 
-#: ../src/libebackend/e-subprocess-factory.c:297
+#: src/libebackend/e-subprocess-factory.c:297
 #, 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”"
 
-#: ../src/libebackend/e-user-prompter-server.c:301
+#: src/libebackend/e-user-prompter-server.c:301
 #, c-format
 msgid "Extension dialog “%s” not found."
 msgstr "Extension dialogue “%s” not found."
 
-#: ../src/libedataserver/e-categories.c:47
+#: src/libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Anniversary"
 
-#: ../src/libedataserver/e-categories.c:48
+#: src/libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../src/libedataserver/e-categories.c:49
+#: src/libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Business"
 
-#: ../src/libedataserver/e-categories.c:50
+#: src/libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Competition"
 
-#: ../src/libedataserver/e-categories.c:51
+#: src/libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Favourites"
 
-#: ../src/libedataserver/e-categories.c:52
+#: src/libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Gifts"
 
-#: ../src/libedataserver/e-categories.c:53
+#: src/libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Goals/Objectives"
 
-#: ../src/libedataserver/e-categories.c:54
+#: src/libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Holiday"
 
-#: ../src/libedataserver/e-categories.c:55
+#: src/libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Holiday Cards"
 
 #. important people (e.g. new business partners)
-#: ../src/libedataserver/e-categories.c:57
+#: src/libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Hot Contacts"
 
-#: ../src/libedataserver/e-categories.c:58
+#: src/libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideas"
 
-#: ../src/libedataserver/e-categories.c:59
+#: src/libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "International"
 msgstr "International"
 
-#: ../src/libedataserver/e-categories.c:60
+#: src/libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Key Customer"
 
-#: ../src/libedataserver/e-categories.c:61
+#: src/libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-#: ../src/libedataserver/e-categories.c:62
+#: src/libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../src/libedataserver/e-categories.c:63
+#: 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
-#: ../src/libedataserver/e-categories.c:65
+#: src/libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Status"
 
-#: ../src/libedataserver/e-categories.c:66
+#: src/libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategies"
 
-#: ../src/libedataserver/e-categories.c:67
+#: src/libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Suppliers"
 
-#: ../src/libedataserver/e-categories.c:68
+#: src/libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Time & Expenses"
 
-#: ../src/libedataserver/e-categories.c:69
+#: src/libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../src/libedataserver/e-categories.c:70
+#: src/libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Waiting"
 
-#: ../src/libedataserver/e-client.c:137
+#: src/libedataserver/e-client.c:137
 msgid "Backend is busy"
 msgstr "Backend is busy"
 
-#: ../src/libedataserver/e-client.c:139
+#: src/libedataserver/e-client.c:139
 msgid "Source not loaded"
 msgstr "Source not loaded"
 
-#: ../src/libedataserver/e-client.c:141
+#: src/libedataserver/e-client.c:141
 msgid "Source already loaded"
 msgstr "Source already loaded"
 
-#: ../src/libedataserver/e-client.c:143
+#: src/libedataserver/e-client.c:143
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../src/libedataserver/e-client.c:147
+#: src/libedataserver/e-client.c:147
 msgid "Repository offline"
 msgstr "Repository offline"
 
 #. 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.
-#: ../src/libedataserver/e-client.c:152
+#: src/libedataserver/e-client.c:152
 msgid "Offline unavailable"
 msgstr "Offline unavailable"
 
-#: ../src/libedataserver/e-client.c:154
+#: src/libedataserver/e-client.c:154
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: ../src/libedataserver/e-client.c:158
+#: src/libedataserver/e-client.c:158
 msgid "Could not cancel"
 msgstr "Could not cancel"
 
-#: ../src/libedataserver/e-client.c:160
+#: src/libedataserver/e-client.c:160
 msgid "Not supported"
 msgstr "Not supported"
 
-#: ../src/libedataserver/e-client.c:162
+#: src/libedataserver/e-client.c:162
 msgid "Unsupported authentication method"
 msgstr "Unsupported authentication method"
 
-#: ../src/libedataserver/e-client.c:164
+#: src/libedataserver/e-client.c:164
 msgid "TLS not available"
 msgstr "TLS not available"
 
-#: ../src/libedataserver/e-client.c:166
+#: src/libedataserver/e-client.c:166
 msgid "Search size limit exceeded"
 msgstr "Search size limit exceeded"
 
-#: ../src/libedataserver/e-client.c:168
+#: src/libedataserver/e-client.c:168
 msgid "Search time limit exceeded"
 msgstr "Search time limit exceeded"
 
-#: ../src/libedataserver/e-client.c:172
+#: src/libedataserver/e-client.c:172
 msgid "Query refused"
 msgstr "Query refused"
 
-#: ../src/libedataserver/e-client.c:174
+#: src/libedataserver/e-client.c:174
 msgid "D-Bus error"
 msgstr "D-Bus error"
 
-#: ../src/libedataserver/e-client.c:176
+#: src/libedataserver/e-client.c:176
 msgid "Other error"
 msgstr "Other error"
 
-#: ../src/libedataserver/e-client.c:178
+#: src/libedataserver/e-client.c:178
 msgid "Backend is not opened yet"
 msgstr "Backend is not opened yet"
 
-#: ../src/libedataserver/e-client.c:180
+#: src/libedataserver/e-client.c:180
 msgid "Object is out of sync"
 msgstr "Object is out of sync"
 
-#: ../src/libedataserver/e-client.c:2037
+#: src/libedataserver/e-client.c:2037
 msgid "Timeout was reached"
 msgstr "Timeout was reached"
 
-#: ../src/libedataserver/e-oauth2-service.c:919
+#: src/libedataserver/e-gdata-session.c:207
+#, c-format
+msgid "Google server is busy, waiting to retry (%d:%02d minute)"
+msgid_plural "Google server is busy, waiting to retry (%d:%02d minutes)"
+msgstr[0] "Google server is busy, waiting to retry (%d:%02d minute)"
+msgstr[1] "Google server is busy, waiting to retry (%d:%02d minutes)"
+
+#: src/libedataserver/e-gdata-session.c:213
+#, c-format
+msgid "Google server is busy, waiting to retry (%d second)"
+msgid_plural "Google server is busy, waiting to retry (%d seconds)"
+msgstr[0] "Google server is busy, waiting to retry (%d second)"
+msgstr[1] "Google server is busy, waiting to retry (%d seconds)"
+
+#: src/libedataserver/e-gdata-session.c:548
+msgid "No JSON object returned by the server"
+msgstr "No JSON object returned by the server"
+
+#: src/libedataserver/e-gdata-session.c:734
+#: src/libedataserver/e-gdata-session.c:793
+#: src/libedataserver/e-gdata-session.c:857
+#: src/libedataserver/e-gdata-session.c:893
+#: src/libedataserver/e-gdata-session.c:950
+#: src/libedataserver/e-gdata-session.c:1004
+#: src/libedataserver/e-gdata-session.c:1440
+#: src/libedataserver/e-gdata-session.c:1484
+#: src/libedataserver/e-gdata-session.c:1549
+#: src/libedataserver/e-gdata-session.c:1621
+#: src/libedataserver/e-gdata-session.c:1662
+#: src/libedataserver/e-gdata-session.c:1720
+#: src/libedataserver/e-gdata-session.c:1783
+#: src/libedataserver/e-gdata-session.c:1843
+#, c-format
+msgid "Failed to call %s: "
+msgstr "Failed to call %s: "
+
+#: src/libedataserver/e-oauth2-service.c:1026
 msgid "Malformed, no message body set"
 msgstr "Malformed, no message body set"
 
 #. 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:1203
+#: src/libedataserver/e-oauth2-service.c:1306
 #, c-format
 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:1218
+#: src/libedataserver/e-oauth2-service.c:1321
 msgid "OAuth2 secret not found"
 msgstr "OAuth2 secret not found"
 
-#: ../src/libedataserver/e-oauth2-service.c:1413
+#: src/libedataserver/e-oauth2-service.c:1518
 #, c-format
 msgid "Received incorrect response from server “%s”."
 msgstr "Received incorrect response from server “%s”."
 
-#: ../src/libedataserver/e-oauth2-service.c:1422
+#: src/libedataserver/e-oauth2-service.c:1527
 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:1464
+#: src/libedataserver/e-oauth2-service.c:1570
 #, c-format
 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:1538
+#: src/libedataserver/e-oauth2-service.c:1854
 msgid ""
 "The access token is expired and it failed to refresh it. Sign to the server "
 "again, please."
@@ -6612,73 +6793,77 @@ msgstr ""
 "again, please."
 
 #. Translators: This is a user-visible string, display name of an OAuth2 service.
-#: ../src/libedataserver/e-oauth2-service-google.c:56
+#: src/libedataserver/e-oauth2-service-google.c:58
 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
+#: src/libedataserver/e-oauth2-service-outlook.c:58
 msgctxt "OAuth2Service"
 msgid "Outlook"
 msgstr "Outlook"
 
 #. Translators: This is a user-visible string, display name of an OAuth2 service.
-#: ../src/libedataserver/e-oauth2-service-yahoo.c:53
+#: src/libedataserver/e-oauth2-service-yahoo.c:54
 msgctxt "OAuth2Service"
 msgid "Yahoo!"
 msgstr "Yahoo!"
 
-#: ../src/libedataserver/e-soup-session.c:963
-msgid "Operation was cancelled"
-msgstr "Operation was cancelled"
-
-#: ../src/libedataserver/e-soup-session.c:969
+#: src/libedataserver/e-soup-session.c:1264
 #, c-format
 msgid "Failed with HTTP error %d: %s"
 msgstr "Failed with HTTP error %d: %s"
 
-#: ../src/libedataserver/e-source.c:771
+#: src/libedataserver/e-soup-session.c:1340
+msgid "Failed to setup authentication"
+msgstr "Failed to setup authentication"
+
+#: src/libedataserver/e-soup-session.c:1747
+msgid "Too many redirects"
+msgstr "Too many redirects"
+
+#: src/libedataserver/e-source.c:772
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "Source file is missing a [%s] group"
 
-#: ../src/libedataserver/e-source.c:1364
+#: src/libedataserver/e-source.c:1381
 #, c-format
 msgid "Data source “%s” is not removable"
 msgstr "Data source “%s” is not removable"
 
-#: ../src/libedataserver/e-source.c:1487
+#: src/libedataserver/e-source.c:1504
 #, c-format
 msgid "Data source “%s” is not writable"
 msgstr "Data source “%s” is not writable"
 
-#: ../src/libedataserver/e-source.c:2227
+#: src/libedataserver/e-source.c:2249
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: ../src/libedataserver/e-source-credentials-provider-impl.c:39
+#: src/libedataserver/e-source-credentials-provider-impl.c:39
 msgid "Credentials lookup is not supported"
 msgstr "Credentials lookup is not supported"
 
-#: ../src/libedataserver/e-source-credentials-provider-impl.c:52
+#: src/libedataserver/e-source-credentials-provider-impl.c:52
 msgid "Credentials store is not supported"
 msgstr "Credentials store is not supported"
 
-#: ../src/libedataserver/e-source-credentials-provider-impl.c:63
+#: src/libedataserver/e-source-credentials-provider-impl.c:63
 msgid "Credentials delete is not supported"
 msgstr "Credentials delete is not supported"
 
-#: ../src/libedataserver/e-source-credentials-provider-impl-password.c:79
+#: src/libedataserver/e-source-credentials-provider-impl-password.c:79
 msgid "Password not found"
 msgstr "Password not found"
 
-#: ../src/libedataserver/e-source-mail-signature.c:473
+#: src/libedataserver/e-source-mail-signature.c:473
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "Signature script must be a local file"
 
-#: ../src/libedataserver/e-source-proxy.c:1650
+#: src/libedataserver/e-source-proxy.c:1651
 #, c-format
 msgid "Source “%s” does not support proxy lookups"
 msgstr "Source “%s” does not support proxy lookups"
@@ -6687,8 +6872,8 @@ msgstr "Source “%s” does not support proxy lookups"
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../src/libedataserver/e-time-utils.c:1691
-#: ../src/libedataserver/e-time-utils.c:1990
+#: src/libedataserver/e-time-utils.c:1697
+#: src/libedataserver/e-time-utils.c:1996
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -6696,8 +6881,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.
-#: ../src/libedataserver/e-time-utils.c:1696
-#: ../src/libedataserver/e-time-utils.c:1981
+#: src/libedataserver/e-time-utils.c:1702
+#: src/libedataserver/e-time-utils.c:1987
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -6705,8 +6890,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.
-#: ../src/libedataserver/e-time-utils.c:1701
-#: ../src/libedataserver/e-time-utils.c:1986
+#: src/libedataserver/e-time-utils.c:1707
+#: src/libedataserver/e-time-utils.c:1992
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -6714,83 +6899,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.
-#: ../src/libedataserver/e-time-utils.c:1706
-#: ../src/libedataserver/e-time-utils.c:1977
+#: src/libedataserver/e-time-utils.c:1712
+#: src/libedataserver/e-time-utils.c:1983
 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.
-#: ../src/libedataserver/e-time-utils.c:1711
+#: src/libedataserver/e-time-utils.c:1717
 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.
-#: ../src/libedataserver/e-time-utils.c:1716
+#: src/libedataserver/e-time-utils.c:1722
 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.
-#: ../src/libedataserver/e-time-utils.c:1719
-#: ../src/libedataserver/e-time-utils.c:1839
-#: ../src/libedataserver/e-time-utils.c:1972
+#: src/libedataserver/e-time-utils.c:1725
+#: src/libedataserver/e-time-utils.c:1845
+#: src/libedataserver/e-time-utils.c:1978
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../src/libedataserver/e-time-utils.c:1726
+#: src/libedataserver/e-time-utils.c:1732
 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.
-#: ../src/libedataserver/e-time-utils.c:1730
+#: src/libedataserver/e-time-utils.c:1736
 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.
-#: ../src/libedataserver/e-time-utils.c:1735
+#: src/libedataserver/e-time-utils.c:1741
 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.
-#: ../src/libedataserver/e-time-utils.c:1740
+#: src/libedataserver/e-time-utils.c:1746
 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.
-#: ../src/libedataserver/e-time-utils.c:1745
+#: src/libedataserver/e-time-utils.c:1751
 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.
-#: ../src/libedataserver/e-time-utils.c:1750
+#: src/libedataserver/e-time-utils.c:1756
 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.
-#: ../src/libedataserver/e-time-utils.c:1753
-#: ../src/libedataserver/e-time-utils.c:1842
+#: src/libedataserver/e-time-utils.c:1759
+#: src/libedataserver/e-time-utils.c:1848
 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.
-#: ../src/libedataserver/e-time-utils.c:1913
-#: ../src/libedataserver/e-time-utils.c:2034
+#: src/libedataserver/e-time-utils.c:1919
+#: src/libedataserver/e-time-utils.c:2040
 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.
-#: ../src/libedataserver/e-time-utils.c:1917
-#: ../src/libedataserver/e-time-utils.c:2026
+#: src/libedataserver/e-time-utils.c:1923
+#: src/libedataserver/e-time-utils.c:2032
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -6798,39 +6983,39 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../src/libedataserver/e-time-utils.c:1922
-#: ../src/libedataserver/e-time-utils.c:2031
+#: src/libedataserver/e-time-utils.c:1928
+#: src/libedataserver/e-time-utils.c:2037
 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.
-#: ../src/libedataserver/e-time-utils.c:1926
-#: ../src/libedataserver/e-time-utils.c:2023
+#: src/libedataserver/e-time-utils.c:1932
+#: src/libedataserver/e-time-utils.c:2029
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../src/libedataserver/e-time-utils.c:1930
+#: src/libedataserver/e-time-utils.c:1936
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../src/libedataserver/e-time-utils.c:1934
+#: src/libedataserver/e-time-utils.c:1940
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../src/libedataserver/e-webdav-discover.c:295
+#: src/libedataserver/e-webdav-discover.c:339
 msgid "Notes"
 msgstr "Notes"
 
-#: ../src/libedataserver/e-webdav-session.c:731
+#: src/libedataserver/e-webdav-session.c:731
 msgid "Cannot determine destination URL without WebDAV extension"
 msgstr "Cannot determine destination URL without WebDAV extension"
 
-#: ../src/libedataserver/e-webdav-session.c:1001
+#: src/libedataserver/e-webdav-session.c:993
 #, c-format
 msgid ""
 "The server responded with an HTML page, which can mean there’s an error on "
@@ -6839,7 +7024,7 @@ 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"
 
-#: ../src/libedataserver/e-webdav-session.c:1003
+#: src/libedataserver/e-webdav-session.c:995
 #, c-format
 msgid ""
 "The server responded with an HTML page, which can mean there’s an error on "
@@ -6853,7 +7038,7 @@ msgstr ""
 #. 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:1024
+#: src/libedataserver/e-webdav-session.c:1016
 #, c-format
 msgid "%s: HTTP error code %d (%s): %s"
 msgstr "%s: HTTP error code %d (%s): %s"
@@ -6861,7 +7046,7 @@ 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:1032
+#: src/libedataserver/e-webdav-session.c:1024
 #, c-format
 msgid "Failed with HTTP error code %d (%s): %s"
 msgstr "Failed with HTTP error code %d (%s): %s"
@@ -6870,229 +7055,341 @@ msgstr "Failed with HTTP error code %d (%s): %s"
 #. 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:1047
+#: src/libedataserver/e-webdav-session.c:1039
 #, c-format
 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:1053
+#: src/libedataserver/e-webdav-session.c:1045
 #, c-format
 msgid "Failed with HTTP error code %d (%s)"
 msgstr "Failed with HTTP error code %d (%s)"
 
-#: ../src/libedataserver/e-webdav-session.c:1348
+#: src/libedataserver/e-webdav-session.c:1357
 msgid "Failed to post data"
 msgstr "Failed to post data"
 
-#: ../src/libedataserver/e-webdav-session.c:1479
-#: ../src/libedataserver/e-webdav-session.c:1556
-#: ../src/libedataserver/e-webdav-session.c:1658
-#: ../src/libedataserver/e-webdav-session.c:2911
-#: ../src/libedataserver/e-webdav-session.c:4184
+#: src/libedataserver/e-webdav-session.c:1438
+#: src/libedataserver/e-webdav-session.c:1504
+#: src/libedataserver/e-webdav-session.c:1595
+#: src/libedataserver/e-webdav-session.c:2719
+#: src/libedataserver/e-webdav-session.c:3966
 msgid "Failed to get input XML content"
 msgstr "Failed to get input XML content"
 
-#: ../src/libedataserver/e-webdav-session.c:1490
+#: src/libedataserver/e-webdav-session.c:1449
 msgid "Failed to get properties"
 msgstr "Failed to get properties"
 
-#: ../src/libedataserver/e-webdav-session.c:1566
+#: src/libedataserver/e-webdav-session.c:1514
 msgid "Failed to update properties"
 msgstr "Failed to update properties"
 
-#: ../src/libedataserver/e-webdav-session.c:1668
+#: src/libedataserver/e-webdav-session.c:1605
 msgid "Failed to issue REPORT"
 msgstr "Failed to issue REPORT"
 
-#: ../src/libedataserver/e-webdav-session.c:1729
+#: src/libedataserver/e-webdav-session.c:1665
 msgid "Failed to create collection"
 msgstr "Failed to create collection"
 
-#: ../src/libedataserver/e-webdav-session.c:1822
-#: ../src/libedataserver/e-webdav-session.c:1983
+#: src/libedataserver/e-webdav-session.c:1748
+#: src/libedataserver/e-webdav-session.c:1898
 msgid "Failed to get XML request content"
 msgstr "Failed to get XML request content"
 
-#: ../src/libedataserver/e-webdav-session.c:1834
+#: src/libedataserver/e-webdav-session.c:1760
 msgid "Failed to create address book"
 msgstr "Failed to create address book"
 
-#: ../src/libedataserver/e-webdav-session.c:1996
+#: src/libedataserver/e-webdav-session.c:1911
 msgid "Failed to create calendar"
 msgstr "Failed to create calendar"
 
-#: ../src/libedataserver/e-webdav-session.c:2124
-#: ../src/libedataserver/e-webdav-session.c:2135
+#: src/libedataserver/e-webdav-session.c:2036
+#: src/libedataserver/e-webdav-session.c:2047
 msgid "Failed to read resource"
 msgstr "Failed to read resource"
 
-#: ../src/libedataserver/e-webdav-session.c:2275
-msgid "Cannot rewind input stream: Not supported"
-msgstr "Cannot rewind input stream: Not supported"
-
-#: ../src/libedataserver/e-webdav-session.c:2439
-#: ../src/libedataserver/e-webdav-session.c:2580
+#: src/libedataserver/e-webdav-session.c:2283
+#: src/libedataserver/e-webdav-session.c:2425
 msgid "Failed to put data"
 msgstr "Failed to put data"
 
-#: ../src/libedataserver/e-webdav-session.c:2453
-#: ../src/libedataserver/e-webdav-session.c:2588
+#: src/libedataserver/e-webdav-session.c:2291
+#: src/libedataserver/e-webdav-session.c:2433
 #, c-format
 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:2682
+#: src/libedataserver/e-webdav-session.c:2521
 msgid "Failed to delete resource"
 msgstr "Failed to delete resource"
 
-#: ../src/libedataserver/e-webdav-session.c:2751
+#: src/libedataserver/e-webdav-session.c:2580
 msgid "Failed to copy resource"
 msgstr "Failed to copy resource"
 
-#: ../src/libedataserver/e-webdav-session.c:2815
+#: src/libedataserver/e-webdav-session.c:2634
 msgid "Failed to move resource"
 msgstr "Failed to move resource"
 
-#: ../src/libedataserver/e-webdav-session.c:2922
+#: src/libedataserver/e-webdav-session.c:2730
 msgid "Failed to lock resource"
 msgstr "Failed to lock resource"
 
-#: ../src/libedataserver/e-webdav-session.c:2936
-#: ../src/libedataserver/e-webdav-session.c:3144
+#: src/libedataserver/e-webdav-session.c:2744
+#: src/libedataserver/e-webdav-session.c:2931
 msgid "Expected application/xml response, but none returned"
 msgstr "Expected application/xml response, but none returned"
 
-#: ../src/libedataserver/e-webdav-session.c:2939
-#: ../src/libedataserver/e-webdav-session.c:3147
+#: src/libedataserver/e-webdav-session.c:2747
+#: src/libedataserver/e-webdav-session.c:2934
 #, c-format
 msgid "Expected application/xml response, but %s returned"
 msgstr "Expected application/xml response, but %s returned"
 
-#: ../src/libedataserver/e-webdav-session.c:2951
-#: ../src/libedataserver/e-webdav-session.c:3160
+#: src/libedataserver/e-webdav-session.c:2759
+#: src/libedataserver/e-webdav-session.c:2947
 msgid "Failed to parse XML data"
 msgstr "Failed to parse XML data"
 
-#: ../src/libedataserver/e-webdav-session.c:3032
+#: src/libedataserver/e-webdav-session.c:2830
 msgid "Failed to refresh lock"
 msgstr "Failed to refresh lock"
 
-#: ../src/libedataserver/e-webdav-session.c:3093
+#: src/libedataserver/e-webdav-session.c:2881
 msgid "Failed to unlock"
 msgstr "Failed to unlock"
 
-#: ../src/libedataserver/e-webdav-session.c:3132
+#: src/libedataserver/e-webdav-session.c:2919
 #, c-format
 msgid "Expected multistatus response, but %d returned (%s)"
 msgstr "Expected multistatus response, but %d returned (%s)"
 
-#: ../src/libedataserver/e-webdav-session.c:3169
+#: src/libedataserver/e-webdav-session.c:2956
 msgid "XML data does not have root node"
 msgstr "XML data does not have root node"
 
-#: ../src/libedataserver/e-webdav-session.c:3192
+#: src/libedataserver/e-webdav-session.c:2979
 #, c-format
 msgid "XML data doesn't have required structure (%s)"
 msgstr "XML data doesn't have required structure (%s)"
 
-#: ../src/libedataserver/e-webdav-session.c:4194
+#: src/libedataserver/e-webdav-session.c:3976
 msgid "Failed to get access control list"
 msgstr "Failed to get access control list"
 
-#: ../src/libedataserver/e-webdav-session.c:4878
+#: src/libedataserver/e-webdav-session.c:4659
 msgid "Cannot store protected nor inherited Access Control Entry."
 msgstr "Cannot store protected nor inherited Access Control Entry."
 
-#: ../src/libedataserver/e-webdav-session.c:4885
+#: src/libedataserver/e-webdav-session.c:4666
 msgid "Provided invalid principal kind for Access Control Entry."
 msgstr "Provided invalid principal kind for Access Control Entry."
 
-#: ../src/libedataserver/e-webdav-session.c:4892
+#: src/libedataserver/e-webdav-session.c:4673
 msgid "Cannot store property-based Access Control Entry."
 msgstr "Cannot store property-based Access Control Entry."
 
-#: ../src/libedataserver/e-webdav-session.c:4899
+#: src/libedataserver/e-webdav-session.c:4680
 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:4907
+#: src/libedataserver/e-webdav-session.c:4688
 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:4966
+#: src/libedataserver/e-webdav-session.c:4747
 msgid "Access Control Entry privilege cannot be NULL."
 msgstr "Access Control Entry privilege cannot be NULL."
 
-#: ../src/libedataserverui/e-buffer-tagger.c:71
+#: src/libedataserverui/e-buffer-tagger.c:79
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../src/libedataserverui/e-buffer-tagger.c:548
-msgid "Ctrl-click to open a link"
-msgstr "Ctrl-click to open a link"
-
-#: ../src/libedataserverui/e-buffer-tagger.c:810
+#: src/libedataserverui/e-buffer-tagger.c:562
+#: src/libedataserverui/e-buffer-tagger.c:976
 msgid "Copy _Link Location"
 msgstr "Copy _Link Location"
 
-#: ../src/libedataserverui/e-buffer-tagger.c:817
+#: src/libedataserverui/e-buffer-tagger.c:567
+#: src/libedataserverui/e-buffer-tagger.c:983
 msgid "O_pen Link in Browser"
 msgstr "O_pen Link in Browser"
 
-#: ../src/libedataserverui/e-credentials-prompter.c:260
-#: ../src/libedataserverui/e-credentials-prompter.c:1753
-#: ../src/libedataserverui/e-credentials-prompter.c:1797
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
+#: src/libedataserverui/e-buffer-tagger.c:712
+msgid "Ctrl-click to open a link"
+msgstr "Ctrl-click to open a link"
+
+#. x509 certificate usage types
+#: src/libedataserverui/e-certificate-widget.c:288
+msgid "Digital Signature"
+msgstr "Digital Signature"
+
+#: src/libedataserverui/e-certificate-widget.c:289
+msgid "Key Encipherment"
+msgstr "Key Encypherment"
+
+#: src/libedataserverui/e-certificate-widget.c:411
+msgid "Certificate"
+msgstr "Certificate"
+
+#: src/libedataserverui/e-certificate-widget.c:411
+msgid "Identity"
+msgstr "Identity"
+
+#: src/libedataserverui/e-certificate-widget.c:412
+#: src/libedataserverui/e-certificate-widget.c:424
+msgid "Issuer"
+msgstr "Issuer"
+
+#: src/libedataserverui/e-certificate-widget.c:413
+msgid "Expires on"
+msgstr "Expires on"
+
+#: src/libedataserverui/e-certificate-widget.c:414
+msgid "Subject"
+msgstr "Subject"
+
+#: src/libedataserverui/e-certificate-widget.c:414
+#: src/libedataserverui/e-certificate-widget.c:424
+msgid "Common Name"
+msgstr "Common Name"
+
+#: src/libedataserverui/e-certificate-widget.c:416
+#: src/libedataserverui/e-certificate-widget.c:425
+msgid "Email"
+msgstr "E-mail"
+
+#: src/libedataserverui/e-certificate-widget.c:418
+#: src/libedataserverui/e-certificate-widget.c:427
+msgid "Organization Unit"
+msgstr "Organisation Unit"
+
+#: src/libedataserverui/e-certificate-widget.c:419
+#: src/libedataserverui/e-certificate-widget.c:428
+msgid "Country"
+msgstr "Country"
+
+#: src/libedataserverui/e-certificate-widget.c:420
+#: src/libedataserverui/e-certificate-widget.c:429
+msgid "State"
+msgstr "State"
+
+#: src/libedataserverui/e-certificate-widget.c:421
+#: src/libedataserverui/e-certificate-widget.c:430
+msgid "Locality"
+msgstr "Locality"
+
+#: src/libedataserverui/e-certificate-widget.c:422
+#: src/libedataserverui/e-certificate-widget.c:431
+msgid "Domain Component Name"
+msgstr "Domain Component Name"
+
+#: src/libedataserverui/e-certificate-widget.c:423
+msgid "Alternative Emails"
+msgstr "Alternative E-mails"
+
+#: src/libedataserverui/e-certificate-widget.c:432
+#: src/libedataserverui/e-certificate-widget.c:440
+msgid "SHA-256 Fingerprint"
+msgstr "SHA-256 Fingerprint"
+
+#: src/libedataserverui/e-certificate-widget.c:433
+msgid "Details"
+msgstr "Details"
+
+#: src/libedataserverui/e-certificate-widget.c:433
+msgid "Not Before"
+msgstr "Not Before"
+
+#: src/libedataserverui/e-certificate-widget.c:434
+msgid "Not After"
+msgstr "Not After"
+
+#: src/libedataserverui/e-certificate-widget.c:435
+msgid "Usage"
+msgstr "Usage"
+
+#: src/libedataserverui/e-certificate-widget.c:436
+msgid "Version"
+msgstr "Version"
+
+#: src/libedataserverui/e-certificate-widget.c:437
+msgid "Serial Number"
+msgstr "Serial Number"
+
+#: src/libedataserverui/e-certificate-widget.c:438
+msgid "Key ID"
+msgstr "Key ID"
+
+#: src/libedataserverui/e-certificate-widget.c:439
+msgid "Signature Algorithm"
+msgstr "Signature Algorithm"
+
+#: src/libedataserverui/e-certificate-widget.c:441
+msgid "Public Key"
+msgstr "Public Key"
+
+#: src/libedataserverui/e-certificate-widget.c:441
+msgid "Algorithm"
+msgstr "Algorithm"
+
+#: src/libedataserverui/e-credentials-prompter.c:260
+#: src/libedataserverui/e-credentials-prompter.c:1755
+#: src/libedataserverui/e-credentials-prompter.c:1799
 msgid "Credentials prompt was cancelled"
 msgstr "Credentials prompt was cancelled"
 
-#: ../src/libedataserverui/e-credentials-prompter.c:776
+#: src/libedataserverui/e-credentials-prompter.c:776
 #, c-format
 msgid "Source “%s” doesn’t support prompt for credentials"
 msgstr "Source “%s” doesn’t support prompt for credentials"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:202
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:264
 #, c-format
 msgid "Failed to obtain access token from address “%s”: %s"
 msgstr "Failed to obtain access token from address “%s”: %s"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:246
-msgid "Requesting access token, please wait..."
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:295
+msgid "Requesting access token, please wait…"
 msgstr "Requesting access token, please wait…"
 
 #. 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
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:569
 #, c-format
 msgid "%s Address Book authentication request"
 msgstr "%s 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 Calendar authentication request".
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:477
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:574
 #, c-format
 msgid "%s Calendar authentication request"
 msgstr "%s 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 Memo List authentication request".
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:482
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:579
 #, c-format
 msgid "%s Memo List authentication request"
 msgstr "%s 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 Task List authentication request".
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:487
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:584
 #, c-format
 msgid "%s Task List authentication request"
 msgstr "%s 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 Mail authentication request".
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:493
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:590
 #, c-format
 msgid "%s Mail authentication request"
 msgstr "%s Mail authentication request"
@@ -7100,7 +7397,7 @@ msgstr "%s Mail authentication request"
 #. generic account prompt
 #. 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
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:595
 #, c-format
 msgid "%s account authentication request"
 msgstr "%s account authentication request"
@@ -7108,7 +7405,7 @@ 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
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:609
 #, c-format
 msgid ""
 "Login to your %s account and accept conditions in order to access your "
@@ -7120,7 +7417,7 @@ msgstr ""
 #. 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
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:616
 #, c-format
 msgid ""
 "Login to your %s account and accept conditions in order to access your "
@@ -7132,7 +7429,7 @@ msgstr ""
 #. 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
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:623
 #, c-format
 msgid ""
 "Login to your %s account and accept conditions in order to access your mail "
@@ -7144,7 +7441,7 @@ msgstr ""
 #. 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
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:630
 #, c-format
 msgid ""
 "Login to your %s account and accept conditions in order to access your mail "
@@ -7156,7 +7453,7 @@ msgstr ""
 #. 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
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:637
 #, c-format
 msgid ""
 "Login to your %s account and accept conditions in order to access your memo "
@@ -7168,7 +7465,7 @@ msgstr ""
 #. 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
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:644
 #, c-format
 msgid ""
 "Login to your %s account and accept conditions in order to access your task "
@@ -7180,7 +7477,7 @@ msgstr ""
 #. 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
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:651
 #, c-format
 msgid ""
 "Login to your %s account and accept conditions in order to access your "
@@ -7189,71 +7486,98 @@ msgstr ""
 "Login to your %s account and accept conditions in order to access your "
 "account “%s”."
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:730
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:235
-#: ../src/libedataserverui/e-trust-prompt.c:111
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1094
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:853
+#, c-format
+msgid "Failed to open browser: %s"
+msgstr "Failed to open browser: %s"
+
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:954
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:243
+#: src/libedataserverui/e-trust-prompt.c:117
+#: src/libedataserverui/e-webdav-discover-widget.c:1149
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:804
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:1036
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:132
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:1066
+msgid "Click here to open the URL"
+msgstr "Click here to open the URL"
+
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:1104
+msgid ""
+"Open the above URL in a browser and go through the OAuth2 wizard there. Copy "
+"the resulting authorization code, or the URL the OAuth2 wizard finished "
+"with, below to continue the authentication process."
+msgstr ""
+"Open the above URL in a browser and go through the OAuth2 wizard there. Copy "
+"the resulting authorisation code, or the URL the OAuth2 wizard finished "
+"with, below to continue the authentication process."
+
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:1141
+msgid "_Authorization code:"
+msgstr "_Authorisation code:"
+
+#: src/libedataserverui/e-credentials-prompter-impl-oauth2.c:1154
+msgid "C_ontinue"
+msgstr "C_ontinue"
+
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:136
 msgid "Address book authentication request"
 msgstr "Address book authentication request"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:137
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:141
 msgid "Calendar authentication request"
 msgstr "Calendar authentication request"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:141
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:145
 msgid "Mail authentication request"
 msgstr "Mail authentication request"
 
 #. generic account prompt
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:144
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:148
 msgid "Authentication request"
 msgstr "Authentication request"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:153
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:157
 #, c-format
 msgid "Please enter the password for address book “%s”."
 msgstr "Please enter the password for address book “%s”."
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:157
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:161
 #, c-format
 msgid "Please enter the password for calendar “%s”."
 msgstr "Please enter the password for calendar “%s”."
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:161
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:165
 #, c-format
 msgid "Please enter the password for mail account “%s”."
 msgstr "Please enter the password for mail account “%s”."
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:165
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:169
 #, c-format
 msgid "Please enter the password for mail transport “%s”."
 msgstr "Please enter the password for mail transport “%s”."
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:169
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:173
 #, c-format
 msgid "Please enter the password for memo list “%s”."
 msgstr "Please enter the password for memo list “%s”."
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:173
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:177
 #, c-format
 msgid "Please enter the password for task list “%s”."
 msgstr "Please enter the password for task list “%s”."
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:177
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:181
 #, c-format
 msgid "Please enter the password for account “%s”."
 msgstr "Please enter the password for account “%s”."
 
 #. Translators: This is part of a credential prompt, constructing for example: "Please enter the password for account “%s”.\n(host: hostname)"
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:183
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:187
 #, c-format
 msgid ""
 "\n"
@@ -7262,160 +7586,176 @@ msgstr ""
 "\n"
 "(host: %s)"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:236
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1095
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:244
+#: src/libedataserverui/e-webdav-discover-widget.c:1150
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:354
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:380
 msgid "_User Name:"
 msgstr "_User Name:"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:366
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:392
 msgid "_Password:"
 msgstr "_Password:"
 
 #. Remember password check
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:382
+#: src/libedataserverui/e-credentials-prompter-impl-password.c:408
 msgid "_Add this password to your keyring"
 msgstr "_Add this password to your keyring"
 
 #. Translators: meaning as "Snooze, until event start time"
-#: ../src/libedataserverui/e-reminders-widget.c:182
+#: src/libedataserverui/e-reminders-widget.c:237
 msgid "until start time"
 msgstr "until start time"
 
-#: ../src/libedataserverui/e-reminders-widget.c:233
+#: src/libedataserverui/e-reminders-widget.c:262
 msgid "Add custom time…"
 msgstr "Add custom time…"
 
-#: ../src/libedataserverui/e-reminders-widget.c:237
+#: src/libedataserverui/e-reminders-widget.c:266
 msgid "Clear custom times"
 msgstr "Clear custom times"
 
-#: ../src/libedataserverui/e-reminders-widget.c:285
+#: src/libedataserverui/e-reminders-widget.c:323
 msgctxt "overdue"
 msgid "now"
 msgstr "now"
 
-#: ../src/libedataserverui/e-reminders-widget.c:303
+#: src/libedataserverui/e-reminders-widget.c:341
 #, c-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d year"
 msgstr[1] "%d years"
 
-#: ../src/libedataserverui/e-reminders-widget.c:309
+#: src/libedataserverui/e-reminders-widget.c:347
 msgctxt "overdue"
 msgid "overdue"
 msgstr "overdue"
 
-#: ../src/libedataserverui/e-reminders-widget.c:938
+#: src/libedataserverui/e-reminders-widget.c:983
 #, c-format
 msgid "Failed to launch URI “%s”:"
 msgstr "Failed to launch URI “%s”:"
 
-#: ../src/libedataserverui/e-reminders-widget.c:989
+#: src/libedataserverui/e-reminders-widget.c:1034
 msgid "No reminder is selected."
 msgstr "No reminder is selected."
 
-#: ../src/libedataserverui/e-reminders-widget.c:1067
+#: src/libedataserverui/e-reminders-widget.c:1116
 msgid "No details are available."
 msgstr "No details are available."
 
-#: ../src/libedataserverui/e-reminders-widget.c:1071
+#: src/libedataserverui/e-reminders-widget.c:1120
 msgid "Multiple reminders are selected."
 msgstr "Multiple reminders are selected."
 
-#: ../src/libedataserverui/e-reminders-widget.c:1105
+#: src/libedataserverui/e-reminders-widget.c:1154
 msgid "Failed to dismiss reminder:"
 msgstr "Failed to dismiss reminder:"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1126
+#: src/libedataserverui/e-reminders-widget.c:1175
 msgid "Failed to dismiss all:"
 msgstr "Failed to dismiss all:"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1262
+#: src/libedataserverui/e-reminders-widget.c:1335
 msgid "Set a custom snooze time for"
 msgstr "Set a custom snooze time for"
 
 #. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where the text in "[]" means a separate widget
-#: ../src/libedataserverui/e-reminders-widget.c:1275
+#: src/libedataserverui/e-reminders-widget.c:1348
 msgctxt "reminders-snooze"
 msgid "da_ys"
 msgstr "da_ys"
 
 #. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where the text in "[]" means a separate widget
-#: ../src/libedataserverui/e-reminders-widget.c:1291
+#: src/libedataserverui/e-reminders-widget.c:1364
 msgctxt "reminders-snooze"
 msgid "_hours"
 msgstr "_hours"
 
 #. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where the text in "[]" means a separate widget
-#: ../src/libedataserverui/e-reminders-widget.c:1307
+#: src/libedataserverui/e-reminders-widget.c:1380
 msgctxt "reminders-snooze"
 msgid "_minutes"
 msgstr "_minutes"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1313
+#: src/libedataserverui/e-reminders-widget.c:1386
 msgid "_Add Snooze time"
 msgstr "_Add Snooze time"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1631
-#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
+#: src/libedataserverui/e-reminders-widget.c:1749
+#: src/services/evolution-user-prompter/prompt-user-gtk.c:119
 msgid "_Dismiss"
 msgstr "_Dismiss"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1632
+#: src/libedataserverui/e-reminders-widget.c:1750
 msgid "Dismiss _All"
 msgstr "Dismiss _All"
 
-#: ../src/libedataserverui/e-reminders-widget.c:1634
+#: src/libedataserverui/e-reminders-widget.c:1752
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: ../src/libedataserverui/e-trust-prompt.c:110
-#: ../src/modules/trust-prompt/trust-prompt-gtk.c:117
+#: src/libedataserverui/e-trust-prompt.c:116
+#: src/modules/trust-prompt/trust-prompt-gtk.c:129
 msgid "Certificate trust..."
 msgstr "Certificate trust…"
 
-#: ../src/libedataserverui/e-trust-prompt.c:112
-#: ../src/modules/trust-prompt/trust-prompt-gtk.c:118
+#: src/libedataserverui/e-trust-prompt.c:118
+#: src/modules/trust-prompt/trust-prompt-gtk.c:130
 msgid "_Reject"
 msgstr "_Reject"
 
-#: ../src/libedataserverui/e-trust-prompt.c:113
-#: ../src/modules/trust-prompt/trust-prompt-gtk.c:119
+#: src/libedataserverui/e-trust-prompt.c:119
+#: src/modules/trust-prompt/trust-prompt-gtk.c:131
 msgid "Accept _Temporarily"
 msgstr "Accept _Temporarily"
 
-#: ../src/libedataserverui/e-trust-prompt.c:114
-#: ../src/modules/trust-prompt/trust-prompt-gtk.c:120
+#: src/libedataserverui/e-trust-prompt.c:120
+#: src/modules/trust-prompt/trust-prompt-gtk.c:132
 msgid "_Accept Permanently"
 msgstr "_Accept Permanently"
 
-#: ../src/libedataserverui/e-trust-prompt.c:185
-#: ../src/modules/trust-prompt/trust-prompt-gtk.c:157
+#: src/libedataserverui/e-trust-prompt.c:124
+msgid "Temporarily reject the certificate"
+msgstr "Temporarily reject the certificate"
+
+#: src/libedataserverui/e-trust-prompt.c:127
+msgid "Permanently reject the certificate"
+msgstr "Permanently reject the certificate"
+
+#: src/libedataserverui/e-trust-prompt.c:130
+msgid "Temporarily accept the certificate"
+msgstr "Temporarily accept the certificate"
+
+#: src/libedataserverui/e-trust-prompt.c:133
+msgid "Permanently accept the certificate"
+msgstr "Permanently accept the certificate"
+
+#: src/libedataserverui/e-trust-prompt.c:218
+#: src/modules/trust-prompt/trust-prompt-gtk.c:169
 #, 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?"
 
-#: ../src/libedataserverui/e-trust-prompt.c:207
-#: ../src/modules/trust-prompt/trust-prompt-gtk.c:172
+#: src/libedataserverui/e-trust-prompt.c:240
+#: src/modules/trust-prompt/trust-prompt-gtk.c:184
 msgid "Reason:"
 msgstr "Reason:"
 
-#: ../src/libedataserverui/e-trust-prompt.c:210
+#: src/libedataserverui/e-trust-prompt.c:243
 msgid "Detailed error:"
 msgstr "Detailed error:"
 
-#: ../src/libedataserverui/e-trust-prompt.c:272
-#: ../src/modules/trust-prompt/module-trust-prompt.c:80
+#: src/libedataserverui/e-trust-prompt.c:302
+#: 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."
 
-#: ../src/libedataserverui/e-trust-prompt.c:274
-#: ../src/modules/trust-prompt/module-trust-prompt.c:82
+#: src/libedataserverui/e-trust-prompt.c:304
+#: 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."
@@ -7423,18 +7763,18 @@ msgstr ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 
-#: ../src/libedataserverui/e-trust-prompt.c:276
-#: ../src/modules/trust-prompt/module-trust-prompt.c:84
+#: src/libedataserverui/e-trust-prompt.c:306
+#: src/modules/trust-prompt/module-trust-prompt.c:84
 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:278
-#: ../src/modules/trust-prompt/module-trust-prompt.c:86
+#: src/libedataserverui/e-trust-prompt.c:308
+#: src/modules/trust-prompt/module-trust-prompt.c:86
 msgid "The certificate has expired."
 msgstr "The certificate has expired."
 
-#: ../src/libedataserverui/e-trust-prompt.c:280
-#: ../src/modules/trust-prompt/module-trust-prompt.c:88
+#: src/libedataserverui/e-trust-prompt.c:310
+#: src/modules/trust-prompt/module-trust-prompt.c:88
 msgid ""
 "The certificate has been revoked according to the connection’s certificate "
 "revocation list."
@@ -7442,52 +7782,52 @@ msgstr ""
 "The certificate has been revoked according to the connection’s certificate "
 "revocation list."
 
-#: ../src/libedataserverui/e-trust-prompt.c:282
-#: ../src/modules/trust-prompt/module-trust-prompt.c:90
+#: src/libedataserverui/e-trust-prompt.c:312
+#: src/modules/trust-prompt/module-trust-prompt.c:90
 msgid "The certificate’s algorithm is considered insecure."
 msgstr "The certificate’s algorithm is considered insecure."
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:193
+#: src/libedataserverui/e-webdav-discover-widget.c:208
 msgid "Supports"
 msgstr "Supports"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:204
+#: src/libedataserverui/e-webdav-discover-widget.c:219
 msgid "_User mail:"
 msgstr "_User mail:"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:542
+#: src/libedataserverui/e-webdav-discover-widget.c:565
 msgctxt "WebDAVDiscover"
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:543
+#: src/libedataserverui/e-webdav-discover-widget.c:566
 msgctxt "WebDAVDiscover"
 msgid "Events"
 msgstr "Events"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:544
+#: src/libedataserverui/e-webdav-discover-widget.c:567
 msgctxt "WebDAVDiscover"
 msgid "Memos"
 msgstr "Memos"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:545
+#: src/libedataserverui/e-webdav-discover-widget.c:568
 msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:857
+#: src/libedataserverui/e-webdav-discover-widget.c:891
 msgid "Invalid URL"
 msgstr "Invalid URI"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:902
+#: src/libedataserverui/e-webdav-discover-widget.c:940
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:905
+#: src/libedataserverui/e-webdav-discover-widget.c:943
 msgid "Searching server sources..."
 msgstr "Searching server sources…"
 
-#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:248
+#: 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 "
@@ -7496,47 +7836,47 @@ msgstr ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain a password for “%s”"
 
-#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:315
+#: 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
-#: ../src/modules/gnome-online-accounts/goaewsclient.c:220
+#: src/modules/gnome-online-accounts/goaewsclient.c:240
 #, c-format
 msgid "Code: %u — Unexpected response from server"
 msgstr "Code: %u — Unexpected response from server"
 
 #. TODO: more specific
-#: ../src/modules/gnome-online-accounts/goaewsclient.c:241
+#: src/modules/gnome-online-accounts/goaewsclient.c:263
 #, c-format
 msgid "Failed to parse autodiscover response XML"
 msgstr "Failed to parse autodiscover response XML"
 
 #. TODO: more specific
-#: ../src/modules/gnome-online-accounts/goaewsclient.c:250
+#: src/modules/gnome-online-accounts/goaewsclient.c:272
 #, c-format
 msgid "Failed to find Autodiscover element"
 msgstr "Failed to find Autodiscover element"
 
 #. TODO: more specific
-#: ../src/modules/gnome-online-accounts/goaewsclient.c:262
+#: src/modules/gnome-online-accounts/goaewsclient.c:284
 #, c-format
 msgid "Failed to find Response element"
 msgstr "Failed to find Response element"
 
 #. TODO: more specific
-#: ../src/modules/gnome-online-accounts/goaewsclient.c:274
+#: src/modules/gnome-online-accounts/goaewsclient.c:296
 #, c-format
 msgid "Failed to find Account element"
 msgstr "Failed to find Account element"
 
 #. TODO: more specific
-#: ../src/modules/gnome-online-accounts/goaewsclient.c:288
+#: src/modules/gnome-online-accounts/goaewsclient.c:310
 #, c-format
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "Failed to find ASUrl and OABUrl in autodiscover response"
 
-#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1422
+#: src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1431
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -7545,24 +7885,24 @@ msgstr ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an access token for “%s”"
 
-#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1472
+#: src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1481
 #, c-format
 msgid "Failed to obtain an access token for “%s”: "
 msgstr "Failed to obtain an access token for “%s”: "
 
-#: ../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
+#: 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"
 
-#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:40
-#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:42
+#: 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"
 
-#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:42
-#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:44
+#: 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"
@@ -7570,26 +7910,26 @@ 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-alarm-notify/e-alarm-notify.c:326
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:354
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:883
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:1131
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:332
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:343
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:879
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:1127
 msgid "Reminders"
 msgstr "Reminders"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:466
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:460
 msgid "Warning"
 msgstr "Warning"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:467
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:461
 msgid "_No"
 msgstr "_No"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:468
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:462
 msgid "_Yes"
 msgstr "_Yes"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:472
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:466
 #, c-format
 msgid ""
 "A calendar reminder is about to trigger. This reminder is configured to run "
@@ -7606,154 +7946,106 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:487
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:481
 msgid "Do not ask me about this program again"
 msgstr "Do not ask me about this program again"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:788
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:782
 msgid "Display Reminders window with _notifications"
 msgstr "Display Reminders window with _notifications"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:789
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:783
 msgid "Keep reminder notification window always on _top"
 msgstr "Keep reminder notification window always on _top"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:790
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:784
+msgid "Enable _desktop notifications"
+msgstr "Enable _desktop notifications"
+
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:785
+msgid "Enable _audio notifications"
+msgstr "Enable _audio notifications"
+
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:786
 msgid "Display reminders for _completed tasks"
 msgstr "Display reminders for _completed tasks"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:791
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:787
 msgid "Display reminders for _past events"
 msgstr "Display reminders for _past events"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:805
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:801
 msgid "Reminders Options:"
 msgstr "Reminders Options:"
 
-#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:899
+#: src/services/evolution-alarm-notify/e-alarm-notify.c:895
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "You have %d reminder"
 msgstr[1] "You have %d reminders"
 
-#: ../src/services/evolution-source-registry/builtin/birthdays.source.in.h:1
-msgid "Birthdays & Anniversaries"
-msgstr "Birthdays & Anniversaries"
-
-#: ../src/services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../src/services/evolution-source-registry/builtin/carddav-stub.source.in.h:1
-msgid "CardDAV"
-msgstr "CardDAV"
-
-#: ../src/services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../src/services/evolution-source-registry/builtin/google-stub.source.in.h:1
-msgid "Google"
-msgstr "Google"
-
-#: ../src/services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
-msgid "On LDAP Servers"
-msgstr "On LDAP Servers"
-
-#: ../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"
-
-#: ../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"
-
-#: ../src/services/evolution-source-registry/builtin/system-proxy.source.in.h:1
-msgid "Default Proxy Settings"
-msgstr "Default Proxy Settings"
-
-#: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1
-msgid "Search Folders"
-msgstr "Search Folders"
-
-#: ../src/services/evolution-source-registry/builtin/weather-stub.source.in.h:1
-msgid "Weather"
-msgstr "Weather"
-
-#: ../src/services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
-msgid "On The Web"
-msgstr "On The Web"
-
-#: ../src/services/evolution-source-registry/builtin/webdav-notes-stub.source.in.h:1
-msgid "WebDAV Notes"
-msgstr "WebDAV Notes"
-
-#: ../src/services/evolution-source-registry/evolution-source-registry.c:41
+#: src/services/evolution-source-registry/evolution-source-registry.c:41
 msgid "Don’t migrate user data from previous versions of Evolution"
 msgstr "Don’t migrate user data from previous versions of Evolution"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:69
-#: ../src/tools/addressbook-export/addressbook-export.c:781
+#: 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"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:99
+#: src/tools/addressbook-export/addressbook-export.c:99
 #, c-format
 msgid "Failed to open client “%s”: %s"
 msgstr "Failed to open client “%s”: %s"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:889
+#: src/tools/addressbook-export/addressbook-export.c:889
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:922
+#: 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"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:923
+#: src/tools/addressbook-export/addressbook-export.c:923
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:926
+#: src/tools/addressbook-export/addressbook-export.c:926
 msgid "List local address book folders"
 msgstr "List local address book folders"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:929
+#: src/tools/addressbook-export/addressbook-export.c:929
 msgid "Show cards as vcard or csv file"
 msgstr "Show cards as vcard or csv file"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:930
+#: src/tools/addressbook-export/addressbook-export.c:930
 msgid "[vcard|csv]"
 msgstr "csv]"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:978
+#: 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."
 
-#: ../src/tools/addressbook-export/addressbook-export.c:992
+#: 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
+#: src/tools/list-sources/list-sources.c:83
 msgid "Show only enabled sources"
 msgstr "Show only enabled sources"
 
-#: ../src/tools/list-sources/list-sources.c:86
+#: src/tools/list-sources/list-sources.c:86
 msgid "Show source’s UID"
 msgstr "Show source’s UID"
 
-#: ../src/tools/list-sources/list-sources.c:89
+#: src/tools/list-sources/list-sources.c:89
 msgid "Show source’s authentication information"
 msgstr "Show source’s authentication information"
 
-#: ../src/tools/list-sources/list-sources.c:92
+#: 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)"
@@ -7761,149 +8053,214 @@ 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
+#: 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
+#: src/tools/list-sources/list-sources.c:106
 msgid "yes"
 msgstr "yes"
 
-#: ../src/tools/list-sources/list-sources.c:106
+#: src/tools/list-sources/list-sources.c:106
 msgid "no"
 msgstr "no"
 
-#: ../src/tools/list-sources/list-sources.c:126
+#: src/tools/list-sources/list-sources.c:126
 msgid "Collection"
 msgstr "Collection"
 
-#: ../src/tools/list-sources/list-sources.c:132
+#: 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
+#: 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
+#: src/tools/list-sources/list-sources.c:147
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../src/tools/list-sources/list-sources.c:148
+#: src/tools/list-sources/list-sources.c:148
 msgid "Calendar"
 msgstr "Calendar"
 
-#: ../src/tools/list-sources/list-sources.c:149
+#: src/tools/list-sources/list-sources.c:149
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../src/tools/list-sources/list-sources.c:150
+#: src/tools/list-sources/list-sources.c:150
 msgid "Task List"
 msgstr "Task List"
 
-#: ../src/tools/list-sources/list-sources.c:151
+#: src/tools/list-sources/list-sources.c:151
 msgid "Mail Account"
 msgstr "Mail Account"
 
-#: ../src/tools/list-sources/list-sources.c:152
+#: src/tools/list-sources/list-sources.c:152
 msgid "Mail Transport"
 msgstr "Mail Transport"
 
-#: ../src/tools/list-sources/list-sources.c:153
+#: src/tools/list-sources/list-sources.c:153
 msgid "Mail Identity"
 msgstr "Mail Identity"
 
-#: ../src/tools/list-sources/list-sources.c:154
+#: src/tools/list-sources/list-sources.c:154
 msgid "Mail Submission"
 msgstr "Mail Submission"
 
-#: ../src/tools/list-sources/list-sources.c:155
+#: src/tools/list-sources/list-sources.c:155
 msgid "Mail Signature"
 msgstr "Mail Signature"
 
-#: ../src/tools/list-sources/list-sources.c:156
+#: src/tools/list-sources/list-sources.c:156
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/tools/list-sources/list-sources.c:224
+#: src/tools/list-sources/list-sources.c:224
 #, c-format
 msgid "UID: %s"
 msgstr "UID: %s"
 
-#: ../src/tools/list-sources/list-sources.c:228
+#: src/tools/list-sources/list-sources.c:228
 #, c-format
 msgid "Parent UID: %s"
 msgstr "Parent UID: %s"
 
-#: ../src/tools/list-sources/list-sources.c:231
+#: src/tools/list-sources/list-sources.c:231
 #, c-format
 msgid "Enabled: %s"
 msgstr "Enabled: %s"
 
-#: ../src/tools/list-sources/list-sources.c:233
+#: src/tools/list-sources/list-sources.c:233
 #, c-format
 msgid "Backend: %s"
 msgstr "Backend: %s"
 
-#: ../src/tools/list-sources/list-sources.c:238
+#: src/tools/list-sources/list-sources.c:238
 #, c-format
 msgid "Calendar enabled: %s"
 msgstr "Calendar enabled: %s"
 
-#: ../src/tools/list-sources/list-sources.c:239
+#: src/tools/list-sources/list-sources.c:239
 #, c-format
 msgid "Contacts enabled: %s"
 msgstr "Contacts enabled: %s"
 
-#: ../src/tools/list-sources/list-sources.c:240
+#: src/tools/list-sources/list-sources.c:240
 #, c-format
 msgid "Mail enabled: %s"
 msgstr "Mail enabled: %s"
 
-#: ../src/tools/list-sources/list-sources.c:247
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: src/tools/list-sources/list-sources.c:420
 msgid "Failed to parse arguments: Unknown error"
 msgstr "Failed to parse arguments: Unknown error"
 
-#: ../src/tools/list-sources/list-sources.c:429
+#: src/tools/list-sources/list-sources.c:429
 #, c-format
 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
+#: src/tools/list-sources/list-sources.c:445
 #, c-format
 msgid "No sources had been found\n"
 msgstr "No sources had been found\n"
 
+#: src/services/evolution-source-registry/builtin/birthdays.source.desktop.in:4
+msgid "Birthdays & Anniversaries"
+msgstr "Birthdays & Anniversaries"
+
+#: src/services/evolution-source-registry/builtin/caldav-stub.source.desktop.in:4
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: src/services/evolution-source-registry/builtin/carddav-stub.source.desktop.in:4
+msgid "CardDAV"
+msgstr "CardDAV"
+
+#: src/services/evolution-source-registry/builtin/contacts-stub.source.desktop.in:4
+msgid "Contacts"
+msgstr "Contacts"
+
+#: src/services/evolution-source-registry/builtin/google-stub.source.desktop.in:4
+msgid "Google"
+msgstr "Google"
+
+#: src/services/evolution-source-registry/builtin/ldap-stub.source.desktop.in:4
+msgid "On LDAP Servers"
+msgstr "On LDAP Servers"
+
+#: src/services/evolution-source-registry/builtin/local.source.desktop.in:5
+#: src/services/evolution-source-registry/builtin/local-stub.source.desktop.in:6
+msgid "On This Computer"
+msgstr "On This Computer"
+
+#: src/services/evolution-source-registry/builtin/system-address-book.source.desktop.in:4
+#: src/services/evolution-source-registry/builtin/system-calendar.source.desktop.in:4
+#: src/services/evolution-source-registry/builtin/system-memo-list.source.desktop.in:4
+#: src/services/evolution-source-registry/builtin/system-task-list.source.desktop.in:4
+msgid "Personal"
+msgstr "Personal"
+
+#: src/services/evolution-source-registry/builtin/system-proxy.source.desktop.in:4
+msgid "Default Proxy Settings"
+msgstr "Default Proxy Settings"
+
+#: src/services/evolution-source-registry/builtin/vfolder.source.desktop.in:5
+msgid "Search Folders"
+msgstr "Search Folders"
+
+#: src/services/evolution-source-registry/builtin/weather-stub.source.desktop.in:4
+msgid "Weather"
+msgstr "Weather"
+
+#: src/services/evolution-source-registry/builtin/webcal-stub.source.desktop.in:4
+msgid "On The Web"
+msgstr "On The Web"
+
+#: src/services/evolution-source-registry/builtin/webdav-notes-stub.source.desktop.in:4
+msgid "WebDAV Notes"
+msgstr "WebDAV Notes"
+
+#~ msgid "Connection to Server"
+#~ msgstr "Connection to Server"
+
+#~ msgid "Operation was cancelled"
+#~ msgstr "Operation was cancelled"
+
+#~ msgid "Cannot rewind input stream: Not supported"
+#~ msgstr "Cannot rewind input stream: Not supported"
+
 #~ msgid "Failed to create contact from returned server data"
 #~ msgstr "Failed to create contact from returned server data"
 
@@ -7962,9 +8319,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Unknown User"
 #~ msgstr "Unknown User"
 
-#~ msgid "Protocol not supported"
-#~ msgstr "Protocol not supported"
-
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operation has been cancelled"
 
@@ -8091,10 +8445,6 @@ msgstr "No sources had been found\n"
 #~ 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"
 
@@ -8234,9 +8584,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Error retrieving message"
 #~ msgstr "Error retrieving message"
 
-#~ msgid "Error fetching new messages"
-#~ msgstr "Error fetching new messages"
-
 #~ msgid "Error while fetching messages"
 #~ msgstr "Error while fetching messages"
 
@@ -8448,24 +8795,15 @@ msgstr "No sources had been found\n"
 #~ msgid "Email Signer Certificate"
 #~ msgstr "E-mail Signer Certificate"
 
-#~ msgid "Email Recipient Certificate"
-#~ msgstr "E-mail Recipient Certificate"
-
 #~ msgid "Issued To"
 #~ msgstr "Issued To"
 
-#~ msgid "Common Name (CN)"
-#~ msgstr "Common Name (CN)"
-
 #~ msgid "Organization (O)"
 #~ msgstr "Organisation (O)"
 
 #~ msgid "Organizational Unit (OU)"
 #~ msgstr "Organisational Unit (OU)"
 
-#~ msgid "Serial Number"
-#~ msgstr "Serial Number"
-
 #~ msgid "Issued By"
 #~ msgstr "Issued By"
 
@@ -8475,15 +8813,9 @@ msgstr "No sources had been found\n"
 #~ msgid "Issued On"
 #~ msgstr "Issued On"
 
-#~ msgid "Expires On"
-#~ msgstr "Expires On"
-
 #~ msgid "Fingerprints"
 #~ msgstr "Fingerprints"
 
-#~ msgid "SHA1 Fingerprint"
-#~ msgstr "SHA1 Fingerprint"
-
 #~ msgid "MD5 Fingerprint"
 #~ msgstr "MD5 Fingerprint"
 
@@ -8499,12 +8831,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Field Value"
 #~ msgstr "Field Value"
 
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Version"
-#~ msgstr "Version"
-
 #~ msgid "Version 1"
 #~ msgstr "Version 1"
 
@@ -8547,9 +8873,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Object Identifier (%s)"
 #~ msgstr "Object Identifier (%s)"
 
-#~ msgid "Algorithm Identifier"
-#~ msgstr "Algorithm Identifier"
-
 #~ msgid "Algorithm Parameters"
 #~ msgstr "Algorithm Parameters"
 
@@ -8559,9 +8882,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Subject Public Key Algorithm"
 #~ msgstr "Subject Public Key Algorithm"
 
-#~ msgid "Subject's Public Key"
-#~ msgstr "Subject's Public Key"
-
 #~ msgid "Error: Unable to process extension"
 #~ msgstr "Error: Unable to process extension"
 
@@ -8580,9 +8900,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Non-repudiation"
 #~ msgstr "Non-repudiation"
 
-#~ msgid "Key Encipherment"
-#~ msgstr "Key Encypherment"
-
 #~ msgid "Data Encipherment"
 #~ msgstr "Data Encypherment"
 
@@ -8610,12 +8927,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Certificate Signature Algorithm"
 #~ msgstr "Certificate Signature Algorithm"
 
-#~ msgid "Issuer"
-#~ msgstr "Issuer"
-
-#~ msgid "Subject"
-#~ msgstr "Subject"
-
 #~ msgid "Issuer Unique ID"
 #~ msgstr "Issuer Unique ID"
 
@@ -8628,9 +8939,6 @@ msgstr "No sources had been found\n"
 #~ msgid "_View Certificate"
 #~ msgstr "_View Certificate"
 
-#~ msgid "Detailed information about the certificate:"
-#~ msgstr "Detailed information about the certificate:"
-
 #~ msgid "Issuer:"
 #~ msgstr "Issuer:"
 
@@ -8790,9 +9098,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Could not find message body in FETCH response."
 #~ msgstr "Could not find message body in FETCH response."
 
-#~ msgid "Failed to cache message %s: "
-#~ msgstr "Failed to cache message %s: "
-
 #~ msgid "Names_pace:"
 #~ msgstr "Names_pace:"
 
@@ -8978,15 +9283,9 @@ msgstr "No sources had been found\n"
 #~ msgid "Invalid source type"
 #~ msgstr "Invalid source type"
 
-#~ msgid "_Use custom command to connect to server"
-#~ msgstr "_Use custom command to connect to server"
-
 #~ msgid "Co_mmand:"
 #~ msgstr "Co_mmand:"
 
-#~ msgid "Command:"
-#~ msgstr "Command:"
-
 #~ msgid "Closing tmp stream failed: "
 #~ msgstr "Closing tmp stream failed: "
 
@@ -9155,9 +9454,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Could not create thread for populating cache"
 #~ msgstr "Could not create thread for populating cache"
 
-#~ msgid "Cannot retrieve calendar alarm e-mail address: %s"
-#~ msgstr "Cannot retrieve calendar alarm e-mail address: %s"
-
 #~ msgid "Cannot retrieve calendar's LDAP attribute: %s"
 #~ msgstr "Cannot retrieve calendar's LDAP attribute: %s"
author	Bruce Cowan <bruce@bcowan.me.uk>	2023-03-13 13:15:20 +0000
committer	GNOME Translation Robot <gnome-sysadmin@gnome.org>	2023-03-13 13:15:20 +0000
commit	fc39a0f714a4b34fe42af4ea43495cae33c0e437 (patch)
tree	ffaea5a0ef482a7b2fc3fe17f46cdff9c7355ea2
parent	7f9bf3ab8e6435ac690b823b8a4c83a4a86e885d (diff)
download	evolution-data-server-fc39a0f714a4b34fe42af4ea43495cae33c0e437.tar.gz