[evolution-data-server] Update British English translation



commit 9af2399cdf580ad3e55d8b10b537861d36709369
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Sun Aug 19 16:04:40 2018 +0000

    Update British English translation

 po/en_GB.po | 2636 ++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 1714 insertions(+), 922 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 9980d0763..0a0b0e615 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,28 +4,111 @@
 # 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 eu>, 2010, 2011, 2012, 2013, 2018.
+# Bruce Cowan <bruce bcowan me uk>, 2010, 2011, 2012, 2013, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-02-23 13:33+0000\n"
-"PO-Revision-Date: 2018-03-02 12:36+0000\n"
-"Last-Translator: Bruce Cowan <bruce bcowan eu>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution-data-server/";
+"issues\n"
+"POT-Creation-Date: 2018-07-17 12:28+0000\n"
+"PO-Revision-Date: 2018-08-19 17:03+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\n"
 "X-Project-Style: gnome\n"
 
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:220
+#, c-format
+#| msgid "Given URL “%s” doesn’t reference WebDAV address book"
+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:279
+#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1159
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4326
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:49
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:54
+#: ../src/addressbook/libebook/e-book.c:1079
+#: ../src/addressbook/libebook/e-book-client.c:2130
+#: ../src/addressbook/libebook/e-book-client.c:2302
+#: ../src/addressbook/libebook/e-book-client.c:2515
+#: ../src/addressbook/libebook/e-book-client.c:2646
+#: ../src/addressbook/libebook/e-book-client.c:2805
+#: ../src/addressbook/libebook/e-book-client.c:2939
+#: ../src/addressbook/libebook/e-book-client.c:3070
+#: ../src/addressbook/libebook/e-book-client.c:3228
+#: ../src/addressbook/libebook/e-book-client.c:3423
+#: ../src/addressbook/libebook/e-book-client.c:3641
+#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:263
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:274
+#: ../src/calendar/backends/http/e-cal-backend-http.c:210
+#: ../src/calendar/libecal/e-cal.c:2334
+#: ../src/calendar/libecal/e-cal-client.c:277
+#: ../src/calendar/libecal/e-cal-client.c:3544
+#: ../src/calendar/libecal/e-cal-client.c:3717
+#: ../src/calendar/libecal/e-cal-client.c:3981
+#: ../src/calendar/libecal/e-cal-client.c:4222
+#: ../src/calendar/libecal/e-cal-client.c:4412
+#: ../src/calendar/libecal/e-cal-client.c:4605
+#: ../src/calendar/libecal/e-cal-client.c:4814
+#: ../src/calendar/libecal/e-cal-client.c:4983
+#: ../src/calendar/libecal/e-cal-client.c:5186
+#: ../src/calendar/libecal/e-cal-client.c:5336
+#: ../src/calendar/libecal/e-cal-client.c:5530
+#: ../src/calendar/libecal/e-cal-client.c:5683
+#: ../src/calendar/libecal/e-cal-client.c:5900
+#: ../src/calendar/libecal/e-cal-client.c:6054
+#: ../src/calendar/libecal/e-cal-client.c:6280
+#: ../src/calendar/libecal/e-cal-client.c:6476
+#: ../src/calendar/libecal/e-cal-client.c:6839
+#: ../src/calendar/libecal/e-cal-client.c:7061
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1757
+#: ../src/camel/camel-filter-driver.c:1719
+#: ../src/camel/camel-filter-driver.c:1851
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3204
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3210
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3220
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3232
+#: ../src/camel/providers/nntp/camel-nntp-store.c:422
+#: ../src/libebackend/e-server-side-source.c:501
+#: ../src/libedataserver/e-client.c:188
+#: ../src/libedataserver/e-soup-session.c:1136
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:204
+#: ../src/libedataserverui/e-reminders-widget.c:1780
+#: ../src/tools/list-sources/list-sources.c:429
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1036
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1192
+#| msgid "Signon service did not return a secret"
+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:1038
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1194
+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:1040
+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:1147
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1010
+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:120
 #, c-format
-#| msgid "Failed to remove file '%s': %s"
 msgid "Failed to remove file “%s”: %s"
 msgstr "Failed to remove file “%s”: %s"
 
@@ -36,140 +119,74 @@ msgstr "Failed to make directory %s: %s"
 
 #: ../src/addressbook/backends/file/e-book-backend-file.c:419
 #, c-format
-#| msgid "Failed to create hardlink for resource '%s': %s"
 msgid "Failed to create hardlink for resource “%s”: %s"
 msgstr "Failed to create hardlink for resource “%s”: %s"
 
 #: ../src/addressbook/backends/file/e-book-backend-file.c:524
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1257
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1260
 msgid "No UID in the contact"
 msgstr "No UID in the contact"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:852
+#: ../src/addressbook/backends/file/e-book-backend-file.c:856
 #, 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:991
+#: ../src/addressbook/backends/file/e-book-backend-file.c:994
 msgid "Loading..."
 msgstr "Loading..."
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:993
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4444
+#: ../src/addressbook/backends/file/e-book-backend-file.c:996
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4436
 msgid "Searching..."
 msgstr "Searching…"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1285
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1288
 #, c-format
-#| msgid "Tried to modify contact '%s' with out of sync revision"
 msgid "Tried to modify contact “%s” with out of sync revision"
 msgstr "Tried to modify contact “%s” with out of sync revision"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1476
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1561
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1479
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1564
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7342
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7411
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7365
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7434
 #, c-format
-#| msgid "Contact '%s' not found"
 msgid "Contact “%s” not found"
 msgstr "Contact “%s” not found"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1621
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1702
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1624
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1705
 #, c-format
-#| msgid "Query '%s' not supported"
 msgid "Query “%s” not supported"
 msgstr "Query “%s” not supported"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1630
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1711
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1633
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1714
 #, c-format
-#| msgid "Invalid Query '%s'"
 msgid "Invalid Query “%s”"
 msgstr "Invalid Query “%s”"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1976
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1979
 #: ../src/addressbook/libedata-book/e-book-meta-backend.c:2015
 msgid "Requested to delete an unrelated cursor"
 msgstr "Requested to delete an unrelated cursor"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:2047
+#: ../src/addressbook/backends/file/e-book-backend-file.c:2050
 #, c-format
-#| msgid "Failed to rename old database from '%s' to '%s': %s"
 msgid "Failed to rename old database from “%s” to “%s”: %s"
 msgstr "Failed to rename old database from “%s” to “%s”: %s"
 
-#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1159
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4334
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:239
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:49
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:54
-#: ../src/addressbook/libebook/e-book.c:1079
-#: ../src/addressbook/libebook/e-book-client.c:2129
-#: ../src/addressbook/libebook/e-book-client.c:2301
-#: ../src/addressbook/libebook/e-book-client.c:2514
-#: ../src/addressbook/libebook/e-book-client.c:2645
-#: ../src/addressbook/libebook/e-book-client.c:2804
-#: ../src/addressbook/libebook/e-book-client.c:2938
-#: ../src/addressbook/libebook/e-book-client.c:3069
-#: ../src/addressbook/libebook/e-book-client.c:3227
-#: ../src/addressbook/libebook/e-book-client.c:3422
-#: ../src/addressbook/libebook/e-book-client.c:3640
-#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:200
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:274
-#: ../src/calendar/backends/http/e-cal-backend-http.c:204
-#: ../src/calendar/libecal/e-cal.c:2334
-#: ../src/calendar/libecal/e-cal-client.c:277
-#: ../src/calendar/libecal/e-cal-client.c:3544
-#: ../src/calendar/libecal/e-cal-client.c:3717
-#: ../src/calendar/libecal/e-cal-client.c:3981
-#: ../src/calendar/libecal/e-cal-client.c:4222
-#: ../src/calendar/libecal/e-cal-client.c:4412
-#: ../src/calendar/libecal/e-cal-client.c:4605
-#: ../src/calendar/libecal/e-cal-client.c:4814
-#: ../src/calendar/libecal/e-cal-client.c:4983
-#: ../src/calendar/libecal/e-cal-client.c:5186
-#: ../src/calendar/libecal/e-cal-client.c:5336
-#: ../src/calendar/libecal/e-cal-client.c:5530
-#: ../src/calendar/libecal/e-cal-client.c:5683
-#: ../src/calendar/libecal/e-cal-client.c:5900
-#: ../src/calendar/libecal/e-cal-client.c:6054
-#: ../src/calendar/libecal/e-cal-client.c:6280
-#: ../src/calendar/libecal/e-cal-client.c:6476
-#: ../src/calendar/libecal/e-cal-client.c:6839
-#: ../src/calendar/libecal/e-cal-client.c:7061
-#: ../src/calendar/libedata-cal/e-cal-cache.c:1742
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3029
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3039
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3051
-#: ../src/camel/providers/nntp/camel-nntp-store.c:422
-#: ../src/libebackend/e-server-side-source.c:501
-#: ../src/libedataserver/e-client.c:188
-#: ../src/libedataserver/e-soup-session.c:1119
-#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:204
-#: ../src/tools/list-sources/list-sources.c:429
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: ../src/addressbook/backends/google/e-book-backend-google.c:924
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1005
-msgid "Object to save is not a valid vCard"
-msgstr "Object to save is not a valid vCard"
-
-#: ../src/addressbook/backends/google/e-book-backend-google.c:976
-#| msgid "Failed to create hardlink for resource '%s': %s"
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1066
 msgid "Failed to create contact from returned server data"
 msgstr "Failed to create contact from returned server data"
 
-#: ../src/addressbook/backends/google/e-book-backend-google.c:992
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1082
 msgid "Server returned contact without UID"
 msgstr "Server returned contact without UID"
 
 #. System Group: My Contacts
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1658
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1656
 #: ../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
@@ -178,17 +195,17 @@ msgid "Personal"
 msgstr "Personal"
 
 #. System Group: Friends
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1660
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1658
 msgid "Friends"
 msgstr "Friends"
 
 #. System Group: Family
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1662
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1660
 msgid "Family"
 msgstr "Family"
 
 #. System Group: Coworkers
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1664
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1662
 msgid "Coworkers"
 msgstr "Coworkers"
 
@@ -211,78 +228,68 @@ msgid "Invalid DN syntax"
 msgstr "Invalid DN syntax"
 
 #: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1156
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4333
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4325
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP error 0x%x (%s)"
 
 #: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1772
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2114
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2127
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2116
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2129
 #, 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:2041
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2187
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2043
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2190
 #, 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:2331
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2469
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2335
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2474
 #, 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:4270
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4261
 msgid "Receiving LDAP search results..."
 msgstr "Receiving LDAP search results…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4470
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4462
 msgid "Error performing search"
 msgstr "Error performing search"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4610
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4602
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Downloading contacts (%d)…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5101
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5093
 msgid "The backend does not support bulk additions"
 msgstr "The backend does not support bulk additions"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5184
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5176
 msgid "Adding contact to LDAP server..."
 msgstr "Adding contact to LDAP server…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5241
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5233
 msgid "The backend does not support bulk modifications"
 msgstr "The backend does not support bulk modifications"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5263
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5255
 msgid "Modifying contact from LDAP server..."
 msgstr "Modifying contact from LDAP server…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5333
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5325
 msgid "Removing contact from LDAP server..."
 msgstr "Removing contact from LDAP server…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5751
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5743
 #, c-format
-#| msgid "Failed to get the DN for user '%s'"
 msgid "Failed to get the DN for user “%s”"
 msgstr "Failed to get the DN for user “%s”"
 
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:180
-#, c-format
-msgid "Given URL “%s” doesn’t reference WebDAV address book"
-msgstr "Given URL “%s” doesn’t reference WebDAV address book"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:929
-msgid "Received object is not a valid vCard"
-msgstr "Received object is not a valid vCard"
-
 #: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:38
 msgid "No such book"
 msgstr "No such book"
@@ -518,7 +525,6 @@ msgstr "Video Conferencing URL"
 
 #. Misc fields
 #: ../src/addressbook/libebook-contacts/e-contact.c:204
-#| msgid "Spouse's Name"
 msgid "Spouse’s Name"
 msgstr "Spouse’s Name"
 
@@ -925,13 +931,11 @@ msgstr "Text is too long for a phone number"
 
 #: ../src/addressbook/libebook/e-book-client.c:929
 #, c-format
-#| msgid "Unknown book property '%s'"
 msgid "Unknown book property “%s”"
 msgstr "Unknown book property “%s”"
 
 #: ../src/addressbook/libebook/e-book-client.c:944
 #, c-format
-#| msgid "Cannot change value of book property '%s'"
 msgid "Cannot change value of book property “%s”"
 msgstr "Cannot change value of book property “%s”"
 
@@ -941,7 +945,6 @@ msgstr "Cannot change value of book property “%s”"
 #: ../src/calendar/libecal/e-cal-client.c:1715
 #: ../src/calendar/libecal/e-cal-client.c:1953
 #, c-format
-#| msgid "Unable to connect to '%s': "
 msgid "Unable to connect to “%s”: "
 msgstr "Unable to connect to “%s”: "
 
@@ -952,39 +955,34 @@ msgid "Client disappeared"
 msgstr "Client disappeared"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:2254
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:2255
 #, c-format
-#| msgid "Error introspecting unknown summary field '%s'"
 msgid "Error introspecting unknown summary field “%s”"
 msgstr "Error introspecting unknown summary field “%s”"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../src/addressbook/libedata-book/e-book-cache.c:542
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1393
+#: ../src/addressbook/libedata-book/e-book-cache.c:543
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1394
 msgid "Error parsing regular expression"
 msgstr "Error parsing regular expression"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../src/addressbook/libedata-book/e-book-cache.c:4475
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1877
-#: ../src/camel/camel-db.c:802
+#: ../src/addressbook/libedata-book/e-book-cache.c:4522
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1878
+#: ../src/camel/camel-db.c:820
 #, c-format
 msgid "Insufficient memory"
 msgstr "Insufficient memory"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
 #, c-format
-#| msgid "Invalid contact field '%d' specified in summary"
 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:1731
-#: ../src/addressbook/libedata-book/e-book-cache.c:365
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:604
+#: ../src/addressbook/libedata-book/e-book-cache.c:366
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:605
 #, c-format
-#| msgid ""
-#| "Contact field '%s' of type '%s' specified in summary, but only boolean, "
-#| "string and string list field types are supported"
 msgid ""
 "Contact field “%s” of type “%s” specified in summary, but only boolean, "
 "string and string list field types are supported"
@@ -1002,8 +1000,8 @@ msgstr ""
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4308
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4401
-#: ../src/addressbook/libedata-book/e-book-cache.c:3433
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5817
+#: ../src/addressbook/libedata-book/e-book-cache.c:3441
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5840
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "Query contained unsupported elements"
@@ -1066,8 +1064,8 @@ 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:6219
-#: ../src/addressbook/libedata-book/e-book-cache.c:5561
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8116
+#: ../src/addressbook/libedata-book/e-book-cache.c:5608
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8139
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
@@ -1077,8 +1075,8 @@ msgstr ""
 "the contact list"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6227
-#: ../src/addressbook/libedata-book/e-book-cache.c:5568
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8124
+#: ../src/addressbook/libedata-book/e-book-cache.c:5615
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8147
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
@@ -1087,87 +1085,77 @@ 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:330
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:570
+#: ../src/addressbook/libedata-book/e-book-cache.c:331
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:571
 #, c-format
-#| msgid "Unsupported contact field '%d' specified in summary"
 msgid "Unsupported contact field “%d” specified in summary"
 msgstr "Unsupported contact field “%d” specified in summary"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:3428
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5810
-#: ../src/calendar/libedata-cal/e-cal-cache.c:1607
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2917
+#: ../src/addressbook/libedata-book/e-book-cache.c:3436
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5833
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1621
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3314
 #, c-format
 msgid "Invalid query: %s"
 msgstr "Invalid query: %s"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:3598
-#| msgid "Invalid query for EbSqlCursor"
+#: ../src/addressbook/libedata-book/e-book-cache.c:3606
 msgid "Invalid query for a book cursor"
 msgstr "Invalid query for a book cursor"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:4479
-#: ../src/libebackend/e-cache.c:756
+#: ../src/addressbook/libedata-book/e-book-cache.c:4526
+#: ../src/libebackend/e-cache.c:759
 #, c-format
-#| msgid "Cannot open mailbox: %s: "
 msgid "Can’t open database %s: %s"
 msgstr "Can’t open database %s: %s"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5082
-#: ../src/addressbook/libedata-book/e-book-cache.c:5134
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2333
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2396
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2567
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1331
-#: ../src/libebackend/e-cache.c:1385 ../src/libebackend/e-cache.c:2238
-#: ../src/libebackend/e-cache.c:2278
+#: ../src/addressbook/libedata-book/e-book-cache.c:5129
+#: ../src/addressbook/libedata-book/e-book-cache.c:5181
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2730
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2793
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2964
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1342
+#: ../src/libebackend/e-cache.c:1374 ../src/libebackend/e-cache.c:2298
+#: ../src/libebackend/e-cache.c:2338
 #, c-format
-#| msgid "Object not found"
 msgid "Object “%s” not found"
 msgstr "Object “%s” not found"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5194
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2458
+#: ../src/addressbook/libedata-book/e-book-cache.c:5241
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2855
 #, c-format
-#| msgid "Object not found"
 msgid "Object with extra “%s” not found"
 msgstr "Object with extra “%s” not found"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5348
-#| msgid "At least one sort field must be specified to use an EbSdbCursor"
+#: ../src/addressbook/libedata-book/e-book-cache.c:5395
 msgid "At least one sort field must be specified to use a cursor"
 msgstr "At least one sort field must be specified to use a cursor"
 
-#: ../src/addressbook/libedata-book/e-book-cache.c:5357
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7956
+#: ../src/addressbook/libedata-book/e-book-cache.c:5404
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7979
 msgid "Cannot sort by a field that is not a string type"
 msgstr "Cannot sort by a field that is not a string type"
 
 #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1050
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1052
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1063
 #, c-format
 msgid "Preloaded object for UID “%s” is invalid"
 msgstr "Preloaded object for UID “%s” is invalid"
 
 #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1058
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1060
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1071
 #, c-format
 msgid "Received object for UID “%s” is invalid"
 msgstr "Received object for UID “%s” is invalid"
 
 #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1885
 #: ../src/addressbook/libedata-book/e-book-meta-backend.c:2333
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3100
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3210
 #, c-format
-#| msgid "Unable to create cache path"
 msgid "Failed to create cache “%s”:"
 msgstr "Failed to create cache “%s”:"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1950
-#| msgid ""
-#| "Cannot upgrade contacts database from a legacy database with more than "
-#| "one addressbook. Delete one of the entries in the 'folders' table first."
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1951
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the “folders” table first."
@@ -1175,11 +1163,11 @@ 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:5985
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:6008
 msgid "Invalid query for EbSqlCursor"
 msgstr "Invalid query for EbSqlCursor"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7938
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7961
 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"
 
