[evolution-data-server] Update Finnish translation



commit 1db6cbc95a8fbbb33e001a95e34fd710c84201ad
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Sat Feb 18 18:26:16 2017 +0000

    Update Finnish translation

 po/fi.po | 4060 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2169 insertions(+), 1891 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index cdbe37f..c96a40d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,15 +7,15 @@
 # Gnome 2012-03 Finnish translation sprint participants:
 # Niklas Laxström
 # Timo Jyrinki <timo jyrinki iki fi>, 2012.
-# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2010, 2013, 2014, 2016.
+# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2010, 2013, 2014, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-08-24 15:50+0000\n"
-"PO-Revision-Date: 2016-09-04 11:43+0300\n"
+"POT-Creation-Date: 2017-02-16 13:57+0000\n"
+"PO-Revision-Date: 2017-02-18 20:25+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -26,330 +26,337 @@ msgstr ""
 "X-POT-Import-Date: 2012-02-19 15:17:30+0000\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:120
+#: ../src/addressbook/backends/file/e-book-backend-file.c:120
 #, c-format
-msgid "Failed to remove file '%s': %s"
-msgstr "Tiedoston \"%s\" poistaminen epäonnistui: %s"
+#| msgid "Failed to remove file '%s': %s"
+msgid "Failed to remove file “%s”: %s"
+msgstr "Tiedoston “%s” poistaminen epäonnistui: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:148
+#: ../src/addressbook/backends/file/e-book-backend-file.c:148
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Kansion \"%s\" luominen epäonnistui: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:419
+#: ../src/addressbook/backends/file/e-book-backend-file.c:419
 #, fuzzy, c-format
-msgid "Failed to create hardlink for resource '%s': %s"
+msgid "Failed to create hardlink for resource “%s”: %s"
 msgstr "Lapsiprosessin \"%s\" luominen epäonnistui: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:524
-#: ../addressbook/backends/file/e-book-backend-file.c:1256
+#: ../src/addressbook/backends/file/e-book-backend-file.c:524
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1256
 msgid "No UID in the contact"
 msgstr "UID puuttuu yhteystiedosta"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:851
+#: ../src/addressbook/backends/file/e-book-backend-file.c:851
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr ""
 
-#: ../addressbook/backends/file/e-book-backend-file.c:990
+#: ../src/addressbook/backends/file/e-book-backend-file.c:990
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:992
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4357
+#: ../src/addressbook/backends/file/e-book-backend-file.c:992
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4353
 msgid "Searching..."
 msgstr "Etsitään..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1284
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1284
 #, 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 ""
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1475
-#: ../addressbook/backends/file/e-book-backend-file.c:1560
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
-#: ../addressbook/libedata-book/e-book-sqlite.c:7342
-#: ../addressbook/libedata-book/e-book-sqlite.c:7411
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1475
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1560
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7342
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7411
 #, c-format
-msgid "Contact '%s' not found"
-msgstr "Yhteystietoa \"%s\" ei löydy"
+#| msgid "Contact '%s' not found"
+msgid "Contact “%s” not found"
+msgstr "Yhteystietoa “%s” ei löydy"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1620
-#: ../addressbook/backends/file/e-book-backend-file.c:1701
-#, fuzzy, c-format
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1620
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1701
+#, c-format
 #| msgid "Protocol not supported"
-msgid "Query '%s' not supported"
-msgstr "Protokolla ei ole tuettu"
+msgid "Query “%s” not supported"
+msgstr "Kysely “%s” ei ole tuettu"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1629
-#: ../addressbook/backends/file/e-book-backend-file.c:1710
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1629
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1710
 #, c-format
-msgid "Invalid Query '%s'"
-msgstr "Virheellinen kysely '%s'"
+#| msgid "Invalid Query '%s'"
+msgid "Invalid Query “%s”"
+msgstr "Virheellinen kysely “%s”"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1975
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1975
 msgid "Requested to delete an unrelated cursor"
 msgstr ""
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2046
-#, c-format
-msgid "Failed to rename old database from '%s' to '%s': %s"
-msgstr "Vanhan tietokannan '%s' nimen muuttaminen muotoon '%s' epäonnistui: %s"
-
-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:867
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51
-#: ../addressbook/libebook-contacts/e-phone-number.c:56
-#: ../addressbook/libebook/e-book.c:1078
-#: ../addressbook/libebook/e-book-client.c:2131
-#: ../addressbook/libebook/e-book-client.c:2303
-#: ../addressbook/libebook/e-book-client.c:2516
-#: ../addressbook/libebook/e-book-client.c:2647
-#: ../addressbook/libebook/e-book-client.c:2806
-#: ../addressbook/libebook/e-book-client.c:2940
-#: ../addressbook/libebook/e-book-client.c:3071
-#: ../addressbook/libebook/e-book-client.c:3229
-#: ../addressbook/libebook/e-book-client.c:3424
-#: ../addressbook/libebook/e-book-client.c:3642
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:680
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:728
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:745
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
-#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
-#: ../calendar/libecal/e-cal-client.c:3520
-#: ../calendar/libecal/e-cal-client.c:3693
-#: ../calendar/libecal/e-cal-client.c:3957
-#: ../calendar/libecal/e-cal-client.c:4198
-#: ../calendar/libecal/e-cal-client.c:4388
-#: ../calendar/libecal/e-cal-client.c:4581
-#: ../calendar/libecal/e-cal-client.c:4790
-#: ../calendar/libecal/e-cal-client.c:4959
-#: ../calendar/libecal/e-cal-client.c:5162
-#: ../calendar/libecal/e-cal-client.c:5312
-#: ../calendar/libecal/e-cal-client.c:5506
-#: ../calendar/libecal/e-cal-client.c:5659
-#: ../calendar/libecal/e-cal-client.c:5876
-#: ../calendar/libecal/e-cal-client.c:6030
-#: ../calendar/libecal/e-cal-client.c:6256
-#: ../calendar/libecal/e-cal-client.c:6452
-#: ../calendar/libecal/e-cal-client.c:6815
-#: ../calendar/libecal/e-cal-client.c:7037
-#: ../camel/providers/imapx/camel-imapx-server.c:3041
-#: ../camel/providers/imapx/camel-imapx-server.c:3051
-#: ../camel/providers/imapx/camel-imapx-server.c:3063
-#: ../camel/providers/nntp/camel-nntp-store.c:424
-#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
+#: ../src/addressbook/backends/file/e-book-backend-file.c:2046
+#, 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 "Vanhan tietokannan “%s” nimen muuttaminen muotoon “%s” epäonnistui: %s"
+
+#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1162
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4243
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:384
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:867
+#: ../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:707
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:755
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:772
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:272
+#: ../src/calendar/libecal/e-cal.c:2334
+#: ../src/calendar/libecal/e-cal-client.c:277
+#: ../src/calendar/libecal/e-cal-client.c:3518
+#: ../src/calendar/libecal/e-cal-client.c:3691
+#: ../src/calendar/libecal/e-cal-client.c:3955
+#: ../src/calendar/libecal/e-cal-client.c:4196
+#: ../src/calendar/libecal/e-cal-client.c:4386
+#: ../src/calendar/libecal/e-cal-client.c:4579
+#: ../src/calendar/libecal/e-cal-client.c:4788
+#: ../src/calendar/libecal/e-cal-client.c:4957
+#: ../src/calendar/libecal/e-cal-client.c:5160
+#: ../src/calendar/libecal/e-cal-client.c:5310
+#: ../src/calendar/libecal/e-cal-client.c:5504
+#: ../src/calendar/libecal/e-cal-client.c:5657
+#: ../src/calendar/libecal/e-cal-client.c:5874
+#: ../src/calendar/libecal/e-cal-client.c:6028
+#: ../src/calendar/libecal/e-cal-client.c:6254
+#: ../src/calendar/libecal/e-cal-client.c:6450
+#: ../src/calendar/libecal/e-cal-client.c:6813
+#: ../src/calendar/libecal/e-cal-client.c:7035
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3048
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3058
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3070
+#: ../src/camel/providers/nntp/camel-nntp-store.c:422
+#: ../src/libebackend/e-server-side-source.c:498
+#: ../src/libedataserver/e-client.c:188
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:781
+#: ../src/addressbook/backends/google/e-book-backend-google.c:782
 msgid "Querying for updated contacts…"
 msgstr "Haetaan päivittyneitä yhteystietoja..."
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:965
+#: ../src/addressbook/backends/google/e-book-backend-google.c:966
 msgid "Querying for updated groups…"
 msgstr "Haetaan päivittyneitä ryhmiä..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1748
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1749
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4995
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1504
 msgid "The backend does not support bulk additions"
 msgstr "Taustapalvelu ei tue massalisäyksiä"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1905
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1626
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1906
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5131
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1626
 msgid "The backend does not support bulk modifications"
 msgstr "Taustapalvelu ei tue massamuokkauksia"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2114
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1726
+#: ../src/addressbook/backends/google/e-book-backend-google.c:2115
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1726
 msgid "The backend does not support bulk removals"
 msgstr "Taustapalvelu ei tue massapoistoja"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2236
+#: ../src/addressbook/backends/google/e-book-backend-google.c:2237
 msgid "Loading…"
 msgstr "Ladataan…"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1653
-#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
-#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
-#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
-#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1670
+#: ../src/services/evolution-source-registry/builtin/system-address-book.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-calendar.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-task-list.source.in.h:1
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1655
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1672
 msgid "Friends"
 msgstr "Ystävät"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1657
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1674
 msgid "Family"
 msgstr "Perhe"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1659
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1676
 msgid "Coworkers"
 msgstr "Työkaverit"
 
 #. Translators: An error message shown to a user when trying to do an
 #. * operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:114
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:110
 msgid "Not connected"
 msgstr "Ei yhteyttä"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:892
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:888
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1016
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1012
 msgid "Reconnecting to LDAP server..."
 msgstr "Odotetaan uudelleen yhteyttä LDAP-palvelimeen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1143
 msgid "Invalid DN syntax"
 msgstr "Virheellinen DN-syntaksi"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1159
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4242
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP-virhe 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1775
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1771
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2094
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: ldap_first_entry palautti arvon NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2024
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2152
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2289
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2285
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2412
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4195
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4191
 msgid "Receiving LDAP search results..."
 msgstr "Vastaanotetaan LDAP-haun tuloksia..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4379
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4375
 msgid "Error performing search"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4512
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4508
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Ladataan yhteystietoja (%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5082
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5078
 msgid "Adding contact to LDAP server..."
 msgstr "Lisätään yhteystieto LDAP-palvelimelle..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5157
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5153
 msgid "Modifying contact from LDAP server..."
 msgstr "Muokataan yhteystietoa LDAP-palvelimella..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5223
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5219
 msgid "Removing contact from LDAP server..."
 msgstr "Poistetaan yhteystieto LDAP-palvelimelta..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
-#, c-format
-msgid "Failed to get the DN for user '%s'"
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5614
+#, fuzzy, c-format
+#| msgid "Failed to get the DN for user '%s'"
+msgid "Failed to get the DN for user “%s”"
 msgstr "DN:n hakeminen käyttäjälle \"%s\" epäonnistui"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
-#: ../calendar/backends/http/e-cal-backend-http.c:513
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:588
+#: ../src/calendar/backends/http/e-cal-backend-http.c:514
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "Virheellinen URI: %s"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:836
 msgid "Loading Addressbook summary..."
 msgstr "Ladataan osoitekirjan yhteenvetoa..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:864
 #, c-format
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr ""
 "PROPFIND-toiminto webdav-palvelimella epäonnistui HTTP-tilakoodilla %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:883
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:883
 msgid "No response body in webdav PROPFIND result"
 msgstr "Vastausrunko puuttuu webdav-palvelimen vastauksesta PROPFIND-pyyntöön"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:944
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:944
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "Ladataan yhteystietoja (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1358
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1358
 msgid "Cannot transform SoupURI to string"
 msgstr ""
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1555
-#, fuzzy, c-format
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1555
+#, c-format
 #| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgid "Create resource '%s' failed with HTTP status %d (%s)"
-msgstr "Resurssin \"%s\" luominen epäonnistui HTTP-statuskoodilla %d (%s)"
+msgid "Create resource “%s” failed with HTTP status %d (%s)"
+msgstr "Resurssin “%s” luominen epäonnistui HTTP-tilakoodilla %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1657
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1657
 msgid "Contact on server changed -> not modifying"
 msgstr "Yhteystieto muuttui palvelimella -> ei muokata"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1665
-#, fuzzy, c-format
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1665
+#, c-format
 #| msgid "Modify contact failed with HTTP status: %d (%s)"
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "Yhteystiedon muokkaaminen epäonnistui HTTP-tilakoodilla %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1758
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1774
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1758
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1774
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE epäonnistui HTTP-tilakoodilla %d"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:38
 #, fuzzy
 msgid "No such book"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
-#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:40
+#: ../src/addressbook/libedata-book/e-data-book.c:382
 msgid "Contact not found"
 msgstr "Yhteystietoa ei löytynyt"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
-#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../src/addressbook/libedata-book/e-data-book.c:383
 msgid "Contact ID already exists"
 msgstr "Yhteystiedon tunniste on jo olemassa"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:44
 msgid "No such source"
 msgstr "Lähdettä ei ole olemassa"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:48
-#: ../addressbook/libedata-book/e-data-book.c:401
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../src/addressbook/libedata-book/e-data-book.c:399
 msgid "No space"
 msgstr "Ei tilaa"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:130
+#: ../src/addressbook/libebook-contacts/e-contact.c:128
 msgid "Unique ID"
 msgstr "Yksilöllinen tunniste"
 
@@ -357,12 +364,12 @@ msgstr "Yksilöllinen tunniste"
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook-contacts/e-contact.c:135
+#: ../src/addressbook/libebook-contacts/e-contact.c:133
 msgid "File Under"
 msgstr "Tallenna kohtaan"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:137
+#: ../src/addressbook/libebook-contacts/e-contact.c:135
 #, fuzzy
 msgid "Book UID"
 msgstr "Kirjan URI"
@@ -371,435 +378,436 @@ msgstr "Kirjan URI"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook-contacts/e-contact.c:143
+#: ../src/addressbook/libebook-contacts/e-contact.c:141
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../src/addressbook/libebook-contacts/e-contact.c:142
 msgid "Given Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../src/addressbook/libebook-contacts/e-contact.c:143
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:146
+#: ../src/addressbook/libebook-contacts/e-contact.c:144
 msgid "Nickname"
 msgstr "Lempinimi"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:149
+#: ../src/addressbook/libebook-contacts/e-contact.c:147
 msgid "Email 1"
 msgstr "1. sähköposti"
 
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../src/addressbook/libebook-contacts/e-contact.c:148
 msgid "Email 2"
 msgstr "2. sähköposti"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../src/addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 3"
 msgstr "3. sähköposti"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../src/addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 4"
 msgstr "4. sähköposti"
 
-#: ../addressbook/libebook-contacts/e-contact.c:154
+#: ../src/addressbook/libebook-contacts/e-contact.c:152
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../src/addressbook/libebook-contacts/e-contact.c:155
 msgid "Home Address Label"
 msgstr "Kotiosoite"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../src/addressbook/libebook-contacts/e-contact.c:156
 msgid "Work Address Label"
 msgstr "Työosoite"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../src/addressbook/libebook-contacts/e-contact.c:157
 msgid "Other Address Label"
 msgstr "Muu osoite"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../src/addressbook/libebook-contacts/e-contact.c:160
 msgid "Assistant Phone"
 msgstr "Apulaisen puhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../src/addressbook/libebook-contacts/e-contact.c:161
 msgid "Business Phone"
 msgstr "Työpuhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../src/addressbook/libebook-contacts/e-contact.c:162
 msgid "Business Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../src/addressbook/libebook-contacts/e-contact.c:163
 msgid "Business Fax"
 msgstr "Työ/faksi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../src/addressbook/libebook-contacts/e-contact.c:164
 msgid "Callback Phone"
 msgstr "Takaisinsoitto"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../src/addressbook/libebook-contacts/e-contact.c:165
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../src/addressbook/libebook-contacts/e-contact.c:166
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../src/addressbook/libebook-contacts/e-contact.c:167
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../src/addressbook/libebook-contacts/e-contact.c:168
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../src/addressbook/libebook-contacts/e-contact.c:169
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../src/addressbook/libebook-contacts/e-contact.c:170
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:173
+#: ../src/addressbook/libebook-contacts/e-contact.c:171
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../src/addressbook/libebook-contacts/e-contact.c:172
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../src/addressbook/libebook-contacts/e-contact.c:173
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../src/addressbook/libebook-contacts/e-contact.c:174
 msgid "Pager"
 msgstr "Pager"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../src/addressbook/libebook-contacts/e-contact.c:175
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../src/addressbook/libebook-contacts/e-contact.c:176
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../src/addressbook/libebook-contacts/e-contact.c:177
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:181
+#: ../src/addressbook/libebook-contacts/e-contact.c:179
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:184
+#: ../src/addressbook/libebook-contacts/e-contact.c:182
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../addressbook/libebook-contacts/e-contact.c:185
+#: ../src/addressbook/libebook-contacts/e-contact.c:183
 msgid "Organizational Unit"
 msgstr "Organisaatioyksikkö"
 
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../src/addressbook/libebook-contacts/e-contact.c:184
 msgid "Office"
 msgstr "Asema"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../src/addressbook/libebook-contacts/e-contact.c:185
 msgid "Title"
 msgstr "Titteli"
 
-#: ../addressbook/libebook-contacts/e-contact.c:188
+#: ../src/addressbook/libebook-contacts/e-contact.c:186
 msgid "Role"
 msgstr "Rooli"
 
-#: ../addressbook/libebook-contacts/e-contact.c:189
+#: ../src/addressbook/libebook-contacts/e-contact.c:187
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../src/addressbook/libebook-contacts/e-contact.c:188
 msgid "Assistant"
 msgstr "Apulainen"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../src/addressbook/libebook-contacts/e-contact.c:191
 msgid "Homepage URL"
 msgstr "Kotisivun URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../src/addressbook/libebook-contacts/e-contact.c:192
 msgid "Weblog URL"
 msgstr "Weblogin URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:197
+#: ../src/addressbook/libebook-contacts/e-contact.c:195
 msgid "Categories"
 msgstr "Ryhmät"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../src/addressbook/libebook-contacts/e-contact.c:198
 msgid "Calendar URI"
 msgstr "Kalenterin URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../src/addressbook/libebook-contacts/e-contact.c:199
 msgid "Free/Busy URL"
 msgstr "Vapaa/varattu URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../src/addressbook/libebook-contacts/e-contact.c:200
 msgid "ICS Calendar"
 msgstr "ICS-kalenteri"
 
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../src/addressbook/libebook-contacts/e-contact.c:201
 msgid "Video Conferencing URL"
 msgstr "Videoneuvottelun URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:206
-msgid "Spouse's Name"
+#: ../src/addressbook/libebook-contacts/e-contact.c:204
+#| msgid "Spouse's Name"
+msgid "Spouse’s Name"
 msgstr "Puolison nimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../src/addressbook/libebook-contacts/e-contact.c:205
 msgid "Note"
 msgstr "Huomio"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:210
+#: ../src/addressbook/libebook-contacts/e-contact.c:208
 msgid "AIM Home Screen Name 1"
 msgstr "AIM-kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../src/addressbook/libebook-contacts/e-contact.c:209
 msgid "AIM Home Screen Name 2"
 msgstr "AIM-kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../src/addressbook/libebook-contacts/e-contact.c:210
 msgid "AIM Home Screen Name 3"
 msgstr "AIM-kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../src/addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Work Screen Name 1"
 msgstr "AIM-työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../src/addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Work Screen Name 2"
 msgstr "AIM-työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../src/addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Work Screen Name 3"
 msgstr "AIM-työnimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../src/addressbook/libebook-contacts/e-contact.c:214
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise-kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../src/addressbook/libebook-contacts/e-contact.c:215
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise-kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../src/addressbook/libebook-contacts/e-contact.c:216
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise-kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../src/addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise-työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../src/addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise-työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../src/addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-työnimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../src/addressbook/libebook-contacts/e-contact.c:220
 msgid "Jabber Home ID 1"
 msgstr "Jabber koti ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../src/addressbook/libebook-contacts/e-contact.c:221
 msgid "Jabber Home ID 2"
 msgstr "Jabber koti ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../src/addressbook/libebook-contacts/e-contact.c:222
 msgid "Jabber Home ID 3"
 msgstr "Jabber koti ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../src/addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Work ID 1"
 msgstr "Jabber työ ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../src/addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Work ID 2"
 msgstr "Jabber työ ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../src/addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Work ID 3"
 msgstr "Jabber työ ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../src/addressbook/libebook-contacts/e-contact.c:226
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!-kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../src/addressbook/libebook-contacts/e-contact.c:227
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!-kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../src/addressbook/libebook-contacts/e-contact.c:228
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!-kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../src/addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!-työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../src/addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!-työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../src/addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!-työnimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../src/addressbook/libebook-contacts/e-contact.c:232
 msgid "MSN Home Screen Name 1"
 msgstr "MSN-kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../src/addressbook/libebook-contacts/e-contact.c:233
 msgid "MSN Home Screen Name 2"
 msgstr "MSN-kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../src/addressbook/libebook-contacts/e-contact.c:234
 msgid "MSN Home Screen Name 3"
 msgstr "MSN-kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../src/addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Work Screen Name 1"
 msgstr "MSN-työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../src/addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Work Screen Name 2"
 msgstr "MSN-työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:239
+#: ../src/addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:240
+#: ../src/addressbook/libebook-contacts/e-contact.c:238
 msgid "ICQ Home ID 1"
 msgstr "ICQ koti ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../src/addressbook/libebook-contacts/e-contact.c:239
 msgid "ICQ Home ID 2"
 msgstr "ICQ koti ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../src/addressbook/libebook-contacts/e-contact.c:240
 msgid "ICQ Home ID 3"
 msgstr "ICQ koti ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:243
+#: ../src/addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Work ID 1"
 msgstr "ICQ työ ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:244
+#: ../src/addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Work ID 2"
 msgstr "ICQ työ ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../src/addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Work ID 3"
 msgstr "ICQ työ ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../src/addressbook/libebook-contacts/e-contact.c:246
 msgid "Last Revision"
 msgstr "Viimeisin tarkistettu versio"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook-contacts/e-contact.c:252
+#: ../src/addressbook/libebook-contacts/e-contact.c:250
 msgid "Name or Org"
 msgstr "Nimi tai Org"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:255
+#: ../src/addressbook/libebook-contacts/e-contact.c:253
 msgid "Address List"
 msgstr "Osoitelista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:256
+#: ../src/addressbook/libebook-contacts/e-contact.c:254
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../src/addressbook/libebook-contacts/e-contact.c:255
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../src/addressbook/libebook-contacts/e-contact.c:256
 msgid "Other Address"
 msgstr "Muu osoite"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:261
+#: ../src/addressbook/libebook-contacts/e-contact.c:259
 msgid "Category List"
 msgstr "Ryhmäluettelo"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:264
+#: ../src/addressbook/libebook-contacts/e-contact.c:262
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../src/addressbook/libebook-contacts/e-contact.c:263
 msgid "Logo"
 msgstr "Logo"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:269
-#: ../libedataserverui/e-webdav-discover-widget.c:153
+#: ../src/addressbook/libebook-contacts/e-contact.c:267
+#: ../src/libedataserverui/e-webdav-discover-widget.c:151
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../src/addressbook/libebook-contacts/e-contact.c:268
 msgid "Email List"
 msgstr "Sähköpostilista"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:273
+#: ../src/addressbook/libebook-contacts/e-contact.c:271
 msgid "AIM Screen Name List"
 msgstr "AIM näyttönimien lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:274
+#: ../src/addressbook/libebook-contacts/e-contact.c:272
 msgid "GroupWise ID List"
 msgstr "GroupWise-ID-lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../src/addressbook/libebook-contacts/e-contact.c:273
 msgid "Jabber ID List"
 msgstr "Jabber-ID-lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:276
+#: ../src/addressbook/libebook-contacts/e-contact.c:274
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo!-näyttönimien lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:277
+#: ../src/addressbook/libebook-contacts/e-contact.c:275
 msgid "MSN Screen Name List"
 msgstr "MSN-näyttönimien lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../src/addressbook/libebook-contacts/e-contact.c:276
 msgid "ICQ ID List"
 msgstr "ICQ ID lista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:280
+#: ../src/addressbook/libebook-contacts/e-contact.c:278
 msgid "Wants HTML Mail"
 msgstr "Tahtoo HTML-postia"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * field describing whether it's a Contact list (list of email addresses) or a
 #. * regular contact for one person/organization/...
-#: ../addressbook/libebook-contacts/e-contact.c:285
+#: ../src/addressbook/libebook-contacts/e-contact.c:283
 msgid "List"
 msgstr "Lista"
 
@@ -807,199 +815,199 @@ msgstr "Lista"
 #. * used to determine whether when sending to Contact lists the addresses should be
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook-contacts/e-contact.c:290
+#: ../src/addressbook/libebook-contacts/e-contact.c:288
 #, fuzzy
 msgid "List Shows Addresses"
 msgstr "Lista näytettävistä osoitteista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../src/addressbook/libebook-contacts/e-contact.c:290
 msgid "Birth Date"
 msgstr "Syntymäpäivä"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:948
+#: ../src/addressbook/libebook-contacts/e-contact.c:291
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:946
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:296
+#: ../src/addressbook/libebook-contacts/e-contact.c:294
 msgid "X.509 Certificate"
 msgstr "X.509-varmenne"
 
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../src/addressbook/libebook-contacts/e-contact.c:295
 msgid "PGP Certificate"
 msgstr "PGP-varmenne"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../src/addressbook/libebook-contacts/e-contact.c:297
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu koti ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../src/addressbook/libebook-contacts/e-contact.c:298
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu koti ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../src/addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu koti ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../src/addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu työ ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../src/addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu työ ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../src/addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu työ ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../src/addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID lista"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../src/addressbook/libebook-contacts/e-contact.c:306
 msgid "Geographic Information"
 msgstr "Maantieteelliset tiedot"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../src/addressbook/libebook-contacts/e-contact.c:308
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../src/addressbook/libebook-contacts/e-contact.c:310
 msgid "Skype Home Name 1"
 msgstr "Skype-kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../src/addressbook/libebook-contacts/e-contact.c:311
 msgid "Skype Home Name 2"
 msgstr "Skype-kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../src/addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 3"
 msgstr "Skype-kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../src/addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Work Name 1"
 msgstr "Skype-työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../src/addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Work Name 2"
 msgstr "Skype-työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../src/addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 3"
 msgstr "Skype-työnimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../src/addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Name List"
 msgstr "Skype-nimilista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../src/addressbook/libebook-contacts/e-contact.c:318
 msgid "SIP address"
 msgstr "SIP-osoite"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../src/addressbook/libebook-contacts/e-contact.c:320
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk -kotinimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:323
+#: ../src/addressbook/libebook-contacts/e-contact.c:321
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk -kotinimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:324
+#: ../src/addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk -kotinimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:325
+#: ../src/addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk -työnimi 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:326
+#: ../src/addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk -työnimi 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:327
+#: ../src/addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk -työnimi 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:328
+#: ../src/addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Name List"
 msgstr "Google Talk -nimilista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:330
+#: ../src/addressbook/libebook-contacts/e-contact.c:328
 msgid "Twitter Name List"
 msgstr "Twitter-nimilista"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1660
-#: ../addressbook/libebook/e-destination.c:918
+#: ../src/addressbook/libebook-contacts/e-contact.c:1658
+#: ../src/addressbook/libebook/e-destination.c:919
 msgid "Unnamed List"
 msgstr "Nimeämätön lista"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:41
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:39
 msgid "The library was built without phone number support."
-msgstr ""
+msgstr "Kirjasto koostettiin ilman puhelinnumerotukea."
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:43
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:41
 msgid "The phone number parser reported a yet unknown error code."
 msgstr ""
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:45
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:43
 msgid "Not a phone number"
 msgstr "Ei puhelinnumero"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:45
 #, fuzzy
 #| msgid "Invalid range"
 msgid "Invalid country calling code"
 msgstr "Virheellinen alue"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:47
 msgid ""
 "Remaining text after the country calling code is too short for a phone number"
 msgstr ""
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:51
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:49
 msgid "Text is too short for a phone number"
-msgstr ""
+msgstr "Teksti on liian lyhyt puhelinnumeroksi"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:53
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:51
 msgid "Text is too long for a phone number"
-msgstr ""
+msgstr "Teksti on liian pitkä puhelinnumeroksi"
 
-#: ../addressbook/libebook/e-book-client.c:931
+#: ../src/addressbook/libebook/e-book-client.c:929
 #, fuzzy, c-format
-msgid "Unknown book property '%s'"
+msgid "Unknown book property “%s”"
 msgstr "Tuntematon virhe: %s"
 
-#: ../addressbook/libebook/e-book-client.c:946
+#: ../src/addressbook/libebook/e-book-client.c:944
 #, fuzzy, c-format
-msgid "Cannot change value of book property '%s'"
+msgid "Cannot change value of book property “%s”"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../addressbook/libebook/e-book-client.c:1390
-#: ../addressbook/libebook/e-book-client.c:1621
-#: ../addressbook/libebook/e-book-client.c:1898
-#: ../calendar/libecal/e-cal-client.c:1717
-#: ../calendar/libecal/e-cal-client.c:1955
+#: ../src/addressbook/libebook/e-book-client.c:1388
+#: ../src/addressbook/libebook/e-book-client.c:1619
+#: ../src/addressbook/libebook/e-book-client.c:1896
+#: ../src/calendar/libecal/e-cal-client.c:1715
+#: ../src/calendar/libecal/e-cal-client.c:1953
 #, fuzzy, c-format
-msgid "Unable to connect to '%s': "
+msgid "Unable to connect to “%s”: "
 msgstr "Yhteyttä %s:ään ei voitu luoda: %s"
 
-#: ../addressbook/libebook/e-book-client-view.c:870
-#: ../calendar/libecal/e-cal-client-view.c:681
+#: ../src/addressbook/libebook/e-book-client-view.c:868
+#: ../src/calendar/libecal/e-cal-client-view.c:679
 #, c-format
 msgid "Client disappeared"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../addressbook/libedata-book/e-book-sqlite.c:2254
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:905
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:2254
 #, c-format
-msgid "Error introspecting unknown summary field '%s'"
+msgid "Error introspecting unknown summary field “%s”"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../addressbook/libedata-book/e-book-sqlite.c:1393
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1393
 #, fuzzy
 #| msgid ""
 #| "Error executing search expression: %s:\n"
@@ -1009,371 +1017,387 @@ msgstr ""
 "Virhe suoritettaessa hakulauseketta: %s:\n"
 "%s"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../addressbook/libedata-book/e-book-sqlite.c:1877 ../camel/camel-db.c:751
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1877
+#: ../src/camel/camel-db.c:802
 #, c-format
 msgid "Insufficient memory"
 msgstr "Muisti ei riitä"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
 #, c-format
-msgid "Invalid contact field '%d' specified in summary"
+msgid "Invalid contact field “%d” specified in summary"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
-#: ../addressbook/libedata-book/e-book-sqlite.c:604
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:604
 #, c-format
 msgid ""
-"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"Contact field “%s” of type “%s” specified in summary, but only boolean, "
 "string and string list field types are supported"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
-#: ../addressbook/libedata-book/e-book-sqlite.c:5817
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5817
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
-#, fuzzy, c-format
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
+#, c-format
 #| msgid "Invalid query"
 msgid "Invalid Query"
 msgstr "Virheellinen kysely"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
-#: ../addressbook/libedata-book/e-data-book.c:396
-#: ../addressbook/libedata-book/e-data-book.c:1146
-#: ../calendar/libedata-cal/e-data-cal.c:428
-#: ../calendar/libedata-cal/e-data-cal.c:1427 ../libedataserver/e-client.c:177
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
+#: ../src/addressbook/libedata-book/e-data-book.c:394
+#: ../src/addressbook/libedata-book/e-data-book.c:1144
+#: ../src/calendar/libedata-cal/e-data-cal.c:429
+#: ../src/calendar/libedata-cal/e-data-cal.c:1436
+#: ../src/libedataserver/e-client.c:175
 #, c-format
 msgid "Invalid query"
 msgstr "Virheellinen kysely"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
 #, fuzzy, c-format
 #| msgid "Failed to remove file '%s': %s"
 msgid "Unable to remove the db file: errno %d"
 msgstr "Tiedoston \"%s\" poistaminen epäonnistui: %s"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
-#: ../addressbook/libedata-book/e-book-sqlite.c:8116
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8116
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
 "the contact list"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
-#: ../addressbook/libedata-book/e-book-sqlite.c:8124
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8124
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
 "contact list"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:570
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:570
 #, c-format
-msgid "Unsupported contact field '%d' specified in summary"
+msgid "Unsupported contact field “%d” specified in summary"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1950
+#: ../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."
+"addressbook. Delete one of the entries in the “folders” table first."
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5810
-#, fuzzy, c-format
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5810
+#, c-format
 #| msgid "Invalid query: "
 msgid "Invalid query: %s"
-msgstr "Virheellinen haku: "
+msgstr "Virheellinen kysely: %s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5985
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5985
 #, fuzzy
 #| msgid "Invalid query: "
 msgid "Invalid query for EbSqlCursor"
 msgstr "Virheellinen haku: "
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7938
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7938
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7956
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7956
 msgid "Cannot sort by a field that is not a string type"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book.c:380
-#: ../calendar/libedata-cal/e-data-cal.c:409
+#: ../src/addressbook/libedata-book/e-data-book.c:378
+#: ../src/calendar/libedata-cal/e-data-cal.c:410
 msgid "Success"
 msgstr "Valmis"
 
-#: ../addressbook/libedata-book/e-data-book.c:381
-#: ../calendar/libecal/e-cal.c:2304 ../calendar/libedata-cal/e-data-cal.c:410
-#: ../libedataserver/e-client.c:144
+#: ../src/addressbook/libedata-book/e-data-book.c:379
+#: ../src/calendar/libecal/e-cal.c:2302
+#: ../src/calendar/libedata-cal/e-data-cal.c:411
+#: ../src/libedataserver/e-client.c:142
 msgid "Backend is busy"
 msgstr "Taustajärjestelmä on käytössä"
 
-#: ../addressbook/libedata-book/e-data-book.c:382
-#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:154
+#: ../src/addressbook/libedata-book/e-data-book.c:380
+#: ../src/calendar/libedata-cal/e-data-cal.c:412
+#: ../src/libedataserver/e-client.c:152
 msgid "Repository offline"
 msgstr "Lähde poissa käytöstä"
 
-#: ../addressbook/libedata-book/e-data-book.c:383
-#: ../calendar/libecal/e-cal.c:2318 ../calendar/libedata-cal/e-data-cal.c:412
-#: ../libedataserver/e-client.c:161
+#: ../src/addressbook/libedata-book/e-data-book.c:381
+#: ../src/calendar/libecal/e-cal.c:2316
+#: ../src/calendar/libedata-cal/e-data-cal.c:413
+#: ../src/libedataserver/e-client.c:159
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
-#: ../addressbook/libedata-book/e-data-book.c:386
-#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../src/addressbook/libedata-book/e-data-book.c:384
+#: ../src/calendar/libedata-cal/e-data-cal.c:418
 msgid "Authentication Failed"
 msgstr "Tunnistus epäonnistui"
 
-#: ../addressbook/libedata-book/e-data-book.c:387
-#: ../calendar/libedata-cal/e-data-cal.c:418
+#: ../src/addressbook/libedata-book/e-data-book.c:385
+#: ../src/calendar/libedata-cal/e-data-cal.c:419
 msgid "Authentication Required"
 msgstr "Tunnistautuminen vaaditaan"
 
-#: ../addressbook/libedata-book/e-data-book.c:388
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../src/addressbook/libedata-book/e-data-book.c:386
+#: ../src/calendar/libedata-cal/e-data-cal.c:420
 msgid "Unsupported field"
 msgstr "Kenttä ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:389
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:169
+#: ../src/addressbook/libedata-book/e-data-book.c:387
+#: ../src/calendar/libedata-cal/e-data-cal.c:422
+#: ../src/libedataserver/e-client.c:167
 msgid "Unsupported authentication method"
 msgstr "Tunnistautumismenetelmä ei ole tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:390
-#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:171
+#: ../src/addressbook/libedata-book/e-data-book.c:388
+#: ../src/calendar/libedata-cal/e-data-cal.c:423
+#: ../src/libedataserver/e-client.c:169
 msgid "TLS not available"
 msgstr "TLS ei käytettävissä"
 
-#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../src/addressbook/libedata-book/e-data-book.c:389
 msgid "Address book does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../src/addressbook/libedata-book/e-data-book.c:390
 msgid "Book removed"
 msgstr "Kirja poistettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:393
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../src/addressbook/libedata-book/e-data-book.c:391
+#: ../src/calendar/libedata-cal/e-data-cal.c:426
 msgid "Not available in offline mode"
 msgstr "Ei käytettävissä yhteydettömässä tilassa"
 
-#: ../addressbook/libedata-book/e-data-book.c:394
-#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:173
+#: ../src/addressbook/libedata-book/e-data-book.c:392
+#: ../src/calendar/libedata-cal/e-data-cal.c:427
+#: ../src/libedataserver/e-client.c:171
 msgid "Search size limit exceeded"
 msgstr "Haun kokorajoitus ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:395
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:175
+#: ../src/addressbook/libedata-book/e-data-book.c:393
+#: ../src/calendar/libedata-cal/e-data-cal.c:428
+#: ../src/libedataserver/e-client.c:173
 msgid "Search time limit exceeded"
 msgstr "Haun aikaraja ylitettiin"
 
-#: ../addressbook/libedata-book/e-data-book.c:397
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:179
+#: ../src/addressbook/libedata-book/e-data-book.c:395
+#: ../src/calendar/libedata-cal/e-data-cal.c:430
+#: ../src/libedataserver/e-client.c:177
 msgid "Query refused"
 msgstr "Kyselyä ei hyväksytty"
 
-#: ../addressbook/libedata-book/e-data-book.c:398
-#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:165
+#: ../src/addressbook/libedata-book/e-data-book.c:396
+#: ../src/calendar/libedata-cal/e-data-cal.c:431
+#: ../src/libedataserver/e-client.c:163
 msgid "Could not cancel"
 msgstr "Ei voi perua"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
 #. { OtherError,                       N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:400
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../src/addressbook/libedata-book/e-data-book.c:398
+#: ../src/calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid server version"
 msgstr "Virheellinen palvelimen versio"
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:433
-#: ../libedataserver/e-client.c:142
+#: ../src/addressbook/libedata-book/e-data-book.c:400
+#: ../src/calendar/libecal/e-cal.c:2300
+#: ../src/calendar/libedata-cal/e-data-cal.c:434
+#: ../src/libedataserver/e-client.c:140
 msgid "Invalid argument"
 msgstr "Virheellinen argumentti"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:404
-#: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
-#: ../calendar/libecal/e-cal.c:1909 ../calendar/libecal/e-cal.c:2341
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:167
+#: ../src/addressbook/libedata-book/e-data-book.c:402
+#: ../src/calendar/libecal/e-cal.c:1057 ../src/calendar/libecal/e-cal.c:1425
+#: ../src/calendar/libecal/e-cal.c:1907 ../src/calendar/libecal/e-cal.c:2339
+#: ../src/calendar/libedata-cal/e-data-cal.c:436
+#: ../src/libedataserver/e-client.c:165
 #, c-format
 msgid "Not supported"
 msgstr "Ei tuettu"
 
-#: ../addressbook/libedata-book/e-data-book.c:405
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
+#: ../src/addressbook/libedata-book/e-data-book.c:403
+#: ../src/calendar/libedata-cal/e-data-cal.c:437
+#: ../src/libedataserver/e-client.c:183
 msgid "Backend is not opened yet"
 msgstr "Taustapalvelu ei vielä käynnissä"
 
-#: ../addressbook/libedata-book/e-data-book.c:406
-#: ../libedataserver/e-client.c:187
+#: ../src/addressbook/libedata-book/e-data-book.c:404
+#: ../src/libedataserver/e-client.c:185
 #, fuzzy
 #| msgid "Object not found"
 msgid "Object is out of sync"
 msgstr "Kohdetta ei löydy"
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:183
+#: ../src/addressbook/libedata-book/e-data-book.c:412
+#: ../src/calendar/libedata-cal/e-data-cal.c:445
+#: ../src/libedataserver/e-client.c:181
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: ../addressbook/libedata-book/e-data-book.c:1171
-#: ../calendar/libedata-cal/e-data-cal.c:1452
+#: ../src/addressbook/libedata-book/e-data-book.c:1169
+#: ../src/calendar/libedata-cal/e-data-cal.c:1461
 msgid "Invalid query: "
 msgstr "Virheellinen haku: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1420
+#: ../src/addressbook/libedata-book/e-data-book.c:1418
 msgid "Cannot open book: "
 msgstr "Kirjan avaaminen epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1458
+#: ../src/addressbook/libedata-book/e-data-book.c:1456
 msgid "Cannot refresh address book: "
 msgstr "Osoitekirjan päivitys epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1497
+#: ../src/addressbook/libedata-book/e-data-book.c:1497
 msgid "Cannot get contact: "
 msgstr "Yhteystiedon hakeminen epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1546
+#: ../src/addressbook/libedata-book/e-data-book.c:1546
 msgid "Cannot get contact list: "
 msgstr "Yhteystietoluettelon haku epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1602
+#: ../src/addressbook/libedata-book/e-data-book.c:1602
 #, fuzzy
 msgid "Cannot get contact list uids: "
 msgstr "Kansion %s säiliötä ei voitu hakea"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1653
+#: ../src/addressbook/libedata-book/e-data-book.c:1653
 msgid "Cannot add contact: "
 msgstr "Yhteystiedon lisäys epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1706
+#: ../src/addressbook/libedata-book/e-data-book.c:1706
 msgid "Cannot modify contacts: "
 msgstr "Yhteystietojen muokkaaminen epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1759
+#: ../src/addressbook/libedata-book/e-data-book.c:1759
 msgid "Cannot remove contacts: "
 msgstr "Yhteystietojen poisto epäonnistui: "
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:776
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:774
 msgid "Cursor does not support setting the search expression"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:859
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:857
 #, fuzzy
 #| msgid "Store does not support an INBOX"
 msgid "Cursor does not support step"
 msgstr "Kansio ei tue INBOXia"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:942
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:940
 #, fuzzy
 msgid "Cursor does not support alphabetic indexes"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:266
 msgid "Unrecognized cursor origin"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:336
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:334
 msgid "Out of sync revision while moving cursor"
 msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:430
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:428
 msgid "Alphabetic index was set for incorrect locale"
 msgstr ""
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:678
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:705
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Palvelin ei ole tavoitettavissa (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
-#, fuzzy, c-format
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:731
+#, c-format
 #| msgid "Failed to get the DN for user '%s'"
 msgid "Failed to login to the server: %s"
-msgstr "DN:n hakeminen käyttäjälle \"%s\" epäonnistui"
+msgstr "Kirjautuminen palvelimelle epäonnistui: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:726
-#, fuzzy, c-format
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:753
+#, c-format
 #| msgid "Failed to connect to a server using SSL: %s"
 msgid "Failed to connect to a server using SSL/TLS: %s"
-msgstr "SSL-yhteyden muodostaminen palvelimeen epäonnistui: %s"
+msgstr "Yhteyden muodostaminen palvelimeen SSL/TLS:ää käyttäen epäonnistui: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:742
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:769
 #, fuzzy, c-format
 #| msgid "Unexpected HTTP status code %d returned (%s)"
 msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
 msgstr "Odottamaton HTTP-tilakoodi %d palautettiin (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:763
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:790
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV-taustapalvelua ei ole vielä ladattu"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1200
-#: ../libedataserver/e-webdav-discover.c:147
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1232
+#: ../src/libedataserver/e-webdav-discover.c:145
 msgid "Invalid Redirect URL"
 msgstr "Virheellinen uudelleenohjaus"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2899
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:2946
 #, c-format
-msgid "Cannot create local cache folder '%s'"
-msgstr "Paikallisen välimuistikansion \"%s\" luominen epäonnistui"
+#| msgid "Cannot create local cache folder '%s'"
+msgid "Cannot create local cache folder “%s”"
+msgstr "Paikallisen välimuistikansion “%s” luominen epäonnistui"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2985
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:3032
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1382,845 +1406,891 @@ msgstr ""
 "Palvelimeen ei saatu yhteyttä, kalenteri avattiin vain-luku -tilassa.\n"
 "Virheviesti oli: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4090
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4137
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV ei tue massalisäyksiä"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4193
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4240
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV ei tue massamuokkauksia"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4474
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4521
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV ei tue massapoistoja"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5221
-msgid "Calendar doesn't support Free/Busy"
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5268
+#, fuzzy
+#| msgid "Calendar doesn't support Free/Busy"
+msgid "Calendar doesn’t support Free/Busy"
 msgstr "Kalenteri ei tue Vapaa/Varattu -tiloja"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5230
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5277
 msgid "Schedule outbox url not found"
 msgstr ""
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5327
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5374
 msgid "Unexpected result in schedule-response"
 msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:950
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:948
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:986
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:984
 #, c-format
 msgid "Birthday: %s"
 msgstr "Syntymäpäivä: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1017
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1015
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Vuosipäivä: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:245
+#: ../src/calendar/backends/file/e-cal-backend-file.c:243
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Kalenteritietoja ei voi tallentaa: virheellinen URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:252
-#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../src/calendar/backends/file/e-cal-backend-file.c:250
+#: ../src/calendar/backends/file/e-cal-backend-file.c:256
 msgid "Cannot save calendar data"
 msgstr "Kalenteritietoja ei voi tallentaa"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:582
+#: ../src/calendar/backends/http/e-cal-backend-http.c:583
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Uudelleenohjaus virheelliseen URI:in"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:641
+#: ../src/calendar/backends/http/e-cal-backend-http.c:642
 #, c-format
 msgid "Bad file format."
 msgstr "Virheellinen tiedostomuoto."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:651
+#: ../src/calendar/backends/http/e-cal-backend-http.c:652
 #, c-format
 msgid "Not a calendar."
 msgstr "Ei kalenteri."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:955
-#: ../calendar/backends/weather/e-cal-backend-weather.c:709
+#: ../src/calendar/backends/http/e-cal-backend-http.c:956
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:710
 msgid "Could not create cache file"
 msgstr "Välimuistitiedostoa ei voitu luoda"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:195
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:196
 msgid "Could not retrieve weather data"
 msgstr "Säätietoja ei voitu hakea"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:378
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:379
 msgid "Weather: Fog"
 msgstr "Sää: sumuista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:379
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:380
 msgid "Weather: Cloudy Night"
 msgstr "Sää: pilvinen yö"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:380
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:381
 msgid "Weather: Cloudy"
 msgstr "Sää: pilvistä"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:381
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:382
 msgid "Weather: Overcast"
 msgstr "Sää: poutaista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:382
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:383
 msgid "Weather: Showers"
 msgstr "Sää: sadekuuroja"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:383
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:384
 msgid "Weather: Snow"
 msgstr "Sää: sadetta"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:384
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:385
 msgid "Weather: Clear Night"
 msgstr "Sää: kirkas yö"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:385
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:386
 msgid "Weather: Sunny"
 msgstr "Sää: Aurinkoista"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:386
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:387
 msgid "Weather: Thunderstorms"
 msgstr "Sää: ukkosta"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:412
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:413
 #, c-format
 msgid "%.1f °F"
 msgstr "%.1f °F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:415
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:416
 #, c-format
 msgid "%.1f °C"
 msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../calendar/backends/weather/e-cal-backend-weather.c:418
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:419
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:424
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:425
 #, c-format
 msgid "%.1f"
 msgstr "%.1f"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:589
-#: ../calendar/backends/weather/e-cal-backend-weather.c:617
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:590
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:618
 msgid "Forecast"
 msgstr "Sääennuste"
 
-#: ../calendar/libecal/e-cal.c:2306
+#: ../src/calendar/libecal/e-cal.c:2304
 msgid "Repository is offline"
 msgstr "Varasto on yhteydettömässä tilassa"
 
-#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:266
+#: ../src/calendar/libecal/e-cal.c:2306
+#: ../src/calendar/libecal/e-cal-client.c:264
 msgid "No such calendar"
 msgstr "Kalenteria ei ole olemassa"
 
-#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268
-#: ../calendar/libedata-cal/e-data-cal.c:414
+#: ../src/calendar/libecal/e-cal.c:2308
+#: ../src/calendar/libecal/e-cal-client.c:266
+#: ../src/calendar/libedata-cal/e-data-cal.c:415
 msgid "Object not found"
 msgstr "Kohdetta ei löydy"
 
-#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../src/calendar/libecal/e-cal.c:2310
+#: ../src/calendar/libecal/e-cal-client.c:268
+#: ../src/calendar/libedata-cal/e-data-cal.c:416
 msgid "Invalid object"
 msgstr "Virheellinen kohde"
 
-#: ../calendar/libecal/e-cal.c:2314
+#: ../src/calendar/libecal/e-cal.c:2312
 msgid "URI not loaded"
 msgstr "URIa ei ole ladattu"
 
-#: ../calendar/libecal/e-cal.c:2316
+#: ../src/calendar/libecal/e-cal.c:2314
 msgid "URI already loaded"
 msgstr "URI on jo ladattu"
 
-#: ../calendar/libecal/e-cal.c:2320
+#: ../src/calendar/libecal/e-cal.c:2318
 msgid "Unknown User"
 msgstr "Tuntematon käyttäjä"
 
-#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:274
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../src/calendar/libecal/e-cal.c:2320
+#: ../src/calendar/libecal/e-cal-client.c:272
+#: ../src/calendar/libedata-cal/e-data-cal.c:417
 msgid "Object ID already exists"
 msgstr "OID on jo olemassa"
 
-#: ../calendar/libecal/e-cal.c:2324
+#: ../src/calendar/libecal/e-cal.c:2322
 msgid "Protocol not supported"
 msgstr "Protokolla ei ole tuettu"
 
-#: ../calendar/libecal/e-cal.c:2326
-#, fuzzy
+#: ../src/calendar/libecal/e-cal.c:2324
 #| msgid "Operation has been canceled"
 msgid "Operation has been cancelled"
 msgstr "Toimenpide on peruttu"
 
-#: ../calendar/libecal/e-cal.c:2328
+#: ../src/calendar/libecal/e-cal.c:2326
 msgid "Could not cancel operation"
 msgstr "Toimenpidettä ei voitu perua"
 
-#: ../calendar/libecal/e-cal.c:2330 ../libedataserver/e-client.c:150
+#: ../src/calendar/libecal/e-cal.c:2328 ../src/libedataserver/e-client.c:148
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../calendar/libecal/e-cal.c:2332
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#: ../libedataserver/e-client.c:152
+#: ../src/calendar/libecal/e-cal.c:2330
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1126
+#: ../src/libedataserver/e-client.c:150
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: ../calendar/libecal/e-cal.c:2334
+#: ../src/calendar/libecal/e-cal.c:2332
 msgid "A D-Bus exception has occurred"
 msgstr "Tapahtui D-Bus-poikkeus"
 
-#: ../calendar/libecal/e-cal.c:2338
+#: ../src/calendar/libecal/e-cal.c:2336
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: ../calendar/libecal/e-cal-client.c:272
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../src/calendar/libecal/e-cal-client.c:270
+#: ../src/calendar/libedata-cal/e-data-cal.c:425
 msgid "Unknown user"
 msgstr "Tuntematon käyttäjä"
 
-#: ../calendar/libecal/e-cal-client.c:276
-#: ../calendar/libedata-cal/e-data-cal.c:413
+#: ../src/calendar/libecal/e-cal-client.c:274
+#: ../src/calendar/libedata-cal/e-data-cal.c:414
 msgid "Invalid range"
 msgstr "Virheellinen alue"
 
-#: ../calendar/libecal/e-cal-client.c:1065
+#: ../src/calendar/libecal/e-cal-client.c:1063
 #, c-format
-msgid "Unknown calendar property '%s'"
-msgstr "Tuntematon kalenteriominaisuus '%s'"
+#| msgid "Unknown calendar property '%s'"
+msgid "Unknown calendar property “%s”"
+msgstr "Tuntematon kalenteriominaisuus “%s”"
 
-#: ../calendar/libecal/e-cal-client.c:1080
+#: ../src/calendar/libecal/e-cal-client.c:1078
 #, c-format
-msgid "Cannot change value of calendar property '%s'"
-msgstr "Kalenteriominaisuuden '%s' arvon muuttaminen ei onnistu"
+#| msgid "Cannot change value of calendar property '%s'"
+msgid "Cannot change value of calendar property “%s”"
+msgstr "Kalenteriominaisuuden “%s” arvon muuttaminen ei onnistu"
 
-#: ../calendar/libecal/e-cal-component.c:1357
+#: ../src/calendar/libecal/e-cal-component.c:1358
 msgid "Untitled appointment"
 msgstr "Nimeämätön tapaaminen"
 
-#: ../calendar/libecal/e-cal-recur.c:4744
+#: ../src/calendar/libecal/e-cal-recur.c:4739
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:4745
+#: ../src/calendar/libecal/e-cal-recur.c:4740
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:4746
+#: ../src/calendar/libecal/e-cal-recur.c:4741
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:4747
+#: ../src/calendar/libecal/e-cal-recur.c:4742
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:4748
+#: ../src/calendar/libecal/e-cal-recur.c:4743
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:4749
+#: ../src/calendar/libecal/e-cal-recur.c:4744
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:4750
+#: ../src/calendar/libecal/e-cal-recur.c:4745
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:4751
+#: ../src/calendar/libecal/e-cal-recur.c:4746
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:4752
+#: ../src/calendar/libecal/e-cal-recur.c:4747
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:4753
+#: ../src/calendar/libecal/e-cal-recur.c:4748
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:4754
+#: ../src/calendar/libecal/e-cal-recur.c:4749
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:4755
+#: ../src/calendar/libecal/e-cal-recur.c:4750
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:4756
+#: ../src/calendar/libecal/e-cal-recur.c:4751
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4757
+#: ../src/calendar/libecal/e-cal-recur.c:4752
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4758
+#: ../src/calendar/libecal/e-cal-recur.c:4753
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4759
+#: ../src/calendar/libecal/e-cal-recur.c:4754
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4760
+#: ../src/calendar/libecal/e-cal-recur.c:4755
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4761
+#: ../src/calendar/libecal/e-cal-recur.c:4756
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4762
+#: ../src/calendar/libecal/e-cal-recur.c:4757
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4763
+#: ../src/calendar/libecal/e-cal-recur.c:4758
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4764
+#: ../src/calendar/libecal/e-cal-recur.c:4759
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4765
+#: ../src/calendar/libecal/e-cal-recur.c:4760
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4766
+#: ../src/calendar/libecal/e-cal-recur.c:4761
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4767
+#: ../src/calendar/libecal/e-cal-recur.c:4762
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4768
+#: ../src/calendar/libecal/e-cal-recur.c:4763
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4769
+#: ../src/calendar/libecal/e-cal-recur.c:4764
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4770
+#: ../src/calendar/libecal/e-cal-recur.c:4765
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4771
+#: ../src/calendar/libecal/e-cal-recur.c:4766
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4772
+#: ../src/calendar/libecal/e-cal-recur.c:4767
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4773
+#: ../src/calendar/libecal/e-cal-recur.c:4768
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4774
+#: ../src/calendar/libecal/e-cal-recur.c:4769
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:706 ../calendar/libecal/e-cal-util.c:733
+#: ../src/calendar/libecal/e-cal-util.c:707
+#: ../src/calendar/libecal/e-cal-util.c:734
 msgctxt "Priority"
 msgid "High"
 msgstr "Korkea"
 
-#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
+#: ../src/calendar/libecal/e-cal-util.c:709
+#: ../src/calendar/libecal/e-cal-util.c:736
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
+#: ../src/calendar/libecal/e-cal-util.c:711
+#: ../src/calendar/libecal/e-cal-util.c:738
 msgctxt "Priority"
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:731
+#: ../src/calendar/libecal/e-cal-util.c:732
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1379
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1506
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1555
-#, c-format
-msgid "\"%s\" expects one argument"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:83
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1061
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1377
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1504
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1553
+#, fuzzy, c-format
+#| msgid "\"%s\" expects one argument"
+msgid "“%s” expects one argument"
 msgstr "\"%s\" ottaa yhden argumentin"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
-#, c-format
-msgid "\"%s\" expects the first argument to be a string"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:90
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:672
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1384
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1392
+#, fuzzy, c-format
+#| msgid "\"%s\" expects the first argument to be a string"
+msgid "“%s” expects the first argument to be a string"
 msgstr "\"%s\" olettaa ensimmäisen argumentin olevan merkkijonon"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:165
 #, fuzzy, c-format
-msgid "\"%s\" expects two or three arguments"
+msgid "“%s” expects two or three arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:263
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:824
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
-#, c-format
-msgid "\"%s\" expects the first argument to be a time_t"
+#: ../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:822
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1068
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1453
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1511
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1560
+#, fuzzy, 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\" olettaa ensimmäisen argumentin olevan muotoa time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:335
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
-#, c-format
-msgid "\"%s\" expects the second argument to be a time_t"
+#: ../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:831
+#, fuzzy, 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\" olettaa toisen argumentin olevan muotoa time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:191
 #, fuzzy, c-format
-msgid "\"%s\" expects the third argument to be a string"
+msgid "“%s” expects the third argument to be a string"
 msgstr "\"%s\" olettaa ensimmäisen argumentin olevan merkkijonon"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:255
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:253
 #, fuzzy, c-format
-msgid "\"%s\" expects none or two arguments"
+msgid "“%s” expects none or two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
-#, c-format
-msgid "\"%s\" expects two arguments"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:316
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:665
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:815
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1446
+#, fuzzy, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "“%s” expects two arguments"
 msgstr "\"%s\" olettaa kahta argumenttia"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:603
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:626
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:749
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:988
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1340
-#, c-format
-msgid "\"%s\" expects no arguments"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:601
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:624
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:747
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:779
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:986
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1019
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1338
+#, fuzzy, c-format
+#| msgid "\"%s\" expects no arguments"
+msgid "“%s” expects no arguments"
 msgstr "\"%s\" ei ota argumentteja"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:683
-#, c-format
-msgid "\"%s\" expects the second argument to be a string"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:681
+#, fuzzy, c-format
+#| msgid "\"%s\" expects the second argument to be a string"
+msgid "“%s” expects the second argument to be a string"
 msgstr "\"%s\" olettaa toisen argumentin olevan merkkijonon"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
-#, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:712
+#, fuzzy, c-format
+#| msgid ""
+#| "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+#| "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+#| "\"classification\""
 msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-"\"classification\""
+"“%s” expects the first argument to be either “any”, “summary”, or "
+"“description”, or “location”, or “attendee”, or “organizer”, or "
+"“classification”"
 msgstr ""
 "\"%s\" olettaa ensimmäisen argumentin olevan joko \"any\", \"summary\", "
 "\"description\", \"sijainti\", \"attendee\", \"organizer\" tai "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
-#, c-format
-msgid "\"%s\" expects at least one argument"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:883
+#, fuzzy, c-format
+#| msgid "\"%s\" expects at least one argument"
+msgid "“%s” expects at least one argument"
 msgstr "\"%s\" tahtoo vähintään yhden argumentin"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:900
-#, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:898
+#, fuzzy, 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)"
+"“%s” expects all arguments to be strings or one and only one argument to be "
+"a boolean false (#f)"
 msgstr ""
 "\"%s\" olettaa kaikkien argumenttien olevan merkkijonoja, tai yhden ja "
 "ainoastaan yhden olevan totuusarvoisen epätoden (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1403
-#, c-format
-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1401
+#, fuzzy, 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\" olettaa ensimmäisen argumentin olevan ISO-8601 muotoinen päiväys"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1464
-#, c-format
-msgid "\"%s\" expects the second argument to be an integer"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1462
+#, fuzzy, c-format
+#| msgid "\"%s\" expects the second argument to be an integer"
+msgid "“%s” expects the second argument to be an integer"
 msgstr "\"%s\" olettaa toisen argumentin olevan kokonaisluvun"
 
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../src/calendar/libedata-cal/e-data-cal.c:421
 msgid "Unsupported method"
 msgstr "Menetelmä ei ole tuettu."
 
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../src/calendar/libedata-cal/e-data-cal.c:424
 msgid "Calendar does not exist"
 msgstr "Kalenteria ei ole olemassa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1645
+#: ../src/calendar/libedata-cal/e-data-cal.c:1655
 msgid "Cannot open calendar: "
 msgstr "Kalenterin avaus epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1682
+#: ../src/calendar/libedata-cal/e-data-cal.c:1693
 msgid "Cannot refresh calendar: "
 msgstr "Kalenterin päivitys epäonnistui: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1723
+#: ../src/calendar/libedata-cal/e-data-cal.c:1735
 #, fuzzy
 msgid "Cannot retrieve calendar object path: "
 msgstr "Kalenteritietoja ei voi tallentaa"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1775
+#: ../src/calendar/libedata-cal/e-data-cal.c:1788
 #, fuzzy
 msgid "Cannot retrieve calendar object list: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1832
+#: ../src/calendar/libedata-cal/e-data-cal.c:1846
 #, fuzzy
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1882
+#: ../src/calendar/libedata-cal/e-data-cal.c:1897
 #, fuzzy
 msgid "Cannot create calendar object: "
 msgstr "Viestiä ei voi luoda: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1950
-#, fuzzy
+#: ../src/calendar/libedata-cal/e-data-cal.c:1966
 msgid "Cannot modify calendar object: "
-msgstr "Kalenteria ei voi päivittää"
+msgstr "Kalenteriobjektia ei voi muokata: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2028
-#, fuzzy
+#: ../src/calendar/libedata-cal/e-data-cal.c:2045
 msgid "Cannot remove calendar object: "
-msgstr "Kalenteria ei voi päivittää"
+msgstr "Kalenteriobjektia ei voi poistaa: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2114
+#: ../src/calendar/libedata-cal/e-data-cal.c:2132
 #, fuzzy
 msgid "Cannot receive calendar objects: "
 msgstr "Kalenteria ei voi päivittää"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2157
-#, fuzzy
+#: ../src/calendar/libedata-cal/e-data-cal.c:2176
 msgid "Cannot send calendar objects: "
-msgstr "Kalenteritietoja ei voi tallentaa"
+msgstr "Kalenteriobjekteja ei voi lähettää: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2209
+#: ../src/calendar/libedata-cal/e-data-cal.c:2229
 #, fuzzy
 msgid "Could not retrieve attachment uris: "
 msgstr "Tietoa ei voitu avata välimuistista: %s: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2254
+#: ../src/calendar/libedata-cal/e-data-cal.c:2275
 #, fuzzy
 msgid "Could not discard reminder: "
 msgstr "Kansiota ei voitu tallentaa: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2295
+#: ../src/calendar/libedata-cal/e-data-cal.c:2317
 #, fuzzy
 msgid "Could not retrieve calendar time zone: "
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2335
-#, fuzzy
+#: ../src/calendar/libedata-cal/e-data-cal.c:2358
 msgid "Could not add calendar time zone: "
-msgstr "Kansiota ei voitu uudelleen nimetä: %s"
+msgstr "Kalenterin aikavyöhykettä ei voi lisätä: "
 
-#: ../camel/camel-cipher-context.c:204
+#: ../src/camel/camel-cipher-context.c:202
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue allekirjoitusta"
 
-#: ../camel/camel-cipher-context.c:217
+#: ../src/camel/camel-cipher-context.c:215
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue varmennusta"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../src/camel/camel-cipher-context.c:231
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue tiedon salausta"
 
-#: ../camel/camel-cipher-context.c:247
+#: ../src/camel/camel-cipher-context.c:245
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Tämä salakirjoitusmenetelmä ei tue salauksen purkua"
 
-#: ../camel/camel-cipher-context.c:363
+#: ../src/camel/camel-cipher-context.c:361
 msgid "Signing message"
 msgstr "Allekirjoitetaan viestiä"
 
-#: ../camel/camel-cipher-context.c:653
+#: ../src/camel/camel-cipher-context.c:651
 msgid "Encrypting message"
 msgstr "Salataan viestiä"
 
-#: ../camel/camel-cipher-context.c:825
+#: ../src/camel/camel-cipher-context.c:823
 msgid "Decrypting message"
 msgstr "Puretaan viestin salausta"
 
-#: ../camel/camel-data-cache.c:179
+#: ../src/camel/camel-data-cache.c:203
 #, c-format
 msgid "Unable to create cache path"
 msgstr "Välimuistipolun luonti epäonnistui"
 
-#: ../camel/camel-data-cache.c:457
+#: ../src/camel/camel-data-cache.c:532
 msgid "Empty cache file"
 msgstr ""
 
-#: ../camel/camel-data-cache.c:534
+#: ../src/camel/camel-data-cache.c:609
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Tietoa ei voitu avata välimuistista: %s: %s"
 
-#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
-#, c-format
-msgid "Could not rename '%s' to %s: %s"
+#: ../src/camel/camel-db.c:855
+#: ../src/camel/providers/local/camel-mbox-store.c:904
+#, fuzzy, c-format
+#| msgid "Could not rename '%s' to %s: %s"
+msgid "Could not rename “%s” to %s: %s"
 msgstr "Uudelleennimeäminen %s:stä %s:ksi epäonnistui: %s"
 
-#: ../camel/camel-filter-driver.c:935 ../camel/camel-filter-search.c:773
-#, c-format
-msgid "Failed to create child process '%s': %s"
+#: ../src/camel/camel-filter-driver.c:990
+#: ../src/camel/camel-filter-search.c:779
+#, fuzzy, c-format
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to create child process “%s”: %s"
 msgstr "Lapsiprosessin \"%s\" luominen epäonnistui: %s"
 
-#: ../camel/camel-filter-driver.c:983
+#: ../src/camel/camel-filter-driver.c:1038
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Virheellinen viestivirta lähteestä %s: %s"
 
-#: ../camel/camel-filter-driver.c:1190 ../camel/camel-filter-driver.c:1199
+#: ../src/camel/camel-filter-driver.c:1245
+#: ../src/camel/camel-filter-driver.c:1254
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1297
+#: ../src/camel/camel-filter-driver.c:1352
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1308
+#: ../src/camel/camel-filter-driver.c:1363
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1404
+#: ../src/camel/camel-filter-driver.c:1460
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu avata"
 
-#: ../camel/camel-filter-driver.c:1416
+#: ../src/camel/camel-filter-driver.c:1472
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Saapuvien viestien kansiota ei voitu käsitellä"
 
-#: ../camel/camel-filter-driver.c:1439
+#: ../src/camel/camel-filter-driver.c:1496
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiä %d (%d %%)"
 
-#: ../camel/camel-filter-driver.c:1448 ../camel/camel-filter-driver.c:1470
+#: ../src/camel/camel-filter-driver.c:1505
+#: ../src/camel/camel-filter-driver.c:1528
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../camel/camel-filter-driver.c:1489 ../camel/camel-filter-driver.c:1603
+#: ../src/camel/camel-filter-driver.c:1547
+#: ../src/camel/camel-filter-driver.c:1661
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: ../camel/camel-filter-driver.c:1494 ../camel/camel-filter-driver.c:1611
+#: ../src/camel/camel-filter-driver.c:1552
+#: ../src/camel/camel-filter-driver.c:1669
 msgid "Complete"
 msgstr "Valmis"
 
-#: ../camel/camel-filter-driver.c:1557
+#: ../src/camel/camel-filter-driver.c:1615
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestiä %d / %d"
 
-#: ../camel/camel-filter-driver.c:1575
+#: ../src/camel/camel-filter-driver.c:1633
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: ../camel/camel-filter-driver.c:1770 ../camel/camel-filter-driver.c:1797
-#, c-format
-msgid "Execution of filter '%s' failed: "
+#: ../src/camel/camel-filter-driver.c:1828
+#: ../src/camel/camel-filter-driver.c:1855
+#, fuzzy, c-format
+#| msgid "Execution of filter '%s' failed: "
+msgid "Execution of filter “%s” failed: "
 msgstr "Suodattimen \"%s\" suorittaminen epäonnistui: "
 
-#: ../camel/camel-filter-driver.c:1787
+#: ../src/camel/camel-filter-driver.c:1845
 #, fuzzy, c-format
 #| msgid "Error parsing filter: %s: %s"
-msgid "Error parsing filter '%s': %s: %s"
+msgid "Error parsing filter “%s”: %s: %s"
 msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1806
+#: ../src/camel/camel-filter-driver.c:1864
 #, fuzzy, c-format
 #| msgid "Error executing filter: %s: %s"
-msgid "Error executing filter '%s': %s: %s"
+msgid "Error executing filter “%s”: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: ../camel/camel-filter-search.c:139
+#: ../src/camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "Viestiä ei voitu hakea."
 
-#: ../camel/camel-filter-search.c:513
+#: ../src/camel/camel-filter-search.c:519
 msgid "Invalid arguments to (system-flag)"
 msgstr "Virheellisiä argumentteja (system-flag)"
 
-#: ../camel/camel-filter-search.c:531
+#: ../src/camel/camel-filter-search.c:537
 msgid "Invalid arguments to (user-tag)"
 msgstr "Virheellisiä argumentteja (user-tag)"
 
-#: ../camel/camel-filter-search.c:1043
+#: ../src/camel/camel-filter-search.c:1066
 #, fuzzy
 #| msgid "Invalid arguments to (system-flag)"
 msgid "Invalid arguments to (message-location)"
 msgstr "Virheellisiä argumentteja (system-flag)"
 
-#: ../camel/camel-filter-search.c:1124 ../camel/camel-filter-search.c:1135
+#: ../src/camel/camel-filter-search.c:1147
+#: ../src/camel/camel-filter-search.c:1158
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 
-#: ../camel/camel-folder.c:327
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:311
 #, fuzzy, 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] "Etsitään muuttuneita viestejä kansiosta %s"
 msgstr[1] "Etsitään muuttuneita viestejä kansiosta %s"
 
-#: ../camel/camel-folder.c:370
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:354
 #, fuzzy, 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] "Etsitään muuttuneita viestejä kansiosta %s"
 msgstr[1] "Etsitään muuttuneita viestejä kansiosta %s"
 
-#: ../camel/camel-folder.c:421
+#. 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
 #, fuzzy, 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] "Suodatetaan uusia viestejä"
 msgstr[1] "Suodatetaan uusia viestejä"
 
-#: ../camel/camel-folder.c:1029
-#: ../camel/providers/local/camel-maildir-folder.c:330
+#: ../src/camel/camel-folder.c:1016
+#: ../src/camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Siirretään viestejä"
 
-#: ../camel/camel-folder.c:1032
+#: ../src/camel/camel-folder.c:1019
 msgid "Copying messages"
 msgstr "Kopioidaan viestejä"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:1077
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:1064
 #, fuzzy, c-format
 #| msgid "No provider available for protocol '%s'"
-msgid "Quota information not supported for folder '%s : %s'"
+msgid "Quota information not supported for folder “%s : %s”"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:1176
-#, fuzzy, c-format
+#. 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:1166
+#, c-format
 #| msgid "Opening folder '%s'"
-msgid "Filtering folder '%s : %s'"
-msgstr "Avataan kansiota ”%s”"
+msgid "Filtering folder “%s : %s”"
+msgstr "Suodatetaan kansiota “%s : %s”"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:2916
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:2971
 #, fuzzy, c-format
 #| msgid "Expunging folder '%s'"
-msgid "Expunging folder '%s : %s'"
+msgid "Expunging folder “%s : %s”"
 msgstr "Siivotaan poistettuja kansiosta ”%s”"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:3050
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:3105
 #, fuzzy, c-format
-msgid "Retrieving message '%s' in '%s : %s'"
+msgid "Retrieving message “%s” in “%s : %s”"
 msgstr "Haetaan POP-viestiä %d"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:3243
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:3327
 #, fuzzy, c-format
-msgid "Retrieving quota information for '%s : %s'"
+msgid "Retrieving quota information for “%s : %s”"
 msgstr "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:3541
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:3625
 #, fuzzy, c-format
 #| msgid "Refreshing folder '%s'"
-msgid "Refreshing folder '%s : %s'"
+msgid "Refreshing folder “%s : %s”"
 msgstr "Päivitetään kansiota ”%s”"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:845 ../camel/camel-folder-search.c:887
+#: ../src/camel/camel-folder-search.c:898
+#: ../src/camel/camel-folder-search.c:940
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) vaatii yhden totuusarvoisen tuloksen"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:922
+#: ../src/camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ei ole sallittu kohdan %s sisällä"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:929 ../camel/camel-folder-search.c:937
+#: ../src/camel/camel-folder-search.c:982
+#: ../src/camel/camel-folder-search.c:990
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) vaatii vertaustyypin merkkijonon"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:965
+#: ../src/camel/camel-folder-search.c:1018
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) olettaa tuloksena olevan taulukon"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../src/camel/camel-folder-search.c:1028
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) vaatii kansion asettamisen"
 