@@ -1358,11 +1346,11 @@ msgstr "Cannot modify contacts: "
 msgid "Cannot remove contacts: "
 msgstr "Cannot remove contacts: "
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:774
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:777
 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:857
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:864
 msgid "Cursor does not support step"
 msgstr "Cursor does not support step"
 
@@ -1385,13 +1373,12 @@ msgstr "Out of sync revision while moving cursor"
 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:143
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:206
 #, 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:1579
-#| msgid "Failed to encode data"
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1783
 msgid "Failed to parse response data"
 msgstr "Failed to parse response data"
 
@@ -1418,23 +1405,21 @@ msgstr "Cannot save calendar data: Malformed URI."
 msgid "Cannot save calendar data"
 msgstr "Cannot save calendar data"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:135
-#| msgid "URI not loaded"
+#: ../src/calendar/backends/http/e-cal-backend-http.c:141
 msgid "URI not set"
 msgstr "URI not set"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:203
+#: ../src/calendar/backends/http/e-cal-backend-http.c:209
 #, c-format
-#| msgid "Malformed URI: %s"
 msgid "Malformed URI “%s”: %s"
 msgstr "Malformed URI “%s”: %s"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:349
+#: ../src/calendar/backends/http/e-cal-backend-http.c:372
 #, c-format
 msgid "Bad file format."
 msgstr "Bad file format."
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:358
+#: ../src/calendar/backends/http/e-cal-backend-http.c:381
 #, c-format
 msgid "Not a calendar."
 msgstr "Not a calendar."
@@ -1592,13 +1577,11 @@ msgstr "Invalid range"
 
 #: ../src/calendar/libecal/e-cal-client.c:1063
 #, c-format
-#| msgid "Unknown calendar property '%s'"
 msgid "Unknown calendar property “%s”"
 msgstr "Unknown calendar property “%s”"
 
 #: ../src/calendar/libecal/e-cal-client.c:1078
 #, c-format
-#| msgid "Cannot change value of calendar property '%s'"
 msgid "Cannot change value of calendar property “%s”"
 msgstr "Cannot change value of calendar property “%s”"
 
@@ -1606,246 +1589,1010 @@ msgstr "Cannot change value of calendar property “%s”"
 msgid "Untitled appointment"
 msgstr "Untitled appointment"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4744
+#: ../src/calendar/libecal/e-cal-recur.c:4751
 msgid "1st"
 msgstr "1st"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4745
+#: ../src/calendar/libecal/e-cal-recur.c:4752
 msgid "2nd"
 msgstr "2nd"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4746
+#: ../src/calendar/libecal/e-cal-recur.c:4753
 msgid "3rd"
 msgstr "3rd"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4747
+#: ../src/calendar/libecal/e-cal-recur.c:4754
 msgid "4th"
 msgstr "4th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4748
+#: ../src/calendar/libecal/e-cal-recur.c:4755
 msgid "5th"
 msgstr "5th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4749
+#: ../src/calendar/libecal/e-cal-recur.c:4756
 msgid "6th"
 msgstr "6th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4750
+#: ../src/calendar/libecal/e-cal-recur.c:4757
 msgid "7th"
 msgstr "7th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4751
+#: ../src/calendar/libecal/e-cal-recur.c:4758
 msgid "8th"
 msgstr "8th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4752
+#: ../src/calendar/libecal/e-cal-recur.c:4759
 msgid "9th"
 msgstr "9th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4753
+#: ../src/calendar/libecal/e-cal-recur.c:4760
 msgid "10th"
 msgstr "10th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4754
+#: ../src/calendar/libecal/e-cal-recur.c:4761
 msgid "11th"
 msgstr "11th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4755
+#: ../src/calendar/libecal/e-cal-recur.c:4762
 msgid "12th"
 msgstr "12th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4756
+#: ../src/calendar/libecal/e-cal-recur.c:4763
 msgid "13th"
 msgstr "13th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4757
+#: ../src/calendar/libecal/e-cal-recur.c:4764
 msgid "14th"
 msgstr "14th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4758
+#: ../src/calendar/libecal/e-cal-recur.c:4765
 msgid "15th"
 msgstr "15th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4759
+#: ../src/calendar/libecal/e-cal-recur.c:4766
 msgid "16th"
 msgstr "16th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4760
+#: ../src/calendar/libecal/e-cal-recur.c:4767
 msgid "17th"
 msgstr "17th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4761
+#: ../src/calendar/libecal/e-cal-recur.c:4768
 msgid "18th"
 msgstr "18th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4762
+#: ../src/calendar/libecal/e-cal-recur.c:4769
 msgid "19th"
 msgstr "19th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4763
+#: ../src/calendar/libecal/e-cal-recur.c:4770
 msgid "20th"
 msgstr "20th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4764
+#: ../src/calendar/libecal/e-cal-recur.c:4771
 msgid "21st"
 msgstr "21st"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4765
+#: ../src/calendar/libecal/e-cal-recur.c:4772
 msgid "22nd"
 msgstr "22nd"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4766
+#: ../src/calendar/libecal/e-cal-recur.c:4773
 msgid "23rd"
 msgstr "23rd"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4767
+#: ../src/calendar/libecal/e-cal-recur.c:4774
 msgid "24th"
 msgstr "24th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4768
+#: ../src/calendar/libecal/e-cal-recur.c:4775
 msgid "25th"
 msgstr "25th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4769
+#: ../src/calendar/libecal/e-cal-recur.c:4776
 msgid "26th"
 msgstr "26th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4770
+#: ../src/calendar/libecal/e-cal-recur.c:4777
 msgid "27th"
 msgstr "27th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4771
+#: ../src/calendar/libecal/e-cal-recur.c:4778
 msgid "28th"
 msgstr "28th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4772
+#: ../src/calendar/libecal/e-cal-recur.c:4779
 msgid "29th"
 msgstr "29th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4773
+#: ../src/calendar/libecal/e-cal-recur.c:4780
 msgid "30th"
 msgstr "30th"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4774
+#: ../src/calendar/libecal/e-cal-recur.c:4781
 msgid "31st"
 msgstr "31st"
 
-#: ../src/calendar/libecal/e-cal-util.c:707
-#: ../src/calendar/libecal/e-cal-util.c:734
+#: ../src/calendar/libecal/e-cal-recur.c:4940
+#, 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:4946
+#, 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:4954
+#, 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:4960
+#, 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:5050
+#, 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:5056
+#, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] "Every week"
+msgstr[1] "Every %d weeks"
+
+#. Translators: This is used to merge set of week day names in a recurrence, which can contain any
+#. of the week day names. The string always starts with "on DAYNAME", then it can continue either
+#. 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:5070
+#, c-format
+msgctxt "recur-description-dayname"
+msgid "%1$s%2$s"
+msgstr "%1$s%2$s"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5087
+msgctxt "recur-description"
+msgid "on Sunday"
+msgstr "on Sunday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5088
+msgctxt "recur-description"
+msgid ", Sunday"
+msgstr ", Sunday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5089
+msgctxt "recur-description"
+msgid " and Sunday"
+msgstr " and Sunday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5092
+msgctxt "recur-description"
+msgid "on Monday"
+msgstr "on Monday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5093
+msgctxt "recur-description"
+msgid ", Monday"
+msgstr ", Monday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5094
+msgctxt "recur-description"
+msgid " and Monday"
+msgstr " and Monday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5097
+msgctxt "recur-description"
+msgid "on Tuesday"
+msgstr "on Tuesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5098
+msgctxt "recur-description"
+msgid ", Tuesday"
+msgstr ", Tuesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5099
+msgctxt "recur-description"
+msgid " and Tuesday"
+msgstr " and Tuesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5102
+msgctxt "recur-description"
+msgid "on Wednesday"
+msgstr "on Wednesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5103
+msgctxt "recur-description"
+msgid ", Wednesday"
+msgstr ", Wednesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5104
+msgctxt "recur-description"
+msgid " and Wednesday"
+msgstr " and Wednesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5107
+msgctxt "recur-description"
+msgid "on Thursday"
+msgstr "on Thursday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5108
+msgctxt "recur-description"
+msgid ", Thursday"
+msgstr ", Thursday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5109
+msgctxt "recur-description"
+msgid " and Thursday"
+msgstr " and Thursday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5112
+#| msgctxt "CategoryName"
+#| msgid "Holiday"
+msgctxt "recur-description"
+msgid "on Friday"
+msgstr "on Friday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5113
+msgctxt "recur-description"
+msgid ", Friday"
+msgstr ", Friday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5114
+msgctxt "recur-description"
+msgid " and Friday"
+msgstr " and Friday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5117
+msgctxt "recur-description"
+msgid "on Saturday"
+msgstr "on Saturday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5118
+msgctxt "recur-description"
+msgid ", Saturday"
+msgstr ", Saturday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5119
+msgctxt "recur-description"
+msgid " and Saturday"
+msgstr " and Saturday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5252
+#, 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:5258
+#, 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:5268
+#: ../src/calendar/libecal/e-cal-recur.c:5589
+msgctxt "recur-description"
+msgid "on the last Sunday"
+msgstr "on the last Sunday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5271
+#: ../src/calendar/libecal/e-cal-recur.c:5439
+msgctxt "recur-description"
+msgid "on the last Monday"
+msgstr "on the last Monday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5274
+#: ../src/calendar/libecal/e-cal-recur.c:5464
+msgctxt "recur-description"
+msgid "on the last Tuesday"
+msgstr "on the last Tuesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5277
+#: ../src/calendar/libecal/e-cal-recur.c:5489
+msgctxt "recur-description"
+msgid "on the last Wednesday"
+msgstr "on the last Wednesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5280
+#: ../src/calendar/libecal/e-cal-recur.c:5514
+msgctxt "recur-description"
+msgid "on the last Thursday"
+msgstr "on the last Thursday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5283
+#: ../src/calendar/libecal/e-cal-recur.c:5539
+msgctxt "recur-description"
+msgid "on the last Friday"
+msgstr "on the last Friday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5286
+#: ../src/calendar/libecal/e-cal-recur.c:5564
+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:5296
+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:5300
+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:5304
+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:5308
+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:5312
+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:5316
+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:5320
+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:5324
+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:5328
+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:5332
+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:5336
+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:5340
+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:5344
+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:5348
+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:5352
+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:5356
+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:5360
+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:5364
+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:5368
+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:5372
+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:5376
+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:5380
+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:5384
+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:5388
+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:5392
+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:5396
+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:5400
+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:5404
+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:5408
+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:5412
+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:5416
+msgctxt "recur-description"
+msgid "on the 31st day"
+msgstr "on the 31st day"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5424
+msgctxt "recur-description"
+msgid "on the first Monday"
+msgstr "on the first Monday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5427
+msgctxt "recur-description"
+msgid "on the second Monday"
+msgstr "on the second Monday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5430
+msgctxt "recur-description"
+msgid "on the third Monday"
+msgstr "on the third Monday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5433
+msgctxt "recur-description"
+msgid "on the fourth Monday"
+msgstr "on the fourth Monday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5436
+msgctxt "recur-description"
+msgid "on the fifth Monday"
+msgstr "on the fifth Monday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5449
+msgctxt "recur-description"
+msgid "on the first Tuesday"
+msgstr "on the first Tuesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5452
+msgctxt "recur-description"
+msgid "on the second Tuesday"
+msgstr "on the second Tuesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5455
+msgctxt "recur-description"
+msgid "on the third Tuesday"
+msgstr "on the third Tuesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5458
+msgctxt "recur-description"
+msgid "on the fourth Tuesday"
+msgstr "on the fourth Tuesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5461
+msgctxt "recur-description"
+msgid "on the fifth Tuesday"
+msgstr "on the fifth Tuesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5474
+msgctxt "recur-description"
+msgid "on the first Wednesday"
+msgstr "on the first Wednesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5477
+msgctxt "recur-description"
+msgid "on the second Wednesday"
+msgstr "on the second Wednesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5480
+msgctxt "recur-description"
+msgid "on the third Wednesday"
+msgstr "on the third Wednesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5483
+msgctxt "recur-description"
+msgid "on the fourth Wednesday"
+msgstr "on the fourth Wednesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5486
+msgctxt "recur-description"
+msgid "on the fifth Wednesday"
+msgstr "on the fifth Wednesday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5499
+msgctxt "recur-description"
+msgid "on the first Thursday"
+msgstr "on the first Thursday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5502
+msgctxt "recur-description"
+msgid "on the second Thursday"
+msgstr "on the second Thursday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5505
+msgctxt "recur-description"
+msgid "on the third Thursday"
+msgstr "on the third Thursday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5508
+msgctxt "recur-description"
+msgid "on the fourth Thursday"
+msgstr "on the fourth Thursday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5511
+msgctxt "recur-description"
+msgid "on the fifth Thursday"
+msgstr "on the fifth Thursday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5524
+msgctxt "recur-description"
+msgid "on the first Friday"
+msgstr "on the first Friday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5527
+msgctxt "recur-description"
+msgid "on the second Friday"
+msgstr "on the second Friday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5530
+msgctxt "recur-description"
+msgid "on the third Friday"
+msgstr "on the third Friday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5533
+msgctxt "recur-description"
+msgid "on the fourth Friday"
+msgstr "on the fourth Friday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5536
+msgctxt "recur-description"
+msgid "on the fifth Friday"
+msgstr "on the fifth Friday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5549
+msgctxt "recur-description"
+msgid "on the first Saturday"
+msgstr "on the first Saturday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5552
+msgctxt "recur-description"
+msgid "on the second Saturday"
+msgstr "on the second Saturday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5555
+msgctxt "recur-description"
+msgid "on the third Saturday"
+msgstr "on the third Saturday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5558
+msgctxt "recur-description"
+msgid "on the fourth Saturday"
+msgstr "on the fourth Saturday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5561
+msgctxt "recur-description"
+msgid "on the fifth Saturday"
+msgstr "on the fifth Saturday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5574
+msgctxt "recur-description"
+msgid "on the first Sunday"
+msgstr "on the first Sunday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5577
+msgctxt "recur-description"
+msgid "on the second Sunday"
+msgstr "on the second Sunday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5580
+msgctxt "recur-description"
+msgid "on the third Sunday"
+msgstr "on the third Sunday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5583
+msgctxt "recur-description"
+msgid "on the fourth Sunday"
+msgstr "on the fourth Sunday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5586
+msgctxt "recur-description"
+msgid "on the fifth Sunday"
+msgstr "on the fifth Sunday"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5615
+#, 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:5621
+#, 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:5629
+#, 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:5635
+#, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] "Every year"
+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:5654
+#, c-format
+msgid "for one occurrence"
+msgid_plural "for %d occurrences"
+msgstr[0] "for one occurrence"
+msgstr[1] "for %d occurrences"
+
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. 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:5689
+#, c-format
+msgctxt "recur-description"
+msgid "until %s"
+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:5695
+msgctxt "recur-description"
+msgid "forever"
+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:5705
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s %2$s %3$s"
+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:5710
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s %2$s"
+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:5726
+#, c-format
+msgid ", with one exception"
+msgid_plural ", with %d exceptions"
+msgstr[0] ", with one exception"
+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:5733
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s%2$s"
+msgstr "%1$s%2$s"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5746
+#: ../src/calendar/libecal/e-cal-recur.c:5769
+msgctxt "recur-description"
+msgid "The meeting recurs"
+msgstr "The meeting recurs"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5748
+#: ../src/calendar/libecal/e-cal-recur.c:5771
+#| msgid "Untitled appointment"
+msgctxt "recur-description"
+msgid "The appointment recurs"
+msgstr "The appointment recurs"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5751
+#: ../src/calendar/libecal/e-cal-recur.c:5774
+msgctxt "recur-description"
+msgid "The task recurs"
+msgstr "The task recurs"
+
+#. if (icalcomponent_isa (icalcomp) == ICAL_VJOURNAL_COMPONENT)
+#: ../src/calendar/libecal/e-cal-recur.c:5753
+#: ../src/calendar/libecal/e-cal-recur.c:5776
+msgctxt "recur-description"
+msgid "The memo recurs"
+msgstr "The memo recurs"
+
+#. Translators: This adds a prefix in front of the complete recurrence description.
+#. 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:5760
+#, c-format
+msgctxt "recur-description-prefix"
+msgid "%1$s %2$s"
+msgstr "%1$s %2$s"
+
+#: ../src/calendar/libecal/e-cal-util.c:746
+#: ../src/calendar/libecal/e-cal-util.c:773
 msgctxt "Priority"
 msgid "High"
 msgstr "High"
 
-#: ../src/calendar/libecal/e-cal-util.c:709
-#: ../src/calendar/libecal/e-cal-util.c:736
+#: ../src/calendar/libecal/e-cal-util.c:748
+#: ../src/calendar/libecal/e-cal-util.c:775
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/calendar/libecal/e-cal-util.c:711
-#: ../src/calendar/libecal/e-cal-util.c:738
+#: ../src/calendar/libecal/e-cal-util.c:750
+#: ../src/calendar/libecal/e-cal-util.c:777
 msgctxt "Priority"
 msgid "Low"
 msgstr "Low"
 
 #. An empty string is the same as 'None'.
-#: ../src/calendar/libecal/e-cal-util.c:732
+#: ../src/calendar/libecal/e-cal-util.c:771
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Undefined"
 
+#: ../src/calendar/libecal/e-cal-util.c:813
+#: ../src/libedataserverui/e-reminders-widget.c:291
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d week"
+msgstr[1] "%d weeks"
+
+#: ../src/calendar/libecal/e-cal-util.c:822
+#: ../src/libedataserverui/e-reminders-widget.c:287
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d day"
+msgstr[1] "%d days"
+
+#: ../src/calendar/libecal/e-cal-util.c:831
+#: ../src/libedataserverui/e-reminders-widget.c:283
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
+
+#: ../src/calendar/libecal/e-cal-util.c:840
+#: ../src/libedataserverui/e-reminders-widget.c:279
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+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:845
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
+#: ../src/calendar/libecal/e-reminder-watcher.c:2522
+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:2538
+#, c-format
+#| msgid "%s (%s)"
+msgctxt "overdue"
+msgid "%s (%s) %s"
+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:2543
+#, c-format
+#| msgid "%s (%s)"
+msgctxt "overdue"
+msgid "%s (%s)"
+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:2548
+#, c-format
+msgctxt "overdue"
+msgid "%s %s"
+msgstr "%s %s"
+
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:83
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1083
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1396
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1523
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1572
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1399
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1526
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1575
 #, c-format
-#| msgid "\"%s\" expects one argument"
 msgid "“%s” expects one argument"
 msgstr "“%s” expects one argument"
 
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:90
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:686
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1403
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1411
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:689
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1406
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1414
 #, c-format
-#| msgid "\"%s\" expects the first argument to be a string"
 msgid "“%s” expects the first argument to be a string"
 msgstr "“%s” expects the first argument to be a string"
 
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:165
 #, c-format
-#| msgid "\"%s\" expects two or three arguments"
 msgid "“%s” expects two or three arguments"
 msgstr "“%s” expects two or three arguments"
 
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:172
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:261
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:323
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:836
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1090
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1472
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1530
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1579
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:839
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1093
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1475
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1533
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1582
 #, c-format