-#: ../camel/camel-folder-search.c:1887 ../camel/camel-folder-search.c:2056
+#: ../src/camel/camel-folder-search.c:2106
+#: ../src/camel/camel-folder-search.c:2280
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2229,7 +2299,8 @@ msgstr ""
 "Hakulauseketta ei voi tulkita: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1899 ../camel/camel-folder-search.c:2068
+#: ../src/camel/camel-folder-search.c:2118
+#: ../src/camel/camel-folder-search.c:2292
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2238,36 +2309,33 @@ msgstr ""
 "Virhe suoritettaessa hakulauseketta: %s:\n"
 "%s"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2171
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder-summary.c:1612
 #, fuzzy, c-format
 #| msgid "Cannot write offline journal for folder '%s': %s"
-msgid "Release unused memory for folder '%s : %s'"
+msgid "Release unused memory for folder “%s : %s”"
 msgstr "Kansion \"%s\" yhteydettömän tilan muutoslokia ei voi luoda: %s"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2390
-#, fuzzy, c-format
-#| msgid "Updating folder '%s'"
-msgid "Update preview data for folder '%s : %s'"
-msgstr "Päivitetään kansiota '%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
+#, c-format
+msgid "Output from %s:"
+msgstr ""
 
-#: ../camel/camel-gpg-context.c:819 ../camel/camel-gpg-context.c:824
-#: ../camel/camel-gpg-context.c:1514
+#: ../src/camel/camel-gpg-context.c:834 ../src/camel/camel-gpg-context.c:839
+#: ../src/camel/camel-gpg-context.c:1543
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg:n suoritus epäonnistui: %s"
 
-#: ../camel/camel-gpg-context.c:824
-#: ../camel/providers/smtp/camel-smtp-transport.c:1131
+#: ../src/camel/camel-gpg-context.c:839
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../camel/camel-gpg-context.c:936
+#: ../src/camel/camel-gpg-context.c:951
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2278,340 +2346,364 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:972
+#: ../src/camel/camel-gpg-context.c:987
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg käyttäjätunnisteen vihjeen tulkitseminen epäonnistui."
 
-#: ../camel/camel-gpg-context.c:997 ../camel/camel-gpg-context.c:1012
+#: ../src/camel/camel-gpg-context.c:1012 ../src/camel/camel-gpg-context.c:1027
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg salalausepyynnön tulkinta epäonnistui."
 
-#: ../camel/camel-gpg-context.c:1033
+#: ../src/camel/camel-gpg-context.c:1048
 #, c-format
+#| msgid ""
+#| "You need a PIN to unlock the key for your\n"
+#| "SmartCard: \"%s\""
 msgid ""
 "You need a PIN to unlock the key for your\n"
-"SmartCard: \"%s\""
-msgstr "Tarvitset PIN-koodin avataksesi älykorttisi: \"%s\""
+"SmartCard: “%s”"
+msgstr ""
+"Tarvitset PIN-koodin avataksesi\n"
+"älykorttisi: “%s”"
 
-#: ../camel/camel-gpg-context.c:1037
+#: ../src/camel/camel-gpg-context.c:1052
 #, c-format
+#| msgid ""
+#| "You need a passphrase to unlock the key for\n"
+#| "user: \"%s\""
 msgid ""
 "You need a passphrase to unlock the key for\n"
-"user: \"%s\""
+"user: “%s”"
 msgstr ""
 "Tarvitse salalauseen avataksesi avaimen\n"
-"käyttäjälle: \"%s\""
+"käyttäjälle: “%s”"
 
-#: ../camel/camel-gpg-context.c:1043
-#, c-format
-msgid "Unexpected request from GnuPG for '%s'"
+#: ../src/camel/camel-gpg-context.c:1058
+#, fuzzy, c-format
+#| msgid "Unexpected request from GnuPG for '%s'"
+msgid "Unexpected request from GnuPG for “%s”"
 msgstr "Odottamaton pyyntö GnuPG:ltä kohteelle \"%s\""
 
-#: ../camel/camel-gpg-context.c:1055
+#: ../src/camel/camel-gpg-context.c:1070
 msgid ""
-"Note the encrypted content doesn't contain information about a recipient, "
+"Note the encrypted content doesn’t contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1086 ../camel/camel-net-utils.c:524
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
-#: ../libedataserver/e-client.c:163
+#: ../src/camel/camel-gpg-context.c:1101 ../src/camel/camel-net-utils.c:522
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:398
+#: ../src/libedataserver/e-client.c:161
 #, c-format
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../camel/camel-gpg-context.c:1107
+#: ../src/camel/camel-gpg-context.c:1122
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Salaisen avaimen avaus epäonnistui: 3 virheellistä salalausetta syötetty."
 
-#: ../camel/camel-gpg-context.c:1120
+#: ../src/camel/camel-gpg-context.c:1135
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus GnuPG:ltä: %s"
 
-#: ../camel/camel-gpg-context.c:1234
+#: ../src/camel/camel-gpg-context.c:1249
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Salaus epäonnistui: kelvollisia vastaanottajia ei ole määritelty"
 
-#: ../camel/camel-gpg-context.c:1943 ../camel/camel-smime-context.c:843
-#, fuzzy
+#. Translators: The first '%s' is replaced with the e-mail address, like '<user example com>';
+#. the second '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
+#: ../src/camel/camel-gpg-context.c:1262
+#, c-format
+msgid ""
+"Failed to encrypt: Invalid recipient %s specified. A common issue is that "
+"the %s doesn’t have imported public key for this recipient."
+msgstr ""
+
+#: ../src/camel/camel-gpg-context.c:1972 ../src/camel/camel-smime-context.c:841
 msgid "Could not generate signing data: "
-msgstr "Allekirjoitustietoa ei voitu luoda: %s"
+msgstr "Allekirjoitustietoa ei voitu luoda: "
 
-#: ../camel/camel-gpg-context.c:1994 ../camel/camel-gpg-context.c:2230
-#: ../camel/camel-gpg-context.c:2346 ../camel/camel-gpg-context.c:2522
+#: ../src/camel/camel-gpg-context.c:2023 ../src/camel/camel-gpg-context.c:2259
+#: ../src/camel/camel-gpg-context.c:2375 ../src/camel/camel-gpg-context.c:2551
 msgid "Failed to execute gpg."
 msgstr "gpg:n suoritus epäonnistui."
 
-#: ../camel/camel-gpg-context.c:2100 ../camel/camel-gpg-context.c:2108
-#: ../camel/camel-gpg-context.c:2116 ../camel/camel-gpg-context.c:2136
-#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
-#: ../camel/camel-smime-context.c:995
+#: ../src/camel/camel-gpg-context.c:2129 ../src/camel/camel-gpg-context.c:2137
+#: ../src/camel/camel-gpg-context.c:2145 ../src/camel/camel-gpg-context.c:2165
+#: ../src/camel/camel-smime-context.c:970
+#: ../src/camel/camel-smime-context.c:984
+#: ../src/camel/camel-smime-context.c:993
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:2182
+#: ../src/camel/camel-gpg-context.c:2211
 #, fuzzy
 msgid "Cannot verify message signature: "
 msgstr "Viestin allekirjoitusta ei voi tarkistaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:2311
+#: ../src/camel/camel-gpg-context.c:2340
 #, fuzzy
 msgid "Could not generate encrypting data: "
 msgstr "Salaustieto ei voitu luoda: %s"
 
-#: ../camel/camel-gpg-context.c:2386
+#: ../src/camel/camel-gpg-context.c:2415
 msgid "This is a digitally encrypted message part"
 msgstr "Digitaalisesti salattu viestin osa"
 
-#: ../camel/camel-gpg-context.c:2445 ../camel/camel-gpg-context.c:2454
-#: ../camel/camel-gpg-context.c:2477
+#: ../src/camel/camel-gpg-context.c:2474 ../src/camel/camel-gpg-context.c:2483
+#: ../src/camel/camel-gpg-context.c:2506
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Viestin salausta ei voi purkaa: virheellinen viestin muoto"
 
-#: ../camel/camel-gpg-context.c:2465
+#: ../src/camel/camel-gpg-context.c:2494
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-osan salauksen purku epäonnistui: protokollavirhe"
 
-#: ../camel/camel-gpg-context.c:2532
+#: ../src/camel/camel-gpg-context.c:2561
 #, fuzzy, c-format
 #| msgid "Failed to decrypt MIME part: protocol error"
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "MIME-osan salauksen purku epäonnistui: protokollavirhe"
 
-#: ../camel/camel-gpg-context.c:2568 ../camel/camel-smime-context.c:1288
+#: ../src/camel/camel-gpg-context.c:2597
+#: ../src/camel/camel-smime-context.c:1286
 msgid "Encrypted content"
 msgstr "Salattu sisältö"
 
-#: ../camel/camel-junk-filter.c:167
+#: ../src/camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr ""
 
-#: ../camel/camel-lock.c:110
+#: ../src/camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Lukkotiedostoa %s:lle ei voitu luoda: %s"
 
-#: ../camel/camel-lock.c:153
+#: ../src/camel/camel-lock.c:154
 #, fuzzy, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr ""
 "Aikaviivekatkaisu yritettäessä hankkia lukkotiedostoa %s:lle. Yritä "
 "myöhemmin uudestaan."
 
-#: ../camel/camel-lock.c:215
+#: ../src/camel/camel-lock.c:221
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Lukitseminen käyttäen fcntl(2) kutsua epäonnistui: %s"
 
-#: ../camel/camel-lock.c:282
+#: ../src/camel/camel-lock.c:293
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Lukitseminen käyttäen flock(2) kutsua epäonnistui: %s"
 
-#: ../camel/camel-lock-client.c:107
+#: ../src/camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Lukitsevan apulaisen putkea ei voi luoda: %s"
 
-#: ../camel/camel-lock-client.c:131
+#: ../src/camel/camel-lock-client.c:129
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Lukitsevaa apulaista ei voi käynnistää: %s"
 
-#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+#: ../src/camel/camel-lock-client.c:216 ../src/camel/camel-lock-client.c:244
+#, fuzzy, c-format
+#| msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Could not lock “%s”: protocol error with lock-helper"
 msgstr "\"%s\" ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
 
-#: ../camel/camel-lock-client.c:234
-#, c-format
-msgid "Could not lock '%s'"
+#: ../src/camel/camel-lock-client.c:232
+#, fuzzy, c-format
+#| msgid "Could not lock '%s'"
+msgid "Could not lock “%s”"
 msgstr "Lukitus epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:101
+#: ../src/camel/camel-movemail.c:99
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Sähköpostitiedostoa %s ei voitu avata: %s"
 
-#: ../camel/camel-movemail.c:121
+#: ../src/camel/camel-movemail.c:119
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Sähköpostitiedostoa %s ei voitu tarkistaa: %s"
 
-#: ../camel/camel-movemail.c:136
+#: ../src/camel/camel-movemail.c:134
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Tilapäistä sähköpostitiedostoa %s ei voitu avata: %s"
 
-#: ../camel/camel-movemail.c:166
+#: ../src/camel/camel-movemail.c:164
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:200
+#: ../src/camel/camel-movemail.c:198
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Putken luonti epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:214
+#: ../src/camel/camel-movemail.c:212
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Haaroitus epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:252
+#: ../src/camel/camel-movemail.c:250
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Ohjelma movemail epäonnistui: %s"
 
-#: ../camel/camel-movemail.c:253
+#: ../src/camel/camel-movemail.c:251
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
-#: ../camel/camel-movemail.c:280
+#: ../src/camel/camel-movemail.c:278
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Virhe luettaessa viestitiedostoa: %s"
 
-#: ../camel/camel-movemail.c:293
+#: ../src/camel/camel-movemail.c:291
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
 
-#: ../camel/camel-movemail.c:500 ../camel/camel-movemail.c:569
+#: ../src/camel/camel-movemail.c:499 ../src/camel/camel-movemail.c:573
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin väliaikaistiedostoa: %s"
 
-#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432
+#: ../src/camel/camel-multipart-signed.c:277
+#: ../src/camel/camel-multipart-signed.c:430
 #, c-format
 msgid "No content available"
 msgstr "Ei sisältöä saatavilla"
 
-#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440
+#: ../src/camel/camel-multipart-signed.c:285
+#: ../src/camel/camel-multipart-signed.c:438
 #, c-format
 msgid "No signature available"
 msgstr "Ei allekirjoitusta saatavilla"
 
-#: ../camel/camel-multipart-signed.c:806
+#: ../src/camel/camel-multipart-signed.c:804
 #, c-format
 msgid "parse error"
 msgstr "Virhe tulkittaessa"
 
-#: ../camel/camel-net-utils.c:708
+#: ../src/camel/camel-net-utils.c:714
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ratkaistaan: %s"
 
-#: ../camel/camel-net-utils.c:733
+#: ../src/camel/camel-net-utils.c:739
 msgid "Host lookup failed"
 msgstr "Palvelimen osoitteen haku epäonnistui"
 
-#: ../camel/camel-net-utils.c:739
+#: ../src/camel/camel-net-utils.c:745
 #, c-format
-msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgid "Host lookup “%s” failed. Check your host name for spelling errors."
 msgstr ""
 
-#: ../camel/camel-net-utils.c:743
+#: ../src/camel/camel-net-utils.c:749
 #, fuzzy, c-format
 #| msgid "Host lookup failed: %s: %s"
-msgid "Host lookup '%s' failed: %s"
+msgid "Host lookup “%s” failed: %s"
 msgstr "Palvelimen %s osoitteen haku epäonnistui: %s"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-offline-folder.c:96
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:125
 #, fuzzy, c-format
 #| msgid "Downloading new messages for offline mode"
-msgid "Downloading new messages for offline mode in '%s : %s'"
+msgid "Downloading new messages for offline mode in “%s : %s”"
 msgstr "Haetaan uusia viestejä yhteydettömään käyttöön"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-offline-folder.c:167
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:221
 #, fuzzy, c-format
 #| msgid "Syncing messages in folder '%s' to disk"
-msgid "Storing changes in folder '%s : %s'"
+msgid "Storing changes in folder “%s : %s”"
 msgstr "Synkronoidaan viestejä kansiossa %s levylle"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-offline-folder.c:257
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:311
 #, fuzzy, c-format
 #| msgid "Downloading new messages for offline mode"
-msgid "Checking download of new messages for offline in '%s : %s'"
+msgid "Checking download of new messages for offline in “%s : %s”"
 msgstr "Haetaan uusia viestejä yhteydettömään käyttöön"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-offline-folder.c:373
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:428
 #, fuzzy, c-format
 #| msgid "Syncing messages in folder '%s' to disk"
-msgid "Syncing messages in folder '%s : %s' to disk"
+msgid "Syncing messages in folder “%s : %s” to disk"
 msgstr "Synkronoidaan viestejä kansiossa %s levylle"
 
-#: ../camel/camel-offline-folder.c:436
+#: ../src/camel/camel-offline-folder.c:513
 #, fuzzy
 msgid "Copy folder content locally for _offline operation"
 msgstr "Kopioi kansion sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../camel/camel-provider.c:55
+#: ../src/camel/camel-provider.c:89
 msgid "Virtual folder email provider"
 msgstr "Virtuaalikansion sähköpostitarjoaja"
 
-#: ../camel/camel-provider.c:57
+#: ../src/camel/camel-provider.c:91
 msgid "For reading mail as a query of another set of folders"
 msgstr "Sähköpostien lukuun hakuna joukosta muita kansioita"
 
-#: ../camel/camel-provider.c:260
+#: ../src/camel/camel-provider.c:294
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Moduulin %s lataaminen epäonnistui: Järjestelmäsi ei tue moduulien "
 "lataamista."
 
-#: ../camel/camel-provider.c:269
+#: ../src/camel/camel-provider.c:303
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ei voitu ladata: %s"
 
-#: ../camel/camel-provider.c:278
+#: ../src/camel/camel-provider.c:312
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ei voitu ladata: moduulissa ei ole alustuskoodia"
 
-#: ../camel/camel-provider.c:424 ../camel/camel-session.c:436
-#, c-format
-msgid "No provider available for protocol '%s'"
+#: ../src/camel/camel-provider.c:458 ../src/camel/camel-session.c:434
+#, fuzzy, c-format
+#| msgid "No provider available for protocol '%s'"
+msgid "No provider available for protocol “%s”"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/camel-sasl-anonymous.c:32
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../src/camel/camel-sasl-anonymous.c:35
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:82
 msgid "Anonymous"
 msgstr "Anonyymi"
 
-#: ../camel/camel-sasl-anonymous.c:34
+#: ../src/camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Tämä valitsin kirjautuu palvelimelle anonyymisti."
 
-#: ../camel/camel-sasl-anonymous.c:67
+#: ../src/camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
 msgstr "Todennus epäonnistui."
 
-#: ../camel/camel-sasl-anonymous.c:78
+#: ../src/camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2620,7 +2712,7 @@ msgstr ""
 "Virheellinen sähköpostiosoitteen seurantatieto:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:92
+#: ../src/camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2629,7 +2721,7 @@ msgstr ""
 "Virheellinen läpinäkyvän seurannan tieto:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:106
+#: ../src/camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2638,11 +2730,11 @@ msgstr ""
 "Virheellinen seurannan tieto:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../src/camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../src/camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2650,11 +2742,11 @@ msgstr ""
 "Tämä vaihtoehto yhdistää palvelimeen käyttäen turvallista CRAM-MD5 "
 "salasanaa, jos palvelin tukee tätä."
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../src/camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../src/camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2662,52 +2754,53 @@ msgstr ""
 "Tämä vaihtoehto ottaa yhteyttä palvelimeen käyttäen turvallista DIGEST-MD5 "
 "salasanaa, jos palvelin tukee tätä."
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../src/camel/camel-sasl-digest-md5.c:852
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Palvelimen haaste liian pitkä (>2048 tavua)"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../src/camel/camel-sasl-digest-md5.c:863
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Palvelimen haaste on virheellinen\n"
 
-#: ../camel/camel-sasl-digest-md5.c:873
-#, c-format
-msgid "Server challenge contained invalid \"Quality of Protection\" token"
+#: ../src/camel/camel-sasl-digest-md5.c:871
+#, fuzzy, c-format
+#| msgid "Server challenge contained invalid \"Quality of Protection\" token"
+msgid "Server challenge contained invalid “Quality of Protection” token"
 msgstr ""
 "Palvelimen haaste sisälsi virheellisen \"Quality of Protection\" kentän"
 
-#: ../camel/camel-sasl-digest-md5.c:906
+#: ../src/camel/camel-sasl-digest-md5.c:904
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Palvelimen vaste ei sisältänyt todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:927
+#: ../src/camel/camel-sasl-digest-md5.c:925
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Palvelimen vaste sisälsi vajaata todennustietoa"
 
-#: ../camel/camel-sasl-digest-md5.c:940
+#: ../src/camel/camel-sasl-digest-md5.c:938
 #, c-format
 msgid "Server response does not match"
 msgstr "Palvelimen vaste ei vastaa haluttua"
 
-#: ../camel/camel-sasl-gssapi.c:94
+#: ../src/camel/camel-sasl-gssapi.c:92
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:96
+#: ../src/camel/camel-sasl-gssapi.c:94
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Tämä vaihtoehto yhdistää palvelimeen käyttäen Kerberos 5 - tunnistautumista."
 
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../src/camel/camel-sasl-gssapi.c:146
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../src/camel/camel-sasl-gssapi.c:179
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2715,11 +2808,11 @@ msgstr ""
 "Annettu valtuustieto ei tue määriteltyä mekanismia, tai se on toteutukselle "
 "tuntematon."
 
-#: ../camel/camel-sasl-gssapi.c:186
+#: ../src/camel/camel-sasl-gssapi.c:184
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Määritelty target_name parametri oli väärin muotoiltu."
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../src/camel/camel-sasl-gssapi.c:187
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2727,7 +2820,7 @@ msgstr ""
 "Määritelty target_name parametri sisälsi virheellisen tai tukemattoman "
 "tyyppisen nimen."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../src/camel/camel-sasl-gssapi.c:191
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2735,7 +2828,7 @@ msgstr ""
 "input_token sisältää eri kanavasidontoja kun mitä on määritelty "
 "input_chan_bindings parametrissa."
 
-#: ../camel/camel-sasl-gssapi.c:198
+#: ../src/camel/camel-sasl-gssapi.c:196
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2743,7 +2836,7 @@ msgstr ""
 "input_token sisältää virheellisen allekirjoituksen tai allekirjoituksen, "
 "jota ei voi varmentaa."
 
-#: ../camel/camel-sasl-gssapi.c:202
+#: ../src/camel/camel-sasl-gssapi.c:200
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2751,52 +2844,52 @@ msgstr ""
 "Annetut valtuustiedot eivät ole kelvollisia tämän tilan alustamisessa tai "
 "valtuustiedon kahva ei viitannut mihinkään valtuustietoihin."
 
-#: ../camel/camel-sasl-gssapi.c:207
+#: ../src/camel/camel-sasl-gssapi.c:205
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Määritelty tilakahva ei viittaa kelvolliseen tilaan."
 
-#: ../camel/camel-sasl-gssapi.c:210
+#: ../src/camel/camel-sasl-gssapi.c:208
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_check:ille tehdyt eheystarkistukset epäonnistuivat."
 
-#: ../camel/camel-sasl-gssapi.c:213
+#: ../src/camel/camel-sasl-gssapi.c:211
 msgid "The consistency checks performed on the credential failed."
 msgstr "Valtuustiedoille tehdyt eheystarkistukset epäonnistuivat."
 
-#: ../camel/camel-sasl-gssapi.c:216
+#: ../src/camel/camel-sasl-gssapi.c:214
 msgid "The referenced credentials have expired."
 msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 
-#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
-#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
-#: ../camel/providers/smtp/camel-smtp-transport.c:799
+#: ../src/camel/camel-sasl-gssapi.c:220 ../src/camel/camel-sasl-gssapi.c:402
+#: ../src/camel/camel-sasl-gssapi.c:451 ../src/camel/camel-sasl-gssapi.c:468
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:797
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
-#: ../camel/camel-sasl-gssapi.c:482
+#: ../src/camel/camel-sasl-gssapi.c:480
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Turvakerros ei ole tuettu."
 
-#: ../camel/camel-sasl-login.c:37
+#: ../src/camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Kirjautuminen"
 
-#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
+#: ../src/camel/camel-sasl-login.c:37 ../src/camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "Tämä valitsin yhdistää palvelimeen yksinkertaista salasanaa käyttäen."
 
-#: ../camel/camel-sasl-login.c:107
+#: ../src/camel/camel-sasl-login.c:105
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Tuntematon todennustila."
 
-#: ../camel/camel-sasl-ntlm.c:46
+#: ../src/camel/camel-sasl-ntlm.c:44
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:48
+#: ../src/camel/camel-sasl-ntlm.c:46
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2804,406 +2897,424 @@ msgstr ""
 "Tämä vaihtoehto yhdistää Windows-palvelimeen käyttäen NTLM/Secure Password "
 "tunnistautumista."
 
-#: ../camel/camel-sasl-plain.c:41
+#: ../src/camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "SELVÄKIELINEN"
 
-#: ../camel/camel-sasl-popb4smtp.c:43
+#: ../src/camel/camel-sasl-popb4smtp.c:41
 msgid "POP before SMTP"
 msgstr "POP ennen SMTP:tä"
 
-#: ../camel/camel-sasl-popb4smtp.c:45
+#: ../src/camel/camel-sasl-popb4smtp.c:43
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 "Tämä vaihtoehto tunnistautuu POP-yhteyteen, ennen kuin yrittää SMTP:n "
 "käyttöä."
 
-#: ../camel/camel-sasl-popb4smtp.c:83
+#: ../src/camel/camel-sasl-popb4smtp.c:81
 #, fuzzy
 msgid "POP Source UID"
 msgstr "POP:in lähde-URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../src/camel/camel-sasl-popb4smtp.c:95
 #, fuzzy, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr ""
 "POP ennen SMTP:tä tunnistautuminen käyttäen tuntematonta siirtomenetelmää"
 
-#: ../camel/camel-sasl-popb4smtp.c:109 ../camel/camel-sasl-popb4smtp.c:118
+#: ../src/camel/camel-sasl-popb4smtp.c:107
+#: ../src/camel/camel-sasl-popb4smtp.c:116
 #, fuzzy, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP ennen SMTP:tä käyttäen lähdettä, joka ei ole POP"
 
-#: ../camel/camel-search-private.c:113
+#: ../src/camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Säännöllisen lausekkeen käännös epäonnistui: %s: %s"
 
-#: ../camel/camel-session.c:445
+#: ../src/camel/camel-session.c:443
 #, fuzzy, c-format
-msgid "Invalid GType registered for protocol '%s'"
+msgid "Invalid GType registered for protocol “%s”"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/camel-session.c:514
-#: ../camel/providers/imapx/camel-imapx-server.c:2990
-#: ../camel/providers/pop3/camel-pop3-store.c:308
-#: ../camel/providers/pop3/camel-pop3-store.c:790
-#: ../camel/providers/smtp/camel-smtp-transport.c:672
+#: ../src/camel/camel-session.c:512
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2997
+#: ../src/camel/providers/pop3/camel-pop3-store.c:306
+#: ../src/camel/providers/pop3/camel-pop3-store.c:788
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:670
 #, c-format
 msgid "No support for %s authentication"
 msgstr "Tunnistautumismenetelmä %s ei ole tuettu"
 
-#: ../camel/camel-session.c:529
+#: ../src/camel/camel-session.c:527
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s-tunnistautuminen epäonnistui"
 
-#: ../camel/camel-session.c:598
+#: ../src/camel/camel-session.c:596
 msgid "Forwarding messages is not supported"
 msgstr "Viestien edelleenlähetystä ei tueta"
 
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
-#, c-format
-msgid "Cannot find certificate for '%s'"
+#: ../src/camel/camel-smime-context.c:346
+#: ../src/camel/camel-smime-context.c:1073
+#, fuzzy, c-format
+#| msgid "Cannot find certificate for '%s'"
+msgid "Cannot find certificate for “%s”"
 msgstr "Varmennetta \"%s\":lle ei löydy"
 
-#: ../camel/camel-smime-context.c:376
+#: ../src/camel/camel-smime-context.c:374
 msgid "Cannot create CMS message"
 msgstr "CMS-viestiä ei voi luoda"
 
-#: ../camel/camel-smime-context.c:381
+#: ../src/camel/camel-smime-context.c:379
 msgid "Cannot create CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voitu luoda"
 
-#: ../camel/camel-smime-context.c:387
+#: ../src/camel/camel-smime-context.c:385
 msgid "Cannot attach CMS signed data"
 msgstr "CMS-allekirjoitettua tietoa ei voi liittää"
 
-#: ../camel/camel-smime-context.c:394
+#: ../src/camel/camel-smime-context.c:392
 msgid "Cannot attach CMS data"
 msgstr "CMS-tietoa ei voi liittää"
 
-#: ../camel/camel-smime-context.c:400
+#: ../src/camel/camel-smime-context.c:398
 msgid "Cannot create CMS Signer information"
 msgstr "CMS-allekirjoitustietoa ei voitu luoda"
 
-#: ../camel/camel-smime-context.c:406
+#: ../src/camel/camel-smime-context.c:404
 msgid "Cannot find certificate chain"
 msgstr "Varmenneketjua ei löydy"
 
-#: ../camel/camel-smime-context.c:412
+#: ../src/camel/camel-smime-context.c:410
 msgid "Cannot add CMS Signing time"
 msgstr "CMS allekirjoitusaikaa ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../src/camel/camel-smime-context.c:434
+#: ../src/camel/camel-smime-context.c:449
 #, c-format
-msgid "Encryption certificate for '%s' does not exist"
-msgstr "Salausvarmennetta kohteelle \"%s\" ei ole olemassa."
+#| msgid "Encryption certificate for '%s' does not exist"
+msgid "Encryption certificate for “%s” does not exist"
+msgstr "Salausvarmennetta kohteelle “%s” ei ole olemassa."
 
-#: ../camel/camel-smime-context.c:458
+#: ../src/camel/camel-smime-context.c:456
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs-attribuuttia ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:463
+#: ../src/camel/camel-smime-context.c:461
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs-attribuuttia ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:468
+#: ../src/camel/camel-smime-context.c:466
 msgid "Cannot add encryption certificate"
 msgstr "Salausvarmennetta ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:474
+#: ../src/camel/camel-smime-context.c:472
 msgid "Cannot add CMS Signer information"
 msgstr "CMS allekirjoittajatietoa ei voi lisätä"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:507
+#: ../src/camel/camel-smime-context.c:505
 msgid "Unverified"
 msgstr "Varmistamaton"
 
-#: ../camel/camel-smime-context.c:509
+#: ../src/camel/camel-smime-context.c:507
 msgid "Good signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../camel/camel-smime-context.c:511
+#: ../src/camel/camel-smime-context.c:509
 msgid "Bad signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../camel/camel-smime-context.c:513
+#: ../src/camel/camel-smime-context.c:511
 msgid "Content tampered with or altered in transit"
 msgstr "Sisältöä muutettu siirrettäessä"
 
-#: ../camel/camel-smime-context.c:515
+#: ../src/camel/camel-smime-context.c:513
 msgid "Signing certificate not found"
 msgstr "Allekirjoitusvarmennetta ei löytynyt"
 
-#: ../camel/camel-smime-context.c:517
+#: ../src/camel/camel-smime-context.c:515
 msgid "Signing certificate not trusted"
 msgstr "Allekirjoitusvarmenteeseen ei luoteta"
 
-#: ../camel/camel-smime-context.c:519
+#: ../src/camel/camel-smime-context.c:517
 msgid "Signature algorithm unknown"
 msgstr "Allekirjoituksen algoritmi on tuntematon"
 
-#: ../camel/camel-smime-context.c:521
+#: ../src/camel/camel-smime-context.c:519
 msgid "Signature algorithm unsupported"
 msgstr "Allekirjoituksen algoritmi ei ole tuettu"
 
-#: ../camel/camel-smime-context.c:523
+#: ../src/camel/camel-smime-context.c:521
 msgid "Malformed signature"
 msgstr "Virhe allekirjoituksen muodossa"
 
-#: ../camel/camel-smime-context.c:525
+#: ../src/camel/camel-smime-context.c:523
 msgid "Processing error"
 msgstr "Virhe käsittelyssä"
 
-#: ../camel/camel-smime-context.c:570
+#: ../src/camel/camel-smime-context.c:568
 msgid "No signed data in signature"
 msgstr "Allekirjoituksessa ei ole allekirjoitettua tietoa"
 
-#: ../camel/camel-smime-context.c:575
+#: ../src/camel/camel-smime-context.c:573
 msgid "Digests missing from enveloped data"
 msgstr "Viestin kuoresta ei ole tiivisteitä."
 
-#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
+#: ../src/camel/camel-smime-context.c:586
+#: ../src/camel/camel-smime-context.c:597
 msgid "Cannot calculate digests"
 msgstr "Tiivisteitä ei voi laskea"
 
-#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
+#: ../src/camel/camel-smime-context.c:604
+#: ../src/camel/camel-smime-context.c:608
 msgid "Cannot set message digests"
 msgstr "Viestin tiivisteitä ei voi asettaa"
 
-#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
+#: ../src/camel/camel-smime-context.c:618
+#: ../src/camel/camel-smime-context.c:623
 msgid "Certificate import failed"
 msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../camel/camel-smime-context.c:635
+#: ../src/camel/camel-smime-context.c:633
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Viesti on itsessään varmenne, varmenteita ei voi tarkistaa"
 
-#: ../camel/camel-smime-context.c:638
+#: ../src/camel/camel-smime-context.c:636
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Viesti on itsessään varmenne, varmenteet tuotu ja tarkistettu"
 
-#: ../camel/camel-smime-context.c:642
+#: ../src/camel/camel-smime-context.c:640
 msgid "Cannot find signature digests"
 msgstr "Allekirjoitustiivisteitä ei löydy"
 
-#: ../camel/camel-smime-context.c:659
+#: ../src/camel/camel-smime-context.c:657
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allekirjoittaja: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1149
+#: ../src/camel/camel-smime-context.c:853
+#: ../src/camel/camel-smime-context.c:1147
 msgid "Cannot create encoder context"
 msgstr "Kooderin kontekstia ei voi luoda"
 
-#: ../camel/camel-smime-context.c:861
+#: ../src/camel/camel-smime-context.c:859
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS-kooderiin ei voitu lisätä tietoa"
 
-#: ../camel/camel-smime-context.c:866 ../camel/camel-smime-context.c:1166
+#: ../src/camel/camel-smime-context.c:864
+#: ../src/camel/camel-smime-context.c:1164
 msgid "Failed to encode data"
 msgstr "Tiedon koodaus epäonnistui"
 
-#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
+#: ../src/camel/camel-smime-context.c:1012
+#: ../src/camel/camel-smime-context.c:1261
 msgid "Decoder failed"
 msgstr "Purkaja epäonnistui"
 
-#: ../camel/camel-smime-context.c:1083
+#: ../src/camel/camel-smime-context.c:1081
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Yhteistä massasalausalgoritmia ei löydy"
 
-#: ../camel/camel-smime-context.c:1091
+#: ../src/camel/camel-smime-context.c:1089
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Lokeroa massasalausavaimelle ei voi varata"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../src/camel/camel-smime-context.c:1100
 msgid "Cannot create CMS Message"
 msgstr "CMS-viestiä ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1108
+#: ../src/camel/camel-smime-context.c:1106
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS-käärittyä tietoa ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1114
+#: ../src/camel/camel-smime-context.c:1112
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS-käärittyä tietoa ei voi liittää"
 
-#: ../camel/camel-smime-context.c:1120
+#: ../src/camel/camel-smime-context.c:1118
 msgid "Cannot attach CMS data object"
 msgstr "CMS tieto-oliota ei voi liittää"
 
-#: ../camel/camel-smime-context.c:1129
+#: ../src/camel/camel-smime-context.c:1127
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi luoda"
 
-#: ../camel/camel-smime-context.c:1134
+#: ../src/camel/camel-smime-context.c:1132
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS-vastaanottajatietoja ei voi lisätä"
 
-#: ../camel/camel-smime-context.c:1160
+#: ../src/camel/camel-smime-context.c:1158
 msgid "Failed to add data to encoder"
 msgstr "Tiedon lisäys koodaajaan epäonnistui"
 
-#: ../camel/camel-smime-context.c:1270
+#: ../src/camel/camel-smime-context.c:1268
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME purku: salauskontekstia ei löytynyt"
 
-#: ../camel/camel-store.c:1284
+#: ../src/camel/camel-store.c:1370
 #, c-format
-msgid "Opening folder '%s'"
-msgstr "Avataan kansiota ”%s”"
+#| msgid "Opening folder '%s'"
+msgid "Opening folder “%s”"
+msgstr "Avataan kansiota “%s”"
 
-#: ../camel/camel-store.c:1578
-#, c-format
-msgid "Scanning folders in '%s'"
+#: ../src/camel/camel-store.c:1665
+#, fuzzy, c-format
+#| msgid "Scanning folders in '%s'"
+msgid "Scanning folders in “%s”"
 msgstr "Tutkitaan kansion ”%s” alikansioita"
 
-#: ../camel/camel-store.c:1606 ../camel/camel-store.c:1651
-#: ../camel/camel-vtrash-folder.c:45
+#: ../src/camel/camel-store.c:1693 ../src/camel/camel-store.c:1738
+#: ../src/camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Roskakori"
 
-#: ../camel/camel-store.c:1620 ../camel/camel-store.c:1668
-#: ../camel/camel-vtrash-folder.c:47
+#: ../src/camel/camel-store.c:1707 ../src/camel/camel-store.c:1755
+#: ../src/camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../camel/camel-store.c:2269
+#: ../src/camel/camel-store.c:2356
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kansiota ei voi luoda: %s: kansio on olemassa"
 
-#: ../camel/camel-store.c:2276
+#: ../src/camel/camel-store.c:2363
 #, c-format
-msgid "Creating folder '%s'"
-msgstr "Luodaan kansiota '%s'"
+#| msgid "Creating folder '%s'"
+msgid "Creating folder “%s”"
+msgstr "Luodaan kansiota “%s”"
 