-#| msgid "\"%s\" expects the first argument to be a time_t"
 msgid "“%s” expects the first argument to be a time_t"
 msgstr "“%s” expects the first argument to be a time_t"
 
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:181
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:269
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:845
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:848
 #, c-format
-#| msgid "\"%s\" expects the second argument to be a time_t"
 msgid "“%s” expects the second argument to be a time_t"
 msgstr "“%s” expects the second argument to be a time_t"
 
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:191
 #, c-format
-#| msgid "\"%s\" expects the third argument to be a string"
 msgid "“%s” expects the third argument to be a string"
 msgstr "“%s” expects the third argument to be a string"
 
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:253
 #, c-format
-#| msgid "\"%s\" expects none or two arguments"
 msgid "“%s” expects none or two arguments"
 msgstr "“%s” expects none or two arguments"
 
 #: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:316
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:679
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:829
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1465
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:682
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1468
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "“%s” expects two arguments"
 msgstr "“%s” expects two arguments"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:612
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:635
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:761
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:793
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1002
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1035
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1357
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:615
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:638
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:764
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:796
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1005
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1038
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1360
 #, c-format
-#| msgid "\"%s\" expects no arguments"
 msgid "“%s” expects no arguments"
 msgstr "“%s” expects no arguments"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:698
 #, c-format
-#| msgid "\"%s\" expects the second argument to be a string"
 msgid "“%s” expects the second argument to be a string"
 msgstr "“%s” expects the second argument to be a string"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:726
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:729
 #, c-format
-#| msgid ""
-#| "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-#| "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-#| "\"classification\""
 msgid ""
 "“%s” expects the first argument to be either “any”, “summary”, or "
 "“description”, or “location”, or “attendee”, or “organizer”, or "
@@ -1855,17 +2602,13 @@ msgstr ""
 "“description”, or “location”, or “attendee”, or “organizer”, or "
 "“classification”"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:897
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:900
 #, c-format
-#| msgid "\"%s\" expects at least one argument"
 msgid "“%s” expects at least one argument"
 msgstr "“%s” expects at least one argument"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:912
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:915
 #, c-format
-#| msgid ""
-#| "\"%s\" expects all arguments to be strings or one and only one argument "
-#| "to be a boolean false (#f)"
 msgid ""
 "“%s” expects all arguments to be strings or one and only one argument to be "
 "a boolean false (#f)"
@@ -1873,52 +2616,45 @@ 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:1420
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1423
 #, c-format
-#| msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgid "“%s” expects the first argument to be an ISO 8601 date/time string"
 msgstr "“%s” expects the first argument to be an ISO 8601 date/time string"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1481
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1484
 #, c-format
-#| msgid "\"%s\" expects the second argument to be an integer"
 msgid "“%s” expects the second argument to be an integer"
 msgstr "“%s” expects the second argument to be an integer"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:1741
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1756
 #, c-format
-#| msgid "Failed to create create child process '%s': %s"
 msgid "Failed to create SQLite function, error code “%d”: %s"
 msgstr "Failed to create SQLite function, error code “%d”: %s"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2331
-#: ../src/calendar/libedata-cal/e-cal-cache.c:2394
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2728
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2791
 #, c-format
-#| msgid "Object not found"
 msgid "Object “%s”, “%s” not found"
 msgstr "Object “%s”, “%s” not found"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3089
-#| msgid "Cannot add contact: "
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3531
 msgid "Cannot add timezone without tzid"
 msgstr "Cannot add timezone without tzid"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3095
-#| msgid "Cannot authenticate without a username"
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3540
 msgid "Cannot add timezone without component"
 msgstr "Cannot add timezone without component"
 
-#: ../src/calendar/libedata-cal/e-cal-cache.c:3101
-#| msgid "Cannot send message: one or more invalid recipients"
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3546
 msgid "Cannot add timezone with invalid component"
 msgstr "Cannot add timezone with invalid component"
 
-#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1107
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1118
 #, 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:3896
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:4037
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -2020,15 +2756,15 @@ msgstr "Encryption is not supported by this cypher"
 msgid "Decryption is not supported by this cipher"
 msgstr "Decryption is not supported by this cypher"
 
-#: ../src/camel/camel-cipher-context.c:361
+#: ../src/camel/camel-cipher-context.c:362
 msgid "Signing message"
 msgstr "Signing message"
 
-#: ../src/camel/camel-cipher-context.c:651
+#: ../src/camel/camel-cipher-context.c:654
 msgid "Encrypting message"
 msgstr "Encrypting message"
 
-#: ../src/camel/camel-cipher-context.c:823
+#: ../src/camel/camel-cipher-context.c:827
 msgid "Decrypting message"
 msgstr "Decrypting message"
 
@@ -2046,97 +2782,108 @@ msgstr "Empty cache file"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Could not remove cache entry: %s: %s"
 
-#: ../src/camel/camel-db.c:855
+#: ../src/camel/camel-db.c:874
 #: ../src/camel/providers/local/camel-mbox-store.c:904
 #, c-format
-#| msgid "Could not rename '%s' to %s: %s"
 msgid "Could not rename “%s” to %s: %s"
 msgstr "Could not rename “%s” to %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:991
+#. 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:262
+#, c-format
+#| msgid "Scanning for changed messages in “%s : %s”"
+msgid "Transferring filtered messages in “%s : %s”"
+msgstr "Transferring filtered messages in “%s : %s”"
+
+#: ../src/camel/camel-filter-driver.c:1127
 #: ../src/camel/camel-filter-search.c:930
 #, c-format
-#| msgid "Failed to create child process '%s': %s"
 msgid "Failed to create child process “%s”: %s"
 msgstr "Failed to create child process “%s”: %s"
 
-#: ../src/camel/camel-filter-driver.c:1039
+#: ../src/camel/camel-filter-driver.c:1175
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Invalid message stream received from %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1259
-#: ../src/camel/camel-filter-driver.c:1271
+#: ../src/camel/camel-filter-driver.c:1396
+#: ../src/camel/camel-filter-driver.c:1409
 msgid "Syncing folders"
 msgstr "Syncing folders"
 
-#: ../src/camel/camel-filter-driver.c:1378
+#: ../src/camel/camel-filter-driver.c:1517
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parsing filter: %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1389
+#: ../src/camel/camel-filter-driver.c:1528
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error executing filter: %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1486
+#: ../src/camel/camel-filter-driver.c:1626
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Unable to open spool folder"
 
-#: ../src/camel/camel-filter-driver.c:1498
+#: ../src/camel/camel-filter-driver.c:1638
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Unable to process spool folder"
 
-#: ../src/camel/camel-filter-driver.c:1522
+#: ../src/camel/camel-filter-driver.c:1669
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Getting message %d (%d%%)"
 
-#: ../src/camel/camel-filter-driver.c:1531
-#: ../src/camel/camel-filter-driver.c:1554
+#: ../src/camel/camel-filter-driver.c:1678
+#: ../src/camel/camel-filter-driver.c:1701
 #, c-format
 msgid "Failed on message %d"
 msgstr "Failed on message %d"
 
-#: ../src/camel/camel-filter-driver.c:1573
-#: ../src/camel/camel-filter-driver.c:1687
+#: ../src/camel/camel-filter-driver.c:1719
+#: ../src/camel/camel-filter-driver.c:1851
+#, c-format
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to transfer messages: %s"
+msgstr "Failed to transfer messages: %s"
+
+#: ../src/camel/camel-filter-driver.c:1729
+#: ../src/camel/camel-filter-driver.c:1865
 msgid "Syncing folder"
 msgstr "Syncing folder"
 
-#: ../src/camel/camel-filter-driver.c:1578
-#: ../src/camel/camel-filter-driver.c:1695
+#: ../src/camel/camel-filter-driver.c:1734
+#: ../src/camel/camel-filter-driver.c:1873
 msgid "Complete"
 msgstr "Complete"
 
-#: ../src/camel/camel-filter-driver.c:1641
+#: ../src/camel/camel-filter-driver.c:1805
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Getting message %d of %d"
 
-#: ../src/camel/camel-filter-driver.c:1659
+#: ../src/camel/camel-filter-driver.c:1823
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Failed at message %d of %d"
 
-#: ../src/camel/camel-filter-driver.c:1866
-#: ../src/camel/camel-filter-driver.c:1890
+#: ../src/camel/camel-filter-driver.c:2033
+#: ../src/camel/camel-filter-driver.c:2057
 #, c-format
-#| msgid "Execution of filter '%s' failed: "
 msgid "Execution of filter “%s” failed: "
 msgstr "Execution of filter “%s” failed: "
 
-#: ../src/camel/camel-filter-driver.c:1880
+#: ../src/camel/camel-filter-driver.c:2047
 #, c-format
-#| msgid "Error parsing filter '%s': %s: %s"
 msgid "Error parsing filter “%s”: %s: %s"
 msgstr "Error parsing filter “%s”: %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1899
+#: ../src/camel/camel-filter-driver.c:2066
 #, c-format
-#| msgid "Error executing filter '%s': %s: %s"
 msgid "Error executing filter “%s”: %s: %s"
 msgstr "Error executing filter “%s”: %s: %s"
 
@@ -2167,8 +2914,6 @@ msgstr "Error executing filter search: %s: %s"
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
 #: ../src/camel/camel-folder.c:311
 #, c-format
-#| msgid "Learning new spam message in '%s : %s'"
-#| msgid_plural "Learning new spam messages in '%s : %s'"
 msgid "Learning new spam message in “%s : %s”"
 msgid_plural "Learning new spam messages in “%s : %s”"
 msgstr[0] "Learning new spam message in “%s : %s”"
@@ -2179,8 +2924,6 @@ msgstr[1] "Learning new spam messages in “%s : %s”"
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
 #: ../src/camel/camel-folder.c:354
 #, c-format
-#| msgid "Learning new ham message in '%s : %s'"
-#| msgid_plural "Learning new ham messages in '%s : %s'"
 msgid "Learning new ham message in “%s : %s”"
 msgid_plural "Learning new ham messages in “%s : %s”"
 msgstr[0] "Learning new ham message in “%s : %s”"
@@ -2189,112 +2932,104 @@ msgstr[1] "Learning new ham messages in “%s : %s”"
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:405
+#: ../src/camel/camel-folder.c:402
 #, c-format
-#| msgid "Filtering new message in '%s : %s'"
-#| msgid_plural "Filtering new messages in '%s : %s'"
 msgid "Filtering new message in “%s : %s”"
 msgid_plural "Filtering new messages in “%s : %s”"
 msgstr[0] "Filtering new message in “%s : %s”"
 msgstr[1] "Filtering new messages in “%s : %s”"
 
-#: ../src/camel/camel-folder.c:1030
-#: ../src/camel/providers/local/camel-maildir-folder.c:330
+#: ../src/camel/camel-folder.c:1004
+#: ../src/camel/providers/local/camel-maildir-folder.c:331
 msgid "Moving messages"
 msgstr "Moving messages"
 
-#: ../src/camel/camel-folder.c:1033
+#: ../src/camel/camel-folder.c:1007
 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:1078
+#: ../src/camel/camel-folder.c:1052
 #, c-format
-#| msgid "Quota information not supported for folder '%s : %s'"
 msgid "Quota information not supported for folder “%s : %s”"
 msgstr "Quota information not supported for folder “%s : %s”"
 
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:1180
+#: ../src/camel/camel-folder.c:1154
 #, c-format
-#| msgid "Filtering folder '%s : %s'"
 msgid "Filtering folder “%s : %s”"
 msgstr "Filtering folder “%s : %s”"
 
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:2985
+#: ../src/camel/camel-folder.c:2987
 #, c-format
-#| msgid "Expunging folder '%s : %s'"
 msgid "Expunging folder “%s : %s”"
 msgstr "Expunging folder “%s : %s”"
 
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3119
+#: ../src/camel/camel-folder.c:3122
 #, c-format
-#| msgid "Retrieving message '%s' in '%s : %s'"
 msgid "Retrieving message “%s” in “%s : %s”"
 msgstr "Retrieving message “%s” in “%s : %s”"
 
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3341
+#: ../src/camel/camel-folder.c:3347
 #, c-format
-#| msgid "Retrieving quota information for '%s : %s'"
 msgid "Retrieving quota information for “%s : %s”"
 msgstr "Retrieving quota information for “%s : %s”"
 
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3639
+#: ../src/camel/camel-folder.c:3647
 #, c-format
-#| msgid "Refreshing folder '%s : %s'"
 msgid "Refreshing folder “%s : %s”"
 msgstr "Refreshing folder “%s : %s”"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:905
-#: ../src/camel/camel-folder-search.c:948
+#: ../src/camel/camel-folder-search.c:920
+#: ../src/camel/camel-folder-search.c:963
 #, 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:986
+#: ../src/camel/camel-folder-search.c:1001
 #, 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:993
-#: ../src/camel/camel-folder-search.c:1001
+#: ../src/camel/camel-folder-search.c:1008
+#: ../src/camel/camel-folder-search.c:1016
 #, 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:1029
+#: ../src/camel/camel-folder-search.c:1044
 #, 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:1039
+#: ../src/camel/camel-folder-search.c:1054
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) requires the folder set"
 
-#: ../src/camel/camel-folder-search.c:2125
-#: ../src/camel/camel-folder-search.c:2299
+#: ../src/camel/camel-folder-search.c:2196
+#: ../src/camel/camel-folder-search.c:2370
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2303,8 +3038,8 @@ msgstr ""
 "Cannot parse search expression: %s:\n"
 "%s"
 
-#: ../src/camel/camel-folder-search.c:2137
-#: ../src/camel/camel-folder-search.c:2311
+#: ../src/camel/camel-folder-search.c:2208
+#: ../src/camel/camel-folder-search.c:2382
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2316,30 +3051,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:1668
+#: ../src/camel/camel-folder-summary.c:1663
 #, c-format
-#| msgid "Release unused memory for folder '%s : %s'"
 msgid "Release unused memory for folder “%s : %s”"
 msgstr "Release unused memory for folder “%s : %s”"
 
 #. Translators: The '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
-#: ../src/camel/camel-gpg-context.c:417
+#: ../src/camel/camel-gpg-context.c:451
 #, c-format
 msgid "Output from %s:"
 msgstr "Output from %s:"
 
-#: ../src/camel/camel-gpg-context.c:834 ../src/camel/camel-gpg-context.c:839
-#: ../src/camel/camel-gpg-context.c:1543
+#: ../src/camel/camel-gpg-context.c:916 ../src/camel/camel-gpg-context.c:921
+#: ../src/camel/camel-gpg-context.c:1634
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: ../src/camel/camel-gpg-context.c:839
+#: ../src/camel/camel-gpg-context.c:921
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:1127
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/camel/camel-gpg-context.c:951
+#: ../src/camel/camel-gpg-context.c:1033
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2350,21 +3084,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/camel/camel-gpg-context.c:987
+#: ../src/camel/camel-gpg-context.c:1069
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: ../src/camel/camel-gpg-context.c:1012 ../src/camel/camel-gpg-context.c:1027
+#: ../src/camel/camel-gpg-context.c:1094 ../src/camel/camel-gpg-context.c:1109
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: ../src/camel/camel-gpg-context.c:1048
+#: ../src/camel/camel-gpg-context.c:1130
 #, c-format
-#| msgid ""
-#| "You need a PIN to unlock the key for your\n"
-#| "SmartCard: \"%s\""
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: “%s”"
@@ -2372,11 +3103,8 @@ msgstr ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: “%s”"
 
-#: ../src/camel/camel-gpg-context.c:1052
+#: ../src/camel/camel-gpg-context.c:1134
 #, c-format
-#| msgid ""
-#| "You need a passphrase to unlock the key for\n"
-#| "user: \"%s\""
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: “%s”"
@@ -2384,16 +3112,12 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: “%s”"
 
-#: ../src/camel/camel-gpg-context.c:1058
+#: ../src/camel/camel-gpg-context.c:1140
 #, c-format
-#| msgid "Unexpected request from GnuPG for '%s'"
 msgid "Unexpected request from GnuPG for “%s”"
 msgstr "Unexpected request from GnuPG for “%s”"
 
-#: ../src/camel/camel-gpg-context.c:1070
-#| msgid ""
-#| "Note the encrypted content doesn't contain information about a recipient, "
-#| "thus there will be a password prompt for each of stored private key."
+#: ../src/camel/camel-gpg-context.c:1152
 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."
@@ -2401,31 +3125,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:1101 ../src/camel/camel-net-utils.c:522
+#: ../src/camel/camel-gpg-context.c:1183 ../src/camel/camel-net-utils.c:522
 #: ../src/camel/providers/nntp/camel-nntp-summary.c:405
 #: ../src/libedataserver/e-client.c:161
 #, c-format
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../src/camel/camel-gpg-context.c:1122
+#: ../src/camel/camel-gpg-context.c:1204
 #, 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:1135
+#: ../src/camel/camel-gpg-context.c:1217
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: ../src/camel/camel-gpg-context.c:1249
+#: ../src/camel/camel-gpg-context.c:1333
 #, 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:1262
+#: ../src/camel/camel-gpg-context.c:1346
 #, c-format
 msgid ""
 "Failed to encrypt: Invalid recipient %s specified. A common issue is that "
@@ -2434,54 +3158,59 @@ msgstr ""
 "Failed to encrypt: Invalid recipient %s specified. A common issue is that "
 "the %s doesn’t have imported public key for this recipient."
 
-#: ../src/camel/camel-gpg-context.c:2054 ../src/camel/camel-smime-context.c:841
+#: ../src/camel/camel-gpg-context.c:2145 ../src/camel/camel-smime-context.c:873
 msgid "Could not generate signing data: "
 msgstr "Could not generate signing data: "
 
-#: ../src/camel/camel-gpg-context.c:2105 ../src/camel/camel-gpg-context.c:2341
-#: ../src/camel/camel-gpg-context.c:2457 ../src/camel/camel-gpg-context.c:2633
+#: ../src/camel/camel-gpg-context.c:2196 ../src/camel/camel-gpg-context.c:2435
+#: ../src/camel/camel-gpg-context.c:2574 ../src/camel/camel-gpg-context.c:2751
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
-#: ../src/camel/camel-gpg-context.c:2211 ../src/camel/camel-gpg-context.c:2219
-#: ../src/camel/camel-gpg-context.c:2227 ../src/camel/camel-gpg-context.c:2247
-#: ../src/camel/camel-smime-context.c:970
-#: ../src/camel/camel-smime-context.c:984
-#: ../src/camel/camel-smime-context.c:993
+#: ../src/camel/camel-gpg-context.c:2303 ../src/camel/camel-gpg-context.c:2311
+#: ../src/camel/camel-gpg-context.c:2319 ../src/camel/camel-gpg-context.c:2339
+#: ../src/camel/camel-smime-context.c:1002
+#: ../src/camel/camel-smime-context.c:1016
+#: ../src/camel/camel-smime-context.c:1025
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: ../src/camel/camel-gpg-context.c:2293
+#: ../src/camel/camel-gpg-context.c:2385
 msgid "Cannot verify message signature: "
 msgstr "Cannot verify message signature: "
 