-#: ../camel/camel-store.c:2453 ../camel/camel-vee-store.c:410
-#: ../camel/providers/local/camel-maildir-store.c:346
+#: ../src/camel/camel-store.c:2540 ../src/camel/camel-vee-store.c:420
+#: ../src/camel/providers/local/camel-maildir-store.c:344
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: ../camel/camel-store.c:2643 ../camel/camel-vee-store.c:461
-#: ../camel/providers/local/camel-maildir-store.c:914
+#: ../src/camel/camel-store.c:2730 ../src/camel/camel-vee-store.c:471
+#: ../src/camel/providers/local/camel-maildir-store.c:912
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
 
-#: ../camel/camel-stream.c:168
+#: ../src/camel/camel-stream.c:170
 #, fuzzy
 #| msgid "Cannot authenticate without a username"
 msgid "Cannot write with no base stream"
 msgstr "Tunnistautuminen ilman käyttäjätunnusta ei ole mahdollista"
 
-#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
+#: ../src/camel/camel-stream.c:290 ../src/camel/camel-stream.c:341
 #, fuzzy, c-format
 #| msgid "Store root %s is not an absolute path"
-msgid "Stream type '%s' is not seekable"
+msgid "Stream type “%s” is not seekable"
 msgstr "Säilön juuri %s ei ole absoluuttinen polku"
 
-#: ../camel/camel-stream-filter.c:344
+#: ../src/camel/camel-stream-filter.c:342
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr ""
 
-#: ../camel/camel-stream-null.c:74
+#: ../src/camel/camel-stream-null.c:76
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr ""
 
-#: ../camel/camel-stream-process.c:278
-#: ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../src/camel/camel-stream-process.c:284
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:717
 #, c-format
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: ../camel/camel-stream-process.c:283
+#: ../src/camel/camel-stream-process.c:289
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Komentoon \"%s\" liittyminen epäonnistui: %s"
+#| msgid "Could not connect with command \"%s\": %s"
+msgid "Could not connect with command “%s”: %s"
+msgstr "Yhdistäminen komennolla “%s” epäonnistui: %s"
 
-#: ../camel/camel-subscribable.c:273
+#: ../src/camel/camel-subscribable.c:234
 #, c-format
-msgid "Subscribing to folder '%s'"
-msgstr "Tilataan kansio '%s'"
+#| msgid "Subscribing to folder '%s'"
+msgid "Subscribing to folder “%s”"
+msgstr "Tilataan kansio “%s”"
 
-#: ../camel/camel-subscribable.c:442
+#: ../src/camel/camel-subscribable.c:403
 #, fuzzy, c-format
-msgid "Unsubscribing from folder '%s'"
+msgid "Unsubscribing from folder “%s”"
 msgstr "_Näytä ainoastaan tilatut kansiot"
 
-#: ../camel/camel-url.c:327
-#, c-format
-msgid "Could not parse URL '%s'"
+#: ../src/camel/camel-url.c:325
+#, fuzzy, c-format
+#| msgid "Could not parse URL '%s'"
+msgid "Could not parse URL “%s”"
 msgstr "URLia \"%s\" ei voi tulkita"
 
-#: ../camel/camel-vee-folder.c:491
+#: ../src/camel/camel-vee-folder.c:498
 #, c-format
-msgid "Updating folder '%s'"
-msgstr "Päivitetään kansiota '%s'"
+#| msgid "Updating folder '%s'"
+msgid "Updating folder “%s”"
+msgstr "Päivitetään kansiota “%s”"
 
-#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:984
+#: ../src/camel/camel-vee-folder.c:898 ../src/camel/camel-vee-folder.c:1013
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Viestien kopioiminen tai siirtäminen ei onnistu virtuaalisiin kansioihin"
 
-#. Translators: The first '%s' is replaced with a message UID, the second '%s'
-#. is replaced with an account name and the third '%s' is replaced with a full
-#. path name. The spaces around ':' are intentional, as the whole '%s : %s' is
+#. Translators: The first “%s” is replaced with a message UID, the second “%s”
+#. is replaced with an account name and the third “%s” is replaced with a full
+#. path name. The spaces around “:” are intentional, as the whole “%s : %s” is
 #. meant as an absolute identification of the folder.
-#: ../camel/camel-vee-folder.c:906
+#: ../src/camel/camel-vee-folder.c:935
 #, fuzzy, c-format
 #| msgid "No such message %s in %s"
-msgid "No such message %s in '%s : %s'"
+msgid "No such message %s in “%s : %s”"
 msgstr "Viestiä %s ei voitu löytää %s:stä"
 
-#: ../camel/camel-vee-folder.c:960
+#: ../src/camel/camel-vee-folder.c:989
 #, fuzzy, c-format
-msgid "Error storing '%s': "
+msgid "Error storing “%s”: "
 msgstr "Virhe tallennettaessa \"%s\": %s"
 
-#: ../camel/camel-vee-folder.c:1198
+#: ../src/camel/camel-vee-folder.c:1236
 msgid "Automatically _update on change in source folders"
 msgstr ""
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:40
+#: ../src/camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "Ei vastaavaa"
 
-#: ../camel/camel-vee-store.c:436
+#: ../src/camel/camel-vee-store.c:446
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: ../camel/camel-vee-store.c:471
+#: ../src/camel/camel-vee-store.c:481
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
 
-#: ../camel/camel-vee-store.c:533
+#: ../src/camel/camel-vee-store.c:544
 msgid "Enable _Unmatched folder"
 msgstr ""
 
-#: ../camel/camel-vee-store.c:1030
+#: ../src/camel/camel-vee-store.c:1067
 #, fuzzy
 msgid "Updating Unmatched search folder"
 msgstr "Tallennetaan kansiota"
 
-#: ../camel/camel-vtrash-folder.c:46
+#: ../src/camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Viestejä ei voi kopioida roskakoriin"
 
-#: ../camel/camel-vtrash-folder.c:48
+#: ../src/camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Viestejä ei voi kopioida roskapostikansioon"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:973
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:967
 #, fuzzy, c-format
 #| msgid "You must be working online to complete this operation"
 msgid "You must be working online to complete this operation (%s)"
@@ -3211,584 +3322,608 @@ msgstr ""
 "Sinun täytyy olla yhteydellisessä tilassa suorittaaksesi tämän toiminnon "
 "loppuun"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:981
-#: ../camel/providers/imapx/camel-imapx-server.c:3123
-#: ../camel/providers/nntp/camel-nntp-store.c:353
-#: ../camel/providers/nntp/camel-nntp-store.c:1350
-#: ../camel/providers/nntp/camel-nntp-store.c:2158
-#: ../camel/providers/nntp/camel-nntp-store.c:2302
-#: ../camel/providers/pop3/camel-pop3-folder.c:449
-#: ../camel/providers/pop3/camel-pop3-folder.c:632
-#: ../camel/providers/pop3/camel-pop3-folder.c:834
-#: ../camel/providers/pop3/camel-pop3-folder.c:1044
-#: ../camel/providers/pop3/camel-pop3-store.c:296
-#: ../camel/providers/pop3/camel-pop3-store.c:529
-#: ../camel/providers/pop3/camel-pop3-store.c:577
-#: ../camel/providers/pop3/camel-pop3-store.c:672
-#: ../camel/providers/pop3/camel-pop3-store.c:1107
-#: ../camel/providers/smtp/camel-smtp-transport.c:543
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:975
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3130
+#: ../src/camel/providers/nntp/camel-nntp-store.c:351
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1348
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2160
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2304
+#: ../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:835
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1047
+#: ../src/camel/providers/pop3/camel-pop3-store.c:294
+#: ../src/camel/providers/pop3/camel-pop3-store.c:527
+#: ../src/camel/providers/pop3/camel-pop3-store.c:575
+#: ../src/camel/providers/pop3/camel-pop3-store.c:670
+#: ../src/camel/providers/pop3/camel-pop3-store.c:1105
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:541
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr ""
 "Sinun täytyy olla yhteydellisessä tilassa suorittaaksesi tämän toiminnon "
 "loppuun"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1561
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1649
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1555
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1643
 #, c-format
 msgid "No destination folder specified"
 msgstr "Kohdekansiota ei määritelty"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1588
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1582
 #, fuzzy
 msgid "Unable to move junk messages"
 msgstr "Viestin haku epäonnistui: %s"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1683
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1677
 #, fuzzy
 msgid "Unable to move deleted messages"
 msgstr "Viestin haku epäonnistui: %s"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/providers/imapx/camel-imapx-folder.c:705
+#. 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:705
 #, fuzzy, c-format
 #| msgid "No provider available for protocol '%s'"
-msgid "No quota information available for folder '%s : %s'"
+msgid "No quota information available for folder “%s : %s”"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:968
-#: ../camel/providers/nntp/camel-nntp-folder.c:765
-#, fuzzy
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:980
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:754
 msgid "Apply message _filters to this folder"
-msgstr "Viestejä ei voi kopioida roskakoriin"
+msgstr "Toteuta v_iestisuodattimet tässä kansiossa"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:979
-#, fuzzy
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:991
 msgid "Always check for _new mail in this folder"
-msgstr "Etsi aina uusia viestejä tästä kansiosta"
+msgstr "Etsi aina uusia _viestejä tästä kansiosta"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1090
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1102
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1099
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1114
 #, fuzzy, c-format
 msgid "Could not create cache for %s: "
 msgstr "Välimuistitiedostoa ei voitu luoda"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/providers/imapx/camel-imapx-folder.c:1300
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1330
 #, fuzzy, c-format
 #| msgid "No provider available for protocol '%s'"
-msgid "No IMAP mailbox available for folder '%s : %s'"
+msgid "No IMAP mailbox available for folder “%s : %s”"
 msgstr "Protokollalle \"%s\" ei ole saatavilla tuottajaa"
 
-#: ../camel/providers/imapx/camel-imapx-input-stream.c:101
+#: ../src/camel/providers/imapx/camel-imapx-input-stream.c:102
 #, c-format
 msgid "Source stream returned no data"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:38
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:36
 msgid "Checking for New Mail"
 msgstr "Haetaan uusia viestejä"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:38
 msgid "C_heck for new messages in all folders"
 msgstr "Etsi uusia viestejä kaikista kansioista"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "_Etsi uusia viestejä tilatuista kansioista"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Use _Quick Resync if the server supports it"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:44
 msgid "_Listen for server change notifications"
 msgstr "_Kuuntele palvelimen muutosilmoituksia"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:47
 msgid "Connection to Server"
 msgstr "Yhteys palvelimeen"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Numbe_r of concurrent connections to use"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:52
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "Kansiot"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Show only subscribed folders"
 msgstr "_Näytä ainoastaan tilatut kansiot"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:57
 msgid "O_verride server-supplied folder namespace"
 msgstr "Ohita pal_velimen tarjoama kansioiden nimiavaruus"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
 msgid "Namespace:"
 msgstr "Nimiavaruus:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:77
-#: ../camel/providers/local/camel-local-provider.c:99
-#: ../camel/providers/nntp/camel-nntp-provider.c:38
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:62
+#: ../src/camel/providers/local/camel-local-provider.c:37
+#: ../src/camel/providers/local/camel-local-provider.c:63
+#: ../src/camel/providers/local/camel-local-provider.c:84
+#: ../src/camel/providers/local/camel-local-provider.c:108
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:36
 msgid "Options"
 msgstr "Asetukset"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:40
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:64
+#: ../src/camel/providers/local/camel-local-provider.c:39
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:38
 msgid "Apply _filters to new messages in all folders"
 msgstr "_Käytä suodattimia uusille viesteille kaikissa kansioissa"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:66
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "Käytä suodattimia uusille viesteille saapuvien kansiossa tällä palvelimella"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:68
+#: ../src/camel/providers/local/camel-local-provider.c:41
+#: ../src/camel/providers/local/camel-local-provider.c:67
+#: ../src/camel/providers/local/camel-local-provider.c:88
+#: ../src/camel/providers/local/camel-local-provider.c:112
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:40
 msgid "Check new messages for _Junk contents"
 msgstr "_Etsi roskapostia uusista viesteistä"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:70
 #, fuzzy
 #| msgid "Only check for Junk messages in the IN_BOX folder"
 msgid "Only check for Junk messages in the In_box folder"
 msgstr "Etsi roskapostia vain saapuvien kansiosta"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:72
 #, fuzzy
 #| msgid "Automatically synchroni_ze remote mail locally"
 msgid "Synchroni_ze remote mail locally in all folders"
 msgstr "_Synkronoi sähköposti etäpalvelimelta automaattisesti"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Default IMAP port"
 msgstr "IMAP:in oletusportti"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:81
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:80
 msgid "IMAP over TLS"
 msgstr "IMAP TLS:llä"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:87
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:89
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Sähköpostien luku ja tallennus IMAP-palvelimilta."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1167
+#: ../src/camel/providers/imapx/camel-imapx-server.c:1166
 #, fuzzy
 msgid "Error writing to cache stream"
 msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2806
-#: ../camel/providers/imapx/camel-imapx-server.c:2894
-#: ../camel/providers/imapx/camel-imapx-server.c:3156
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2813
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2901
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3163
 #, fuzzy
 msgid "Failed to get capabilities"
 msgstr "Välimuistiin tallennus epäonnistui %s: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2825
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2832
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2826
-#: ../camel/providers/smtp/camel-smtp-transport.c:281
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2833
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:279
 msgid "STARTTLS not supported"
 msgstr "STARTTLS laajennos ei ole käytettävissä"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2835
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2842
 msgid "Failed to issue STARTTLS"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2883
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2890
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "IMAP-palvelimeen %s yhdistäminen turvallisessa tilassa epäonnistui: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2977
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2984
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP-palvelin %s ei tue tunnistautumismenetelmää %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3008
-#: ../camel/providers/nntp/camel-nntp-store.c:459
-#: ../camel/providers/nntp/camel-nntp-store.c:601
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3015
+#: ../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 "Tunnistautuminen ilman käyttäjätunnusta ei ole mahdollista"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3017
-#: ../camel/providers/nntp/camel-nntp-store.c:610
-#: ../camel/providers/pop3/camel-pop3-store.c:690
-#: ../camel/providers/pop3/camel-pop3-store.c:728
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3024
+#: ../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
 #, fuzzy
 msgid "Authentication password not available"
 msgstr "Todennus epäonnistui"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3025
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3032
 msgid "Failed to authenticate"
 msgstr "Tunnistautuminen epäonnistui"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3178
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3185
 msgid "Failed to issue NAMESPACE"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3196
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3203
 #, fuzzy
 msgid "Failed to enable QResync"
 msgstr "Välimuistiin tallennus epäonnistui %s: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3228
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3235
 #, fuzzy
 msgid "Failed to issue NOTIFY"
 msgstr "Virhe viestin %d kohdalla"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3706
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3713
 msgid "Failed to select mailbox"
 msgstr "Postilaatikon valinta epäonnistui"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3809
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3816
 #, fuzzy
 msgid "Cannot issue command, no stream available"
 msgstr "Palvelu ei ole saatavilla"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4073
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4080
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Viestiä tunnisteella %s ei voi noutaa: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4074
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4081
 msgid "No such message available."
 msgstr "Tämä viesti ei ole saatavilla."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4111
-#: ../camel/providers/imapx/camel-imapx-server.c:4136
-#: ../camel/providers/imapx/camel-imapx-server.c:4175
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4118
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4143
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4182
 msgid "Error fetching message"
 msgstr "Virhe viestiä noutaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4153
-#: ../camel/providers/imapx/camel-imapx-server.c:4760
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4160
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4759
 #, fuzzy
 msgid "Error performing NOOP"
 msgstr "Virhe suoritettaessa hakua"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4168
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4175
 #, fuzzy
 msgid "Failed to close the tmp stream"
 msgstr "Tiedon koodaus epäonnistui"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4199
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4206
 #, fuzzy
 msgid "Failed to copy the tmp file"
 msgstr "Välimuistiin tallennus epäonnistui %s: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4362
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4369
 msgid "Error moving messages"
 msgstr "Virhe viestejä siirtäessä"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4362
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4369
 msgid "Error copying messages"
 msgstr "Virhe viestejä kopioitaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4546
-#: ../camel/providers/imapx/camel-imapx-server.c:4567
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4554
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4575
 #, fuzzy
 msgid "Cannot create spool file: "
 msgstr "Viestiä ei voi luoda: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4668
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4661
 #, fuzzy
 msgid "Error appending message"
 msgstr "Lähetetään viestiä"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/providers/imapx/camel-imapx-server.c:4913
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4912
 #, fuzzy, c-format
-msgid "Scanning for changed messages in '%s : %s'"
+msgid "Scanning for changed messages in “%s : %s”"
 msgstr "Etsitään muuttuneita viestejä kansiosta %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4917
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4916
 #, fuzzy
 #| msgid "Error syncing changes"
 msgid "Error scanning changes"
 msgstr "Virhe muutoksia synkronoidessa"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/providers/imapx/camel-imapx-server.c:4938
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4937
 #, fuzzy, c-format
-msgid "Fetching summary information for new messages in '%s : %s'"
+msgid "Fetching summary information for new messages in “%s : %s”"
 msgstr "Haetaan yhteenvetoa uusista viesteistä kansiossa %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4956
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4955
 #, fuzzy
 #| msgid "Error fetching message"
 msgid "Error fetching message info"
 msgstr "Virhe viestiä noutaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5018
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5037
 msgid "Error running STATUS"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5510
-#: ../camel/providers/imapx/camel-imapx-server.c:5562
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5544
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5574
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5609
 msgid "Error syncing changes"
 msgstr "Virhe muutoksia synkronoidessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5673
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5747
 #, fuzzy
 msgid "Error expunging message"
 msgstr "Poistetaan vanhoja viestejä pysyvästi"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5743
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5819
 msgid "Error fetching folders"
 msgstr "Virhe kansioita noutaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5754
-#, fuzzy
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5830
 #| msgid "Error fetching folders"
 msgid "Error fetching subscribed folders"
-msgstr "Virhe kansioita noutaessa"
+msgstr "Virhe tilattuja kansioita noutaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5776
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5852
 msgid "Error creating folder"
 msgstr "Virhe luotaessa kansiota"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5832
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5908
 msgid "Error deleting folder"
 msgstr "Virhe kansiota poistaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5878
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5954
 msgid "Error renaming folder"
 msgstr "Virhe kansion nimeä muutettaessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5910
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5986
 msgid "Error subscribing to folder"
 msgstr "Virhe kansiota tilatessa"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5946
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6022
 #, fuzzy
 msgid "Error unsubscribing from folder"
 msgstr "_Näytä ainoastaan tilatut kansiot"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5986
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6062
 msgid "IMAP server does not support quotas"
 msgstr "IMAP-palvelin ei tue quota-tilarajoja"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5998
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6074
 msgid "Error retrieving quota information"
 msgstr "Virhe haettaessa kiintiötietoja"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6045
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6121
 msgid "Search failed"
 msgstr "Haku epäonnistui"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../camel/providers/imapx/camel-imapx-server.c:6163
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6239
 #, fuzzy
 msgid "Error running IDLE"
 msgstr "Virhe suoritettaessa hakua"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imapx/camel-imapx-store.c:224
-#: ../camel/providers/local/camel-maildir-folder.c:482
-#: ../camel/providers/local/camel-maildir-store.c:347
-#: ../camel/providers/local/camel-maildir-store.c:826
-#: ../camel/providers/local/camel-maildir-store.c:832
-#: ../camel/providers/local/camel-maildir-store.c:915
-#: ../camel/providers/local/camel-spool-store.c:393
+#: ../src/camel/providers/imapx/camel-imapx-store.c:232
+#: ../src/camel/providers/local/camel-maildir-folder.c:478
+#: ../src/camel/providers/local/camel-maildir-store.c:345
+#: ../src/camel/providers/local/camel-maildir-store.c:824
+#: ../src/camel/providers/local/camel-maildir-store.c:830
+#: ../src/camel/providers/local/camel-maildir-store.c:913
+#: ../src/camel/providers/local/camel-spool-store.c:390
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:765
+#: ../src/camel/providers/imapx/camel-imapx-store.c:802
 #, c-format
 msgid "IMAP server %s"
 msgstr "Imap-palvelin %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:768
+#: ../src/camel/providers/imapx/camel-imapx-store.c:805
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:836
+#: ../src/camel/providers/imapx/camel-imapx-store.c:873
 msgid "No IMAPx connection object provided"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-store.c:853
-#: ../camel/providers/nntp/camel-nntp-provider.c:92
-#: ../camel/providers/pop3/camel-pop3-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-store.c:890
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:92
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:80
 msgid "Password"
 msgstr "Salasana"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:855
+#: ../src/camel/providers/imapx/camel-imapx-store.c:892
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen selväkielistä salasanaa käyttäen."
 
-#: ../camel/providers/imapx/camel-imapx-store.c:938
+#: ../src/camel/providers/imapx/camel-imapx-store.c:975
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1381
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1425
 #, c-format
-msgid "No IMAP namespace for folder path '%s'"
+msgid "No IMAP namespace for folder path “%s”"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1642
-#: ../camel/providers/imapx/camel-imapx-store.c:1876
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1686
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1920
 #, fuzzy, c-format
-msgid "Retrieving folder list for '%s'"
+msgid "Retrieving folder list for “%s”"
 msgstr "Valmistellaan kansiota \"%s\" yhteydettömään tilaan"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2093
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2137
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%c\""
-
-#: ../camel/providers/imapx/camel-imapx-store.c:2470
+#| 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 "Kansion nimi “%s” ei ole kelvollinen koska se sisältää merkin “%c”"
+
+#. Translators: The strings in "IMAPDefaults" context are folder names as can be presented
+#. by the server; There's checked for the localized version of it and for the non-localized
+#. version as well. It's always the folder name (eventually path) as provided by the server,
+#. when returned in given localization. it can be checked semi-easily in the case of
+#. the GMail variants, by changing the GMail interface language in the GMail Preferences.
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2514
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Drafts"
 msgstr "[Gmail]/Luonnokset"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2471
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2515
 msgctxt "IMAPDefaults"
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2472
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2516
 msgctxt "IMAPDefaults"
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2475
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2519
 msgctxt "IMAPDefaults"
 msgid "Templates"
 msgstr "Mallit"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2478
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2522
 msgctxt "IMAPDefaults"
 msgid "Archive"
 msgstr "Arkisto"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2481
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2525
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Sent Mail"
 msgstr "[Gmail]/Lähetetyt"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2482
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2526
 msgctxt "IMAPDefaults"
 msgid "Sent"
 msgstr "Lähetetyt"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2483
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2527
 msgctxt "IMAPDefaults"
 msgid "Sent Items"
 msgstr "Lähetetyt kohteet"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2484
-#| msgid "Sending message"
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2528
 msgctxt "IMAPDefaults"
 msgid "Sent Messages"
 msgstr "Lähetetyt viestit"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2487
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2531
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Spam"
 msgstr "[Gmail]/Roskaposti"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2488
-#| msgid "Junk"
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2532
 msgctxt "IMAPDefaults"
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2489
-#| msgid "Email"
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2533
 msgctxt "IMAPDefaults"
 msgid "Junk E-mail"
 msgstr "Roskaposti"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2490
-#| msgid "Email"
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2534
 msgctxt "IMAPDefaults"
 msgid "Junk Email"
 msgstr "Roskaposti"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2491
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2535
 msgctxt "IMAPDefaults"
 msgid "Spam"
 msgstr "Roskaposti"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2492
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2536
 #, fuzzy
 #| msgid "Mail"
 msgctxt "IMAPDefaults"
 msgid "Bulk Mail"
 msgstr "Sähköposti"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2495
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2539
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Trash"
 msgstr "[Gmail]/Roskakori"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2496
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2540
 msgctxt "IMAPDefaults"
 msgid "Trash"
 msgstr "Roskakori"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2497
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2541
 msgctxt "IMAPDefaults"
 msgid "Deleted Items"
 msgstr "Poistetut kohteet"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2498
-#| msgctxt "IMAPDefaults"
-#| msgid "Deleted Items"
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2542
 msgctxt "IMAPDefaults"
 msgid "Deleted Messages"
 msgstr "Poistetut viestit"
 
-#: ../camel/providers/local/camel-local-folder.c:190
+#. Translators: This is used for a folder description,
+#. * for folders being under $HOME.  The first %s is replaced
+#. * with a relative path under $HOME, the second %s is
+#. * replaced with a protocol name, like mbox/maldir/...
+#: ../src/camel/providers/local/camel-local-folder.c:187
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:200
-#: ../camel/providers/local/camel-local-folder.c:209
+#. Translators: This is used for a folder description, for
+#. * folders being under /var/spool/mail.  The first %s is
+#. * replaced with a relative path under /var/spool/mail,
+#. * the second %s is replaced with a protocol name, like
+#. * mbox/maldir/...
+#. Translators: This is used for a folder description, for
+#. * folders being under /var/mail.  The first %s is replaced
+#. * with a relative path under /var/mail, the second %s is
+#. * replaced with a protocol name, like mbox/maldir/...
+#: ../src/camel/providers/local/camel-local-folder.c:197
+#: ../src/camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "postilaatikko: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:218
+#. Translators: This is used for a folder description.
+#. * The first %s is replaced with a folder's full path,
+#. * the second %s is replaced with a protocol name, like
+#. * mbox/maldir/...
+#: ../src/camel/providers/local/camel-local-folder.c:215
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:495
-#, fuzzy
+#: ../src/camel/providers/local/camel-local-folder.c:505
 msgid "_Index message body data"
-msgstr "Indeksoi viestin rungon tiedot"
+msgstr "_Indeksoi viestin rungon tiedot"
 
-#: ../camel/providers/local/camel-local-folder.c:723
+#. Translators: The first %s is replaced with a message ID,
+#. * the second %s is replaced with the folder path,
+#. * the third %s is replaced with a detailed error string
+#: ../src/camel/providers/local/camel-local-folder.c:737
 #, fuzzy, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3797,23 +3932,30 @@ msgstr ""
 "Viestin %s hakeminen kansiosta %s epäonnistui\n"
 "  %s"
 
-#: ../camel/providers/local/camel-local-provider.c:41
-msgid "_Use the '.folders' folder summary file (exmh)"
+#: ../src/camel/providers/local/camel-local-provider.c:43
+#, fuzzy
+#| msgid "_Use the '.folders' folder summary file (exmh)"
+msgid "_Use the “.folders” folder summary file (exmh)"
 msgstr "_Käytä kansioissa '.folders'-yhteenvetotiedostoja (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../src/camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-muotoisia sähköpostihakemistoja"
 
-#: ../camel/providers/local/camel-local-provider.c:49
+#: ../src/camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Sähköpostin tallennus MH-muotoisiin hakemistoihin paikallisesti."
 
-#: ../camel/providers/local/camel-local-provider.c:66
+#: ../src/camel/providers/local/camel-local-provider.c:65
+#| msgid "_Apply filters to new messages in Inbox"
+msgid "Apply _filters to new messages"
+msgstr "_Käytä suodattimia uusille viesteille"
+
+#: ../src/camel/providers/local/camel-local-provider.c:73
 msgid "Local delivery"
 msgstr "Paikallinen toimitus"
 
-#: ../camel/providers/local/camel-local-provider.c:67
+#: ../src/camel/providers/local/camel-local-provider.c:74
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3821,29 +3963,29 @@ msgstr ""
 "Sähköpostin siirto paikallisista mbox-muotoisista saapuvien kansioista "
 "Evolutionin hallinnoimiin kansioihin."
 