-#: ../src/camel/camel-gpg-context.c:2422
+#: ../src/camel/camel-gpg-context.c:2533
 msgid "Could not generate encrypting data: "
 msgstr "Could not generate encrypting data: "
 
-#: ../src/camel/camel-gpg-context.c:2497
+#: ../src/camel/camel-gpg-context.c:2614
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: ../src/camel/camel-gpg-context.c:2556 ../src/camel/camel-gpg-context.c:2565
-#: ../src/camel/camel-gpg-context.c:2588
+#: ../src/camel/camel-gpg-context.c:2674 ../src/camel/camel-gpg-context.c:2683
+#: ../src/camel/camel-gpg-context.c:2706
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Cannot decrypt message: Incorrect message format"
 
-#: ../src/camel/camel-gpg-context.c:2576
+#: ../src/camel/camel-gpg-context.c:2694
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Failed to decrypt MIME part: protocol error"
 
-#: ../src/camel/camel-gpg-context.c:2643
+#: ../src/camel/camel-gpg-context.c:2766
 #, 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:2679
-#: ../src/camel/camel-smime-context.c:1286
+#: ../src/camel/camel-gpg-context.c:2803
+#, c-format
+msgid "GPG blob contains unencrypted text: %s"
+msgstr "GPG blob contains unencrypted text: %s"
+
+#: ../src/camel/camel-gpg-context.c:2805
+#: ../src/camel/camel-smime-context.c:1545
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
@@ -2521,13 +3250,11 @@ msgstr "Cannot fork locking helper: %s"
 
 #: ../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"
 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
 #, c-format
-#| msgid "Could not lock '%s'"
 msgid "Could not lock “%s”"
 msgstr "Could not lock “%s”"
 
@@ -2613,13 +3340,11 @@ msgstr "Host lookup failed"
 
 #: ../src/camel/camel-net-utils.c:745
 #, c-format
-#| msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgid "Host lookup “%s” failed. Check your host name for spelling errors."
 msgstr "Host lookup “%s” failed. Check your host name for spelling errors."
 
 #: ../src/camel/camel-net-utils.c:749
 #, c-format
-#| msgid "Host lookup '%s' failed: %s"
 msgid "Host lookup “%s” failed: %s"
 msgstr "Host lookup “%s” failed: %s"
 
@@ -2633,7 +3358,6 @@ msgstr "Checking reach-ability of account “%s”"
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
 #: ../src/camel/camel-offline-folder.c:125
 #, c-format
-#| msgid "Downloading new messages for offline mode in '%s : %s'"
 msgid "Downloading new messages for offline mode in “%s : %s”"
 msgstr "Downloading new messages for offline mode in “%s : %s”"
 
@@ -2642,7 +3366,6 @@ msgstr "Downloading new messages for offline mode in “%s : %s”"
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
 #: ../src/camel/camel-offline-folder.c:221
 #, c-format
-#| msgid "Storing changes in folder '%s : %s'"
 msgid "Storing changes in folder “%s : %s”"
 msgstr "Storing changes in folder “%s : %s”"
 
@@ -2651,7 +3374,6 @@ msgstr "Storing changes in folder “%s : %s”"
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
 #: ../src/camel/camel-offline-folder.c:311
 #, c-format
-#| msgid "Checking download of new messages for offline in '%s : %s'"
 msgid "Checking download of new messages for offline in “%s : %s”"
 msgstr "Checking download of new messages for offline in “%s : %s”"
 
@@ -2660,7 +3382,6 @@ msgstr "Checking download of new messages for offline in “%s : %s”"
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
 #: ../src/camel/camel-offline-folder.c:428
 #, c-format
-#| msgid "Syncing messages in folder '%s : %s' to disk"
 msgid "Syncing messages in folder “%s : %s” to disk"
 msgstr "Syncing messages in folder “%s : %s” to disk"
 
@@ -2669,19 +3390,17 @@ 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:476
+#: ../src/camel/camel-offline-folder.c:491
 #, c-format
-#| msgid "Syncing messages in folder '%s : %s' to disk"
 msgid "Syncing message %d of %d in folder “%s : %s” to disk"
 msgstr "Syncing message %d of %d in folder “%s : %s” to disk"
 
-#: ../src/camel/camel-offline-folder.c:527
+#: ../src/camel/camel-offline-folder.c:542
 msgid "Copy folder content locally for _offline operation"
 msgstr "Copy folder content locally for _offline operation"
 
 #: ../src/camel/camel-offline-store.c:268
 #, c-format
-#| msgid "Syncing messages in folder '%s : %s' to disk"
 msgid "Syncing messages in account “%s” to disk"
 msgstr "Syncing messages in account “%s” to disk"
 
@@ -2693,24 +3412,23 @@ msgstr "Virtual folder e-mail provider"
 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:295
+#: ../src/camel/camel-provider.c:299
 #, 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:304
+#: ../src/camel/camel-provider.c:308
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Could not load %s: %s"
 
-#: ../src/camel/camel-provider.c:313
+#: ../src/camel/camel-provider.c:317
 #, 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:459 ../src/camel/camel-session.c:434
+#: ../src/camel/camel-provider.c:463 ../src/camel/camel-session.c:434
 #, c-format
-#| msgid "No provider available for protocol '%s'"
 msgid "No provider available for protocol “%s”"
 msgstr "No provider available for protocol “%s”"
 
@@ -2791,7 +3509,6 @@ msgstr "Server challenge invalid\n"
 
 #: ../src/camel/camel-sasl-digest-md5.c:871
 #, c-format
-#| msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgid "Server challenge contained invalid “Quality of Protection” token"
 msgstr "Server challenge contained invalid “Quality of Protection” token"
 
@@ -2819,12 +3536,21 @@ 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:146
+#: ../src/camel/camel-sasl-gssapi.c:149
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
 msgstr "(Unknown GSSAPI mechanism code: %x)"
 
-#: ../src/camel/camel-sasl-gssapi.c:179
+#. 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:172 ../src/camel/camel-sasl-gssapi.c:244
+#, c-format
+#| msgid "%s (%s)"
+msgctxt "gssapi_error"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/camel/camel-sasl-gssapi.c:194
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2832,11 +3558,11 @@ msgstr ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognised by the implementation."
 
-#: ../src/camel/camel-sasl-gssapi.c:184
+#: ../src/camel/camel-sasl-gssapi.c:199
 msgid "The provided target_name parameter was ill-formed."
 msgstr "The provided target_name parameter was ill-formed."
 
-#: ../src/camel/camel-sasl-gssapi.c:187
+#: ../src/camel/camel-sasl-gssapi.c:202
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2844,7 +3570,7 @@ msgstr ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 
-#: ../src/camel/camel-sasl-gssapi.c:191
+#: ../src/camel/camel-sasl-gssapi.c:206
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2852,7 +3578,7 @@ msgstr ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 
-#: ../src/camel/camel-sasl-gssapi.c:196
+#: ../src/camel/camel-sasl-gssapi.c:211
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2860,7 +3586,7 @@ msgstr ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 
-#: ../src/camel/camel-sasl-gssapi.c:200
+#: ../src/camel/camel-sasl-gssapi.c:215
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2868,30 +3594,46 @@ 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:205
+#: ../src/camel/camel-sasl-gssapi.c:220
 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:208
+#: ../src/camel/camel-sasl-gssapi.c:223
 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:211
+#: ../src/camel/camel-sasl-gssapi.c:226
 msgid "The consistency checks performed on the credential failed."
 msgstr "The consistency checks performed on the credential failed."
 
-#: ../src/camel/camel-sasl-gssapi.c:214
+#: ../src/camel/camel-sasl-gssapi.c:229
 msgid "The referenced credentials have expired."
 msgstr "The referenced credentials have expired."
 
-#: ../src/camel/camel-sasl-gssapi.c:220 ../src/camel/camel-sasl-gssapi.c:402
-#: ../src/camel/camel-sasl-gssapi.c:451 ../src/camel/camel-sasl-gssapi.c:468
+#: ../src/camel/camel-sasl-gssapi.c:235 ../src/camel/camel-sasl-gssapi.c:439
+#: ../src/camel/camel-sasl-gssapi.c:489 ../src/camel/camel-sasl-gssapi.c:506
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
-#: ../src/camel/camel-sasl-gssapi.c:480
+#: ../src/camel/camel-sasl-gssapi.c:286
+#| msgid "Could not get message"
+msgid "Could not get session bus:"
+msgstr "Could not get session bus:"
+
+#: ../src/camel/camel-sasl-gssapi.c:320
+#, c-format
+msgid ""
+"Cannot ask for Kerberos ticket. Obtain the ticket manually, like on command "
+"line with “kinit” or open “Online Accounts” in “Settings” and add the "
+"Kerberos account there. Reported error was: %s"
+msgstr ""
+"Cannot ask for Kerberos ticket. Obtain the ticket manually, like on command "
+"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:518
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Unsupported security layer."
@@ -2949,7 +3691,6 @@ 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
-#| msgid "Author"
 msgid "OAuth2"
 msgstr "OAuth2"
 
@@ -2989,14 +3730,13 @@ msgstr "Regular expression compilation failed: %s: %s"
 
 #: ../src/camel/camel-session.c:443
 #, c-format
-#| msgid "Invalid GType registered for protocol '%s'"
 msgid "Invalid GType registered for protocol “%s”"
 msgstr "Invalid GType registered for protocol “%s”"
 
 #: ../src/camel/camel-session.c:512
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2978
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3153
 #: ../src/camel/providers/pop3/camel-pop3-store.c:306
-#: ../src/camel/providers/pop3/camel-pop3-store.c:788
+#: ../src/camel/providers/pop3/camel-pop3-store.c:790
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:670
 #, c-format
 msgid "No support for %s authentication"
@@ -3011,246 +3751,246 @@ msgstr "%s authentication failed"
 msgid "Forwarding messages is not supported"
 msgstr "Forwarding messages is not supported"
 
-#: ../src/camel/camel-smime-context.c:346
-#: ../src/camel/camel-smime-context.c:1073
+#: ../src/camel/camel-smime-context.c:347
 #, c-format
-#| msgid "Cannot find certificate for '%s'"
 msgid "Cannot find certificate for “%s”"
 msgstr "Cannot find certificate for “%s”"
 
-#: ../src/camel/camel-smime-context.c:374
+#: ../src/camel/camel-smime-context.c:375
 msgid "Cannot create CMS message"
 msgstr "Cannot create CMS message"
 
-#: ../src/camel/camel-smime-context.c:379
+#: ../src/camel/camel-smime-context.c:380
 msgid "Cannot create CMS signed data"
 msgstr "Cannot create CMS signed data"
 
-#: ../src/camel/camel-smime-context.c:385
+#: ../src/camel/camel-smime-context.c:386
 msgid "Cannot attach CMS signed data"
 msgstr "Cannot attach CMS signed data"
 
-#: ../src/camel/camel-smime-context.c:392
+#: ../src/camel/camel-smime-context.c:393
 msgid "Cannot attach CMS data"
 msgstr "Cannot attach CMS data"
 
-#: ../src/camel/camel-smime-context.c:398
+#: ../src/camel/camel-smime-context.c:399
 msgid "Cannot create CMS Signer information"
 msgstr "Cannot create CMS Signer information"
 
-#: ../src/camel/camel-smime-context.c:404
+#: ../src/camel/camel-smime-context.c:405
 msgid "Cannot find certificate chain"
 msgstr "Cannot find certificate chain"
 
-#: ../src/camel/camel-smime-context.c:410
+#: ../src/camel/camel-smime-context.c:411
 msgid "Cannot add CMS Signing time"
 msgstr "Cannot add CMS Signing time"
 
-#: ../src/camel/camel-smime-context.c:434
-#: ../src/camel/camel-smime-context.c:449
+#: ../src/camel/camel-smime-context.c:435
+#: ../src/camel/camel-smime-context.c:450
 #, c-format
-#| msgid "Encryption certificate for '%s' does not exist"
 msgid "Encryption certificate for “%s” does not exist"
 msgstr "Encryption certificate for “%s” does not exist"
 
-#: ../src/camel/camel-smime-context.c:456
+#: ../src/camel/camel-smime-context.c:457
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add SMIMEEncKeyPrefs attribute"
 
-#: ../src/camel/camel-smime-context.c:461
+#: ../src/camel/camel-smime-context.c:462
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
 
-#: ../src/camel/camel-smime-context.c:466
+#: ../src/camel/camel-smime-context.c:467
 msgid "Cannot add encryption certificate"
 msgstr "Cannot add encryption certificate"
 
-#: ../src/camel/camel-smime-context.c:472
+#: ../src/camel/camel-smime-context.c:473
 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:505
+#: ../src/camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "Unverified"
 
-#: ../src/camel/camel-smime-context.c:507
+#: ../src/camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "Good signature"
 
-#: ../src/camel/camel-smime-context.c:509
+#: ../src/camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "Bad signature"
 
-#: ../src/camel/camel-smime-context.c:511
+#: ../src/camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "Content tampered with or altered in transit"
 
-#: ../src/camel/camel-smime-context.c:513
+#: ../src/camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "Signing certificate not found"
 
-#: ../src/camel/camel-smime-context.c:515
+#: ../src/camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "Signing certificate not trusted"
 
-#: ../src/camel/camel-smime-context.c:517
+#: ../src/camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "Signature algorithm unknown"
 
-#: ../src/camel/camel-smime-context.c:519
+#: ../src/camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "Signature algorithm unsupported"
 
-#: ../src/camel/camel-smime-context.c:521
+#: ../src/camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "Malformed signature"
 
-#: ../src/camel/camel-smime-context.c:523
+#: ../src/camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "Processing error"
 
-#: ../src/camel/camel-smime-context.c:568
+#: ../src/camel/camel-smime-context.c:569
 msgid "No signed data in signature"
 msgstr "No signed data in signature"
 
-#: ../src/camel/camel-smime-context.c:573
+#: ../src/camel/camel-smime-context.c:574
 msgid "Digests missing from enveloped data"
 msgstr "Digests missing from enveloped data"
 
-#: ../src/camel/camel-smime-context.c:586
-#: ../src/camel/camel-smime-context.c:597
+#: ../src/camel/camel-smime-context.c:587
+#: ../src/camel/camel-smime-context.c:598
 msgid "Cannot calculate digests"
 msgstr "Cannot calculate digests"
 
-#: ../src/camel/camel-smime-context.c:604
-#: ../src/camel/camel-smime-context.c:608
+#: ../src/camel/camel-smime-context.c:605
+#: ../src/camel/camel-smime-context.c:609
 msgid "Cannot set message digests"
 msgstr "Cannot set message digests"
 
-#: ../src/camel/camel-smime-context.c:618
-#: ../src/camel/camel-smime-context.c:623
+#: ../src/camel/camel-smime-context.c:619
+#: ../src/camel/camel-smime-context.c:624
 msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
-#: ../src/camel/camel-smime-context.c:633
+#: ../src/camel/camel-smime-context.c:634
 #, 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:636
+#: ../src/camel/camel-smime-context.c:637
 #, 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:640
+#: ../src/camel/camel-smime-context.c:641
 msgid "Cannot find signature digests"
 msgstr "Cannot find signature digests"
 
-#: ../src/camel/camel-smime-context.c:657
+#: ../src/camel/camel-smime-context.c:660
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signer: %s <%s>: %s\n"
 
-#: ../src/camel/camel-smime-context.c:853
-#: ../src/camel/camel-smime-context.c:1147
+#: ../src/camel/camel-smime-context.c:885
+#: ../src/camel/camel-smime-context.c:1402
 msgid "Cannot create encoder context"
 msgstr "Cannot create encoder context"
 
-#: ../src/camel/camel-smime-context.c:859
+#: ../src/camel/camel-smime-context.c:891
 msgid "Failed to add data to CMS encoder"
 msgstr "Failed to add data to CMS encoder"
 
-#: ../src/camel/camel-smime-context.c:864
-#: ../src/camel/camel-smime-context.c:1164
+#: ../src/camel/camel-smime-context.c:896
+#: ../src/camel/camel-smime-context.c:1419
 msgid "Failed to encode data"
 msgstr "Failed to encode data"
 
-#: ../src/camel/camel-smime-context.c:1012
-#: ../src/camel/camel-smime-context.c:1261
+#: ../src/camel/camel-smime-context.c:1044
+#: ../src/camel/camel-smime-context.c:1520
 msgid "Decoder failed"
 msgstr "Decoder failed"
 
-#: ../src/camel/camel-smime-context.c:1081
+#: ../src/camel/camel-smime-context.c:1296
+#, c-format
+#| msgid "Cannot find certificate for “%s”"
+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:1336
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Cannot find common bulk encryption algorithm"
 
-#: ../src/camel/camel-smime-context.c:1089
+#: ../src/camel/camel-smime-context.c:1344
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Cannot allocate slot for encryption bulk key"
 
-#: ../src/camel/camel-smime-context.c:1100
+#: ../src/camel/camel-smime-context.c:1355
 msgid "Cannot create CMS Message"
 msgstr "Cannot create CMS Message"
 
-#: ../src/camel/camel-smime-context.c:1106
+#: ../src/camel/camel-smime-context.c:1361
 msgid "Cannot create CMS Enveloped data"
 msgstr "Cannot create CMS Enveloped data"
 
-#: ../src/camel/camel-smime-context.c:1112
+#: ../src/camel/camel-smime-context.c:1367
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Cannot attach CMS Enveloped data"
 
-#: ../src/camel/camel-smime-context.c:1118
+#: ../src/camel/camel-smime-context.c:1373
 msgid "Cannot attach CMS data object"
 msgstr "Cannot attach CMS data object"
 
-#: ../src/camel/camel-smime-context.c:1127
+#: ../src/camel/camel-smime-context.c:1382
 msgid "Cannot create CMS Recipient information"
 msgstr "Cannot create CMS Recipient information"
 
-#: ../src/camel/camel-smime-context.c:1132
+#: ../src/camel/camel-smime-context.c:1387
 msgid "Cannot add CMS Recipient information"
 msgstr "Cannot add CMS Recipient information"
 
-#: ../src/camel/camel-smime-context.c:1158
+#: ../src/camel/camel-smime-context.c:1413
 msgid "Failed to add data to encoder"
 msgstr "Failed to add data to encoder"
 
-#: ../src/camel/camel-smime-context.c:1268
+#: ../src/camel/camel-smime-context.c:1527
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: No encrypted content found"
 
-#: ../src/camel/camel-store.c:1401
+#: ../src/camel/camel-store.c:1421
 #, c-format
-#| msgid "Opening folder '%s'"
 msgid "Opening folder “%s”"
 msgstr "Opening folder “%s”"
 
-#: ../src/camel/camel-store.c:1696
+#: ../src/camel/camel-store.c:1718
 #, c-format
-#| msgid "Scanning folders in '%s'"
 msgid "Scanning folders in “%s”"
 msgstr "Scanning folders in “%s”"
 
-#: ../src/camel/camel-store.c:1724 ../src/camel/camel-store.c:1769
+#: ../src/camel/camel-store.c:1746 ../src/camel/camel-store.c:1791
 #: ../src/camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Wastebasket"
 
-#: ../src/camel/camel-store.c:1738 ../src/camel/camel-store.c:1786
+#: ../src/camel/camel-store.c:1760 ../src/camel/camel-store.c:1808
 #: ../src/camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Junk"
 
-#: ../src/camel/camel-store.c:2387
+#: ../src/camel/camel-store.c:2413
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Cannot create folder: %s: folder exists"
 
-#: ../src/camel/camel-store.c:2394
+#: ../src/camel/camel-store.c:2420
 #, c-format
-#| msgid "Creating folder '%s'"
 msgid "Creating folder “%s”"
 msgstr "Creating folder “%s”"
 
-#: ../src/camel/camel-store.c:2571 ../src/camel/camel-vee-store.c:423
+#: ../src/camel/camel-store.c:2598 ../src/camel/camel-vee-store.c:430
 #: ../src/camel/providers/local/camel-maildir-store.c:344
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: ../src/camel/camel-store.c:2761 ../src/camel/camel-vee-store.c:474
+#: ../src/camel/camel-store.c:2789 ../src/camel/camel-vee-store.c:481
 #: ../src/camel/providers/local/camel-maildir-store.c:912
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3262,7 +4002,6 @@ msgstr "Cannot write with no base stream"
 
 #: ../src/camel/camel-stream.c:290 ../src/camel/camel-stream.c:341
 #, c-format
-#| msgid "Stream type '%s' is not seekable"
 msgid "Stream type “%s” is not seekable"
 msgstr "Stream type “%s” is not seekable"
 
@@ -3270,7 +4009,7 @@ msgstr "Stream type “%s” is not seekable"
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "Only reset to beginning is supported with CamelStreamFilter"
 
-#: ../src/camel/camel-stream-null.c:76
+#: ../src/camel/camel-stream-null.c:88
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Only reset to beginning is supported with CamelHttpStream"
 
@@ -3282,35 +4021,30 @@ msgstr "Connection cancelled"
 
 #: ../src/camel/camel-stream-process.c:289
 #, c-format
-#| msgid "Could not connect with command \"%s\": %s"
 msgid "Could not connect with command “%s”: %s"
 msgstr "Could not connect with command “%s”: %s"
 
 #: ../src/camel/camel-subscribable.c:234
 #, c-format
-#| msgid "Subscribing to folder '%s'"
 msgid "Subscribing to folder “%s”"
 msgstr "Subscribing to folder “%s”"
 
 #: ../src/camel/camel-subscribable.c:403
 #, c-format
-#| msgid "Unsubscribing from folder '%s'"
 msgid "Unsubscribing from folder “%s”"
 msgstr "Unsubscribing from folder “%s”"
 
 #: ../src/camel/camel-url.c:325
 #, c-format
-#| msgid "Could not parse URL '%s'"
 msgid "Could not parse URL “%s”"
 msgstr "Could not parse URL “%s”"
 
 #: ../src/camel/camel-vee-folder.c:558
 #, c-format
-#| msgid "Updating folder '%s'"
 msgid "Updating folder “%s”"
 msgstr "Updating folder “%s”"
 
-#: ../src/camel/camel-vee-folder.c:958 ../src/camel/camel-vee-folder.c:1075
+#: ../src/camel/camel-vee-folder.c:965 ../src/camel/camel-vee-folder.c:1082
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
@@ -3319,19 +4053,17 @@ 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:995
+#: ../src/camel/camel-vee-folder.c:1002
 #, c-format
-#| msgid "No such message %s in '%s : %s'"
 msgid "No such message %s in “%s : %s”"
 msgstr "No such message %s in “%s : %s”"
 
-#: ../src/camel/camel-vee-folder.c:1051
+#: ../src/camel/camel-vee-folder.c:1058
 #, c-format
-#| msgid "Error storing '%s': "
 msgid "Error storing “%s”: "
 msgstr "Error storing “%s”: "
 
-#: ../src/camel/camel-vee-folder.c:1301
+#: ../src/camel/camel-vee-folder.c:1308
 msgid "Automatically _update on change in source folders"
 msgstr "Automatically _update on change in source folders"
 
@@ -3341,21 +4073,21 @@ msgstr "Automatically _update on change in source folders"
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: ../src/camel/camel-vee-store.c:449
+#: ../src/camel/camel-vee-store.c:456
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: ../src/camel/camel-vee-store.c:484
+#: ../src/camel/camel-vee-store.c:491
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
 
-#: ../src/camel/camel-vee-store.c:547
+#: ../src/camel/camel-vee-store.c:554
 msgid "Enable _Unmatched folder"
 msgstr "Enable _Unmatched folder"
 
-#: ../src/camel/camel-vee-store.c:1101
+#: ../src/camel/camel-vee-store.c:1109
 msgid "Updating Unmatched search folder"
 msgstr "Updating Unmatched search folder"
 
@@ -3373,20 +4105,20 @@ 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:993
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3111
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3292
 #: ../src/camel/providers/nntp/camel-nntp-store.c:351
 #: ../src/camel/providers/nntp/camel-nntp-store.c:1346
 #: ../src/camel/providers/nntp/camel-nntp-store.c:2158
 #: ../src/camel/providers/nntp/camel-nntp-store.c:2306
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:450
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:633
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:920
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:1134
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:922
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1136
 #: ../src/camel/providers/pop3/camel-pop3-store.c:294
-#: ../src/camel/providers/pop3/camel-pop3-store.c:527
-#: ../src/camel/providers/pop3/camel-pop3-store.c:575
-#: ../src/camel/providers/pop3/camel-pop3-store.c:670
-#: ../src/camel/providers/pop3/camel-pop3-store.c:1105
+#: ../src/camel/providers/pop3/camel-pop3-store.c:529
+#: ../src/camel/providers/pop3/camel-pop3-store.c:577
+#: ../src/camel/providers/pop3/camel-pop3-store.c:672
+#: ../src/camel/providers/pop3/camel-pop3-store.c:1107
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:541
 #, c-format
 msgid "You must be working online to complete this operation"
@@ -3407,7 +4139,6 @@ msgid "Unable to move deleted messages"
 msgstr "Unable to move deleted messages"
 
 #: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1818
-#| msgid "Unable to move junk messages"
 msgid "Unable to move messages to Inbox"
 msgstr "Unable to move messages to Inbox"
 
@@ -3416,25 +4147,34 @@ msgstr "Unable to move messages to Inbox"
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
 #: ../src/camel/providers/imapx/camel-imapx-folder.c:758
 #, c-format
-#| msgid "No quota information available for folder '%s : %s'"
 msgid "No quota information available for folder “%s : %s”"
 msgstr "No quota information available for folder “%s : %s”"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1038
+#. transfer ownership to 'rcf'
+#. 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:1025
+#, c-format
+#| msgid "Storing changes in folder “%s : %s”"
+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:1119
 #: ../src/camel/providers/nntp/camel-nntp-folder.c:841
 msgid "Apply message _filters to this folder"
 msgstr "Apply message _filters to this folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1049
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1130
 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:1162
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1243
 #, 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:1174
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1255
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Could not create cache for %s: "
@@ -3442,9 +4182,8 @@ 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:1379
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1460
 #, c-format
-#| msgid "No IMAP mailbox available for folder '%s : %s'"
 msgid "No IMAP mailbox available for folder “%s : %s”"
 msgstr "No IMAP mailbox available for folder “%s : %s”"
 
@@ -3550,210 +4289,208 @@ msgstr "IMAP"
 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:1116
+#: ../src/camel/providers/imapx/camel-imapx-server.c:1139
 msgid "Error writing to cache stream"
 msgstr "Error writing to cache stream"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2793
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2881
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3144
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2968
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3056
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3325
 msgid "Failed to get capabilities"
 msgstr "Failed to get capabilities"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2812
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2987
 #, 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:2813
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2988
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:279
 msgid "STARTTLS not supported"
 msgstr "STARTTLS not supported"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2822
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2997
 msgid "Failed to issue STARTTLS"
 msgstr "Failed to issue STARTTLS"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2870
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3045
 #, 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:2965
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3140
 #, 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:2996
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3171
 #: ../src/camel/providers/nntp/camel-nntp-store.c:457
 #: ../src/camel/providers/nntp/camel-nntp-store.c:599
 msgid "Cannot authenticate without a username"
 msgstr "Cannot authenticate without a username"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3005
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3180
 #: ../src/camel/providers/nntp/camel-nntp-store.c:608
-#: ../src/camel/providers/pop3/camel-pop3-store.c:688
-#: ../src/camel/providers/pop3/camel-pop3-store.c:726
+#: ../src/camel/providers/pop3/camel-pop3-store.c:690
+#: ../src/camel/providers/pop3/camel-pop3-store.c:728
 msgid "Authentication password not available"
 msgstr "Authentication password not available"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3013
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3188
 msgid "Failed to authenticate"
 msgstr "Failed to authenticate"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3166
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3347
 msgid "Failed to issue NAMESPACE"
 msgstr "Failed to issue NAMESPACE"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3184
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3365
 msgid "Failed to enable QResync"
 msgstr "Failed to enable QResync"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3216
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3397
 msgid "Failed to issue NOTIFY"
 msgstr "Failed to issue NOTIFY"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3694
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3876
 msgid "Failed to select mailbox"
 msgstr "Failed to select mailbox"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3797
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3979
 msgid "Cannot issue command, no stream available"
 msgstr "Cannot issue command, no stream available"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4061
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4245
 #, 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:4062
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4246
 msgid "No such message available."
 msgstr "No such message available."
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4110
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4135
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4174
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4294
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4319
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4358
 msgid "Error fetching message"
 msgstr "Error fetching message"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4152
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4911
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4336
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5099
 msgid "Error performing NOOP"
 msgstr "Error performing NOOP"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4167
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4351
 msgid "Failed to close the tmp stream"
 msgstr "Failed to close the tmp stream"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4198
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4382
 msgid "Failed to copy the tmp file"
 msgstr "Failed to copy the tmp file"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4434
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4620
 msgid "Error moving messages"
 msgstr "Error moving messages"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4434
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4620
 msgid "Error copying messages"
 msgstr "Error copying messages"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4704
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4725
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4892
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4913
 msgid "Cannot create spool file: "
 msgstr "Cannot create spool file: "
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4811
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4999
 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:5064
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5252
 #, c-format
-#| msgid "Scanning for changed messages in '%s : %s'"
 msgid "Scanning for changed messages in “%s : %s”"
 msgstr "Scanning for changed messages in “%s : %s”"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5068
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5256
 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:5089
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5277
 #, c-format
-#| msgid "Fetching summary information for new messages in '%s : %s'"
 msgid "Fetching summary information for new messages in “%s : %s”"
 msgstr "Fetching summary information for new messages in “%s : %s”"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5107
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5295
 msgid "Error fetching message info"
 msgstr "Error fetching message info"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5213
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5401
 msgid "Error running STATUS"
 msgstr "Error running STATUS"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5759
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5789
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5824
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5947
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5977
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6012
 msgid "Error syncing changes"
 msgstr "Error syncing changes"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5962
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6150
 msgid "Error expunging message"
 msgstr "Error expunging message"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6034
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6228
 msgid "Error fetching folders"
 msgstr "Error fetching folders"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6045
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6236
 msgid "Error fetching subscribed folders"
 msgstr "Error fetching subscribed folders"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6067
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6291
 msgid "Error creating folder"
 msgstr "Error creating folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6123
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6347
 msgid "Error deleting folder"
 msgstr "Error deleting folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6169
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6393
 msgid "Error renaming folder"
 msgstr "Error renaming folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6201
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6425
 msgid "Error subscribing to folder"
 msgstr "Error subscribing to folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6237
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6461
 msgid "Error unsubscribing from folder"
 msgstr "Error unsubscribing from folder"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6277
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6501
 msgid "IMAP server does not support quotas"
 msgstr "IMAP server does not support quotas"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6289
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6513
 msgid "Error retrieving quota information"
 msgstr "Error retrieving quota information"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6352
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6576
 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:6470
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6694
 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:354
-#: ../src/camel/providers/local/camel-maildir-folder.c:478
+#: ../src/camel/providers/local/camel-maildir-folder.c:476
 #: ../src/camel/providers/local/camel-maildir-store.c:345
 #: ../src/camel/providers/local/camel-maildir-store.c:824
 #: ../src/camel/providers/local/camel-maildir-store.c:830
@@ -3794,21 +4531,17 @@ msgstr "No such folder %s"
 
 #: ../src/camel/providers/imapx/camel-imapx-store.c:1622
 #, c-format
-#| msgid "No IMAP namespace for folder path '%s'"
 msgid "No IMAP namespace for folder path “%s”"
 msgstr "No IMAP namespace for folder path “%s”"
 
 #: ../src/camel/providers/imapx/camel-imapx-store.c:1890
 #: ../src/camel/providers/imapx/camel-imapx-store.c:2124
 #, c-format
-#| msgid "Retrieving folder list for '%s'"
 msgid "Retrieving folder list for “%s”"
 msgstr "Retrieving folder list for “%s”"
 
 #: ../src/camel/providers/imapx/camel-imapx-store.c:2341
 #, c-format
-#| msgid ""
-#| "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgid "The folder name “%s” is invalid because it contains the character “%c”"
 msgstr "The folder name “%s” is invalid because it contains the character “%c”"
 
@@ -3916,7 +4649,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:187
+#: ../src/camel/providers/local/camel-local-folder.c:190
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
@@ -3930,8 +4663,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:197
-#: ../src/camel/providers/local/camel-local-folder.c:206
+#: ../src/camel/providers/local/camel-local-folder.c:200
+#: ../src/camel/providers/local/camel-local-folder.c:209
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
@@ -3940,19 +4673,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:215
+#: ../src/camel/providers/local/camel-local-folder.c:218
 #, 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:511
 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:737
+#: ../src/camel/providers/local/camel-local-folder.c:749
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3962,7 +4695,6 @@ msgstr ""
 "%s"
 
 #: ../src/camel/providers/local/camel-local-provider.c:43
-#| msgid "_Use the '.folders' folder summary file (exmh)"
 msgid "_Use the “.folders” folder summary file (exmh)"
 msgstr "_Use the “.folders” folder summary file (exmh)"
 
@@ -3975,7 +4707,6 @@ 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
-#| msgid "_Apply filters to new messages in Inbox"
 msgid "Apply _filters to new messages"
 msgstr "Apply _filters to new messages"
 
@@ -4065,46 +4796,43 @@ msgstr "Local stores do not have an inbox"
 #: ../src/camel/providers/local/camel-local-store.c:444
 #: ../src/camel/providers/local/camel-mbox-store.c:737
 #, c-format
-#| msgid "Could not delete folder index file '%s': %s"
 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:472
 #: ../src/camel/providers/local/camel-mbox-store.c:767
 #, c-format
-#| msgid "Could not delete folder meta file '%s': %s"
 msgid "Could not delete folder meta file “%s”: %s"
 msgstr "Could not delete folder meta file “%s”: %s"
 
 #: ../src/camel/providers/local/camel-local-store.c:585
 #, c-format
-#| msgid "Could not rename '%s': %s"
 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:344
-#: ../src/camel/providers/local/camel-mbox-folder.c:128
-#: ../src/camel/providers/local/camel-mbox-folder.c:336
-#: ../src/camel/providers/local/camel-mh-folder.c:157
+#: ../src/camel/providers/local/camel-maildir-folder.c:345
+#: ../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:232
+#: ../src/camel/providers/local/camel-maildir-folder.c:239
 #, 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:282
-#: ../src/camel/providers/local/camel-maildir-folder.c:292
-#: ../src/camel/providers/local/camel-mbox-folder.c:395
-#: ../src/camel/providers/local/camel-mh-folder.c:169
-#: ../src/camel/providers/local/camel-mh-folder.c:179
+#: ../src/camel/providers/local/camel-maildir-folder.c:286
+#: ../src/camel/providers/local/camel-maildir-folder.c:296
+#: ../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:362
+#: ../src/camel/providers/local/camel-maildir-folder.c:363
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Cannot transfer message to destination folder: %s"
@@ -4112,7 +4840,6 @@ msgstr "Cannot transfer message to destination folder: %s"
 #: ../src/camel/providers/local/camel-maildir-store.c:129
 #: ../src/camel/providers/local/camel-maildir-store.c:929
 #, c-format
-#| msgid "Cannot create folder containing '%s'"
 msgid "Cannot create folder containing “%s”"
 msgstr "Cannot create folder containing “%s”"
 
@@ -4128,7 +4855,6 @@ msgstr "Folder %s already exists"
 #: ../src/camel/providers/local/camel-mbox-store.c:399
 #: ../src/camel/providers/local/camel-mbox-store.c:420
 #, c-format
-#| msgid "Cannot create folder: %s: %s"
 msgid "Cannot create folder “%s”: %s"
 msgstr "Cannot create folder “%s”: %s"
 
@@ -4136,7 +4862,6 @@ msgstr "Cannot create folder “%s”: %s"
 #: ../src/camel/providers/local/camel-mbox-store.c:365
 #: ../src/camel/providers/local/camel-mh-store.c:519
 #, c-format
-#| msgid "Cannot get folder: %s: %s"
 msgid "Cannot get folder “%s”: %s"
 msgstr "Cannot get folder “%s”: %s"
 
@@ -4144,13 +4869,11 @@ msgstr "Cannot get folder “%s”: %s"
 #: ../src/camel/providers/local/camel-mbox-store.c:375
 #: ../src/camel/providers/local/camel-mh-store.c:528
 #, c-format
-#| msgid "Cannot get folder '%s': folder does not exist."
 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:312
 #, c-format
-#| msgid "Cannot get folder '%s': not a maildir directory."
 msgid "Cannot get folder “%s”: not a maildir directory."
 msgstr "Cannot get folder “%s”: not a maildir directory."
 
@@ -4158,7 +4881,6 @@ msgstr "Cannot get folder “%s”: not a maildir directory."
 #: ../src/camel/providers/local/camel-maildir-store.c:416
 #: ../src/camel/providers/local/camel-mh-store.c:672
 #, c-format
-#| msgid "Could not delete folder '%s': %s"
 msgid "Could not delete folder “%s”: %s"
 msgstr "Could not delete folder “%s”: %s"
 
@@ -4171,7 +4893,6 @@ msgstr "not a maildir directory"
 #: ../src/camel/providers/local/camel-spool-store.c:210
 #: ../src/camel/providers/local/camel-spool-store.c:229
 #, c-format
-#| msgid "Could not scan folder '%s': %s"
 msgid "Could not scan folder “%s”: %s"
 msgstr "Could not scan folder “%s”: %s"
 
@@ -4197,21 +4918,21 @@ msgstr "Checking for new messages"
 msgid "Storing folder"
 msgstr "Storing folder"
 