-#: ../camel/providers/local/camel-local-provider.c:79
-#: ../camel/providers/local/camel-local-provider.c:101
+#: ../src/camel/providers/local/camel-local-provider.c:86
+#: ../src/camel/providers/local/camel-local-provider.c:110
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Käytä suodattimia uusille viesteille saapuvien kansiossa"
 
-#: ../camel/providers/local/camel-local-provider.c:86
+#: ../src/camel/providers/local/camel-local-provider.c:95
 msgid "Maildir-format mail directories"
 msgstr "Maildir-muotoisia sähköpostikansioita"
 
-#: ../camel/providers/local/camel-local-provider.c:87
+#: ../src/camel/providers/local/camel-local-provider.c:96
 msgid "For storing local mail in maildir directories."
 msgstr "Sähköpostin tallennus maildir-muotoisiin hakemistoihin paikallisesti."
 
-#: ../camel/providers/local/camel-local-provider.c:102
+#: ../src/camel/providers/local/camel-local-provider.c:113
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Tallenna tila-otsakkeet Elm/Pine/Mutt-muodossa"
 
-#: ../camel/providers/local/camel-local-provider.c:109
+#: ../src/camel/providers/local/camel-local-provider.c:120
 msgid "Standard Unix mbox spool file"
 msgstr "Tavallinen Unixin mbox-kansio"
 
-#: ../camel/providers/local/camel-local-provider.c:110
-#: ../camel/providers/local/camel-local-provider.c:124
+#: ../src/camel/providers/local/camel-local-provider.c:121
+#: ../src/camel/providers/local/camel-local-provider.c:135
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3852,520 +3994,551 @@ msgstr ""
 "sähköpostitiedostoihin.\n"
 "Tällä voidaan myös lukea hakemisto Elm, Pine tai Mutt-tyylisiä kansioita."
 
-#: ../camel/providers/local/camel-local-provider.c:123
+#: ../src/camel/providers/local/camel-local-provider.c:134
 msgid "Standard Unix mbox spool directory"
 msgstr "Tavallinen Unixin mbox-muotoinen saapuvien hakemisto"
 
-#: ../camel/providers/local/camel-local-store.c:88
+#: ../src/camel/providers/local/camel-local-store.c:86
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../src/camel/providers/local/camel-local-store.c:168
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: ../camel/providers/local/camel-local-store.c:213
-#: ../camel/providers/local/camel-local-store.c:373
-#: ../camel/providers/local/camel-maildir-store.c:123
-#: ../camel/providers/local/camel-mbox-store.c:572
-#: ../camel/providers/local/camel-spool-store.c:87
+#: ../src/camel/providers/local/camel-local-store.c:211
+#: ../src/camel/providers/local/camel-local-store.c:371
+#: ../src/camel/providers/local/camel-maildir-store.c:121
+#: ../src/camel/providers/local/camel-mbox-store.c:570
+#: ../src/camel/providers/local/camel-spool-store.c:85
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Säilön juuri %s ei ole absoluuttinen polku"
 
-#: ../camel/providers/local/camel-local-store.c:222
+#: ../src/camel/providers/local/camel-local-store.c:220
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Säilön juuri %s ei ole tavallinen hakemisto"
 
-#: ../camel/providers/local/camel-local-store.c:234
-#: ../camel/providers/local/camel-local-store.c:244
-#: ../camel/providers/local/camel-local-store.c:386
-#: ../camel/providers/local/camel-maildir-store.c:165
+#: ../src/camel/providers/local/camel-local-store.c:232
+#: ../src/camel/providers/local/camel-local-store.c:242
+#: ../src/camel/providers/local/camel-local-store.c:384
+#: ../src/camel/providers/local/camel-maildir-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:281
+#: ../src/camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Paikallisissa säilöissä ei ole saapuvien viestien kansiota"
 
-#: ../camel/providers/local/camel-local-store.c:446
-#: ../camel/providers/local/camel-mbox-store.c:739
-#, c-format
-msgid "Could not delete folder index file '%s': %s"
+#: ../src/camel/providers/local/camel-local-store.c:444
+#: ../src/camel/providers/local/camel-mbox-store.c:737
+#, fuzzy, c-format
+#| msgid "Could not delete folder index file '%s': %s"
+msgid "Could not delete folder index file “%s”: %s"
 msgstr "Kansion sisällysluetteloa \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-local-store.c:474
-#: ../camel/providers/local/camel-mbox-store.c:769
-#, c-format
-msgid "Could not delete folder meta file '%s': %s"
+#: ../src/camel/providers/local/camel-local-store.c:472
+#: ../src/camel/providers/local/camel-mbox-store.c:767
+#, fuzzy, c-format
+#| msgid "Could not delete folder meta file '%s': %s"
+msgid "Could not delete folder meta file “%s”: %s"
 msgstr "Kansion metadatatiedostoa \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-local-store.c:587
-#, c-format
-msgid "Could not rename '%s': %s"
+#: ../src/camel/providers/local/camel-local-store.c:585
+#, fuzzy, c-format
+#| msgid "Could not rename '%s': %s"
+msgid "Could not rename “%s”: %s"
 msgstr "Uudelleennimeäminen epäonnistui \"%s\": %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:109
-#: ../camel/providers/local/camel-maildir-folder.c:344
-#: ../camel/providers/local/camel-mbox-folder.c:126
-#: ../camel/providers/local/camel-mbox-folder.c:339
-#: ../camel/providers/local/camel-mh-folder.c:157
+#: ../src/camel/providers/local/camel-maildir-folder.c:107
+#: ../src/camel/providers/local/camel-maildir-folder.c:344
+#: ../src/camel/providers/local/camel-mbox-folder.c:128
+#: ../src/camel/providers/local/camel-mbox-folder.c:336
+#: ../src/camel/providers/local/camel-mh-folder.c:157
 msgid "No such message"
 msgstr "Ei tällaista viestiä"
 
-#: ../camel/providers/local/camel-maildir-folder.c:234
+#: ../src/camel/providers/local/camel-maildir-folder.c:232
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Viestiä ei voi lisätä maildir-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:282
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-mbox-folder.c:400
-#: ../camel/providers/local/camel-mh-folder.c:169
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../src/camel/providers/local/camel-maildir-folder.c:282
+#: ../src/camel/providers/local/camel-maildir-folder.c:292
+#: ../src/camel/providers/local/camel-mbox-folder.c:395
+#: ../src/camel/providers/local/camel-mh-folder.c:169
+#: ../src/camel/providers/local/camel-mh-folder.c:179
 #, fuzzy, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr ""
 "Viestin %s hakeminen kansiosta %s epäonnistui\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:362
+#: ../src/camel/providers/local/camel-maildir-folder.c:362
 #, fuzzy, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Viestiä ei voi lisätä maildir-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:131
-#: ../camel/providers/local/camel-maildir-store.c:931
+#: ../src/camel/providers/local/camel-maildir-store.c:129
+#: ../src/camel/providers/local/camel-maildir-store.c:929
 #, fuzzy, c-format
 #| msgid "Cannot create folder '%s': %s"
-msgid "Cannot create folder containing '%s'"
+msgid "Cannot create folder containing “%s”"
 msgstr "Kansiota \"%s\" ei voi luoda: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:139
-#: ../camel/providers/local/camel-maildir-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:923
+#: ../src/camel/providers/local/camel-maildir-store.c:137
+#: ../src/camel/providers/local/camel-maildir-store.c:156
+#: ../src/camel/providers/local/camel-maildir-store.c:921
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Kansio %s on jo olemassa"
 
-#: ../camel/providers/local/camel-maildir-store.c:266
-#: ../camel/providers/local/camel-maildir-store.c:297
-#: ../camel/providers/local/camel-mbox-store.c:401
-#: ../camel/providers/local/camel-mbox-store.c:422
+#: ../src/camel/providers/local/camel-maildir-store.c:264
+#: ../src/camel/providers/local/camel-maildir-store.c:295
+#: ../src/camel/providers/local/camel-mbox-store.c:399
+#: ../src/camel/providers/local/camel-mbox-store.c:420
 #, c-format
-msgid "Cannot create folder '%s': %s"
-msgstr "Kansiota \"%s\" ei voi luoda: %s"
+#| msgid "Cannot create folder: %s: %s"
+msgid "Cannot create folder “%s”: %s"
+msgstr "Kansiota “%s” ei voi luoda:: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:281
-#: ../camel/providers/local/camel-mbox-store.c:367
-#: ../camel/providers/local/camel-mh-store.c:523
-#, c-format
-msgid "Cannot get folder '%s': %s"
-msgstr "Kansiota \"%s\" ei voi hakea: %s"
+#: ../src/camel/providers/local/camel-maildir-store.c:279
+#: ../src/camel/providers/local/camel-mbox-store.c:365
+#: ../src/camel/providers/local/camel-mh-store.c:519
+#, fuzzy, c-format
+#| msgid "Cannot get folder: %s: %s"
+msgid "Cannot get folder “%s”: %s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:287
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mh-store.c:532
-#, c-format
-msgid "Cannot get folder '%s': folder does not exist."
+#: ../src/camel/providers/local/camel-maildir-store.c:285
+#: ../src/camel/providers/local/camel-mbox-store.c:375
+#: ../src/camel/providers/local/camel-mh-store.c:528
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': folder does not exist."
+msgid "Cannot get folder “%s”: folder does not exist."
 msgstr "Kansiota \"%s\" ei voi hakea: kansiota ei ole olemassa."
 
-#: ../camel/providers/local/camel-maildir-store.c:314
-#, c-format
-msgid "Cannot get folder '%s': not a maildir directory."
+#: ../src/camel/providers/local/camel-maildir-store.c:312
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': not a maildir directory."
+msgid "Cannot get folder “%s”: not a maildir directory."
 msgstr "'Kansiota \"%s\" ei voi avata: ei maildir-muotoinen hakemisto."
 
-#: ../camel/providers/local/camel-maildir-store.c:378
-#: ../camel/providers/local/camel-maildir-store.c:418
-#: ../camel/providers/local/camel-mh-store.c:676
-#, c-format
-msgid "Could not delete folder '%s': %s"
+#: ../src/camel/providers/local/camel-maildir-store.c:376
+#: ../src/camel/providers/local/camel-maildir-store.c:416
+#: ../src/camel/providers/local/camel-mh-store.c:672
+#, fuzzy, c-format
+#| msgid "Could not delete folder '%s': %s"
+msgid "Could not delete folder “%s”: %s"
 msgstr "Kansiota \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:380
+#: ../src/camel/providers/local/camel-maildir-store.c:378
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: ../camel/providers/local/camel-maildir-store.c:666
-#: ../camel/providers/local/camel-maildir-store.c:1146
-#: ../camel/providers/local/camel-spool-store.c:212
-#: ../camel/providers/local/camel-spool-store.c:231
-#, c-format
-msgid "Could not scan folder '%s': %s"
+#: ../src/camel/providers/local/camel-maildir-store.c:664
+#: ../src/camel/providers/local/camel-maildir-store.c:1144
+#: ../src/camel/providers/local/camel-spool-store.c:210
+#: ../src/camel/providers/local/camel-spool-store.c:229
+#, fuzzy, c-format
+#| msgid "Could not scan folder '%s': %s"
+msgid "Could not scan folder “%s”: %s"
 msgstr "Kansiota \"%s\" ei voitu käydä läpi: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:476
-#: ../camel/providers/local/camel-maildir-summary.c:616
+#: ../src/camel/providers/local/camel-maildir-summary.c:448
+#: ../src/camel/providers/local/camel-maildir-summary.c:589
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-kansiota ei voi avata: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:607
+#: ../src/camel/providers/local/camel-maildir-summary.c:580
 msgid "Checking folder consistency"
 msgstr "Tarkastetaan kansion yhdenmukaisuutta"
 
-#: ../camel/providers/local/camel-maildir-summary.c:707
+#: ../src/camel/providers/local/camel-maildir-summary.c:679
 msgid "Checking for new messages"
 msgstr "Etsitään uusia viestejä"
 
-#: ../camel/providers/local/camel-maildir-summary.c:810
-#: ../camel/providers/local/camel-mbox-summary.c:466
-#: ../camel/providers/local/camel-mbox-summary.c:687
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:139
+#: ../src/camel/providers/local/camel-maildir-summary.c:782
+#: ../src/camel/providers/local/camel-mbox-summary.c:367
+#: ../src/camel/providers/local/camel-mbox-summary.c:585
+#: ../src/camel/providers/local/camel-mbox-summary.c:739
+#: ../src/camel/providers/local/camel-spool-summary.c:141
 msgid "Storing folder"
 msgstr "Tallennetaan kansiota"
 
-#: ../camel/providers/local/camel-mbox-folder.c:196
+#: ../src/camel/providers/local/camel-mbox-folder.c:194
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "Sähköpostilaatikkoa ei voi avata: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:262
+#: ../src/camel/providers/local/camel-mbox-folder.c:257
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "Viestiä ei voi lisätä mbox-tiedostoon: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:392
+#: ../src/camel/providers/local/camel-mbox-folder.c:387
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Kansio näyttäisi olevan peruuttamattomasti vaurioitunut."
 
-#: ../camel/providers/local/camel-mbox-folder.c:449
-#: ../camel/providers/local/camel-spool-folder.c:67
+#: ../src/camel/providers/local/camel-mbox-folder.c:444
+#: ../src/camel/providers/local/camel-spool-folder.c:65
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kansion \"%s\" lukkoa ei voi varata: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:389
-#: ../camel/providers/local/camel-mbox-store.c:580
+#: ../src/camel/providers/local/camel-mbox-store.c:387
+#: ../src/camel/providers/local/camel-mbox-store.c:578
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Tämännimistä kansiota ei voi luoda."
 
-#: ../camel/providers/local/camel-mbox-store.c:433
-#, c-format
-msgid "Cannot get folder '%s': not a regular file."
+#: ../src/camel/providers/local/camel-mbox-store.c:431
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': not a regular file."
+msgid "Cannot get folder “%s”: not a regular file."
 msgstr "Kansiota \"%s\" ei voitu avata: ei ole tavallinen tiedosto"
 
-#: ../camel/providers/local/camel-mbox-store.c:596
-#, c-format
-msgid "Cannot create directory '%s': %s."
+#: ../src/camel/providers/local/camel-mbox-store.c:594
+#, fuzzy, c-format
+#| msgid "Cannot create directory '%s': %s."
+msgid "Cannot create directory “%s”: %s."
 msgstr "Kansiota \"%s\" ei voi luoda: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:608
+#: ../src/camel/providers/local/camel-mbox-store.c:606
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kansiota ei voi luoda: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:610
+#: ../src/camel/providers/local/camel-mbox-store.c:608
 msgid "Folder already exists"
 msgstr "Kansio on jo olemassa"
 
-#: ../camel/providers/local/camel-mbox-store.c:650
-#: ../camel/providers/local/camel-mbox-store.c:663
-#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../src/camel/providers/local/camel-mbox-store.c:648
+#: ../src/camel/providers/local/camel-mbox-store.c:661
+#: ../src/camel/providers/local/camel-mbox-store.c:690
 #, c-format
+#| msgid ""
+#| "Could not delete folder '%s':\n"
+#| "%s"
 msgid ""
-"Could not delete folder '%s':\n"
+"Could not delete folder “%s”:\n"
 "%s"
 msgstr ""
-"Kansiota \"%s\" ei voitu poistaa:\n"
+"Kansiota “%s” ei voitu poistaa:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:673
+#: ../src/camel/providers/local/camel-mbox-store.c:671
 #, c-format
-msgid "'%s' is not a regular file."
-msgstr "\"%s\" ei ole tavallinen tiedosto."
+#| msgid "'%s' is not a regular file."
+msgid "“%s” is not a regular file."
+msgstr "“%s” ei ole tavallinen tiedosto."
 
-#: ../camel/providers/local/camel-mbox-store.c:682
+#: ../src/camel/providers/local/camel-mbox-store.c:680
 #, c-format
-msgid "Folder '%s' is not empty. Not deleted."
-msgstr "Kansio \"%s\" ei ole tyhjä, sitä ei poistettu."
+#| msgid "Folder '%s' is not empty. Not deleted."
+msgid "Folder “%s” is not empty. Not deleted."
+msgstr "Kansio “%s” ei ole tyhjä, sitä ei poistettu."
 
-#: ../camel/providers/local/camel-mbox-store.c:709
-#: ../camel/providers/local/camel-mbox-store.c:724
-#, c-format
-msgid "Could not delete folder summary file '%s': %s"
+#: ../src/camel/providers/local/camel-mbox-store.c:707
+#: ../src/camel/providers/local/camel-mbox-store.c:722
+#, fuzzy, c-format
+#| msgid "Could not delete folder summary file '%s': %s"
+msgid "Could not delete folder summary file “%s”: %s"
 msgstr "Kansion yhteenvetotiedostoa \"%s\" ei voitu poistaa: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:806
+#: ../src/camel/providers/local/camel-mbox-store.c:804
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Kansion nimi ei ole sallittu."
 
-#: ../camel/providers/local/camel-mbox-store.c:822
-#, c-format
-msgid "Could not rename '%s': '%s': %s"
+#: ../src/camel/providers/local/camel-mbox-store.c:820
+#, fuzzy, c-format
+#| msgid "Could not rename '%s': '%s': %s"
+msgid "Could not rename “%s”: “%s”: %s"
 msgstr "Kohdetta \"%s\" ei voitu nimetä uudestaan: \"%s\": %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../src/camel/providers/local/camel-mbox-summary.c:377
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kansiota ei voitu avata: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:611
+#: ../src/camel/providers/local/camel-mbox-summary.c:509
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion tarkistus ei onnistu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:696
-#: ../camel/providers/local/camel-mbox-summary.c:845
-#: ../camel/providers/local/camel-spool-summary.c:146
+#: ../src/camel/providers/local/camel-mbox-summary.c:594
+#: ../src/camel/providers/local/camel-mbox-summary.c:748
+#: ../src/camel/providers/local/camel-spool-summary.c:148
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Tiedostoa ei voitu avata: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-spool-summary.c:161
+#: ../src/camel/providers/local/camel-mbox-summary.c:613
+#: ../src/camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Väliaikaista sähköpostilaatikkoa ei voi avata: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:732
-#: ../camel/providers/local/camel-mbox-summary.c:967
+#: ../src/camel/providers/local/camel-mbox-summary.c:630
+#: ../src/camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Lähdekansiota %s ei voitu sulkea: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:745
+#: ../src/camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Väliaikaiskansiota ei voitu sulkea: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:764
+#: ../src/camel/providers/local/camel-mbox-summary.c:662
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:859
-#: ../camel/providers/local/camel-mbox-summary.c:1132
+#: ../src/camel/providers/local/camel-mbox-summary.c:762
+#: ../src/camel/providers/local/camel-mbox-summary.c:1033
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kansiota ei voitu tallentaa: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:898
-#: ../camel/providers/local/camel-mbox-summary.c:1172
+#: ../src/camel/providers/local/camel-mbox-summary.c:803
+#: ../src/camel/providers/local/camel-mbox-summary.c:1076
 #, c-format
 msgid ""
-"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn’t get "
 "it.)"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:908
-#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../src/camel/providers/local/camel-mbox-summary.c:813
+#: ../src/camel/providers/local/camel-mbox-summary.c:1088
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Yhteenveto ja kansio ovat ristiriidassa synkronoinnin jälkeenkin"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1077
-#: ../camel/providers/local/camel-spool-summary.c:356
+#: ../src/camel/providers/local/camel-mbox-summary.c:980
+#: ../src/camel/providers/local/camel-spool-summary.c:358
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1242
-#: ../camel/providers/local/camel-mbox-summary.c:1272
+#: ../src/camel/providers/local/camel-mbox-summary.c:1149
+#: ../src/camel/providers/local/camel-mbox-summary.c:1179
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Väliaikaiseen postikansioon kirjoitus epäonnistui: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1261
+#: ../src/camel/providers/local/camel-mbox-summary.c:1168
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Väliaikaiseen postikansioon kirjoitus epäonnistui: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:116
+#: ../src/camel/providers/local/camel-mh-folder.c:114
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Viestiä ei voi liittää MH-kansioon: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:542
+#: ../src/camel/providers/local/camel-mh-store.c:538
 #, c-format
-msgid "Could not create folder '%s': %s"
-msgstr "Kansiota \"%s\" ei voi luoda: %s"
+#| msgid "Could not create folder '%s': %s"
+msgid "Could not create folder “%s”: %s"
+msgstr "Kansiota “%s” ei voi luoda: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:558
-#, c-format
-msgid "Cannot get folder '%s': not a directory."
+#: ../src/camel/providers/local/camel-mh-store.c:554
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': not a directory."
+msgid "Cannot get folder “%s”: not a directory."
 msgstr "Kansiota \"%s\" ei voi avata: se ei ole hakemisto."
 
-#: ../camel/providers/local/camel-mh-summary.c:236
+#: ../src/camel/providers/local/camel-mh-summary.c:238
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-kansion polku ei voi avata: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:95
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
+#: ../src/camel/providers/local/camel-spool-store.c:93
+#, fuzzy, c-format
+#| msgid "Spool '%s' cannot be opened: %s"
+msgid "Spool “%s” cannot be opened: %s"
 msgstr "Sähköpostilähdettä \"%s\" ei voi avata: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:109
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
+#: ../src/camel/providers/local/camel-spool-store.c:107
+#, fuzzy, c-format
+#| msgid "Spool '%s' is not a regular file or directory"
+msgid "Spool “%s” is not a regular file or directory"
 msgstr "Lähde \"%s\" ei ole tavallinen tiedosto tai hakemisto"
 
-#: ../camel/providers/local/camel-spool-store.c:425
+#: ../src/camel/providers/local/camel-spool-store.c:422
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Saapuvan sähköpostin tiedosto %s"
 
-#: ../camel/providers/local/camel-spool-store.c:429
+#: ../src/camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Sähköpostilähde %s"
 
-#: ../camel/providers/local/camel-spool-store.c:432
+#: ../src/camel/providers/local/camel-spool-store.c:429
 #, fuzzy
 msgid "Invalid spool"
 msgstr "Virheellinen lähde"
 
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../src/camel/providers/local/camel-spool-store.c:478
 #, c-format
-msgid "Folder '%s/%s' does not exist."
-msgstr "Kansiota \"%s/%s\" ei ole olemassa."
+#| msgid "Folder '%s/%s' does not exist."
+msgid "Folder “%s/%s” does not exist."
+msgstr "Kansiota “%s/%s” ei ole olemassa."
 
-#: ../camel/providers/local/camel-spool-store.c:494
+#: ../src/camel/providers/local/camel-spool-store.c:491
 #, c-format
+#| msgid ""
+#| "Could not open folder '%s':\n"
+#| "%s"
 msgid ""
-"Could not open folder '%s':\n"
+"Could not open folder “%s”:\n"
 "%s"
 msgstr ""
-"Kansiota \"%s\" ei voi avata:\n"
+"Kansiota “%s” ei voi avata:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:500
+#: ../src/camel/providers/local/camel-spool-store.c:497
 #, c-format
-msgid "Folder '%s' does not exist."
-msgstr "Kansiota \"%s\" ei ole olemassa."
+#| msgid "Folder '%s' does not exist."
+msgid "Folder “%s” does not exist."
+msgstr "Kansiota “%s” ei ole olemassa."
 
-#: ../camel/providers/local/camel-spool-store.c:508
+#: ../src/camel/providers/local/camel-spool-store.c:505
 #, c-format
+#| msgid ""
+#| "Could not create folder '%s':\n"
+#| "%s"
 msgid ""
-"Could not create folder '%s':\n"
+"Could not create folder “%s”:\n"
 "%s"
 msgstr ""
-"Kansiota \"%s\" ei voi luoda:\n"
+"Kansiota “%s” ei voi luoda:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:521
-#, c-format
-msgid "'%s' is not a mailbox file."
+#: ../src/camel/providers/local/camel-spool-store.c:518
+#, fuzzy, c-format
+#| msgid "'%s' is not a mailbox file."
+msgid "“%s” is not a mailbox file."
 msgstr "\"%s\" ei ole mailbox-muotoinen tiedosto."
 
-#: ../camel/providers/local/camel-spool-store.c:585
+#: ../src/camel/providers/local/camel-spool-store.c:582
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Kansio ei tue INBOXia"
 
-#: ../camel/providers/local/camel-spool-store.c:604
+#: ../src/camel/providers/local/camel-spool-store.c:601
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Saapuvan sähköpostin kansioita ei voi poistaa"
 
-#: ../camel/providers/local/camel-spool-store.c:619
+#: ../src/camel/providers/local/camel-spool-store.c:616
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Saapuvan sähköpostin kansioita ei voi uudelleennimetä"
 
-#: ../camel/providers/local/camel-spool-summary.c:177
-#: ../camel/providers/local/camel-spool-summary.c:189
-#: ../camel/providers/local/camel-spool-summary.c:201
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-spool-summary.c:179
+#: ../src/camel/providers/local/camel-spool-summary.c:191
+#: ../src/camel/providers/local/camel-spool-summary.c:203
+#, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Väliaikaishakemistoa %s ei voitu synkronoida: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:219
+#: ../src/camel/providers/local/camel-spool-summary.c:221
 #, fuzzy, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Saapuvan sähköpostin kansion virkistys epäonnistui %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:253
-#: ../camel/providers/local/camel-spool-summary.c:272
-#: ../camel/providers/local/camel-spool-summary.c:285
+#: ../src/camel/providers/local/camel-spool-summary.c:255
+#: ../src/camel/providers/local/camel-spool-summary.c:274
+#: ../src/camel/providers/local/camel-spool-summary.c:287
 #, fuzzy, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in '%s'"
+"Folder may be corrupt, copy saved in “%s”"
 msgstr ""
 "Sähköpostiviestien kansiota %s ei voi synkronoida: %s\n"
 "Kansio saattaa olla vaurioitunut, kopio tallennettu tiedostoon \"%s\""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
-#: ../camel/providers/nntp/camel-nntp-folder.c:595
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:219
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:584
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Sisäinen virhe: UID on virheellisessä muodossa: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:297
-#: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/pop3/camel-pop3-folder.c:574
-#: ../camel/providers/pop3/camel-pop3-folder.c:1002
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:289
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:294
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:575
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1003
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:309
-#: ../camel/providers/nntp/camel-nntp-folder.c:629
-#: ../camel/providers/pop3/camel-pop3-folder.c:478
-#: ../camel/providers/pop3/camel-pop3-folder.c:510
-#: ../camel/providers/pop3/camel-pop3-folder.c:542
-#: ../camel/providers/pop3/camel-pop3-folder.c:564
-#: ../camel/providers/pop3/camel-pop3-folder.c:583
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:301
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:618
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:479
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:511
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:543
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:565
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:584
 #, fuzzy, c-format
 msgid "Cannot get message %s: "
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:435
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:428
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:434
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Postitus epäonnistui: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:488
 msgid "Posting failed: "
 msgstr "Postitus epäonnistui: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:618
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:607
 #, c-format
 msgid "This message is not currently available"
 msgstr "Tämä viesti ei ole juuri nyt saatavilla"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:727
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:716
 #, c-format
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "Et voi kopioida viestejä NNTP-kansiosta"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:45
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:45
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "Näytä kansiot lyhyessä muodossa (esim. c.o.linux eikä comp.os.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "Näytä _tilauslomakkeessa suhteelliset kansionimet"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:54
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:54
 msgid "Default NNTP port"
 msgstr "NNTP:n oletusportti"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:55
 msgid "NNTP over TLS"
 msgstr "NNTP TLS:llä"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
 msgstr "Keskusteluryhmät"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:63
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:63
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "Tämän tarjoajan avulla voit lukea ja postittaa USENET-uutisryhmiin."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:84
 #, fuzzy
 #| msgid ""
 #| "This option will connect to the server using Kerberos 5 authentication."