-#: ../src/camel/providers/local/camel-mbox-folder.c:194
+#: ../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:257
+#: ../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:387
+#: ../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:444
+#: ../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"
@@ -4225,13 +4946,11 @@ msgstr "Cannot create a folder by this name."
 
 #: ../src/camel/providers/local/camel-mbox-store.c:431
 #, c-format
-#| msgid "Cannot get folder '%s': not a regular file."
 msgid "Cannot get folder “%s”: not a regular file."
 msgstr "Cannot get folder “%s”: not a regular file."
 
 #: ../src/camel/providers/local/camel-mbox-store.c:594
 #, c-format
-#| msgid "Cannot create directory '%s': %s."
 msgid "Cannot create directory “%s”: %s."
 msgstr "Cannot create directory “%s”: %s."
 
@@ -4248,9 +4967,6 @@ msgstr "Folder already exists"
 #: ../src/camel/providers/local/camel-mbox-store.c:661
 #: ../src/camel/providers/local/camel-mbox-store.c:690
 #, c-format
-#| msgid ""
-#| "Could not delete folder '%s':\n"
-#| "%s"
 msgid ""
 "Could not delete folder “%s”:\n"
 "%s"
@@ -4260,20 +4976,17 @@ msgstr ""
 
 #: ../src/camel/providers/local/camel-mbox-store.c:671
 #, c-format
-#| msgid "'%s' is not a regular file."
 msgid "“%s” is not a regular file."
 msgstr "“%s” is not a regular file."
 
 #: ../src/camel/providers/local/camel-mbox-store.c:680
 #, c-format
-#| msgid "Folder '%s' is not empty. Not deleted."
 msgid "Folder “%s” is not empty. Not deleted."
 msgstr "Folder “%s” is not empty. Not deleted."
 
 #: ../src/camel/providers/local/camel-mbox-store.c:707
 #: ../src/camel/providers/local/camel-mbox-store.c:722
 #, c-format
-#| msgid "Could not delete folder summary file '%s': %s"
 msgid "Could not delete folder summary file “%s”: %s"
 msgstr "Could not delete folder summary file “%s”: %s"
 
@@ -4284,7 +4997,6 @@ msgstr "The new folder name is illegal."
 
 #: ../src/camel/providers/local/camel-mbox-store.c:820
 #, c-format
-#| msgid "Could not rename '%s': '%s': %s"
 msgid "Could not rename “%s”: “%s”: %s"
 msgstr "Could not rename “%s”: “%s”: %s"
 
@@ -4336,9 +5048,6 @@ msgstr "Could not store folder: %s"
 #: ../src/camel/providers/local/camel-mbox-summary.c:803
 #: ../src/camel/providers/local/camel-mbox-summary.c:1076
 #, c-format
-#| msgid ""
-#| "MBOX file is corrupted, please fix it. (Expected a From line, but didn't "
-#| "get it.)"
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn’t get "
 "it.)"
@@ -4369,20 +5078,18 @@ msgstr "Writing to temporary mailbox failed: %s"
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Writing to temporary mailbox failed: %s: %s"
 
-#: ../src/camel/providers/local/camel-mh-folder.c:114
+#: ../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
 #, c-format
-#| msgid "Could not create folder '%s': %s"
 msgid "Could not create folder “%s”: %s"
 msgstr "Could not create folder “%s”: %s"
 
 #: ../src/camel/providers/local/camel-mh-store.c:554
 #, c-format
-#| msgid "Cannot get folder '%s': not a directory."
 msgid "Cannot get folder “%s”: not a directory."
 msgstr "Cannot get folder “%s”: not a directory."
 
@@ -4393,13 +5100,11 @@ msgstr "Cannot open MH directory path: %s: %s"
 
 #: ../src/camel/providers/local/camel-spool-store.c:93
 #, c-format
-#| msgid "Spool '%s' cannot be opened: %s"
 msgid "Spool “%s” cannot be opened: %s"
 msgstr "Spool “%s” cannot be opened: %s"
 
 #: ../src/camel/providers/local/camel-spool-store.c:107
 #, c-format
-#| msgid "Spool '%s' is not a regular file or directory"
 msgid "Spool “%s” is not a regular file or directory"
 msgstr "Spool “%s” is not a regular file or directory"
 
@@ -4419,15 +5124,11 @@ msgstr "Invalid spool"
 
 #: ../src/camel/providers/local/camel-spool-store.c:478
 #, c-format
-#| msgid "Folder '%s/%s' does not exist."
 msgid "Folder “%s/%s” does not exist."
 msgstr "Folder “%s/%s” does not exist."
 
 #: ../src/camel/providers/local/camel-spool-store.c:491
 #, c-format
-#| msgid ""
-#| "Could not open folder '%s':\n"
-#| "%s"
 msgid ""
 "Could not open folder “%s”:\n"
 "%s"
@@ -4437,15 +5138,11 @@ msgstr ""
 
 #: ../src/camel/providers/local/camel-spool-store.c:497
 #, c-format
-#| msgid "Folder '%s' does not exist."
 msgid "Folder “%s” does not exist."
 msgstr "Folder “%s” does not exist."
 
 #: ../src/camel/providers/local/camel-spool-store.c:505
 #, c-format
-#| msgid ""
-#| "Could not create folder '%s':\n"
-#| "%s"
 msgid ""
 "Could not create folder “%s”:\n"
 "%s"
@@ -4455,7 +5152,6 @@ msgstr ""
 
 #: ../src/camel/providers/local/camel-spool-store.c:518
 #, c-format
-#| msgid "'%s' is not a mailbox file."
 msgid "“%s” is not a mailbox file."
 msgstr "“%s” is not a mailbox file."
 
@@ -4490,9 +5186,6 @@ msgstr "Could not synchronise spool folder %s: %s"
 #: ../src/camel/providers/local/camel-spool-summary.c:274
 #: ../src/camel/providers/local/camel-spool-summary.c:287
 #, c-format
-#| msgid ""
-#| "Could not synchronize spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in “%s”"
@@ -4509,7 +5202,7 @@ msgstr "Internal error: UID in invalid format: %s"
 #: ../src/camel/providers/nntp/camel-nntp-folder.c:287
 #: ../src/camel/providers/nntp/camel-nntp-folder.c:292
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:575
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:1090
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1092
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
@@ -4610,7 +5303,6 @@ msgstr "Failed to issue STARTTLS for NNTP server %s: "
 
 #: ../src/camel/providers/nntp/camel-nntp-store.c:421
 #, c-format
-#| msgid "NNTP server %s doesn't support STARTTLS: %s"
 msgid "NNTP server %s doesn’t support STARTTLS: %s"
 msgstr "NNTP server %s doesn’t support STARTTLS: %s"
 
@@ -4709,13 +5401,11 @@ msgstr "Operation failed: %s"
 
 #: ../src/camel/providers/nntp/camel-nntp-summary.c:457
 #, c-format
-#| msgid "%s: Scanning new messages"
 msgid "%s: Scanning existing messages"
 msgstr "%s: Scanning existing messages"
 
 #: ../src/camel/providers/nntp/camel-nntp-summary.c:470
 #, c-format
-#| msgid "Unexpected server response from xover: %s"
 msgid "Unexpected server response from listgroup: %s"
 msgstr "Unexpected server response from listgroup: %s"
 
@@ -4750,7 +5440,7 @@ msgstr "Cannot get POP summary: "
 msgid "Expunging old messages"
 msgstr "Expunging old messages"
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:925
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:927
 msgid "Expunging deleted messages"
 msgstr "Expunging deleted messages"
 
@@ -4846,29 +5536,29 @@ msgstr "Failed to connect to POP server %s in secure mode%s"
 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:355
+#: ../src/camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Cannot login to POP server %s: SASL Protocol error"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:377
+#: ../src/camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Failed to authenticate on POP server %s: "
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:485
+#: ../src/camel/providers/pop3/camel-pop3-store.c:487
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 server %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:488
+#: ../src/camel/providers/pop3/camel-pop3-store.c:490
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3 server for %s on %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:700
-#: ../src/camel/providers/pop3/camel-pop3-store.c:713
-#: ../src/camel/providers/pop3/camel-pop3-store.c:799
+#: ../src/camel/providers/pop3/camel-pop3-store.c:702
+#: ../src/camel/providers/pop3/camel-pop3-store.c:715
+#: ../src/camel/providers/pop3/camel-pop3-store.c:801
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4878,7 +5568,7 @@ msgstr ""
 "Error sending password: "
 
 #. Translators: Do not translate APOP.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:740
+#: ../src/camel/providers/pop3/camel-pop3-store.c:742
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4889,7 +5579,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:814
+#: ../src/camel/providers/pop3/camel-pop3-store.c:816
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4898,13 +5588,12 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:898
+#: ../src/camel/providers/pop3/camel-pop3-store.c:900
 #, c-format
-#| msgid "No such folder %s"
 msgid "No such folder “%s”."
 msgstr "No such folder “%s”."
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:915
+#: ../src/camel/providers/pop3/camel-pop3-store.c:917
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 stores have no folder hierarchy"
@@ -4915,9 +5604,6 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: ../src/camel/providers/sendmail/camel-sendmail-provider.c:33
-#| msgid ""
-#| "For delivering mail by passing it to the \"sendmail\" program on the "
-#| "local system."
 msgid ""
 "For delivering mail by passing it to the “sendmail” program on the local "
 "system."
@@ -4955,13 +5641,11 @@ msgstr "Could not parse arguments"
 
 #: ../src/camel/providers/sendmail/camel-sendmail-transport.c:215
 #, c-format
-#| msgid "Could not create pipe to '%s': %s: mail not sent"
 msgid "Could not create pipe to “%s”: %s: mail not sent"
 msgstr "Could not create pipe to “%s”: %s: mail not sent"
 
 #: ../src/camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
-#| msgid "Could not fork '%s': %s: mail not sent"
 msgid "Could not fork “%s”: %s: mail not sent"
 msgstr "Could not fork “%s”: %s: mail not sent"
 
@@ -4971,19 +5655,16 @@ msgstr "Could not send message: "
 
 #: ../src/camel/providers/sendmail/camel-sendmail-transport.c:343
 #, c-format
-#| msgid "'%s' exited with signal %s: mail not sent."
 msgid "“%s” exited with signal %s: mail not sent."
 msgstr "“%s” exited with signal %s: mail not sent."
 
 #: ../src/camel/providers/sendmail/camel-sendmail-transport.c:353
 #, c-format
-#| msgid "Could not execute '%s': mail not sent."
 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
 #, c-format
-#| msgid "'%s' exited with status %d: mail not sent."
 msgid "“%s” exited with status %d: mail not sent."
 msgstr "“%s” exited with status %d: mail not sent."
 
@@ -5251,14 +5932,84 @@ msgid "Birthday and anniversary reminder units"
 msgstr "Birthday and anniversary reminder units"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
-#| msgid ""
-#| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-#| "\"days\""
 msgid ""
 "Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 msgstr ""
 "Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:7
+msgid "Past reminders for EReminderWatcher"
+msgstr "Past reminders for EReminderWatcher"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:8
+msgid "Snoozed reminders for EReminderWatcher"
+msgstr "Snoozed reminders for EReminderWatcher"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:9
+msgid "Reminder programs"
+msgstr "Reminder programs"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:10
+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
+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
+msgid ""
+"When set to true, the reminders are shown only in the notification tray, "
+"otherwise the reminders dialog is shown immediately"
+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
+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
+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."
+msgstr ""
+"Whether or not to show reminder notification dialogue always on top. Note "
+"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
+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
+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
+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
+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
+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:20
+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:21
+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:22
+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
 msgid "Whether the migration of old setting was already done"
 msgstr "Whether the migration of old setting was already done"
@@ -5268,9 +6019,6 @@ msgid "An absolute path where the gpg (or gpg2) binary is"
 msgstr "An absolute path where the gpg (or gpg2) binary is"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
-#| msgid ""
-#| "An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then "
-#| "it is searched for it. Change requires restart of the application."
 msgid ""
 "An example is “/usr/bin/gpg”; when it is left empty, or an incorrect value "
 "is set, then it will be searched for. Change requires restart of the "
@@ -5285,9 +6033,6 @@ msgid "Whether to load photos of signers/encrypters"
 msgstr "Whether to load photos of signers/encrypters"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:5
-#| msgid ""
-#| "When set to 'true', tries to load also photo of the signers/encrypters, "
-#| "if available in the key/certificate."
 msgid ""
 "When set to “true”, tries to load also photo of the signers/encrypters, if "
 "available in the key/certificate."
@@ -5300,10 +6045,6 @@ msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
 msgstr "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:7
-#| msgid ""
-#| "When set to an unknown value, then the default GNetworkMonitor is used in "
-#| "the background. A special value 'always-online' is used for no network "
-#| "monitoring."
 msgid ""
 "When set to an unknown value, then the default GNetworkMonitor is used in "
 "the background. A special value “always-online” is used for no network "
@@ -5348,46 +6089,58 @@ msgid "A list of hints for OAuth2 services"
 msgstr "A list of hints for OAuth2 services"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:13
+#| msgid ""
+#| "Users can extend the list of supported protocols and hostnames for "
+#| "defined OAuth2 services, in addition to those hard-coded. Each line can "
+#| "be of the form: servicename[-protocol]:hostname1,hostname2,... where "
+#| "'servicename' is the actual service name; the '-protocol' is optional, "
+#| "and if written, then the service can be used only if both 'protocol' and "
+#| "'hostnameX' match; the 'hostnameX' is the actual host name to compare "
+#| "with, case insensitively. Each line can contain multiple values, "
+#| "separated by comma. There can be provided multiple lines for one OAuth2 "
+#| "service. Note that the actual URL where the token is requested and "
+#| "refreshed cannot be changed here, the hostname is to allow other servers, "
+#| "where the OAuth2 service can be used. Examples: Company:mail.company.com "
+#| "- enables 'Company' OAuth2 authentication for 'mail.company.com' host "
+#| "Company-CalDAV:caldav.company.com - enables 'Company' OAuth2 "
+#| "authentication for any 'CalDAV' source, which reads data from 'caldav."
+#| "company.com' host"
 msgid ""
 "Users can extend the list of supported protocols and hostnames for defined "
 "OAuth2 services, in addition to those hard-coded. Each line can be of the "
-"form: servicename[-protocol]:hostname1,hostname2,... where 'servicename' is "
-"the actual service name; the '-protocol' is optional, and if written, then "
-"the service can be used only if both 'protocol' and 'hostnameX' match; the "
-"'hostnameX' is the actual host name to compare with, case insensitively. "
+"form: servicename[-protocol]:hostname1,hostname2,... where “servicename” is "
+"the actual service name; the “-protocol” is optional, and if written, then "
+"the service can be used only if both “protocol” and “hostnameX” match; the "
+"“hostnameX” is the actual host name to compare with, case insensitively. "
 "Each line can contain multiple values, separated by comma. There can be "
 "provided multiple lines for one OAuth2 service. Note that the actual URL "
 "where the token is requested and refreshed cannot be changed here, the "
 "hostname is to allow other servers, where the OAuth2 service can be used. "
-"Examples: Company:mail.company.com - enables 'Company' OAuth2 authentication "
-"for 'mail.company.com' host Company-CalDAV:caldav.company.com - enables "
-"'Company' OAuth2 authentication for any 'CalDAV' source, which reads data "
-"from 'caldav.company.com' host"
+"Examples: Company:mail.company.com — enables “Company” OAuth2 authentication "
+"for “mail.company.com” host Company-CalDAV:caldav.company.com — enables "
+"“Company” OAuth2 authentication for any “CalDAV” source, which reads data "
+"from “caldav.company.com” host"
 msgstr ""
 "Users can extend the list of supported protocols and hostnames for defined "
 "OAuth2 services, in addition to those hard-coded. Each line can be of the "
-"form: servicename[-protocol]:hostname1,hostname2,... where 'servicename' is "
-"the actual service name; the '-protocol' is optional, and if written, then "
-"the service can be used only if both 'protocol' and 'hostnameX' match; the "
-"'hostnameX' is the actual host name to compare with, case insensitively. "
+"form: servicename[-protocol]:hostname1,hostname2,... where “servicename” is "
+"the actual service name; the “-protocol” is optional, and if written, then "
+"the service can be used only if both “protocol” and “hostnameX” match; the "
+"“hostnameX” is the actual host name to compare with, case insensitively. "
 "Each line can contain multiple values, separated by comma. There can be "
 "provided multiple lines for one OAuth2 service. Note that the actual URL "
 "where the token is requested and refreshed cannot be changed here, the "
 "hostname is to allow other servers, where the OAuth2 service can be used. "
-"Examples: Company:mail.company.com - enables 'Company' OAuth2 authentication "
-"for 'mail.company.com' host Company-CalDAV:caldav.company.com - enables "
-"'Company' OAuth2 authentication for any 'CalDAV' source, which reads data "
-"from 'caldav.company.com' host"
+"Examples: Company:mail.company.com — enables “Company” OAuth2 authentication "
+"for “mail.company.com” host Company-CalDAV:caldav.company.com — enables "
+"“Company” OAuth2 authentication for any “CalDAV” source, which reads data "
+"from “caldav.company.com” host"
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
 msgstr "(Deprecated) Proxy type to use"
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-#| msgid ""
-#| "This key was deprecated in version 3.12 and should no longer be used. "
-#| "Proxy settings are now integrated into Evolution-Data-Server's account "
-#| "system. See the ESourceProxy API documentation for details."
 msgid ""
 "This key was deprecated in version 3.12 and should no longer be used. Proxy "
 "settings are now integrated into Evolution-Data-Server’s account system. See "
@@ -5445,29 +6198,36 @@ msgstr "(Deprecated) Port number for SOCKS requests"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(Deprecated) Automatic proxy configuration URL"
 
-#: ../src/libebackend/e-cache.c:751
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolution Alarm Notify"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+#| msgid "Calendar authentication request"
+msgid "Calendar event notifications"
+msgstr "Calendar event notifications"
+
+#: ../src/libebackend/e-cache.c:754
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ../src/libebackend/e-cache.c:943
+#: ../src/libebackend/e-cache.c:946
 #, c-format
-#| msgid "Cannot create directory '%s': %s."
 msgid "Can not make parent directory: %s"
 msgstr "Can not make parent directory: %s"
 
-#: ../src/libebackend/e-collection-backend.c:1017
+#: ../src/libebackend/e-collection-backend.c:1008
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s does not support creating remote resources"
 
-#: ../src/libebackend/e-collection-backend.c:1076
+#: ../src/libebackend/e-collection-backend.c:1067
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s does not support deleting remote resources"
 
-#: ../src/libebackend/e-data-factory.c:1359
+#: ../src/libebackend/e-data-factory.c:1492
 #, c-format
-#| msgid "Backend factory for source '%s' and extension '%s' cannot be found."
 msgid "Backend factory for source “%s” and extension “%s” cannot be found."
 msgstr "Backend factory for source “%s” and extension “%s” cannot be found."
 
@@ -5481,78 +6241,83 @@ msgid "Failed to lookup credentials: "
 msgstr "Failed to lookup credentials: "
 
 #: ../src/libebackend/e-server-side-source.c:1395
-#: ../src/libedataserver/e-source.c:1597
+#: ../src/libedataserver/e-source.c:1583
 #, c-format
-#| msgid "Data source '%s' does not support creating remote resources"
 msgid "Data source “%s” does not support creating remote resources"
 msgstr "Data source “%s” does not support creating remote resources"
 
 #: ../src/libebackend/e-server-side-source.c:1409
 #, c-format
-#| msgid ""
-#| "Data source '%s' has no collection backend to create the remote resource"
 msgid ""
 "Data source “%s” has no collection backend to create the remote resource"
 msgstr ""
 "Data source “%s” has no collection backend to create the remote resource"
 
 #: ../src/libebackend/e-server-side-source.c:1437
-#: ../src/libedataserver/e-source.c:1710
+#: ../src/libedataserver/e-source.c:1696
 #, c-format
-#| msgid "Data source '%s' does not support deleting remote resources"
 msgid "Data source “%s” does not support deleting remote resources"
 msgstr "Data source “%s” does not support deleting remote resources"
 
 #: ../src/libebackend/e-server-side-source.c:1451
 #, c-format
-#| msgid ""
-#| "Data source '%s' has no collection backend to delete the remote resource"
 msgid ""
 "Data source “%s” has no collection backend to delete the remote resource"
 msgstr ""
 "Data source “%s” has no collection backend to delete the remote resource"
 
 #: ../src/libebackend/e-server-side-source.c:1482
-#: ../src/libedataserver/e-source.c:1806
+#: ../src/libedataserver/e-source.c:1792
 #: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080
 #, c-format
-#| msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgid "Data source “%s” does not support OAuth 2.0 authentication"
 msgstr "Data source “%s” does not support OAuth 2.0 authentication"
 
 #: ../src/libebackend/e-server-side-source.c:1860
 #, c-format
-#| msgid "File must have a '.source' extension"
 msgid "File must have a “.source” extension"
 msgstr "File must have a “.source” extension"
 
 #: ../src/libebackend/e-source-registry-server.c:322
 #, c-format
-#| msgid "UID '%s' is already in use"
 msgid "UID “%s” is already in use"
 msgstr "UID “%s” is already in use"
 
-#: ../src/libebackend/e-subprocess-factory.c:277
+#: ../src/libebackend/e-source-registry-server.c:447
+#, c-format
+#| msgid "Cannot find certificate for “%s”"
+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:451
+#, c-format
+#| msgid "Source “%s” (%s) is not a valid OAuth2 source"
+msgid "Source “%s” is not a collection source"
+msgstr "Source “%s” is not a collection source"
+
+#: ../src/libebackend/e-source-registry-server.c:457
+#, c-format
+#| msgid "Cannot find certificate for “%s”"
+msgid "Cannot find source “%s”"
+msgstr "Cannot find source “%s”"
+
+#: ../src/libebackend/e-subprocess-factory.c:281
 #, c-format
-#| msgid "Module '%s' for source UID '%s' cannot be loaded"
 msgid "Module “%s” for source UID “%s” cannot be loaded"
 msgstr "Module “%s” for source UID “%s” cannot be loaded"
 
-#: ../src/libebackend/e-subprocess-factory.c:289
+#: ../src/libebackend/e-subprocess-factory.c:293
 #, c-format
-#| msgid "No such source for UID '%s'"
 msgid "No such source for UID “%s”"
 msgstr "No such source for UID “%s”"
 
-#: ../src/libebackend/e-subprocess-factory.c:300
+#: ../src/libebackend/e-subprocess-factory.c:302
 #, c-format
-#| msgid "Failed to create backend of type '%s' for source UID '%s'"
 msgid "Failed to create backend of type “%s” for source UID “%s”"
 msgstr "Failed to create backend of type “%s” for source UID “%s”"
 
-#: ../src/libebackend/e-user-prompter-server.c:303
+#: ../src/libebackend/e-user-prompter-server.c:304
 #, c-format
-#| msgid "Extension dialog '%s' not found."
 msgid "Extension dialog “%s” not found."
 msgstr "Extension dialogue “%s” not found."
 
@@ -5695,18 +6460,15 @@ msgstr "Timeout was reached"
 #. the third is the name of the OAuth service.
 #: ../src/libedataserver/e-oauth2-service.c:1208
 #, c-format
-#| msgid "Source '%s' (%s) is not a valid Google source"
 msgid "Source “%s” (%s) is not valid for “%s” OAuth2 service"
 msgstr "Source “%s” (%s) is not valid for “%s” OAuth2 service"
 
 #: ../src/libedataserver/e-oauth2-service.c:1223
-#| msgid "Google secret not found"
 msgid "OAuth2 secret not found"
 msgstr "OAuth2 secret not found"
 
 #: ../src/libedataserver/e-oauth2-service.c:1411
 #, c-format
-#| msgid "Unexpected OK response from IMAP server: %s"
 msgid "Received incorrect response from server “%s”."
 msgstr "Received incorrect response from server “%s”."
 
@@ -5717,7 +6479,6 @@ msgstr "Failed to refresh access token. Sign to the server again, please."
 #. Translators: The first %s is a display name of the source, the second is its UID.
 #: ../src/libedataserver/e-oauth2-service.c:1462
 #, c-format
-#| msgid "Source '%s' (%s) is not a valid Google source"
 msgid "Source “%s” (%s) is not a valid OAuth2 source"
 msgstr "Source “%s” (%s) is not a valid OAuth2 source"
 
@@ -5731,7 +6492,6 @@ msgstr ""
 
 #. Translators: This is a user-visible string, display name of an OAuth2 service.
 #: ../src/libedataserver/e-oauth2-service-google.c:56
-#| msgid "Google"
 msgctxt "OAuth2Service"
 msgid "Google"
 msgstr "Google"
@@ -5742,14 +6502,12 @@ msgctxt "OAuth2Service"
 msgid "Outlook"
 msgstr "Outlook"
 
-#: ../src/libedataserver/e-soup-session.c:824
-#| msgid "Operation has been cancelled"
+#: ../src/libedataserver/e-soup-session.c:861
 msgid "Operation was cancelled"
 msgstr "Operation was cancelled"
 
-#: ../src/libedataserver/e-soup-session.c:827
+#: ../src/libedataserver/e-soup-session.c:867
 #, c-format
-#| msgid "Failed to make directory %s: %s"
 msgid "Failed with HTTP error %d: %s"
 msgstr "Failed with HTTP error %d: %s"
 
@@ -5758,19 +6516,17 @@ msgstr "Failed with HTTP error %d: %s"
 msgid "Source file is missing a [%s] group"
 msgstr "Source file is missing a [%s] group"
 
-#: ../src/libedataserver/e-source.c:1377
+#: ../src/libedataserver/e-source.c:1363
 #, c-format
-#| msgid "Data source '%s' is not removable"
 msgid "Data source “%s” is not removable"
 msgstr "Data source “%s” is not removable"
 
-#: ../src/libedataserver/e-source.c:1500
+#: ../src/libedataserver/e-source.c:1486
 #, c-format
-#| msgid "Data source '%s' is not writable"
 msgid "Data source “%s” is not writable"
 msgstr "Data source “%s” is not writable"
 
-#: ../src/libedataserver/e-source.c:2196
+#: ../src/libedataserver/e-source.c:2173
 msgid "Unnamed"
 msgstr "Unnamed"
 
@@ -5797,7 +6553,6 @@ msgstr "Signature script must be a local file"
 
 #: ../src/libedataserver/e-source-proxy.c:1642
 #, c-format
-#| msgid "Source '%s' does not support proxy lookups"
 msgid "Source “%s” does not support proxy lookups"
 msgstr "Source “%s” does not support proxy lookups"
 
@@ -5969,7 +6724,6 @@ msgstr ""
 #. The last '%s' is replaced with detailed error text, as returned by the server.
 #: ../src/libedataserver/e-webdav-session.c:978
 #, c-format
-#| msgid "NSPR error code %d"
 msgid "%s: HTTP error code %d (%s): %s"
 msgstr "%s: HTTP error code %d (%s): %s"
 
@@ -5987,7 +6741,6 @@ msgstr "Failed with HTTP error code %d (%s): %s"
 #. The second '%s' is replaced with a reason phrase of the error (user readable text).
 #: ../src/libedataserver/e-webdav-session.c:1001
 #, c-format
-#| msgid "NSPR error code %d"
 msgid "%s: HTTP error code %d (%s)"
 msgstr "%s: HTTP error code %d (%s)"
 
@@ -5999,158 +6752,136 @@ msgid "Failed with HTTP error code %d (%s)"
 msgstr "Failed with HTTP error code %d (%s)"
 
 #: ../src/libedataserver/e-webdav-session.c:1257
-#| msgid "Failed to encode data"
 msgid "Failed to post data"
 msgstr "Failed to post data"
 
 #: ../src/libedataserver/e-webdav-session.c:1350
 #: ../src/libedataserver/e-webdav-session.c:1425
 #: ../src/libedataserver/e-webdav-session.c:1529
-#: ../src/libedataserver/e-webdav-session.c:2784
-#: ../src/libedataserver/e-webdav-session.c:4036
-#| msgid "Failed to find Account element"
+#: ../src/libedataserver/e-webdav-session.c:2778
+#: ../src/libedataserver/e-webdav-session.c:4030
 msgid "Failed to get input XML content"
 msgstr "Failed to get input XML content"
 
 #: ../src/libedataserver/e-webdav-session.c:1361
-#| msgid "Failed to get capabilities"
 msgid "Failed to get properties"
 msgstr "Failed to get properties"
 
 #: ../src/libedataserver/e-webdav-session.c:1435
-#| msgid "Failed to authenticate"
 msgid "Failed to update properties"
 msgstr "Failed to update properties"
 
 #: ../src/libedataserver/e-webdav-session.c:1539
-#| msgid "Failed to issue NOTIFY"
 msgid "Failed to issue REPORT"
 msgstr "Failed to issue REPORT"
 
 #: ../src/libedataserver/e-webdav-session.c:1598
-#| msgid "Failed to select mailbox"
 msgid "Failed to create collection"
 msgstr "Failed to create collection"
 
 #: ../src/libedataserver/e-webdav-session.c:1689
 #: ../src/libedataserver/e-webdav-session.c:1843
-#| msgid "Failed to get lock using fcntl(2): %s"
 msgid "Failed to get XML request content"
 msgstr "Failed to get XML request content"
 
 #: ../src/libedataserver/e-webdav-session.c:1701
-#| msgid "Failed to read From address"
 msgid "Failed to create address book"
 msgstr "Failed to create address book"
 
 #: ../src/libedataserver/e-webdav-session.c:1856
-#| msgid "Failed to run calendar factory"
 msgid "Failed to create calendar"
 msgstr "Failed to create calendar"
 
 #: ../src/libedataserver/e-webdav-session.c:1988
 #: ../src/libedataserver/e-webdav-session.c:1999
-#| msgid "Failed to read From address"
 msgid "Failed to read resource"
 msgstr "Failed to read resource"
 
 #: ../src/libedataserver/e-webdav-session.c:2148
-#| msgid "Credentials store is not supported"
 msgid "Cannot rewind input stream: Not supported"
 msgstr "Cannot rewind input stream: Not supported"
 
-#: ../src/libedataserver/e-webdav-session.c:2299
-#: ../src/libedataserver/e-webdav-session.c:2451
-#| msgid "Failed to encode data"
+#: ../src/libedataserver/e-webdav-session.c:2311
+#: ../src/libedataserver/e-webdav-session.c:2455
 msgid "Failed to put data"
 msgstr "Failed to put data"
 
-#: ../src/libedataserver/e-webdav-session.c:2318
-#: ../src/libedataserver/e-webdav-session.c:2459
+#: ../src/libedataserver/e-webdav-session.c:2330
+#: ../src/libedataserver/e-webdav-session.c:2463
 #, c-format
-#| msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
 msgid "Failed to put data to server, error code %d (%s)"
 msgstr "Failed to put data to server, error code %d (%s)"
 
-#: ../src/libedataserver/e-webdav-session.c:2561
-#| msgid "Failed to enable QResync"
+#: ../src/libedataserver/e-webdav-session.c:2555
 msgid "Failed to delete resource"
 msgstr "Failed to delete resource"
 
-#: ../src/libedataserver/e-webdav-session.c:2628
-#| msgid "Failed to copy the tmp file"
+#: ../src/libedataserver/e-webdav-session.c:2622
 msgid "Failed to copy resource"
 msgstr "Failed to copy resource"
 
-#: ../src/libedataserver/e-webdav-session.c:2690
-#| msgid "Failed to retrieve message"
+#: ../src/libedataserver/e-webdav-session.c:2684
 msgid "Failed to move resource"
 msgstr "Failed to move resource"
 
-#: ../src/libedataserver/e-webdav-session.c:2795
-#| msgid "Failed to lookup credentials: "
+#: ../src/libedataserver/e-webdav-session.c:2789
 msgid "Failed to lock resource"
 msgstr "Failed to lock resource"
 
-#: ../src/libedataserver/e-webdav-session.c:2809
-#: ../src/libedataserver/e-webdav-session.c:3011
+#: ../src/libedataserver/e-webdav-session.c:2803
+#: ../src/libedataserver/e-webdav-session.c:3005
 msgid "Expected application/xml response, but none returned"
 msgstr "Expected application/xml response, but none returned"
 
-#: ../src/libedataserver/e-webdav-session.c:2812
-#: ../src/libedataserver/e-webdav-session.c:3014
+#: ../src/libedataserver/e-webdav-session.c:2806
+#: ../src/libedataserver/e-webdav-session.c:3008
 #, c-format
 msgid "Expected application/xml response, but %s returned"
 msgstr "Expected application/xml response, but %s returned"
 
-#: ../src/libedataserver/e-webdav-session.c:2824
-#: ../src/libedataserver/e-webdav-session.c:3027
-#| msgid "Failed to encode data"
+#: ../src/libedataserver/e-webdav-session.c:2818
+#: ../src/libedataserver/e-webdav-session.c:3021
 msgid "Failed to parse XML data"
 msgstr "Failed to parse XML data"
 
-#: ../src/libedataserver/e-webdav-session.c:2903
-#| msgid "Failed to select mailbox"
+#: ../src/libedataserver/e-webdav-session.c:2897
 msgid "Failed to refresh lock"
 msgstr "Failed to refresh lock"
 
-#: ../src/libedataserver/e-webdav-session.c:2962
-#| msgid "Failed to authenticate"
+#: ../src/libedataserver/e-webdav-session.c:2956
 msgid "Failed to unlock"
 msgstr "Failed to unlock"
 
-#: ../src/libedataserver/e-webdav-session.c:2999
+#: ../src/libedataserver/e-webdav-session.c:2993
 #, c-format
-#| msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
 msgid "Expected multistatus response, but %d returned (%s)"
 msgstr "Expected multistatus response, but %d returned (%s)"
 
-#: ../src/libedataserver/e-webdav-session.c:4046
-#| msgid "Failed to get lock using fcntl(2): %s"
+#: ../src/libedataserver/e-webdav-session.c:4040
 msgid "Failed to get access control list"
 msgstr "Failed to get access control list"
 
-#: ../src/libedataserver/e-webdav-session.c:4787
+#: ../src/libedataserver/e-webdav-session.c:4781
 msgid "Cannot store protected nor inherited Access Control Entry."
 msgstr "Cannot store protected nor inherited Access Control Entry."
 
-#: ../src/libedataserver/e-webdav-session.c:4794
+#: ../src/libedataserver/e-webdav-session.c:4788
 msgid "Provided invalid principal kind for Access Control Entry."
 msgstr "Provided invalid principal kind for Access Control Entry."
 
-#: ../src/libedataserver/e-webdav-session.c:4801
+#: ../src/libedataserver/e-webdav-session.c:4795
 msgid "Cannot store property-based Access Control Entry."
 msgstr "Cannot store property-based Access Control Entry."
 
-#: ../src/libedataserver/e-webdav-session.c:4808
+#: ../src/libedataserver/e-webdav-session.c:4802
 msgid "Access Control Entry can be only to Grant or Deny, but not None."
 msgstr "Access Control Entry can be only to Grant or Deny, but not None."
 
-#: ../src/libedataserver/e-webdav-session.c:4816
+#: ../src/libedataserver/e-webdav-session.c:4810
 msgid "Access Control Entry can be only to Grant or Deny, but not both."
 msgstr "Access Control Entry can be only to Grant or Deny, but not both."
 
-#: ../src/libedataserver/e-webdav-session.c:4875
+#: ../src/libedataserver/e-webdav-session.c:4869
 msgid "Access Control Entry privilege cannot be NULL."
 msgstr "Access Control Entry privilege cannot be NULL."
 
@@ -6162,13 +6893,11 @@ msgstr "Credentials prompt was cancelled"
 
 #: ../src/libedataserverui/e-credentials-prompter.c:662
 #, c-format
-#| msgid "Source '%s' doesn't support prompt for credentials"
 msgid "Source “%s” doesn’t support prompt for credentials"
 msgstr "Source “%s” doesn’t support prompt for credentials"
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:202
 #, c-format
-#| msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
 msgid "Failed to obtain access token from address “%s”: %s"
 msgstr "Failed to obtain access token from address “%s”: %s"
 
@@ -6180,7 +6909,6 @@ msgstr "Requesting access token, please wait…"
 #. thus it can form a string like "Google Address Book authentication request".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:472
 #, c-format
-#| msgid "Address book authentication request"
 msgid "%s Address Book authentication request"
 msgstr "%s Address Book authentication request"
 
@@ -6188,7 +6916,6 @@ msgstr "%s Address Book authentication request"
 #. thus it can form a string like "Google Calendar authentication request".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:477
 #, c-format
-#| msgid "Calendar authentication request"
 msgid "%s Calendar authentication request"
 msgstr "%s Calendar authentication request"
 
@@ -6196,7 +6923,6 @@ msgstr "%s Calendar authentication request"
 #. thus it can form a string like "Google Memo List authentication request".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:482
 #, c-format
-#| msgid "Google Memo List authentication request"
 msgid "%s Memo List authentication request"
 msgstr "%s Memo List authentication request"
 
@@ -6204,7 +6930,6 @@ msgstr "%s Memo List authentication request"
 #. thus it can form a string like "Google Task List authentication request".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:487
 #, c-format
-#| msgid "Google Task List authentication request"
 msgid "%s Task List authentication request"
 msgstr "%s Task List authentication request"
 
@@ -6212,7 +6937,6 @@ msgstr "%s Task List authentication request"
 #. thus it can form a string like "Google Mail authentication request".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:493
 #, c-format
-#| msgid "Mail authentication request"
 msgid "%s Mail authentication request"
 msgstr "%s Mail authentication request"
 
@@ -6221,7 +6945,6 @@ msgstr "%s Mail authentication request"
 #. thus it can form a string like "Google account authentication request".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:498
 #, c-format