@@ -4375,7 +4548,7 @@ msgid ""
 msgstr ""
 "Tämä vaihtoehto yhdistää palvelimeen käyttäen Kerberos 5 - tunnistautumista."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:94
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:94
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4383,40 +4556,40 @@ msgstr ""
 "Tämä vaihtoehto tunnistautuu NNTP-palvelimelle käyttäen selväkielistä "
 "salasanaa."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:381
+#: ../src/camel/providers/nntp/camel-nntp-store.c:379
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Tervehdystä %s:stä ei voitu lukea: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:393
+#: ../src/camel/providers/nntp/camel-nntp-store.c:391
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-palvelin %s palautti virhekoodin %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:412
+#: ../src/camel/providers/nntp/camel-nntp-store.c:410
 #, fuzzy, c-format
 #| msgid "Failed to authenticate on POP server %s: "
 msgid "Failed to issue STARTTLS for NNTP server %s: "
 msgstr "Tunnistautuminen POP-palvelimelle %s epäonnistui:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:423
+#: ../src/camel/providers/nntp/camel-nntp-store.c:421
 #, fuzzy, c-format
 #| msgid "SMTP server %s does not support %s authentication"
-msgid "NNTP server %s doesn't support STARTTLS: %s"
+msgid "NNTP server %s doesn’t support STARTTLS: %s"
 msgstr "SMTP-palvelin %s ei tue tunnistautumismenetelmää %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:443
+#: ../src/camel/providers/nntp/camel-nntp-store.c:441
 #, fuzzy, c-format
 #| msgid "Failed to connect to SMTP server %s in secure mode: "
 msgid "Failed to connect to NNTP server %s in secure mode: "
 msgstr "Yhdistäminen SMTP-palvelimeen %s turvallisessa tilassa epäonnistui: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:514
+#: ../src/camel/providers/nntp/camel-nntp-store.c:512
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET uutisryhmät palvelimelta %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1250
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4427,23 +4600,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1367
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1365
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Et voi luoda kansioita uutisryhmien alle: tilaa sen sijaan ryhmiä."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1383
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1381
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Et voi nimetä kansiota Uutisryhmissä."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1406
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1404
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Et voi poistaa kansiota uutisryhmistä: lopeta sen sijaan ryhmän tilaaminen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1616
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1618
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4454,7 +4627,7 @@ msgstr ""
 "\n"
 "Uutisryhmää ei ole olemassa. Valittu kohta on luultavasti ylempi kansio."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1683
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1685
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4465,118 +4638,121 @@ msgstr ""
 "\n"
 "Uutisryhmää ei ole olemassa!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2109
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2111
 msgid "NNTP Command failed: "
 msgstr "NNTP-komento epäonnistui: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2214
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2216
 #, c-format
 msgid "Not connected."
 msgstr "Ei yhteyttä."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2316
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2318
 #, c-format
 msgid "No such folder: %s"
 msgstr "Kansiota ei ole: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:197
-#: ../camel/providers/nntp/camel-nntp-summary.c:337
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:190
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:333
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Etsii uusia viestejä"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:219
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:212
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Odottamaton palvelimen vastaus xover:ilta: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:358
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:354
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Odottamaton palvelimen vastaus head:ilta: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:406
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:403
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Toiminto epäonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:357
-#: ../camel/providers/pop3/camel-pop3-folder.c:441
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:358
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:442
 #, c-format
 msgid "No message with UID %s"
 msgstr "Ei viestejä tunnisteella %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:458
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestiä %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:576
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:644
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:645
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:703
-#: ../camel/providers/pop3/camel-pop3-folder.c:706
-#: ../camel/providers/pop3/camel-pop3-folder.c:719
-#: ../camel/providers/pop3/camel-pop3-folder.c:732
-#: ../camel/providers/pop3/camel-pop3-folder.c:746
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:704
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:707
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:720
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:733
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:747
 #, fuzzy
 msgid "Cannot get POP summary: "
 msgstr "POP-yhteenvedon hakeminen ei onnistu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:811
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:812
 msgid "Expunging old messages"
 msgstr "Poistetaan vanhoja viestejä pysyvästi"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:839
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:840
 msgid "Expunging deleted messages"
 msgstr "Poistetaan poistetut viestit pysyvästi"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:36
-#, fuzzy
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:34
 msgid "Message Storage"
 msgstr "Viestisäilö"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:38
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:36
 msgid "_Leave messages on server"
 msgstr "_Jätä viestit palvelimelle"
 
 #. Translators: '%s' is replaced with a widget, where user can
 #. * select how many days can be message left on the server.
-#: ../camel/providers/pop3/camel-pop3-provider.c:42
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:40
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "Poista %s päivän kuluttua"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:42
+msgid "Hint: Use 0 days to keep messages on the server indefinitely."
+msgstr ""
+
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Disable _support for all POP3 extensions"
 msgstr "Poista _käytöstä tuki POP3-laajennoksille"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:52
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:52
 msgid "Default POP3 port"
 msgstr "POP3:n oletusportti"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP3 over TLS"
 msgstr "POP3 TLS:llä"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:60
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:62
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Yhteyksien ottoon ja postien hakuun POP-palvelimilta."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4584,7 +4760,7 @@ msgstr ""
 "tämä vaihtoehto yhdistää POP-palvelimeen selväkielisellä salasanalla. Tämä "
 "on ainoa tapa, jota monet POP-palvelimet tukevat."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:92
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4595,59 +4771,59 @@ msgstr ""
 "palvelimilla, jotka väittävät sitä tukevansa."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:95
+#: ../src/camel/providers/pop3/camel-pop3-store.c:93
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:162
+#: ../src/camel/providers/pop3/camel-pop3-store.c:160
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP-palvelimelta %s ei saatu luettua kelvollista tervehdystä"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:177
+#: ../src/camel/providers/pop3/camel-pop3-store.c:175
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Yhdistäminen POP-palvelimeen %s turvallisessa tilassa epäonnistui: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:178
+#: ../src/camel/providers/pop3/camel-pop3-store.c:176
 msgid "STLS not supported by server"
 msgstr "Palvelin ei tue STLS-laajennosta"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../src/camel/providers/pop3/camel-pop3-store.c:197
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../src/camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Yhdistäminen POP-palvelimeen %s turvallisessa tilassa epäonnistui: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../src/camel/providers/pop3/camel-pop3-store.c:355
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP-palvelimeen %s kirjautuminen epäonnistui: SASL protokollavirhe"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:379
+#: ../src/camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Tunnistautuminen POP-palvelimelle %s epäonnistui:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../src/camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3-palvelin %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../src/camel/providers/pop3/camel-pop3-store.c:488
 #, fuzzy, c-format
 msgid "POP3 server for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:702
-#: ../camel/providers/pop3/camel-pop3-store.c:715
-#: ../camel/providers/pop3/camel-pop3-store.c:801
+#: ../src/camel/providers/pop3/camel-pop3-store.c:700
+#: ../src/camel/providers/pop3/camel-pop3-store.c:713
+#: ../src/camel/providers/pop3/camel-pop3-store.c:799
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4656,7 +4832,8 @@ msgstr ""
 "Yhdistäminen POP-palvelimeen epäonnistui: %s\n"
 "Virhe lähetettäessä salasanaa: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:742
+#. Translators: Do not translate APOP.
+#: ../src/camel/providers/pop3/camel-pop3-store.c:740
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4667,339 +4844,343 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:816
+#: ../src/camel/providers/pop3/camel-pop3-store.c:814
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:900
+#: ../src/camel/providers/pop3/camel-pop3-store.c:898
 #, c-format
-msgid "No such folder '%s'."
-msgstr "Kansiota \"%s\" ei ole olemassa."
+#| msgid "No such folder %s"
+msgid "No such folder “%s”."
+msgstr "Kansioita “%s” ei ole olemassa."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:917
+#: ../src/camel/providers/pop3/camel-pop3-store.c:915
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
-#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:31
+#: ../src/services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:33
+#, fuzzy
+#| msgid ""
+#| "For delivering mail by passing it to the \"sendmail\" program on the "
+#| "local system."
 msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
+"For delivering mail by passing it to the “sendmail” program on the local "
 "system."
 msgstr ""
 "Postin lähettäminen siirtämällä se \"sendmail\"-ohjelmalle paikallisessa "
 "järjestelmässä."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:44
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "Mail delivery via the sendmail program"
 msgstr "Sähköpostin lähetys ohjelman sendmail avulla"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:137
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:137
 #, fuzzy, c-format
 #| msgid "Failed to retrieve message"
 msgid "Failed to read From address"
 msgstr "Viestiä ei voitu hakea."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:154
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:154
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:182
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Vastaanottajalistan tulkitseminen epäonnistui"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:199
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:199
 #, fuzzy, c-format
 #| msgid "Could not parse recipient list"
 msgid "Could not parse arguments"
 msgstr "Vastaanottajalistan tulkitseminen epäonnistui"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:230
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:215
 #, fuzzy, 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 "Putkea sendmailille ei voitu luoda: %s: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:246
 #, fuzzy, c-format
-msgid "Could not fork '%s': %s: mail not sent"
+msgid "Could not fork “%s”: %s: mail not sent"
 msgstr "Sendmailia ei voi käynnistää: %s: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:304
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:301
 msgid "Could not send message: "
 msgstr "Viestin lähettäminen epäonnistui:"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:334
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:343
 #, fuzzy, c-format
-msgid "'%s' exited with signal %s: mail not sent."
+msgid "“%s” exited with signal %s: mail not sent."
 msgstr "Sendmail keskeytettiin signaaliin %s: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:344
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:353
 #, fuzzy, c-format
-msgid "Could not execute '%s': mail not sent."
+msgid "Could not execute “%s”: mail not sent."
 msgstr "Komentoa %s ei voitu suorittaa: sähköpostia ei lähetetty"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:349
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:358
 #, fuzzy, c-format
-msgid "'%s' exited with status %d: mail not sent."
+msgid "“%s” exited with status %d: mail not sent."
 msgstr "Sendmail palautti arvon %d: sähköpostia ei lähetetty"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:37
 msgid "Default SMTP port"
 msgstr "SMTP:n oletusportti"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP over TLS"
 msgstr "SMTP TLS:llä"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Message submission port"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:47
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:45
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:49
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:47
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Sähköpostin lähetys ottamalla yhteyttä sähköpostipalvelimeen SMTP-"
 "protokollalla."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:244
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:235
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:242
 #, fuzzy
 msgid "Welcome response error: "
 msgstr "virhe tervetuloviestissä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:280
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:278
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Yhdistäminen SMTP-palvelimeen %s turvallisessa tilassa epäonnistui: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:289
-#: ../camel/providers/smtp/camel-smtp-transport.c:302
-#: ../camel/providers/smtp/camel-smtp-transport.c:309
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:287
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:300
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:307
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:328
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:326
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Yhdistäminen SMTP-palvelimeen %s turvallisessa tilassa epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:439
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:437
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:442
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP postinvälitys %s:n kautta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:582
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:580
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP-palvelin %s ei tue tunnistautumismenetelmää %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:663
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:661
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
-#, fuzzy
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:697
 #| msgid "AUTH command failed: "
 msgid "AUTH command failed: Not connected."
-msgstr "AUTH-komento epäonnistui: "
+msgstr "AUTH-komento epäonnistui: Ei yhdistetty."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:706
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
-#: ../camel/providers/smtp/camel-smtp-transport.c:732
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:704
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:718
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:730
 msgid "AUTH command failed: "
 msgstr "AUTH-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Viestiä ei voi lähettää: palveluun ei ole yhteyttä."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:898
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voi lähettää: lähettäjän osoite on epäkelpo."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:902
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:900
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:931
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:929
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Viestiä ei voi lähettää: vastaanottajia ei ole määritelty."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:946
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:944
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Viestiä ei voi lähettää: yksi tai useampi viallinen vastaanottaja"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1078
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1076
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksivirhe, tuntematon komento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1080
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1078
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksivirhe parametreissa tai argumenteissa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1080
 msgid "Command not implemented"
 msgstr "Komentoa ei ole toteutettu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1084
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "Command parameter not implemented"
 msgstr "Komennon parametria ei ole toteutettu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "System status, or system help reply"
 msgstr "Järjestelmän tila tai järjestelmän ohjevastaus"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1088
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "Help message"
 msgstr "Ohjeviesti"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1088
 msgid "Service ready"
 msgstr "Palvelu valmis"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1092
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1090
 msgid "Service closing transmission channel"
 msgstr "Palvelu sulkee siirtokanavaa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1092
 msgid "Service not available, closing transmission channel"
 msgstr "Palvelu ei ole käytettävissä, suljetaan siirtokanava"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "Requested mail action okay, completed"
 msgstr "Pyydetty sähköpostikäsky ok, valmis"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1098
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 "Käyttäjä ei ole paikallinen, uudelleenohjaus osoitteeseen <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1098
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Pyydettyä sähköpostikäskyä ei suoritettu: postilaatikko ei käytettävissä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Pyydettyä toimenpidettä ei suoritettu: postilaatikko ei käytettävissä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1104
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1102
 msgid "Requested action aborted: error in processing"
 msgstr "Pyydetty toimenpide keskeytetty: virhe käsittelyssä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1106
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1104
 msgid "User not local; please try <forward-path>"
 msgstr "Käyttäjä ei ole paikallinen: kokeile <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1108
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1106
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Pyydettyä toimenpidettä ei suoritettu: järjestelmän levytila ei riitä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1110
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Pyydettyä toimenpidettä ei suoritettu: varattu levytila ylitetty"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1110
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "Pyydettyä toimenpidettä ei suoritettu: postilaatikon nimi ei ole sallittu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1114
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Aloita sähköpostin kirjoittaminen: lopeta <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1114
 msgid "Transaction failed"
 msgstr "Tapahtuma epäonnistui"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1118
 msgid "A password transition is needed"
 msgstr "Vaaditaan salasanatransaktio"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Authentication mechanism is too weak"
 msgstr "Todennusmenetelmä on liian heikko"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1122
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pyydetty todennusmenetelmä vaatii salausta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1126
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1124
 msgid "Temporary authentication failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1416
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1414
 msgid "SMTP Greeting"
 msgstr "SMTP tervehdys"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1425
-#: ../camel/providers/smtp/camel-smtp-transport.c:1438
-#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1423
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1436
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1443
 msgid "HELO command failed: "
 msgstr "HELO-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1521
-#: ../camel/providers/smtp/camel-smtp-transport.c:1535
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1533
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1542
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM -komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1572
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1570
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO -komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1588
-#: ../camel/providers/smtp/camel-smtp-transport.c:1597
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1586
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1595
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1669
-#: ../camel/providers/smtp/camel-smtp-transport.c:1680
-#: ../camel/providers/smtp/camel-smtp-transport.c:1691
-#: ../camel/providers/smtp/camel-smtp-transport.c:1753
-#: ../camel/providers/smtp/camel-smtp-transport.c:1771
-#: ../camel/providers/smtp/camel-smtp-transport.c:1784
-#: ../camel/providers/smtp/camel-smtp-transport.c:1792
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1669
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1680
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1691
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1740
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1758
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1771
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1779
 msgid "DATA command failed: "
 msgstr "DATA-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1818
-#: ../camel/providers/smtp/camel-smtp-transport.c:1832
-#: ../camel/providers/smtp/camel-smtp-transport.c:1840
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1805
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1819
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1827
 msgid "RSET command failed: "
 msgstr "RSET-komento epäonnistui: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1866
-#: ../camel/providers/smtp/camel-smtp-transport.c:1878
-#: ../camel/providers/smtp/camel-smtp-transport.c:1884
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1853
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1865
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1871
 msgid "QUIT command failed: "
 msgstr "QUIT-komento epäonnistui: "
 
@@ -5030,8 +5211,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
 msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
+"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 msgstr ""
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
@@ -5044,8 +5224,9 @@ msgstr ""
 
 #: ../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."
+"An example is “/usr/bin/gpg”; when it is left empty, or an incorrect value "
+"is set, then it will be searched for. Change requires restart of the "
+"application."
 msgstr ""
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:4
@@ -5054,7 +5235,7 @@ msgstr ""
 
 #: ../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 "
+"When set to “true”, tries to load also photo of the signers/encrypters, if "
 "available in the key/certificate."
 msgstr ""
 
@@ -5065,10 +5246,33 @@ msgstr ""
 #: ../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 "
+"the background. A special value “always-online” is used for no network "
 "monitoring."
 msgstr ""
 
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:8
+msgid ""
+"A full path to a directory where .source files with preconfigured options "
+"can be stored"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:9
+msgid ""
+"This directory, if filled with an existing path, is checked additionally to "
+"XDG configure directories."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:10
+msgid "A list of variables which can be part of the autoconfig .source files"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:11
+msgid ""
+"Each item of the array is expected to be of the form: name=value. These "
+"variables are checked before environment variables, but after the predefined "
+"USER, REALNAME and HOST variables."
+msgstr ""
+
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 #, fuzzy
 #| msgid "Proxy type to use"
@@ -5078,7 +5282,7 @@ msgstr "Käytettävän välityspalvelimen tyyppi"
 #: ../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 "
+"settings are now integrated into Evolution-Data-Server’s account system. See "
 "the ESourceProxy API documentation for details."
 msgstr ""
 
@@ -5148,305 +5352,345 @@ msgstr "Porttinumero SOCKS-pyynnöille"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "Automaattisen välipalvelinmäärittelyn URL"
 
-#: ../libebackend/e-collection-backend.c:976
+#: ../src/libebackend/e-collection-backend.c:977
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr ""
 
-#: ../libebackend/e-collection-backend.c:1035
+#: ../src/libebackend/e-collection-backend.c:1036
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr ""
 
-#: ../libebackend/e-data-factory.c:1294
+#: ../src/libebackend/e-data-factory.c:1295
 #, 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 ""
 
-#: ../libebackend/e-server-side-source.c:141
+#: ../src/libebackend/e-server-side-source.c:142
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:466
+#: ../src/libebackend/e-server-side-source.c:467
 #, fuzzy
 #| msgid "Failed to get lock using fcntl(2): %s"
 msgid "Failed to lookup credentials: "
 msgstr "Lukitseminen käyttäen fcntl(2) kutsua epäonnistui: %s"
 
-#: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
-#, c-format
-msgid "Data source '%s' does not support creating remote resources"
-msgstr ""
+#: ../src/libebackend/e-server-side-source.c:1392
+#: ../src/libedataserver/e-source.c:1599
+#, fuzzy, c-format
+msgid "Data source “%s” does not support creating remote resources"
+msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: ../libebackend/e-server-side-source.c:1405
+#: ../src/libebackend/e-server-side-source.c:1406
 #, c-format
 msgid ""
-"Data source '%s' has no collection backend to create the remote resource"
+"Data source “%s” has no collection backend to create the remote resource"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:1433 ../libedataserver/e-source.c:1708
-#, c-format
-msgid "Data source '%s' does not support deleting remote resources"
-msgstr ""
+#: ../src/libebackend/e-server-side-source.c:1434
+#: ../src/libedataserver/e-source.c:1712
+#, fuzzy, c-format
+msgid "Data source “%s” does not support deleting remote resources"
+msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: ../libebackend/e-server-side-source.c:1447
+#: ../src/libebackend/e-server-side-source.c:1448
 #, c-format
 msgid ""
-"Data source '%s' has no collection backend to delete the remote resource"
+"Data source “%s” has no collection backend to delete the remote resource"
 msgstr ""
 
-#: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
+#: ../src/libebackend/e-server-side-source.c:1479
+#: ../src/libedataserver/e-source.c:1808
+#: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080
 #, fuzzy, 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 "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: ../libebackend/e-server-side-source.c:1856
-#, c-format
-msgid "File must have a '.source' extension"
+#: ../src/libebackend/e-server-side-source.c:1857
+#, fuzzy, c-format
+#| msgid "File must have a '.source' extension"
+msgid "File must have a “.source” extension"
 msgstr "Tiedostolla tulee olla '.source'-pääte"
 
-#: ../libebackend/e-source-registry-server.c:319
-#, c-format
-msgid "UID '%s' is already in use"
+#: ../src/libebackend/e-source-registry-server.c:320
+#, fuzzy, c-format
+#| msgid "UID '%s' is already in use"
+msgid "UID “%s” is already in use"
 msgstr "UID '%s' on jo käytössä"
 
-#: ../libebackend/e-subprocess-factory.c:279
+#: ../src/libebackend/e-subprocess-factory.c:277
 #, c-format
-msgid "Module '%s' for source UID '%s' cannot be loaded"
+msgid "Module “%s” for source UID “%s” cannot be loaded"
 msgstr ""
 
-#: ../libebackend/e-subprocess-factory.c:291
-#, c-format
-msgid "No such source for UID '%s'"
+#: ../src/libebackend/e-subprocess-factory.c:289
+#, fuzzy, c-format
+#| msgid "No such source for UID '%s'"
+msgid "No such source for UID “%s”"
 msgstr "Lähdettä, jonka UID on \"%s\", ei löydy"
 
-#: ../libebackend/e-subprocess-factory.c:302
+#: ../src/libebackend/e-subprocess-factory.c:300
 #, fuzzy, 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 "Lapsiprosessin \"%s\" luominen epäonnistui: %s"
 
-#: ../libebackend/e-user-prompter-server.c:305
+#: ../src/libebackend/e-user-prompter-server.c:303
 #, fuzzy, c-format
 #| msgid "Contact '%s' not found"
-msgid "Extension dialog '%s' not found."
+msgid "Extension dialog “%s” not found."
 msgstr "Yhteystietoa \"%s\" ei löydy"
 
-#: ../libedataserver/e-categories.c:49
+#: ../src/libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
-#: ../libedataserver/e-categories.c:50
+#: ../src/libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../libedataserver/e-categories.c:51
+#: ../src/libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Työ"
 
-#: ../libedataserver/e-categories.c:52
+#: ../src/libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Kilpailu"
 
-#: ../libedataserver/e-categories.c:53
+#: ../src/libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Suosikit"
 
-#: ../libedataserver/e-categories.c:54
+#: ../src/libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Lahjat"
 
-#: ../libedataserver/e-categories.c:55
+#: ../src/libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Tavoitteet"
 
-#: ../libedataserver/e-categories.c:56
+#: ../src/libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Lomapäivä"
 
-#: ../libedataserver/e-categories.c:57
+#: ../src/libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Lomakortit"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:59
+#: ../src/libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Tärkeät yhteystiedot"
 
-#: ../libedataserver/e-categories.c:60
+#: ../src/libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideat"
 
-#: ../libedataserver/e-categories.c:61
+#: ../src/libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "International"
 msgstr "Kansainväliset"
 
-#: ../libedataserver/e-categories.c:62
+#: ../src/libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Avainasiakas"
 
-#: ../libedataserver/e-categories.c:63
+#: ../src/libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: ../libedataserver/e-categories.c:64
+#: ../src/libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Henkilökohtaiset"
 
-#: ../libedataserver/e-categories.c:65
+#: ../src/libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Puhelut"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:67
+#: ../src/libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Tila"
 
-#: ../libedataserver/e-categories.c:68
+#: ../src/libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategiat"
 
-#: ../libedataserver/e-categories.c:69
+#: ../src/libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Toimittajat"
 
-#: ../libedataserver/e-categories.c:70
+#: ../src/libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Aika ja kulut"
 
-#: ../libedataserver/e-categories.c:71
+#: ../src/libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:72
+#: ../src/libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: ../libedataserver/e-client.c:146
+#: ../src/libedataserver/e-client.c:144
 msgid "Source not loaded"
 msgstr "Lähdettä ei ole ladattu"
 
-#: ../libedataserver/e-client.c:148
+#: ../src/libedataserver/e-client.c:146
 msgid "Source already loaded"
 msgstr "Lähde on jo ladattu"
 
 #. Translators: This means that the EClient does not
 #. * support offline mode, or it's not set to by a user,
 #. * thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:159
+#: ../src/libedataserver/e-client.c:157
 msgid "Offline unavailable"
 msgstr "Yhteydetön tila ei ole käytettävissä"
 
-#: ../libedataserver/e-client.c:181
+#: ../src/libedataserver/e-client.c:179
 msgid "D-Bus error"
 msgstr "D-Bus-virhe"
 
-#: ../libedataserver/e-client.c:2023
+#: ../src/libedataserver/e-client.c:2021
 msgid "Timeout was reached"
 msgstr ""
 
-#: ../libedataserver/e-source.c:771
+#: ../src/libedataserver/e-source.c:775
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr ""
 
-#: ../libedataserver/e-source.c:1375
+#: ../src/libedataserver/e-source.c:1379
 #, c-format
-msgid "Data source '%s' is not removable"
+msgid "Data source “%s” is not removable"
 msgstr ""
 
-#: ../libedataserver/e-source.c:1498
+#: ../src/libedataserver/e-source.c:1502
 #, c-format
-msgid "Data source '%s' is not writable"
+msgid "Data source “%s” is not writable"
 msgstr ""
 
-#: ../libedataserver/e-source.c:2194
+#: ../src/libedataserver/e-source.c:2198
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:41
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:39
 #, fuzzy
 #| msgid "Protocol not supported"
 msgid "Credentials lookup is not supported"
 msgstr "Protokolla ei ole tuettu"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:54
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:52
 #, fuzzy
 #| msgid "Forwarding messages is not supported"
 msgid "Credentials store is not supported"
 msgstr "Viestien edelleenlähetystä ei tueta"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:65
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:63
 #, fuzzy
 #| msgid "Forwarding messages is not supported"
 msgid "Credentials delete is not supported"
 msgstr "Viestien edelleenlähetystä ei tueta"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
-#, fuzzy
-#| msgid "Unknown authentication state."
-msgid "Google authentication is not supported"
-msgstr "Tuntematon todennustila."
-
 #. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:79
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:143
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:240
 #, c-format
-msgid "Source '%s' (%s) is not a valid Google source"
-msgstr "Lähde '%s' (%s) ei ole kelvollinen Google-lähde"
+#| msgid "Source '%s' (%s) is not a valid Google source"
+msgid "Source “%s” (%s) is not a valid Google source"
+msgstr "Lähde “%s” (%s) ei ole kelvollinen Google-lähde"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:157
 #, fuzzy
 #| msgid "Object not found"
 msgid "Google secret not found"
 msgstr "Kohdetta ei löydy"
 
-#: ../libedataserver/e-source-credentials-provider-impl-password.c:81
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:188
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:210
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:233
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:530
+#| msgid "Unknown authentication state."
+msgid "Google authentication is not supported"
+msgstr "Google-tunnistautuminen ei ole tuettu"
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:400
+#, fuzzy
+#| msgid "Failed to get lock using fcntl(2): %s"
+msgid "Failed to get Google secret from credentials"
+msgstr "Lukitseminen käyttäen fcntl(2) kutsua epäonnistui: %s"
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:413
+msgid "Refresh token not found in Google secret"
+msgstr ""
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:421
+msgid "Failed to construct refresh_token request"
+msgstr ""
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:454
+#, fuzzy
+#| msgid "Failed to open addressbook at '%s': %s"
+msgid "Failed to encode new access token to Google secret"
+msgstr "Osoitekirjan avaaminen kohteessa \"%s\" epäonnistui: %s"
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:464
+#, fuzzy
+#| msgid "Failed to open addressbook at '%s': %s"
+msgid "Failed to get access token from refresh_token server response"
+msgstr "Osoitekirjan avaaminen kohteessa \"%s\" epäonnistui: %s"
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:470
+#, fuzzy
+#| msgid "Failed to retrieve message"
+msgid "Failed to refresh token"
+msgstr "Viestiä ei voitu hakea."
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-password.c:79
 msgid "Password not found"
 msgstr "Salasanaa ei löydy"
 