-#| msgid "Google account authentication request"
 msgid "%s account authentication request"
 msgstr "%s account authentication request"
 
@@ -6230,9 +6953,6 @@ msgstr "%s account authentication request"
 #. like "On This Computer : Personal".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:512
 #, c-format
-#| msgid ""
-#| "Login to your Google account and accept conditions in order to access "
-#| "your address book \"%s\"."
 msgid ""
 "Login to your %s account and accept conditions in order to access your "
 "address book “%s”."
@@ -6245,9 +6965,6 @@ msgstr ""
 #. like "On This Computer : Personal".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:519
 #, c-format
-#| msgid ""
-#| "Login to your Google account and accept conditions in order to access "
-#| "your calendar \"%s\"."
 msgid ""
 "Login to your %s account and accept conditions in order to access your "
 "calendar “%s”."
@@ -6260,9 +6977,6 @@ msgstr ""
 #. like "On This Computer : Personal".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:526
 #, c-format
-#| msgid ""
-#| "Login to your Google account and accept conditions in order to access "
-#| "your mail account \"%s\"."
 msgid ""
 "Login to your %s account and accept conditions in order to access your mail "
 "account “%s”."
@@ -6275,9 +6989,6 @@ msgstr ""
 #. like "On This Computer : Personal".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:533
 #, c-format
-#| msgid ""
-#| "Login to your Google account and accept conditions in order to access "
-#| "your mail transport \"%s\"."
 msgid ""
 "Login to your %s account and accept conditions in order to access your mail "
 "transport “%s”."
@@ -6290,9 +7001,6 @@ msgstr ""
 #. like "On This Computer : Personal".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:540
 #, c-format
-#| msgid ""
-#| "Login to your Google account and accept conditions in order to access "
-#| "your memo list \"%s\"."
 msgid ""
 "Login to your %s account and accept conditions in order to access your memo "
 "list “%s”."
@@ -6305,9 +7013,6 @@ msgstr ""
 #. like "On This Computer : Personal".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:547
 #, c-format
-#| msgid ""
-#| "Login to your Google account and accept conditions in order to access "
-#| "your task list \"%s\"."
 msgid ""
 "Login to your %s account and accept conditions in order to access your task "
 "list “%s”."
@@ -6320,9 +7025,6 @@ msgstr ""
 #. like "On This Computer : Personal".
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:554
 #, c-format
-#| msgid ""
-#| "Login to your Google account and accept conditions in order to access "
-#| "your account \"%s\"."
 msgid ""
 "Login to your %s account and accept conditions in order to access your "
 "account “%s”."
@@ -6333,7 +7035,7 @@ msgstr ""
 #: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:602
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:230
 #: ../src/libedataserverui/e-trust-prompt.c:112
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1067
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1061
 msgid "_Cancel"
 msgstr "_Cancel"
 
@@ -6356,64 +7058,139 @@ msgstr "Authentication request"
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:155
 #, c-format
-#| msgid "Please enter the password for address book \"%s\"."
 msgid "Please enter the password for address book “%s”."
 msgstr "Please enter the password for address book “%s”."
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:159
 #, c-format
-#| msgid "Please enter the password for calendar \"%s\"."
 msgid "Please enter the password for calendar “%s”."
 msgstr "Please enter the password for calendar “%s”."
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:163
 #, c-format
-#| msgid "Please enter the password for mail account \"%s\"."
 msgid "Please enter the password for mail account “%s”."
 msgstr "Please enter the password for mail account “%s”."
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:167
 #, c-format
-#| msgid "Please enter the password for mail transport \"%s\"."
 msgid "Please enter the password for mail transport “%s”."
 msgstr "Please enter the password for mail transport “%s”."
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:171
 #, c-format
-#| msgid "Please enter the password for memo list \"%s\"."
 msgid "Please enter the password for memo list “%s”."
 msgstr "Please enter the password for memo list “%s”."
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:175
 #, c-format
-#| msgid "Please enter the password for task list \"%s\"."
 msgid "Please enter the password for task list “%s”."
 msgstr "Please enter the password for task list “%s”."
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:179
 #, c-format
-#| msgid "Please enter the password for account \"%s\"."
 msgid "Please enter the password for account “%s”."
 msgstr "Please enter the password for account “%s”."
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:231
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1068
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1062
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:341
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:348
 msgid "_User Name:"
 msgstr "_User Name:"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:353
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:360
 msgid "_Password:"
 msgstr "_Password:"
 
 #. Remember password check
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:369
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:376
 msgid "_Add this password to your keyring"
 msgstr "_Add this password to your keyring"
 
+#: ../src/libedataserverui/e-reminders-widget.c:225
+msgid "Add custom time…"
+msgstr "Add custom time…"
+
+#: ../src/libedataserverui/e-reminders-widget.c:229
+msgid "Clear custom times"
+msgstr "Clear custom times"
+
+#: ../src/libedataserverui/e-reminders-widget.c:277
+#| msgid "no"
+msgctxt "overdue"
+msgid "now"
+msgstr "now"
+
+#: ../src/libedataserverui/e-reminders-widget.c:295
+#, c-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d year"
+msgstr[1] "%d years"
+
+#: ../src/libedataserverui/e-reminders-widget.c:301
+msgctxt "overdue"
+msgid "overdue"
+msgstr "overdue"
+
+#: ../src/libedataserverui/e-reminders-widget.c:912
+#, c-format
+#| msgid "Failed to create cache “%s”:"
+msgid "Failed to launch URI “%s”:"
+msgstr "Failed to launch URI “%s”:"
+
+#: ../src/libedataserverui/e-reminders-widget.c:953
+#| msgid "Could not discard reminder: "
+msgid "Failed to dismiss reminder:"
+msgstr "Failed to dismiss reminder:"
+
+#: ../src/libedataserverui/e-reminders-widget.c:974
+#| msgid "Failed to issue NOTIFY"
+msgid "Failed to dismiss all:"
+msgstr "Failed to dismiss all:"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1110
+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:1123
+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:1139
+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:1155
+msgctxt "reminders-snooze"
+msgid "_minutes"
+msgstr "_minutes"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1161
+msgid "_Add Snooze time"
+msgstr "_Add Snooze time"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1428
+#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
+msgid "_Dismiss"
+msgstr "_Dismiss"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1429
+#| msgid "_Dismiss"
+msgid "Dismiss _All"
+msgstr "Dismiss _All"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1431
+msgid "_Snooze"
+msgstr "_Snooze"
+
 #: ../src/libedataserverui/e-trust-prompt.c:111
 #: ../src/modules/trust-prompt/trust-prompt-gtk.c:117
 msgid "Certificate trust..."
@@ -6437,8 +7214,6 @@ msgstr "_Accept Permanently"
 #: ../src/libedataserverui/e-trust-prompt.c:186
 #: ../src/modules/trust-prompt/trust-prompt-gtk.c:157
 #, c-format
-#| msgid ""
-#| "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
 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?"
 
@@ -6467,7 +7242,6 @@ msgstr ""
 
 #: ../src/libedataserverui/e-trust-prompt.c:277
 #: ../src/modules/trust-prompt/module-trust-prompt.c:84
-#| msgid "The certificate's activation time is still in the future."
 msgid "The certificate’s activation time is still in the future."
 msgstr "The certificate’s activation time is still in the future."
 
@@ -6478,9 +7252,6 @@ msgstr "The certificate has expired."
 
 #: ../src/libedataserverui/e-trust-prompt.c:281
 #: ../src/modules/trust-prompt/module-trust-prompt.c:88
-#| msgid ""
-#| "The certificate has been revoked according to the connection's "
-#| "certificate revocation list."
 msgid ""
 "The certificate has been revoked according to the connection’s certificate "
 "revocation list."
@@ -6490,7 +7261,6 @@ msgstr ""
 
 #: ../src/libedataserverui/e-trust-prompt.c:283
 #: ../src/modules/trust-prompt/module-trust-prompt.c:90
-#| msgid "The certificate's algorithm is considered insecure."
 msgid "The certificate’s algorithm is considered insecure."
 msgstr "The certificate’s algorithm is considered insecure."
 
@@ -6522,27 +7292,20 @@ msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:826
+#: ../src/libedataserverui/e-webdav-discover-widget.c:834
 msgid "Invalid URL"
 msgstr "Invalid URI"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:840
-msgid "User name not filled"
-msgstr "User name not filled"
-
-#: ../src/libedataserverui/e-webdav-discover-widget.c:881
+#: ../src/libedataserverui/e-webdav-discover-widget.c:875
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:884
+#: ../src/libedataserverui/e-webdav-discover-widget.c:878
 msgid "Searching server sources..."
 msgstr "Searching server sources…"
 
 #: ../src/modules/gnome-online-accounts/e-goa-password-based.c:248
 #, c-format
-#| msgid ""
-#| "Cannot find a corresponding account in the org.gnome.OnlineAccounts "
-#| "service from which to obtain a password for '%s'"
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain a password for “%s”"
@@ -6557,7 +7320,6 @@ msgstr "Failed to get password from GOA: "
 #. TODO: more specific
 #: ../src/modules/gnome-online-accounts/goaewsclient.c:220
 #, c-format
-#| msgid "Code: %u - Unexpected response from server"
 msgid "Code: %u — Unexpected response from server"
 msgstr "Code: %u — Unexpected response from server"
 
@@ -6591,11 +7353,8 @@ msgstr "Failed to find Account element"
 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:1336
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1405
 #, c-format
-#| msgid ""
-#| "Cannot find a corresponding account in the org.gnome.OnlineAccounts "
-#| "service from which to obtain an access token for '%s'"
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an access token for “%s”"
@@ -6603,13 +7362,12 @@ 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:1366
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1455
 #, c-format
-#| msgid "Failed to obtain an access token for '%s': "
 msgid "Failed to obtain an access token for “%s”: "
 msgstr "Failed to obtain an access token for “%s”: "
 
-#: ../src/modules/google-backend/module-google-backend.c:587
+#: ../src/modules/google-backend/module-google-backend.c:589
 #: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../src/services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
@@ -6662,9 +7420,6 @@ msgstr "Integrate your mailboxes"
 
 #: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1061
 #, c-format
-#| msgid ""
-#| "Cannot find a corresponding account service in the accounts database from "
-#| "which to obtain an access token for '%s'"
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
 "which to obtain an access token for “%s”"
@@ -6686,17 +7441,14 @@ msgid "Error parsing response as JSON: "
 msgstr "Error parsing response as JSON: "
 
 #: ../src/modules/ubuntu-online-accounts/uoa-utils.c:120
-#| msgid "Didn't find 'email' in JSON data"
 msgid "Didn’t find “email” in JSON data"
 msgstr "Didn’t find “email” in JSON data"
 
 #: ../src/modules/ubuntu-online-accounts/uoa-utils.c:317
-#| msgid "Didn't find 'id' in JSON data"
 msgid "Didn’t find “id” in JSON data"
 msgstr "Didn’t find “id” in JSON data"
 
 #: ../src/modules/ubuntu-online-accounts/uoa-utils.c:322
-#| msgid "Didn't find 'emails.account' in JSON data"
 msgid "Didn’t find “emails.account” in JSON data"
 msgstr "Didn’t find “emails.account” in JSON data"
 
@@ -6732,6 +7484,74 @@ 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:223
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:250
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:755
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:964
+msgid "Reminders"
+msgstr "Reminders"
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:362
+#| msgid "Learning junk"
+msgid "Warning"
+msgstr "Warning"
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:363
+msgid "_No"
+msgstr "_No"
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:364
+msgid "_Yes"
+msgstr "_Yes"
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:368
+#, c-format
+msgid ""
+"A calendar reminder is about to trigger. This reminder is configured to run "
+"the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+"A calendar reminder is about to trigger. This reminder is configured to run "
+"the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:382
+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:660
+msgid "Display reminders in notification area _only"
+msgstr "Display reminders in notification area _only"
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:661
+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:662
+msgid "Display reminders for _completed tasks"
+msgstr "Display reminders for _completed tasks"
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:663
+msgid "Display reminders for _past events"
+msgstr "Display reminders for _past events"
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:677
+msgid "Reminders Options:"
+msgstr "Reminders Options:"
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:771
+#, 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"
@@ -6740,6 +7560,10 @@ msgstr "Birthdays & Anniversaries"
 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/google-stub.source.in.h:1
 msgid "Google"
 msgstr "Google"
@@ -6753,6 +7577,10 @@ msgstr "On LDAP Servers"
 msgid "On This Computer"
 msgstr "On This Computer"
 
+#: ../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"
@@ -6765,19 +7593,10 @@ msgstr "Weather"
 msgid "On The Web"
 msgstr "On The Web"
 
-#: ../src/services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
-msgid "CardDAV"
-msgstr "CardDAV"
-
 #: ../src/services/evolution-source-registry/evolution-source-registry.c:41
-#| msgid "Don't migrate user data from previous versions of Evolution"
 msgid "Don’t migrate user data from previous versions of Evolution"
 msgstr "Don’t migrate user data from previous versions of Evolution"
 
-#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
-msgid "_Dismiss"
-msgstr "_Dismiss"
-
 #: ../src/tools/addressbook-export/addressbook-export.c:69
 #: ../src/tools/addressbook-export/addressbook-export.c:781
 msgid "Can not open file"
@@ -6785,7 +7604,6 @@ msgstr "Cannot open file"
 
 #: ../src/tools/addressbook-export/addressbook-export.c:99
 #, c-format
-#| msgid "Failed to open client '%s': %s"
 msgid "Failed to open client “%s”: %s"
 msgstr "Failed to open client “%s”: %s"
 
@@ -6824,17 +7642,14 @@ msgid "Only support csv or vcard format."
 msgstr "Only support csv or vcard format."
 
 #: ../src/tools/list-sources/list-sources.c:83
-#| msgid "_Show only subscribed folders"
 msgid "Show only enabled sources"
 msgstr "Show only enabled sources"
 
 #: ../src/tools/list-sources/list-sources.c:86
-#| msgid "POP Source UID"
 msgid "Show source’s UID"
 msgstr "Show source’s UID"
 
 #: ../src/tools/list-sources/list-sources.c:89
-#| msgid "Unsupported authentication method"
 msgid "Show source’s authentication information"
 msgstr "Show source’s authentication information"
 
@@ -6855,13 +7670,10 @@ msgid "yes"
 msgstr "yes"
 
 #: ../src/tools/list-sources/list-sources.c:106
-#| msgid "Snow"
 msgid "no"
 msgstr "no"
 
 #: ../src/tools/list-sources/list-sources.c:126
-#| msgctxt "CategoryName"
-#| msgid "Competition"
 msgid "Collection"
 msgstr "Collection"
 
@@ -6878,13 +7690,10 @@ msgid "Address Book"
 msgstr "Address Book"
 
 #: ../src/tools/list-sources/list-sources.c:149
-#| msgctxt "WebDAVDiscover"
-#| msgid "Memos"
 msgid "Memo List"
 msgstr "Memo List"
 
 #: ../src/tools/list-sources/list-sources.c:150
-#| msgid "Tasks"
 msgid "Task List"
 msgstr "Task List"
 
@@ -6897,17 +7706,14 @@ msgid "Mail Transport"
 msgstr "Mail Transport"
 
 #: ../src/tools/list-sources/list-sources.c:153
-#| msgid "Identity"
 msgid "Mail Identity"
 msgstr "Mail Identity"
 
 #: ../src/tools/list-sources/list-sources.c:154
-#| msgid "Message submission port"
 msgid "Mail Submission"
 msgstr "Mail Submission"
 
 #: ../src/tools/list-sources/list-sources.c:155
-#| msgid "Bad signature"
 msgid "Mail Signature"
 msgstr "Mail Signature"
 
@@ -6922,37 +7728,31 @@ msgstr "UID: %s"
 
 #: ../src/tools/list-sources/list-sources.c:228
 #, c-format
-#| msgid "Malformed URI: %s"
 msgid "Parent UID: %s"
 msgstr "Parent UID: %s"
 
 #: ../src/tools/list-sources/list-sources.c:231
 #, c-format
-#| msgid "Posting failed: %s"
 msgid "Enabled: %s"
 msgstr "Enabled: %s"
 
 #: ../src/tools/list-sources/list-sources.c:233
 #, c-format
-#| msgid "Backend is busy"
 msgid "Backend: %s"
 msgstr "Backend: %s"
 
 #: ../src/tools/list-sources/list-sources.c:238
 #, c-format
-#| msgid "Calendar does not exist"
 msgid "Calendar enabled: %s"
 msgstr "Calendar enabled: %s"
 
 #: ../src/tools/list-sources/list-sources.c:239
 #, c-format
-#| msgid "Contact ID already exists"
 msgid "Contacts enabled: %s"
 msgstr "Contacts enabled: %s"
 
 #: ../src/tools/list-sources/list-sources.c:240
 #, c-format
-#| msgid "Operation failed: %s"
 msgid "Mail enabled: %s"
 msgstr "Mail enabled: %s"
 
@@ -6987,13 +7787,11 @@ msgid "Auth Proxy UID: %s"
 msgstr "Auth Proxy UID: %s"
 
 #: ../src/tools/list-sources/list-sources.c:420
-#| msgid "Failed to parse autodiscover response XML"
 msgid "Failed to parse arguments: Unknown error"
 msgstr "Failed to parse arguments: Unknown error"
 
 #: ../src/tools/list-sources/list-sources.c:429
 #, c-format
-#| msgid "Failed to connect to a server using SSL/TLS: %s"
 msgid "Failed to connect to source registry: %s\n"
 msgstr "Failed to connect to source registry: %s\n"
 
@@ -7002,6 +7800,9 @@ msgstr "Failed to connect to source registry: %s\n"
 msgid "No sources had been found\n"
 msgstr "No sources had been found\n"
 
+#~ msgid "User name not filled"
+#~ msgstr "User name not filled"
+
 #~ msgid "Querying for updated contacts…"
 #~ msgstr "Querying for updated contacts…"
 
@@ -7752,9 +8553,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Could not open cache directory: "
 #~ msgstr "Could not open cache directory: "
 
-#~ msgid "Failed to cache message %s: %s"
-#~ msgstr "Failed to cache message %s: %s"
-
 #~ msgid "Failed to cache message %s: "
 #~ msgstr "Failed to cache message %s: "
 
@@ -8157,9 +8955,6 @@ msgstr "No sources had been found\n"
 #~ msgid "Checking for deleted messages %s"
 #~ msgstr "Checking for deleted messages %s"
 
-#~ msgid "Could not get message"
-#~ msgstr "Could not get message"
-
 #~ msgid "Cannot append message to folder '%s': %s"
 #~ msgstr "Cannot append message to folder '%s': %s"
 
@@ -8377,9 +9172,6 @@ msgstr "No sources had been found\n"
 #~ msgid "QUIT command failed"
 #~ msgstr "QUIT command failed"
 
-#~ msgid "Learning junk"
-#~ msgstr "Learning junk"
-
 #~ msgid "Learning non-junk"
 #~ msgstr "Learning non-junk"
 


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