-#: ../libedataserver/e-source-mail-signature.c:481
+#: ../src/libedataserver/e-source-mail-signature.c:482
 #, c-format
 msgid "Signature script must be a local file"
 msgstr ""
 
-#: ../libedataserver/e-source-proxy.c:1641
+#: ../src/libedataserver/e-source-proxy.c:1642
 #, fuzzy, c-format
 #| msgid "Store does not support an INBOX"
-msgid "Source '%s' does not support proxy lookups"
+msgid "Source “%s” does not support proxy lookups"
 msgstr "Kansio ei tue INBOXia"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1692 ../libedataserver/e-time-utils.c:1991
+#: ../src/libedataserver/e-time-utils.c:1691
+#: ../src/libedataserver/e-time-utils.c:1990
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %I.%M.%S %p"
 
@@ -5454,7 +5698,8 @@ msgstr "%a %d.%m.%Y %I.%M.%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1982
+#: ../src/libedataserver/e-time-utils.c:1696
+#: ../src/libedataserver/e-time-utils.c:1981
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
@@ -5462,7 +5707,8 @@ msgstr "%a %d.%m.%Y %H.%M.%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1702 ../libedataserver/e-time-utils.c:1987
+#: ../src/libedataserver/e-time-utils.c:1701
+#: ../src/libedataserver/e-time-utils.c:1986
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %I.%M %p"
 
@@ -5470,78 +5716,83 @@ msgstr "%a %d.%m.%Y %I.%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1978
+#: ../src/libedataserver/e-time-utils.c:1706
+#: ../src/libedataserver/e-time-utils.c:1977
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1712
+#: ../src/libedataserver/e-time-utils.c:1711
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1717
+#: ../src/libedataserver/e-time-utils.c:1716
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1720 ../libedataserver/e-time-utils.c:1840
-#: ../libedataserver/e-time-utils.c:1973
+#: ../src/libedataserver/e-time-utils.c:1719
+#: ../src/libedataserver/e-time-utils.c:1839
+#: ../src/libedataserver/e-time-utils.c:1972
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1727
+#: ../src/libedataserver/e-time-utils.c:1726
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I.%M.%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1731
+#: ../src/libedataserver/e-time-utils.c:1730
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H.%M.%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1736
+#: ../src/libedataserver/e-time-utils.c:1735
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %I.%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1741
+#: ../src/libedataserver/e-time-utils.c:1740
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1746
+#: ../src/libedataserver/e-time-utils.c:1745
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1751
+#: ../src/libedataserver/e-time-utils.c:1750
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1754 ../libedataserver/e-time-utils.c:1843
+#: ../src/libedataserver/e-time-utils.c:1753
+#: ../src/libedataserver/e-time-utils.c:1842
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1914 ../libedataserver/e-time-utils.c:2035
+#: ../src/libedataserver/e-time-utils.c:1913
+#: ../src/libedataserver/e-time-utils.c:2034
 msgid "%I:%M:%S %p"
 msgstr "%I.%M.%S %P"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1918 ../libedataserver/e-time-utils.c:2027
+#: ../src/libedataserver/e-time-utils.c:1917
+#: ../src/libedataserver/e-time-utils.c:2026
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
@@ -5549,622 +5800,649 @@ msgstr "%H.%M.%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1923 ../libedataserver/e-time-utils.c:2032
+#: ../src/libedataserver/e-time-utils.c:1922
+#: ../src/libedataserver/e-time-utils.c:2031
 msgid "%I:%M %p"
 msgstr "%I.%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1927 ../libedataserver/e-time-utils.c:2024
+#: ../src/libedataserver/e-time-utils.c:1926
+#: ../src/libedataserver/e-time-utils.c:2023
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1931
+#: ../src/libedataserver/e-time-utils.c:1930
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1935
+#: ../src/libedataserver/e-time-utils.c:1934
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserver/e-webdav-discover.c:484
-#: ../libedataserver/e-webdav-discover.c:493
+#: ../src/libedataserver/e-webdav-discover.c:447
+#: ../src/libedataserver/e-webdav-discover.c:486
+#: ../src/libedataserver/e-webdav-discover.c:495
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-virhe: %s"
 
-#: ../libedataserver/e-webdav-discover.c:523
-#, fuzzy
+#: ../src/libedataserver/e-webdav-discover.c:525
 #| msgid "Could not parse recipient list"
 msgid "Could not parse response"
-msgstr "Vastaanottajalistan tulkitseminen epäonnistui"
+msgstr "Vastauksen tulkitseminen epäonnistui"
 
-#: ../libedataserver/e-webdav-discover.c:532
+#: ../src/libedataserver/e-webdav-discover.c:534
 msgid "Empty response"
 msgstr "Tyhjä vastaus"
 
-#: ../libedataserver/e-webdav-discover.c:540
-#, fuzzy
+#: ../src/libedataserver/e-webdav-discover.c:542
 #| msgid "Unexpected response from IMAP server: %s"
 msgid "Unexpected reply from server"
-msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
+msgstr "Odottamaton vastaus palvelimelta"
 
-#: ../libedataserverui/e-credentials-prompter.c:260
-#: ../libedataserverui/e-credentials-prompter.c:1563
-#: ../libedataserverui/e-credentials-prompter.c:1607
+#: ../src/libedataserverui/e-credentials-prompter.c:258
+#: ../src/libedataserverui/e-credentials-prompter.c:1576
+#: ../src/libedataserverui/e-credentials-prompter.c:1620
 #, fuzzy
 msgid "Credentials prompt was cancelled"
 msgstr "Toimenpide on peruttu"
 
-#: ../libedataserverui/e-credentials-prompter.c:664
+#: ../src/libedataserverui/e-credentials-prompter.c:662
 #, fuzzy, c-format
 #| msgid "Store does not support an INBOX"
-msgid "Source '%s' doesn't support prompt for credentials"
+msgid "Source “%s” doesn’t support prompt for credentials"
 msgstr "Kansio ei tue INBOXia"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:441
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:444
 #, fuzzy, c-format
 #| msgid "Failed to open addressbook at '%s': %s"
-msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgid "Failed to obtain access token from address “%s”. Error code %d (%s)"
 msgstr "Osoitekirjan avaaminen kohteessa \"%s\" epäonnistui: %s"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:487
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:492
 msgid "Requesting access token, please wait..."
 msgstr ""
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:589
-#, fuzzy
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:594
 #| msgid "Address book authentication request"
 msgid "Google Address book authentication request"
-msgstr "Osoitekirjan tunnistautumispyyntö"
+msgstr "Google-osoitekirjan tunnistautumispyyntö"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:592
-#, fuzzy
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:597
 #| msgid "Calendar authentication request"
 msgid "Google Calendar authentication request"
-msgstr "Kalenterin tunnistautumispyyntö"
+msgstr "Google-kalenterin tunnistautumispyyntö"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:595
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:600
 #, fuzzy
 #| msgid "Mail authentication request"
 msgid "Google Memo List authentication request"
 msgstr "Sähköpostin tunnistautumispyyntö"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:598
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:603
 #, fuzzy
 #| msgid "Mail authentication request"
 msgid "Google Task List authentication request"
 msgstr "Sähköpostin tunnistautumispyyntö"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
-#, fuzzy
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:607
 #| msgid "Mail authentication request"
 msgid "Google Mail authentication request"
-msgstr "Sähköpostin tunnistautumispyyntö"
+msgstr "Google-sähköpostin tunnistautumispyyntö"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:610
 msgid "Google account authentication request"
 msgstr "Google-tilin tunnistautumispyyntö"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:616
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:621
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
-"address book \"%s\"."
+"address book “%s”."
 msgstr ""
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:620
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:625
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
-"calendar \"%s\"."
+"calendar “%s”."
 msgstr ""
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:624
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:629
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
-"mail account \"%s\"."
+"mail account “%s”."
 msgstr ""
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:628
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:633
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
-"mail transport \"%s\"."
+"mail transport “%s”."
 msgstr ""
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:632
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:637
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
-"memo list \"%s\"."
+"memo list “%s”."
 msgstr ""
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:636
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:641
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
-"task list \"%s\"."
+"task list “%s”."
 msgstr ""
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:640
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:645
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
-"account \"%s\"."
+"account “%s”."
 msgstr ""
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:684
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:232
-#: ../libedataserverui/e-trust-prompt.c:114
-#: ../libedataserverui/e-webdav-discover-widget.c:1063
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:689
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:230
+#: ../src/libedataserverui/e-trust-prompt.c:112
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1064
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:132
 msgid "Address book authentication request"
 msgstr "Osoitekirjan tunnistautumispyyntö"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:137
 msgid "Calendar authentication request"
 msgstr "Kalenterin tunnistautumispyyntö"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:141
 msgid "Mail authentication request"
 msgstr "Sähköpostin tunnistautumispyyntö"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:144
 msgid "Authentication request"
 msgstr "Todennuspyyntö"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:155
 #, c-format
-msgid "Please enter the password for address book \"%s\"."
-msgstr "Anna osoitekirjan \"%s\" salasana."
+#| msgid "Please enter the password for address book \"%s\"."
+msgid "Please enter the password for address book “%s”."
+msgstr "Anna osoitekirjan “%s” salasana."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:159
 #, c-format
-msgid "Please enter the password for calendar \"%s\"."
-msgstr "Anna kalenterin \"%s\" salasana."
+#| msgid "Please enter the password for calendar \"%s\"."
+msgid "Please enter the password for calendar “%s”."
+msgstr "Anna kalenterin “%s” salasana."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:163
 #, c-format
-msgid "Please enter the password for mail account \"%s\"."
-msgstr "Anna sähköpostitilin \"%s\" salasana."
+#| msgid "Please enter the password for mail account \"%s\"."
+msgid "Please enter the password for mail account “%s”."
+msgstr "Anna sähköpostitilin “%s” salasana."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:167
 #, fuzzy, c-format
-msgid "Please enter the password for mail transport \"%s\"."
+msgid "Please enter the password for mail transport “%s”."
 msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:171
 #, fuzzy, c-format
-msgid "Please enter the password for memo list \"%s\"."
+msgid "Please enter the password for memo list “%s”."
 msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:175
 #, fuzzy, c-format
-msgid "Please enter the password for task list \"%s\"."
+msgid "Please enter the password for task list “%s”."
 msgstr "Syötä %s-salasana käyttäjälle %s palvelimella %s."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:179
 #, c-format
-msgid "Please enter the password for account \"%s\"."
-msgstr "Anna tilin \"%s\" salasana."
+#| msgid "Please enter the password for account \"%s\"."
+msgid "Please enter the password for account “%s”."
+msgstr "Anna tilin “%s” salasana."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
-#: ../libedataserverui/e-webdav-discover-widget.c:1064
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:231
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1065
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:341
 msgid "_User Name:"
 msgstr "_Käyttäjätunnus:"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:353
 msgid "_Password:"
 msgstr "_Salasana:"
 
 #. Remember password check
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:369
 msgid "_Add this password to your keyring"
 msgstr "_Lisää tämä salasana avainnippuusi"
 
-#: ../libedataserverui/e-trust-prompt.c:113
-#: ../modules/trust-prompt/trust-prompt-gtk.c:119
+#: ../src/libedataserverui/e-trust-prompt.c:111
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:117
 #, fuzzy
 #| msgid "Signing certificate not trusted"
 msgid "Certificate trust..."
 msgstr "Allekirjoitusvarmenteeseen ei luoteta"
 
-#: ../libedataserverui/e-trust-prompt.c:115
-#: ../modules/trust-prompt/trust-prompt-gtk.c:120
+#: ../src/libedataserverui/e-trust-prompt.c:113
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:118
 msgid "_Reject"
 msgstr "_Hylkää"
 
-#: ../libedataserverui/e-trust-prompt.c:116
-#: ../modules/trust-prompt/trust-prompt-gtk.c:121
+#: ../src/libedataserverui/e-trust-prompt.c:114
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:119
 msgid "Accept _Temporarily"
 msgstr "Hyväksy _väliaikaisesti"
 
-#: ../libedataserverui/e-trust-prompt.c:117
-#: ../modules/trust-prompt/trust-prompt-gtk.c:122
+#: ../src/libedataserverui/e-trust-prompt.c:115
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:120
 msgid "_Accept Permanently"
 msgstr "_Hyväksy pysyvästi"
 
-#: ../libedataserverui/e-trust-prompt.c:188
-#: ../modules/trust-prompt/trust-prompt-gtk.c:159
+#: ../src/libedataserverui/e-trust-prompt.c:186
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:157
 #, c-format
-msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "SSL/TLS-varmenne '%s' ei ole luotettu. Haluatko hyväksyä sen?"
+#| 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-varmenne “%s” ei ole luotettu. Haluatko hyväksyä sen?"
 
-#: ../libedataserverui/e-trust-prompt.c:210
-#: ../modules/trust-prompt/trust-prompt-gtk.c:174
+#: ../src/libedataserverui/e-trust-prompt.c:208
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:172
 msgid "Reason:"
 msgstr "Syy:"
 
-#: ../libedataserverui/e-trust-prompt.c:213
+#: ../src/libedataserverui/e-trust-prompt.c:211
 msgid "Detailed error:"
 msgstr "Yksityiskohtainen virhe:"
 
-#: ../libedataserverui/e-trust-prompt.c:275
-#: ../modules/trust-prompt/module-trust-prompt.c:82
+#: ../src/libedataserverui/e-trust-prompt.c:273
+#: ../src/modules/trust-prompt/module-trust-prompt.c:80
 #, fuzzy
 #| msgid "Signing certificate not found"
 msgid "The signing certificate authority is not known."
 msgstr "Allekirjoitusvarmennetta ei löytynyt"
 
-#: ../libedataserverui/e-trust-prompt.c:277
-#: ../modules/trust-prompt/module-trust-prompt.c:84
+#: ../src/libedataserverui/e-trust-prompt.c:275
+#: ../src/modules/trust-prompt/module-trust-prompt.c:82
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr ""
 
-#: ../libedataserverui/e-trust-prompt.c:279
-#: ../modules/trust-prompt/module-trust-prompt.c:86
-msgid "The certificate's activation time is still in the future."
+#: ../src/libedataserverui/e-trust-prompt.c:277
+#: ../src/modules/trust-prompt/module-trust-prompt.c:84
+#, fuzzy
+#| msgid "The certificate's activation time is still in the future."
+msgid "The certificate’s activation time is still in the future."
 msgstr "Varmenteen aktivointiaika on tulevaisuudessa."
 
-#: ../libedataserverui/e-trust-prompt.c:281
-#: ../modules/trust-prompt/module-trust-prompt.c:88
+#: ../src/libedataserverui/e-trust-prompt.c:279
+#: ../src/modules/trust-prompt/module-trust-prompt.c:86
 msgid "The certificate has expired."
 msgstr "Varmenne on vanhentunut."
 
-#: ../libedataserverui/e-trust-prompt.c:283
-#: ../modules/trust-prompt/module-trust-prompt.c:90
+#: ../src/libedataserverui/e-trust-prompt.c:281
+#: ../src/modules/trust-prompt/module-trust-prompt.c:88
 msgid ""
-"The certificate has been revoked according to the connection's certificate "
+"The certificate has been revoked according to the connection’s certificate "
 "revocation list."
 msgstr ""
 
-#: ../libedataserverui/e-trust-prompt.c:285
-#: ../modules/trust-prompt/module-trust-prompt.c:92
-msgid "The certificate's algorithm is considered insecure."
-msgstr ""
+#: ../src/libedataserverui/e-trust-prompt.c:283
+#: ../src/modules/trust-prompt/module-trust-prompt.c:90
+#, fuzzy
+#| msgid "The certificate's activation time is still in the future."
+msgid "The certificate’s algorithm is considered insecure."
+msgstr "Varmenteen aktivointiaika on tulevaisuudessa."
 
-#: ../libedataserverui/e-webdav-discover-widget.c:166
+#: ../src/libedataserverui/e-webdav-discover-widget.c:164
 #, fuzzy
 #| msgctxt "CategoryName"
 #| msgid "Suppliers"
 msgid "Supports"
 msgstr "Toimittajat"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:177
+#: ../src/libedataserverui/e-webdav-discover-widget.c:175
 msgid "_User mail:"
 msgstr "_Käyttäjän sähköposti:"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:523
+#: ../src/libedataserverui/e-webdav-discover-widget.c:521
 msgctxt "WebDAVDiscover"
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:524
+#: ../src/libedataserverui/e-webdav-discover-widget.c:522
 msgctxt "WebDAVDiscover"
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:525
+#: ../src/libedataserverui/e-webdav-discover-widget.c:523
 msgctxt "WebDAVDiscover"
 msgid "Memos"
 msgstr ""
 
-#: ../libedataserverui/e-webdav-discover-widget.c:526
+#: ../src/libedataserverui/e-webdav-discover-widget.c:524
 msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:825
-#, fuzzy
+#: ../src/libedataserverui/e-webdav-discover-widget.c:826
 #| msgid "Invalid Redirect URL"
 msgid "Invalid URL"
-msgstr "Virheellinen uudelleenohjaus"
+msgstr "Virheellinen osoite"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:839
+#: ../src/libedataserverui/e-webdav-discover-widget.c:840
 msgid "User name not filled"
 msgstr ""
 
-#: ../libedataserverui/e-webdav-discover-widget.c:880
+#: ../src/libedataserverui/e-webdav-discover-widget.c:881
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:883
+#: ../src/libedataserverui/e-webdav-discover-widget.c:884
 msgid "Searching server sources..."
 msgstr "Etsitään palvelinlähteitä..."
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:210
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:208
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain a password for '%s'"
+"from which to obtain a password for “%s”"
 msgstr ""
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:273
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:271
 #, fuzzy
 #| msgid "Failed to retrieve message"
 msgid "Failed to get password from GOA: "
 msgstr "Viestiä ei voitu hakea."
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:219
-#, c-format
-msgid "Code: %u - Unexpected response from server"
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:220
+#, fuzzy, c-format
+#| msgid "Code: %u - Unexpected response from server"
+msgid "Code: %u — Unexpected response from server"
 msgstr "Koodi: %u - Odottamaton vastaus palvelimelta"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:240
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:241
 #, fuzzy, c-format
 msgid "Failed to parse autodiscover response XML"
 msgstr "Viestiä ei voitu hakea."
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:249
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:250
 #, fuzzy, c-format
 msgid "Failed to find Autodiscover element"
 msgstr "Tiedon koodaus epäonnistui"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:261
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:262
 #, fuzzy, c-format
 msgid "Failed to find Response element"
 msgstr "Tiedon koodaus epäonnistui"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:273
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:274
 #, fuzzy, c-format
 msgid "Failed to find Account element"
 msgstr "Tiedon koodaus epäonnistui"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:287
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:288
 #, c-format
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr ""
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1235
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1340
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an access token for '%s'"
+"from which to obtain an access token for “%s”"
 msgstr ""
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1370
 #, fuzzy, c-format
 #| msgid "Failed to open addressbook at '%s': %s"
-msgid "Failed to obtain an access token for '%s': "
+msgid "Failed to obtain an access token for “%s”: "
 msgstr "Osoitekirjan avaaminen kohteessa \"%s\" epäonnistui: %s"
 
-#: ../modules/google-backend/module-google-backend.c:602
-#: ../modules/yahoo-backend/module-yahoo-backend.c:226
+#: ../src/modules/google-backend/module-google-backend.c:605
+#: ../src/modules/yahoo-backend/module-yahoo-backend.c:227
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: ../modules/google-backend/module-google-backend.c:659
-#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
-#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+#: ../src/modules/google-backend/module-google-backend.c:662
+#: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../src/services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../modules/yahoo-backend/module-yahoo-backend.c:199
+#: ../src/modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../src/modules/yahoo-backend/module-yahoo-backend.c:200
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
+#: ../src/modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
 msgid "Integrate your calendars"
 msgstr "Integroi kalenterisi"
 
-#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
+#: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
 msgid "Integrate your contacts"
 msgstr "Integroi yhteystietosi"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:272
+#: ../src/modules/ubuntu-online-accounts/e-signon-session-password.c:273
 msgid "Signon service did not return a secret"
 msgstr ""
 
-#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
 msgid "Evolution Data Server"
 msgstr "Evolution-datapalvelin"
 
-#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
+#: ../src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
 msgid "Required to have EDS appear in UOA"
 msgstr ""
 
-#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
 msgid "Google Calendar"
 msgstr "Google-kalenteri"
 
-#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
 msgid "Google Contacts"
 msgstr "Google-yhteystiedot"
 
-#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
 msgid "GMail"
 msgstr "GMail"
 
-#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
+#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
 msgid "Integrate your mailboxes"
 msgstr "Integroi postilaatikkosi"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
+#: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1061
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
-"which to obtain an access token for '%s'"
+"which to obtain an access token for “%s”"
 msgstr ""
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:85
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:282
 #, c-format
 msgid ""
 "Expected status 200 when requesting your identity, instead got status %d (%s)"
 msgstr ""
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:102
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:299
 msgid "Error parsing response as JSON: "
 msgstr "Virhe jäsentäessä vastausta JSON-muodossa: "
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
-msgid "Didn't find 'email' in JSON data"
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:120
+#, fuzzy
+#| msgid "Didn't find 'email' in JSON data"
+msgid "Didn’t find “email” in JSON data"
 msgstr "JSON-datasta ei löytynyt kohtaa 'email'"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:316
-msgid "Didn't find 'id' in JSON data"
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:317
+#, fuzzy
+#| msgid "Didn't find 'id' in JSON data"
+msgid "Didn’t find “id” in JSON data"
 msgstr "JSON-datasta ei löytynyt kohtaa 'id'"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:321
-msgid "Didn't find 'emails.account' in JSON data"
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:322
+#, fuzzy
+#| msgid "Didn't find 'emails.account' in JSON data"
+msgid "Didn’t find “emails.account” in JSON data"
 msgstr "JSON-datasta ei löytynyt kohtaa 'emails.account'"
 
-#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
 msgid "Windows Live Mail"
 msgstr "Windows Live Mail"
 
-#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
 msgid "Yahoo! Calendar"
 msgstr "Yahoo!-kalenteri"
 
-#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
 msgid "Yahoo! Mail"
 msgstr "Yahoo!-sähköposti"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:38
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:32
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:37
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:39
+#: ../src/services/evolution-user-prompter/evolution-user-prompter.c:33
 msgid "Keep running after the last client is closed"
 msgstr ""
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:39
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:41
 msgid "Wait running until at least one client is connected"
 msgstr ""
 
-#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/birthdays.source.in.h:1
 msgid "Birthdays & Anniversaries"
 msgstr "Syntymä- ja juhlapäivät"
 
-#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/google-stub.source.in.h:1
 msgid "Google"
 msgstr "Google"
 
-#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
 msgid "On LDAP Servers"
 msgstr "LDAP-palvelimilla"
 
-#: ../services/evolution-source-registry/builtin/local.source.in.h:1
-#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/local.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/local-stub.source.in.h:1
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
-#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1
 msgid "Search Folders"
 msgstr "Hakukansiot"
 
-#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/weather-stub.source.in.h:1
 msgid "Weather"
 msgstr "Sää"
 
-#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
 msgid "On The Web"
 msgstr "Verkossa"
 
-#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../services/evolution-source-registry/evolution-source-registry.c:39
-msgid "Don't migrate user data from previous versions of Evolution"
-msgstr ""
+#: ../src/services/evolution-source-registry/evolution-source-registry.c:40
+msgid "Don’t migrate user data from previous versions of Evolution"
+msgstr "Älä muunna käyttäjätietoja Evolutionin aiemmista versioista"
 
-#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
+#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
 msgid "_Dismiss"
 msgstr "_Hylkää"
 
-#: ../tools/addressbook-export/addressbook-export.c:70
-#: ../tools/addressbook-export/addressbook-export.c:767
-#| msgid "Cannot open calendar: "
+#: ../src/tools/addressbook-export/addressbook-export.c:68
+#: ../src/tools/addressbook-export/addressbook-export.c:782
 msgid "Can not open file"
 msgstr "Tiedoston avaaminen ei onnistu"
 
-#: ../tools/addressbook-export/addressbook-export.c:100
+#: ../src/tools/addressbook-export/addressbook-export.c:98
 #, fuzzy, c-format
 #| msgid "Failed to remove file '%s': %s"
-msgid "Failed to open client '%s': %s"
+msgid "Failed to open client “%s”: %s"
 msgstr "Tiedoston \"%s\" poistaminen epäonnistui: %s"
 
-#: ../tools/addressbook-export/addressbook-export.c:877
+#: ../src/tools/addressbook-export/addressbook-export.c:892
 #, fuzzy
 #| msgid "Detailed error:"
 msgid "Unhandled error"
 msgstr "Yksityiskohtainen virhe:"
 
-#: ../tools/addressbook-export/addressbook-export.c:910
+#: ../src/tools/addressbook-export/addressbook-export.c:925
 msgid "Specify the output file instead of standard output"
 msgstr ""
 
-#: ../tools/addressbook-export/addressbook-export.c:911
+#: ../src/tools/addressbook-export/addressbook-export.c:926
 msgid "OUTPUTFILE"
 msgstr ""
 
-#: ../tools/addressbook-export/addressbook-export.c:914
+#: ../src/tools/addressbook-export/addressbook-export.c:929
 #, fuzzy
 #| msgid "Error loading address book: %s"
 msgid "List local address book folders"
 msgstr "Virhe osoitekirjaa ladattaessa: %s"
 
-#: ../tools/addressbook-export/addressbook-export.c:917
+#: ../src/tools/addressbook-export/addressbook-export.c:932
 msgid "Show cards as vcard or csv file"
 msgstr ""
 
-#: ../tools/addressbook-export/addressbook-export.c:918
+#: ../src/tools/addressbook-export/addressbook-export.c:933
 msgid "[vcard|csv]"
 msgstr ""
 
-#: ../tools/addressbook-export/addressbook-export.c:966
+#: ../src/tools/addressbook-export/addressbook-export.c:981
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
-#: ../tools/addressbook-export/addressbook-export.c:980
+#: ../src/tools/addressbook-export/addressbook-export.c:995
 msgid "Only support csv or vcard format."
 msgstr ""
 
+#, fuzzy
+#~| msgid "Updating folder '%s'"
+#~ msgid "Update preview data for folder '%s : %s'"
+#~ msgstr "Päivitetään kansiota '%s'"
+
+#~ msgid "Cannot create folder '%s': %s"
+#~ msgstr "Kansiota \"%s\" ei voi luoda: %s"
+
+#~ msgid "Cannot get folder '%s': %s"
+#~ msgstr "Kansiota \"%s\" ei voi hakea: %s"
+
+#~ msgid "No such folder '%s'."
+#~ msgstr "Kansiota \"%s\" ei ole olemassa."
+
 #~ msgid "No backend name in source '%s'"
 #~ msgstr "Taustapalvelun nimeä ei löydy lähteestä \"%s\""
 



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